[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12926 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r12926 - gnunet/src/transport |
|
Date: |
Wed, 8 Sep 2010 16:29:25 +0200 |
Author: wachs
Date: 2010-09-08 16:29:25 +0200 (Wed, 08 Sep 2010)
New Revision: 12926
Modified:
gnunet/src/transport/plugin_transport_http.c
Log:
IN PROGRESS: fixing bsd bug
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-09-08 14:05:01 UTC
(rev 12925)
+++ gnunet/src/transport/plugin_transport_http.c 2010-09-08 14:29:25 UTC
(rev 12926)
@@ -1443,6 +1443,138 @@
}
+
+static void curl_handle_finished (struct Plugin *plugin)
+{
+ struct Session *ps = NULL;
+ struct HTTP_PeerContext *pc = NULL;
+ struct CURLMsg *msg;
+ struct HTTP_Message * cur_msg = NULL;
+
+ int msgs_in_queue;
+ char * tmp;
+ long http_result;
+
+ do
+ {
+ msg = curl_multi_info_read (plugin->multi_handle,
&msgs_in_queue);
+ if ((msgs_in_queue == 0) || (msg == NULL))
+ break;
+ /* get session for affected curl handle */
+ GNUNET_assert ( msg->easy_handle != NULL );
+ curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &tmp);
+ ps = (struct Session *) tmp;
+ GNUNET_assert ( ps != NULL );
+ pc = ps->peercontext;
+ GNUNET_assert ( pc != NULL );
+ switch (msg->msg)
+ {
+
+ case CURLMSG_DONE:
+ if ( (msg->data.result != CURLE_OK) &&
+ (msg->data.result != CURLE_GOT_NOTHING) )
+ {
+ /* sending msg failed*/
+ if (msg->easy_handle == ps->send_endpoint)
+ {
+ #if DEBUG_CONNECTIONS
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Connection %X: HTTP PUT
to peer `%s' (`%s') failed: `%s' `%s'\n"),
+ ps,
+ GNUNET_i2s(&pc->identity),
+
http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ "curl_multi_perform",
+ curl_easy_strerror
(msg->data.result));
+ #endif
+ ps->send_connected = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint=NULL;
+ cur_msg = ps->pending_msgs_tail;
+ if (( NULL != cur_msg) && ( NULL !=
cur_msg->transmit_cont))
+ cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+ }
+ /* GET connection failed */
+ if (msg->easy_handle == ps->recv_endpoint)
+ {
+ #if DEBUG_CONNECTIONS
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Connection %X: HTTP GET to peer
`%s' (`%s') failed: `%s' `%s'\n"),
+ ps,
+ GNUNET_i2s(&pc->identity),
+ http_plugin_address_to_string(NULL,
ps->addr, ps->addrlen),
+ "curl_multi_perform",
+ curl_easy_strerror (msg->data.result));
+ #endif
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_active = GNUNET_NO;
+
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
+ }
+ }
+ else
+ {
+ if (msg->easy_handle == ps->send_endpoint)
+ {
+ GNUNET_assert (CURLE_OK ==
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
+ #if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connection %X: HTTP
PUT connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+ ps,
+
GNUNET_i2s(&pc->identity),
+
http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ http_result);
+ #endif
+ /* Calling transmit continuation */
+ cur_msg = ps->pending_msgs_tail;
+ if (( NULL != cur_msg) && (NULL !=
cur_msg->transmit_cont))
+ {
+ /* HTTP 1xx : Last message before here was
informational */
+ if ((http_result >=100) && (http_result <
200))
+ cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+ /* HTTP 2xx: successful operations */
+ if ((http_result >=200) && (http_result <
300))
+ cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+ /* HTTP 3xx..5xx: error */
+ if ((http_result >=300) && (http_result <
600))
+ cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+ }
+ ps->send_connected = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint =NULL;
+ }
+ if (msg->easy_handle == ps->recv_endpoint)
+ {
+ #if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connection %X: HTTP
GET connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+ ps,
+
GNUNET_i2s(&pc->identity),
+
http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+ http_result);
+ #endif
+ ps->recv_connected = GNUNET_NO;
+ ps->recv_active = GNUNET_NO;
+
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
+ }
+ }
+ if ((ps->recv_connected == GNUNET_NO) &&
(ps->send_connected == GNUNET_NO))
+ remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
+ break;
+ default:
+ break;
+ }
+
+ }
+ while ( (msgs_in_queue > 0) );
+}
+
/**
* Task performing curl operations
* @param cls plugin as closure
@@ -1455,147 +1587,43 @@
struct Plugin *plugin = cls;
static unsigned int handles_last_run;
int running;
- int msgs_in_queue;
- struct CURLMsg *msg;
+
CURLMcode mret;
- struct Session *ps = NULL;
- struct HTTP_PeerContext *pc = NULL;
- struct HTTP_Message * cur_msg = NULL;
- long http_result;
- char * tmp;
GNUNET_assert(cls !=NULL);
plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
+ /*
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_STARTUP \n");
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_SHUTDOWN \n");
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_TIMEOUT \n");
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_READ_READY \n");
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_WRITE_READY \n");
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE ))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"SCHEDULE DUE TO:
GNUNET_SCHEDULER_REASON_PREREQ_DONE \n");
+
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"TIMEOUT RESCHEDULE\n");
+ curl_schedule(plugin);
+ return;
+ }
+ */
+
do
{
running = 0;
mret = curl_multi_perform (plugin->multi_handle, &running);
if ((running < handles_last_run) && (running>0))
- {
- do
- {
-
- msg = curl_multi_info_read (plugin->multi_handle,
&msgs_in_queue);
- if (running == 0)
- break;
- /* get session for affected curl handle */
- GNUNET_assert ( msg->easy_handle != NULL );
- curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &tmp);
- ps = (struct Session *) tmp;
- GNUNET_assert ( ps != NULL );
- pc = ps->peercontext;
- GNUNET_assert ( pc != NULL );
- switch (msg->msg)
- {
-
- case CURLMSG_DONE:
- if ( (msg->data.result != CURLE_OK) &&
- (msg->data.result != CURLE_GOT_NOTHING) )
- {
- /* sending msg failed*/
- if (msg->easy_handle == ps->send_endpoint)
- {
-#if DEBUG_CONNECTIONS
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Connection %X: HTTP PUT to peer `%s'
(`%s') failed: `%s' `%s'\n"),
- ps,
- GNUNET_i2s(&pc->identity),
- http_plugin_address_to_string(NULL, ps->addr,
ps->addrlen),
- "curl_multi_perform",
- curl_easy_strerror (msg->data.result));
-#endif
- ps->send_connected = GNUNET_NO;
- ps->send_active = GNUNET_NO;
-
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
- //curl_easy_cleanup(ps->send_endpoint);
- //ps->send_endpoint=NULL;
- cur_msg = ps->pending_msgs_tail;
- if (( NULL != cur_msg) && ( NULL !=
cur_msg->transmit_cont))
- cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
- }
- /* GET connection failed */
- if (msg->easy_handle == ps->recv_endpoint)
- {
-#if DEBUG_CONNECTIONS
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("Connection %X: HTTP GET to peer `%s' (`%s')
failed: `%s' `%s'\n"),
- ps,
- GNUNET_i2s(&pc->identity),
- http_plugin_address_to_string(NULL, ps->addr,
ps->addrlen),
- "curl_multi_perform",
- curl_easy_strerror (msg->data.result));
-#endif
- ps->recv_connected = GNUNET_NO;
- ps->recv_active = GNUNET_NO;
-
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
- //curl_easy_cleanup(ps->recv_endpoint);
- //ps->recv_endpoint=NULL;
- }
- }
- else
- {
- if (msg->easy_handle == ps->send_endpoint)
- {
- GNUNET_assert (CURLE_OK ==
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
-#if DEBUG_CONNECTIONS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connection %X: HTTP PUT connection to peer
`%s' (`%s') was closed with HTTP code %u\n",
- ps,
- GNUNET_i2s(&pc->identity),
- http_plugin_address_to_string(NULL,
ps->addr, ps->addrlen),
- http_result);
-#endif
- /* Calling transmit continuation */
- cur_msg = ps->pending_msgs_tail;
- if (( NULL != cur_msg) && (NULL !=
cur_msg->transmit_cont))
- {
- /* HTTP 1xx : Last message before here was
informational */
- if ((http_result >=100) && (http_result < 200))
- cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
- /* HTTP 2xx: successful operations */
- if ((http_result >=200) && (http_result < 300))
- cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
- /* HTTP 3xx..5xx: error */
- if ((http_result >=300) && (http_result < 600))
- cur_msg->transmit_cont
(cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
- }
- ps->send_connected = GNUNET_NO;
- ps->send_active = GNUNET_NO;
-
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
- //curl_easy_cleanup(ps->send_endpoint);
- //ps->send_endpoint =NULL;
- }
- if (msg->easy_handle == ps->recv_endpoint)
- {
-#if DEBUG_CONNECTIONS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connection %X: HTTP GET connection to peer
`%s' (`%s') was closed with HTTP code %u\n",
- ps,
- GNUNET_i2s(&pc->identity),
- http_plugin_address_to_string(NULL,
ps->addr, ps->addrlen),
- http_result);
-#endif
- ps->recv_connected = GNUNET_NO;
- ps->recv_active = GNUNET_NO;
-
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
- //curl_easy_cleanup(ps->recv_endpoint);
- //ps->recv_endpoint=NULL;
- }
- }
- if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected
== GNUNET_NO))
- remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
- break;
- default:
- break;
- }
-
- }
- while ( (msgs_in_queue > 0) );
- }
+ curl_handle_finished(plugin);
handles_last_run = running;
}
while (mret == CURLM_CALL_MULTI_PERFORM);
@@ -1618,7 +1646,8 @@
int max;
struct GNUNET_NETWORK_FDSet *grs;
struct GNUNET_NETWORK_FDSet *gws;
- long to;
+ struct GNUNET_TIME_Relative tv;
+ long curl_timeout;
CURLMcode mret;
GNUNET_assert(cls !=NULL);
@@ -1629,10 +1658,12 @@
GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
}
+
max = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
+
mret = curl_multi_fdset (plugin->multi_handle, &rs, &ws, &es, &max);
if (mret != CURLM_OK)
{
@@ -1642,15 +1673,24 @@
curl_multi_strerror (mret));
return GNUNET_SYSERR;
}
- mret = curl_multi_timeout (plugin->multi_handle, &to);
+ tv = GNUNET_TIME_UNIT_FOREVER_REL;
+ mret = curl_multi_timeout (plugin->multi_handle, &curl_timeout);
if (mret != CURLM_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_timeout", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return GNUNET_SYSERR;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_timeout", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
+ return GNUNET_SYSERR;
+ }
+ if (curl_timeout >= 0)
+ {
+ tv = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
curl_timeout);
+ }
+ if (curl_timeout >= -1)
+ {
+ tv = GNUNET_TIME_relative_get_zero();
+ }
grs = GNUNET_NETWORK_fdset_create ();
gws = GNUNET_NETWORK_fdset_create ();
@@ -1659,7 +1699,7 @@
plugin->http_curl_task = GNUNET_SCHEDULER_add_select (plugin->env->sched,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 0),
+ tv,
grs,
gws,
&curl_perform,
@@ -1729,6 +1769,10 @@
return GNUNET_SYSERR;
}
}
+ /* TEST CODE */
+ GNUNET_SCHEDULER_add_now(plugin->env->sched, &curl_perform, plugin);
+ /* TEST CODE */
+#if 0
if (curl_schedule (plugin) == GNUNET_SYSERR)
{
#if DEBUG_CONNECTIONS
@@ -1739,6 +1783,7 @@
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not
connected, initiating connection\n",ps);
#endif
+#endif
}
/* waiting for receive direction */
@@ -1820,8 +1865,14 @@
}
}
}
+
+ /* TEST CODE */
+ GNUNET_SCHEDULER_add_now(plugin->env->sched, &curl_perform, plugin);
+ /* TEST CODE */
+#if 0
if (curl_schedule (plugin) == GNUNET_SYSERR)
return GNUNET_SYSERR;
+#endif
return GNUNET_YES;
}
if (ps->direction == INBOUND)
@@ -2012,13 +2063,13 @@
GNUNET_assert(cls !=NULL);
#if DEBUG_HTTP
- char * force = GNUNET_malloc(40);
+ char * force;
if (force_address == GNUNET_YES)
- strcpy(force,"forced addr.");
+ GNUNET_asprintf(&force, "forced addr.");
if (force_address == GNUNET_NO)
- strcpy(force,"any addr.");
+ GNUNET_asprintf(&force, "any addr.");
if (force_address == GNUNET_SYSERR)
- strcpy(force,"reliable bi-direc. address addr.");
+ GNUNET_asprintf(&force,"reliable bi-direc. address addr.");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Transport tells me to send %u bytes to
`%s' using %s (%s) and session: %X\n",
msgbuf_size,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12926 - gnunet/src/transport,
gnunet <=