X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http.c;h=f879012c92b25ec74c45f489e6dfb57f8e9a0a64;hb=311e9e5636fdd21172f9bca63cc8746c654ae526;hp=ac04610c1f575405513dffd1291750968cb59e77;hpb=5ce0118cbd5e8197863f4a1e87e35d99b1823d4d;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index ac04610c1..f879012c9 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c @@ -35,7 +35,7 @@ #include "gnunet_resolver_service.h" #include "gnunet_server_lib.h" #include "gnunet_container_lib.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "gnunet_os_lib.h" #include "microhttpd.h" #include @@ -512,18 +512,18 @@ static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_ /** * Function setting up curl handle and selecting message to send + * * @param plugin plugin - * @param ses session to send data to - * @param con connection - * @return bytes sent to peer + * @param ps session + * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok */ static int send_check_connections (struct Plugin *plugin, struct Session *ps); /** * Function setting up file descriptors and scheduling task to run - * @param cls closure - * @param ses session to send data to - * @param + * + * @param plugin plugin as closure + * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok */ static int curl_schedule (struct Plugin *plugin); @@ -873,21 +873,30 @@ static void mhd_write_mst_cb (void *cls, ntohs(message->size), GNUNET_i2s(&(ps->peercontext)->identity),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen)); #endif + struct GNUNET_TRANSPORT_ATS_Information distance[2]; + distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE); + distance[0].value = htonl (1); + distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR); + distance[1].value = htonl (0); + delay = pc->plugin->env->receive (ps->peercontext->plugin->env->cls, &pc->identity, - message, 1, ps, + message, + (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, + 2, + ps, NULL, 0); pc->delay = delay; if (pc->reset_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (pc->plugin->env->sched, pc->reset_task); + GNUNET_SCHEDULER_cancel (pc->reset_task); - if (delay.value > 0) + if (delay.rel_value > 0) { #if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.rel_value); #endif - pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); + pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc); } } @@ -1182,7 +1191,7 @@ mhd_access_cb (void *cls, /* Recieving data */ if ((*upload_data_size > 0) && (ps->recv_active == GNUNET_YES)) { - if (pc->delay.value == 0) + if (pc->delay.rel_value == 0) { #if DEBUG_HTTP GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: PUT with %u bytes forwarded to MST\n", ps, *upload_data_size); @@ -1193,7 +1202,7 @@ mhd_access_cb (void *cls, else { #if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: no inbound bandwidth available! Next read was delayed for %llu ms\n", ps, ps->peercontext->delay.value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: no inbound bandwidth available! Next read was delayed for %llu ms\n", ps, ps->peercontext->delay.rel_value); #endif } return MHD_YES; @@ -1264,7 +1273,7 @@ http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_ha &max)); haveto = MHD_get_timeout (daemon_handle, &timeout); if (haveto == MHD_YES) - tv.value = (uint64_t) timeout; + tv.rel_value = (uint64_t) timeout; else tv = GNUNET_TIME_UNIT_SECONDS; GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1); @@ -1274,12 +1283,11 @@ http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_ha { if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4); + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v4); plugin->http_server_daemon_v4 = GNUNET_SCHEDULER_NO_TASK; } - ret = GNUNET_SCHEDULER_add_select (plugin->env->sched, - GNUNET_SCHEDULER_PRIORITY_DEFAULT, + ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, GNUNET_SCHEDULER_NO_TASK, tv, wrs, @@ -1291,12 +1299,11 @@ http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_ha { if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v6); + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v6); plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; } - ret = GNUNET_SCHEDULER_add_select (plugin->env->sched, - GNUNET_SCHEDULER_PRIORITY_DEFAULT, + ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, GNUNET_SCHEDULER_NO_TASK, tv, wrs, @@ -1578,22 +1585,30 @@ static void curl_receive_mst_cb (void *cls, ntohs(message->size), GNUNET_i2s(&(pc->identity)),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen)); #endif + struct GNUNET_TRANSPORT_ATS_Information distance[2]; + distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE); + distance[0].value = htonl (1); + distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR); + distance[1].value = htonl (0); + delay = pc->plugin->env->receive (pc->plugin->env->cls, &pc->identity, - message, 1, ps, + message, + (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, 2, + ps, ps->addr, ps->addrlen); pc->delay = delay; if (pc->reset_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (pc->plugin->env->sched, pc->reset_task); + GNUNET_SCHEDULER_cancel (pc->reset_task); - if (delay.value > 0) + if (delay.rel_value > 0) { #if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Inbound quota management: delay next read for %llu ms \n", ps, delay.rel_value); #endif - pc->reset_task = GNUNET_SCHEDULER_add_delayed (pc->plugin->env->sched, delay, &reset_inbound_quota_delay, pc); + pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc); } } @@ -1611,10 +1626,10 @@ static size_t curl_receive_cb( void *stream, size_t size, size_t nmemb, void *pt { struct Session * ps = ptr; - if (ps->peercontext->delay.value > 0) + if (ps->peercontext->delay.rel_value > 0) { #if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: no inbound bandwidth available! Next read was delayed for %llu ms\n", ps, ps->peercontext->delay.value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: no inbound bandwidth available! Next read was delayed for %llu ms\n", ps, ps->peercontext->delay.rel_value); #endif return (0); } @@ -1803,7 +1818,7 @@ static void curl_perform (void *cls, /** * Function setting up file descriptors and scheduling task to run * - * @param plugin plugin as closure + * @param plugin plugin as closure * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok */ static int curl_schedule(struct Plugin *plugin) @@ -1820,7 +1835,7 @@ static int curl_schedule(struct Plugin *plugin) /* Cancel previous scheduled task */ if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; } @@ -1851,8 +1866,7 @@ static int curl_schedule(struct Plugin *plugin) gws = GNUNET_NETWORK_fdset_create (); GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1); GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1); - plugin->http_curl_task = GNUNET_SCHEDULER_add_select (plugin->env->sched, - GNUNET_SCHEDULER_PRIORITY_DEFAULT, + plugin->http_curl_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, GNUNET_SCHEDULER_NO_TASK, (to == -1) ? GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) : GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, to), grs, @@ -1935,7 +1949,7 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps) curl_easy_setopt(ps->recv_endpoint, CURLOPT_READDATA, ps); curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb); curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEDATA, ps); - curl_easy_setopt(ps->recv_endpoint, CURLOPT_TIMEOUT, (long) timeout.value); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_TIMEOUT, (long) timeout.rel_value); curl_easy_setopt(ps->recv_endpoint, CURLOPT_PRIVATE, ps); curl_easy_setopt(ps->recv_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT); curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, 2*GNUNET_SERVER_MAX_MESSAGE_SIZE); @@ -1958,10 +1972,10 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps) } if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; } - plugin->http_curl_task = GNUNET_SCHEDULER_add_now (plugin->env->sched, &curl_perform, plugin); + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); } /* waiting for receive direction */ @@ -1989,10 +2003,10 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps) ps->send_active=GNUNET_YES; if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; } - plugin->http_curl_task = GNUNET_SCHEDULER_add_now (plugin->env->sched, &curl_perform, plugin); + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); return GNUNET_YES; } else @@ -2034,7 +2048,7 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps) curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps); curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb); curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps); - curl_easy_setopt(ps->send_endpoint, CURLOPT_TIMEOUT, (long) timeout.value); + curl_easy_setopt(ps->send_endpoint, CURLOPT_TIMEOUT, (long) timeout.rel_value); curl_easy_setopt(ps->send_endpoint, CURLOPT_PRIVATE, ps); curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT); curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); @@ -2058,10 +2072,10 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps) } if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; } - plugin->http_curl_task = GNUNET_SCHEDULER_add_now (plugin->env->sched, &curl_perform, plugin); + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); return GNUNET_YES; } if (ps->direction == INBOUND) @@ -2299,17 +2313,15 @@ http_plugin_send (void *cls, if (force_address != GNUNET_YES) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new session %X to peer %s\n", ps, GNUNET_i2s(target)); #endif - if ((addrlen!=0) && (addr!=NULL)) - { - ps->addr = GNUNET_malloc(addrlen); - memcpy(ps->addr,addr,addrlen); - ps->addrlen = addrlen; - } + ps->addr = GNUNET_malloc(addrlen); + memcpy(ps->addr,addr,addrlen); + ps->addrlen = addrlen; + /* else { ps->addr = NULL; ps->addrlen = 0; - } + }*/ ps->direction=OUTBOUND; ps->recv_connected = GNUNET_NO; ps->recv_force_disconnect = GNUNET_NO; @@ -2658,13 +2670,13 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4); + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v4); plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK; } if ( plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v6); + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v6); plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; } @@ -2703,7 +2715,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; } @@ -2982,7 +2994,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) GNUNET_assert ((port > 0) && (port <= 65535)); plugin->port_inbound = port; gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT; - unsigned int timeout = (gn_timeout.value) / 1000; + unsigned int timeout = (gn_timeout.rel_value) / 1000; if ((plugin->http_server_daemon_v6 == NULL) && (plugin->use_ipv6 == GNUNET_YES) && (port != 0)) { struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address; @@ -3102,4 +3114,4 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) return api; } -/* end of plugin_transport_http.c */ +/* end of gnunet_transport_plugin.http.c */