Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zmap
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
zmap
Commits
8ba0bb00
Commit
8ba0bb00
authored
20 years ago
by
edgrif
Browse files
Options
Downloads
Patches
Plain Diff
fix faulty request function, prototype has changed.
parent
a2f2db1f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/zmapServer/das/dasServer.c
+14
-5
14 additions, 5 deletions
src/zmapServer/das/dasServer.c
with
14 additions
and
5 deletions
src/zmapServer/das/dasServer.c
+
14
−
5
View file @
8ba0bb00
...
...
@@ -27,9 +27,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
* Last edited:
Mar
2
2
1
1:09
2004 (edgrif)
* Last edited:
Jun
2
9
1
3:48
2004 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: dasServer.c,v 1.
1
2004-0
3
-2
2
1
3
:4
5:1
9 edgrif Exp $
* CVS info: $Id: dasServer.c,v 1.
2
2004-0
6
-2
9
1
2
:4
8:4
9 edgrif Exp $
*-------------------------------------------------------------------
*/
...
...
@@ -46,7 +46,8 @@ static gboolean createConnection(void **server_out,
char
*
host
,
int
port
,
char
*
userid
,
char
*
passwd
,
int
timeout
)
;
static
gboolean
openConnection
(
void
*
server
)
;
static
gboolean
request
(
void
*
server
,
char
*
request
,
void
**
reply
,
int
*
reply_len
)
;
static
gboolean
request
(
void
*
server
,
ZMapServerRequestType
request
,
char
*
sequence
,
ZMapFeatureContext
*
feature_context
)
;
static
char
*
lastErrorMsg
(
void
*
server
)
;
static
gboolean
closeConnection
(
void
*
server
)
;
static
gboolean
destroyConnection
(
void
*
server
)
;
...
...
@@ -181,7 +182,8 @@ static gboolean openConnection(void *server_in)
/* OH, OK, THE HTTP BIT SHOULD BE THE REQUEST IN HERE PROBABLY.... */
static
gboolean
request
(
void
*
server_in
,
char
*
request
,
void
**
reply
,
int
*
reply_len
)
static
gboolean
request
(
void
*
server_in
,
ZMapServerRequestType
request
,
char
*
sequence
,
ZMapFeatureContext
*
feature_context
)
{
gboolean
result
=
TRUE
;
DasServer
server
=
(
DasServer
)
server_in
;
...
...
@@ -200,15 +202,22 @@ static gboolean request(void *server_in, char *request, void **reply, int *reply
/* OK, this call actually contacts the http server and gets the data. */
if
(
result
&&
((
server
->
curl_error
=
curl_easy_perform
(
server
->
curl_handle
))
!=
CURLE_OK
))
l
((
server
->
curl_error
=
curl_easy_perform
(
server
->
curl_handle
))
!=
CURLE_OK
))
result
=
FALSE
;
/* Dummy data.... */
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
if
(
result
)
{
*
reply
=
(
void
*
)
"das dummy data...."
;
*
reply_len
=
strlen
(
"das dummy data...."
)
+
1
;
}
#endif
/* ED_G_NEVER_INCLUDE_THIS_CODE */
/* DUMMY FOR NOW......... */
*
feature_context
=
NULL
;
return
result
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment