projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaning up set handlers, eliminating 2nd level demultiplexing and improving use...
[oweals/gnunet.git]
/
src
/
transport
/
plugin_transport_http_client.c
diff --git
a/src/transport/plugin_transport_http_client.c
b/src/transport/plugin_transport_http_client.c
index 2b0b8939e8614f9b0284522d98ed34cd0b5f1e40..ceed94af8b2d700e7ddd7bdcde231364bd593e57 100644
(file)
--- a/
src/transport/plugin_transport_http_client.c
+++ b/
src/transport/plugin_transport_http_client.c
@@
-226,17
+226,17
@@
struct GNUNET_ATS_Session
/**
* Session timeout task
*/
/**
* Session timeout task
*/
- struct GNUNET_SCHEDULER_Task *
put_disconnect_task;
+ struct GNUNET_SCHEDULER_Task *put_disconnect_task;
/**
* Session timeout task
*/
/**
* Session timeout task
*/
- struct GNUNET_SCHEDULER_Task *
timeout_task;
+ struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* Task to wake up client receive handle when receiving is allowed again
*/
/**
* Task to wake up client receive handle when receiving is allowed again
*/
- struct GNUNET_SCHEDULER_Task *
recv_wakeup_task;
+ struct GNUNET_SCHEDULER_Task *recv_wakeup_task;
/**
* Absolute time when to receive data again.
/**
* Absolute time when to receive data again.
@@
-681,7
+681,7
@@
client_log (CURL *curl,
ttype = "UNSPECIFIED";
break;
}
ttype = "UNSPECIFIED";
break;
}
- memcpy (text, data, size);
+
GNUNET_
memcpy (text, data, size);
if (text[size - 1] == '\n')
{
text[size] = '\0';
if (text[size - 1] == '\n')
{
text[size] = '\0';
@@
-774,7
+774,7
@@
http_client_plugin_send (void *cls,
msg->buf = (char *) &msg[1];
msg->transmit_cont = cont;
msg->transmit_cont_cls = cont_cls;
msg->buf = (char *) &msg[1];
msg->transmit_cont = cont;
msg->transmit_cont_cls = cont_cls;
- memcpy (msg->buf,
+
GNUNET_
memcpy (msg->buf,
msgbuf,
msgbuf_size);
GNUNET_CONTAINER_DLL_insert_tail (s->msg_head,
msgbuf,
msgbuf_size);
GNUNET_CONTAINER_DLL_insert_tail (s->msg_head,
@@
-1061,8
+1061,10
@@
client_send_cb (void *stream,
"Session %p/request %p: nothing to send, suspending\n",
s,
s->put.easyhandle);
"Session %p/request %p: nothing to send, suspending\n",
s,
s->put.easyhandle);
- s->put_disconnect_task = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT,
- &client_put_disconnect, s);
+ s->put_disconnect_task
+ = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT,
+ &client_put_disconnect,
+ s);
s->put.state = H_PAUSED;
return CURL_READFUNC_PAUSE;
}
s->put.state = H_PAUSED;
return CURL_READFUNC_PAUSE;
}
@@
-1071,7
+1073,9
@@
client_send_cb (void *stream,
/* calculate how much fits in buffer */
len = GNUNET_MIN (msg->size - msg->pos,
size * nmemb);
/* calculate how much fits in buffer */
len = GNUNET_MIN (msg->size - msg->pos,
size * nmemb);
- memcpy (stream, &msg->buf[msg->pos], len);
+ GNUNET_memcpy (stream,
+ &msg->buf[msg->pos],
+ len);
msg->pos += len;
if (msg->pos == msg->size)
{
msg->pos += len;
if (msg->pos == msg->size)
{
@@
-1130,12
+1134,8
@@
static void
client_wake_up (void *cls)
{
struct GNUNET_ATS_Session *s = cls;
client_wake_up (void *cls)
{
struct GNUNET_ATS_Session *s = cls;
- const struct GNUNET_SCHEDULER_TaskContext *tc;
s->recv_wakeup_task = NULL;
s->recv_wakeup_task = NULL;
- tc = GNUNET_SCHEDULER_get_task_context ();
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p/request %p: Waking up GET handle\n",
s, s->get.easyhandle);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p/request %p: Waking up GET handle\n",
s, s->get.easyhandle);
@@
-1301,13
+1301,8
@@
client_run (void *cls)
CURLMsg *msg;
int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */
int msgs_left;
CURLMsg *msg;
int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */
int msgs_left;
- const struct GNUNET_SCHEDULER_TaskContext *tc;
plugin->client_perform_task = NULL;
plugin->client_perform_task = NULL;
- tc = GNUNET_SCHEDULER_get_task_context ();
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
/* While data are available or timeouts occured */
do
{
/* While data are available or timeouts occured */
do
{
@@
-2379,8
+2374,10
@@
http_client_plugin_update_inbound_delay (void *cls,
if (s->recv_wakeup_task != NULL)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
if (s->recv_wakeup_task != NULL)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
- s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delay,
- &client_wake_up, s);
+ s->recv_wakeup_task
+ = GNUNET_SCHEDULER_add_delayed (delay,
+ &client_wake_up,
+ s);
}
}
}
}