X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http.c;h=f879012c92b25ec74c45f489e6dfb57f8e9a0a64;hb=311e9e5636fdd21172f9bca63cc8746c654ae526;hp=36e0f6a4921bc3b577e58d4c53d401604c3f5eef;hpb=e69e7a3bc5bc1620a14d68625ed95ff6401cc976;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 36e0f6a49..f879012c9 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c @@ -25,6 +25,7 @@ */ #include "platform.h" +#include "gnunet_common.h" #include "gnunet_constants.h" #include "gnunet_protocols.h" #include "gnunet_connection_lib.h" @@ -34,19 +35,36 @@ #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 +#if BUILD_HTTPS +#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init +#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done +#define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https +#define PROTOCOL_PREFIX "https" +#else +#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init +#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done +#define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http +#define PROTOCOL_PREFIX "http" +#endif -#define DEBUG_CURL GNUNET_NO #define DEBUG_HTTP GNUNET_NO -#define DEBUG_CONNECTIONS GNUNET_YES +#define DEBUG_CURL GNUNET_NO +#define DEBUG_MHD GNUNET_NO +#define DEBUG_CONNECTIONS GNUNET_NO +#define DEBUG_SESSION_SELECTION GNUNET_NO +#define DEBUG_SCHEDULING GNUNET_NO +#define CURL_TCP_NODELAY GNUNET_YES #define INBOUND GNUNET_NO #define OUTBOUND GNUNET_YES + + /** * Text of the response sent back after the last bytes of a PUT * request have been received (just to formally obey the HTTP @@ -71,11 +89,22 @@ */ #define HTTP_CONNECT_TIMEOUT 30 + /** * Network format for IPv4 addresses. */ struct IPv4HttpAddress { + /** + * Linked list next + */ + struct IPv4HttpAddress * next; + + /** + * Linked list previous + */ + struct IPv4HttpAddress * prev; + /** * IPv4 address, in network byte order. */ @@ -94,6 +123,16 @@ struct IPv4HttpAddress */ struct IPv6HttpAddress { + /** + * Linked list next + */ + struct IPv6HttpAddress * next; + + /** + * Linked list previous + */ + struct IPv6HttpAddress * prev; + /** * IPv6 address. */ @@ -179,6 +218,21 @@ struct HTTP_PeerContext * id for next session */ size_t session_id_counter; + + /** + * Last session used to send data + */ + struct Session * last_session; + + /** + * The task resetting inbound quota delay + */ + GNUNET_SCHEDULER_TaskIdentifier reset_task; + + /** + * Delay from transport service inbound quota tracker when to receive data again + */ + struct GNUNET_TIME_Relative delay; }; @@ -273,6 +327,7 @@ struct Session */ unsigned int recv_force_disconnect; + /** * id for next session * NOTE: 0 is not an ID, zero is not defined. A correct ID is always > 0 @@ -292,6 +347,17 @@ struct Session * inbound session: mhd_connection * */ void * recv_endpoint; + + /** + * Current queue size + */ + size_t queue_length_cur; + + /** + * Max queue size + */ + size_t queue_length_max; + }; /** @@ -304,7 +370,15 @@ struct Plugin */ struct GNUNET_TRANSPORT_PluginEnvironment *env; - unsigned int port_inbound; + /** + * Handle for reporting statistics. + */ + struct GNUNET_STATISTICS_Handle *stats; + + /** + * Plugin Port + */ + uint16_t port_inbound; struct GNUNET_CONTAINER_MultiHashMap *peers; @@ -338,11 +412,73 @@ struct Plugin */ CURLM * multi_handle; + /** + * ipv4 DLL head + */ + struct IPv4HttpAddress * ipv4_addr_head; + + /** + * ipv4 DLL tail + */ + struct IPv4HttpAddress * ipv4_addr_tail; + + /** + * ipv6 DLL head + */ + struct IPv6HttpAddress * ipv6_addr_head; + + /** + * ipv6 DLL tail + */ + struct IPv6HttpAddress * ipv6_addr_tail; + /** * Our ASCII encoded, hashed peer identity * This string is used to distinguish between connections and is added to the urls */ struct GNUNET_CRYPTO_HashAsciiEncoded my_ascii_hash_ident; + + /** + * IPv4 Address the plugin binds to + */ + struct sockaddr_in * bind4_address; + + /** + * IPv6 Address the plugins binds to + */ + struct sockaddr_in6 * bind6_address; + + /** + * Hostname to bind to + */ + char * bind_hostname; + + /** + * Is IPv4 enabled? + */ + int use_ipv6; + + /** + * Is IPv6 enabled? + */ + int use_ipv4; + + /** + * Closure passed by MHD to the mhd_logger function + */ + void * mhd_log; + + /* only needed for HTTPS plugin */ +#if BUILD_HTTPS + /* The certificate MHD uses as an \0 terminated string */ + char * cert; + + /* The private key MHD uses as an \0 terminated string */ + char * key; + + /* crypto init string */ + char * crypto_init; +#endif }; @@ -362,24 +498,82 @@ http_plugin_address_to_string (void *cls, const void *addr, size_t addrlen); -static char * create_url(void * cls, const void * addr, size_t addrlen, size_t id) + +/** + * Call MHD to process pending ipv4 requests and then go back + * and schedule the next run. + */ +static void http_server_daemon_v4_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); +/** + * Call MHD to process pending ipv6 requests and then go back + * and schedule the next run. + */ +static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); + +/** + * Function setting up curl handle and selecting message to send + * + * @param plugin plugin + * @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 plugin plugin as closure + * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok + */ +static int curl_schedule (struct Plugin *plugin); + +/** + * Task scheduled to reset the inbound quota delay for a specific peer + * @param cls plugin as closure + * @param tc task context + */ +static void reset_inbound_quota_delay (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct HTTP_PeerContext * pc; + + GNUNET_assert(cls !=NULL); + + pc = (struct HTTP_PeerContext *) cls; + pc->reset_task = GNUNET_SCHEDULER_NO_TASK; + + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + return; + + pc->delay = GNUNET_TIME_relative_get_zero (); +} + + +/** + * Creates a valid url from passed address and id + * @param plugin plugin + * @param addr address to create url from + * @param addrlen address lenth + * @param id session id + * @return the created url + */ +static char * create_url(struct Plugin *plugin, const void * addr, size_t addrlen, size_t id) { - struct Plugin *plugin = cls; char *url = NULL; + char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen); GNUNET_assert ((addr!=NULL) && (addrlen != 0)); GNUNET_asprintf(&url, - "http://%s/%s;%u", - http_plugin_address_to_string(NULL, addr, addrlen), + "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str, (char *) (&plugin->my_ascii_hash_ident),id); - + GNUNET_free_non_null(addr_str); return url; } /** * Removes a message from the linked list of messages - * @param con connection to remove message from - * @param msg message to remove + * @param ps session + * @param msg message * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success */ static int remove_http_message (struct Session * ps, struct HTTP_Message * msg) @@ -389,22 +583,98 @@ static int remove_http_message (struct Session * ps, struct HTTP_Message * msg) return GNUNET_OK; } +/** + * Iterator to remove peer context + * @param cls the plugin + * @param key the peers public key hashcode + * @param value the peer context + * @return GNUNET_YES on success + */ +int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value) +{ + struct Plugin *plugin = cls; + struct HTTP_PeerContext * pc = value; + struct Session * ps = pc->head; + struct Session * tmp = NULL; + struct HTTP_Message * msg = NULL; + struct HTTP_Message * msg_tmp = NULL; +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing context for peer `%s'\n",GNUNET_i2s(&pc->identity)); +#endif + GNUNET_CONTAINER_multihashmap_remove (plugin->peers, &pc->identity.hashPubKey, pc); + while (ps!=NULL) + { + plugin->env->session_end(plugin, &pc->identity, ps); + tmp = ps->next; + + GNUNET_free_non_null (ps->addr); + GNUNET_free(ps->url); + if (ps->msgtok != NULL) + GNUNET_SERVER_mst_destroy (ps->msgtok); + + msg = ps->pending_msgs_head; + while (msg!=NULL) + { + msg_tmp = msg->next; + GNUNET_free(msg); + msg = msg_tmp; + } + if (ps->direction==OUTBOUND) + { + if (ps->send_endpoint!=NULL) + curl_easy_cleanup(ps->send_endpoint); + if (ps->recv_endpoint!=NULL) + curl_easy_cleanup(ps->recv_endpoint); + } + + GNUNET_free(ps); + ps=tmp; + } + GNUNET_free(pc); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# HTTP peers active"), + -1, + GNUNET_NO); + return GNUNET_YES; +} + + /** * Removes a session from the linked list of sessions * @param pc peer context * @param ps session * @param call_msg_cont GNUNET_YES to call pending message continuations, otherwise no - * @param call_msg_cont_result, result to call message continuations with + * @param call_msg_cont_result result to call message continuations with * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success */ static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps, int call_msg_cont, int call_msg_cont_result) { struct HTTP_Message * msg; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound",ps->session_id); + struct Plugin * plugin = ps->peercontext->plugin; + +#if DEBUG_CONNECTIONS + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session %X with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound", ps, ps->session_id); +#endif + plugin->env->session_end(plugin, &pc->identity, ps); + GNUNET_free_non_null (ps->addr); GNUNET_SERVER_mst_destroy (ps->msgtok); GNUNET_free(ps->url); + if (ps->direction==INBOUND) + { + if (ps->recv_endpoint != NULL) + { + curl_easy_cleanup(ps->recv_endpoint); + ps->recv_endpoint = NULL; + } + if (ps->send_endpoint != NULL) + { + curl_easy_cleanup(ps->send_endpoint); + ps->send_endpoint = NULL; + } + } + msg = ps->pending_msgs_head; while (msg!=NULL) { @@ -412,53 +682,141 @@ static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps, i { msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,call_msg_cont_result); } - GNUNET_free(msg); GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg); + GNUNET_free(msg); msg = ps->pending_msgs_head; } GNUNET_CONTAINER_DLL_remove(pc->head,pc->tail,ps); GNUNET_free(ps); ps = NULL; + + /* no sessions left remove peer */ + if (pc->head==NULL) + { +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No sessions left for peer `%s', removing context\n",GNUNET_i2s(&pc->identity)); +#endif + remove_peer_context_Iterator(plugin, &pc->identity.hashPubKey, pc); + } + return GNUNET_OK; } -static struct Session * get_Session (void * cls, struct HTTP_PeerContext *pc, const void * addr, size_t addr_len) + +/** + * Add the IP of our network interface to the list of + * our external IP addresses. + * + * @param cls the 'struct Plugin*' + * @param name name of the interface + * @param isDefault do we think this may be our default interface + * @param addr address of the interface + * @param addrlen number of bytes in addr + * @return GNUNET_OK to continue iterating + */ +static int +process_interfaces (void *cls, + const char *name, + int isDefault, + const struct sockaddr *addr, socklen_t addrlen) { - struct Session * cc = pc->head; - struct Session * con = NULL; - unsigned int count = 0; + struct Plugin *plugin = cls; + struct IPv4HttpAddress * t4; + struct IPv6HttpAddress * t6; + int af; - GNUNET_assert((addr_len == sizeof (struct IPv4HttpAddress)) || (addr_len == sizeof (struct IPv6HttpAddress))); - while (cc!=NULL) - { - if (addr_len == cc->addrlen) + + GNUNET_assert(cls !=NULL); + af = addr->sa_family; + if ((af == AF_INET) && (plugin->use_ipv4 == GNUNET_YES) && (plugin->bind6_address == NULL)) { - if (0 == memcmp(cc->addr, addr, addr_len)) + struct in_addr bnd_cmp = ((struct sockaddr_in *) addr)->sin_addr; + t4 = GNUNET_malloc(sizeof(struct IPv4HttpAddress)); + /* Not skipping loopback addresses + if (INADDR_LOOPBACK == ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)) { - /* connection can not be used, since it is disconnected */ - if ((cc->recv_force_disconnect==GNUNET_NO) && (cc->send_force_disconnect==GNUNET_NO)) - con = cc; - break; + + return GNUNET_OK; + } + */ + t4->ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; + t4->u_port = htons (plugin->port_inbound); + if (plugin->bind4_address != NULL) + { + if (0 == memcmp(&plugin->bind4_address->sin_addr, &bnd_cmp, sizeof (struct in_addr))) + { + GNUNET_CONTAINER_DLL_insert(plugin->ipv4_addr_head,plugin->ipv4_addr_tail,t4); + plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL); + return GNUNET_OK; + } + GNUNET_free (t4); + return GNUNET_OK; + } + else + { + GNUNET_CONTAINER_DLL_insert(plugin->ipv4_addr_head,plugin->ipv4_addr_tail,t4); + plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL); + return GNUNET_OK; } } - count++; - cc=cc->next; - } - return con; + else if ((af == AF_INET6) && (plugin->use_ipv6 == GNUNET_YES) && (plugin->bind4_address == NULL)) + { + struct in6_addr bnd_cmp6 = ((struct sockaddr_in6 *) addr)->sin6_addr; + if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) + { + return GNUNET_OK; + } + t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress)); + GNUNET_assert(t6 != NULL); + if (plugin->bind6_address != NULL) + { + if (0 == memcmp(&plugin->bind6_address->sin6_addr, &bnd_cmp6, sizeof (struct in6_addr))) + { + memcpy (&t6->ipv6_addr, + &((struct sockaddr_in6 *) addr)->sin6_addr, + sizeof (struct in6_addr)); + t6->u6_port = htons (plugin->port_inbound); + plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL); + GNUNET_CONTAINER_DLL_insert(plugin->ipv6_addr_head,plugin->ipv6_addr_tail,t6); + return GNUNET_OK; + } + GNUNET_free (t6); + return GNUNET_OK; + } + memcpy (&t6->ipv6_addr, + &((struct sockaddr_in6 *) addr)->sin6_addr, + sizeof (struct in6_addr)); + t6->u6_port = htons (plugin->port_inbound); + GNUNET_CONTAINER_DLL_insert(plugin->ipv6_addr_head,plugin->ipv6_addr_tail,t6); + plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL); + } + return GNUNET_OK; } /** - * Callback called by MHD when a connection is terminated + * External logging function for MHD + * @param arg arguments + * @param fmt format string + * @param ap list of arguments */ +void mhd_logger (void * arg, const char * fmt, va_list ap) +{ + char text[1024]; + vsnprintf(text, 1024, fmt, ap); + va_end(ap); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"MHD: %s \n", text); +} + + static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, void **httpSessionCache) { struct Session * ps = *httpSessionCache; if (ps == NULL) return; struct HTTP_PeerContext * pc = ps->peercontext; - + if (connection==ps->recv_endpoint) { #if DEBUG_CONNECTIONS @@ -482,63 +840,77 @@ static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, v /* if both connections disconnected, remove session */ if ((ps->send_connected == GNUNET_NO) && (ps->recv_connected == GNUNET_NO)) { + GNUNET_STATISTICS_update (pc->plugin->env->stats, + gettext_noop ("# HTTP inbound sessions for peers active"), + -1, + GNUNET_NO); remove_session(pc,ps,GNUNET_YES,GNUNET_SYSERR); } } +/** + * Callback called by MessageStreamTokenizer when a message has arrived + * @param cls current session as closure + * @param client clien + * @param message the message to be forwarded to transport service + */ + static void mhd_write_mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) { - + struct GNUNET_TIME_Relative delay; struct Session *ps = cls; - struct HTTP_PeerContext *pc = ps->peercontext; GNUNET_assert(ps != NULL); - GNUNET_assert(pc != NULL); + struct HTTP_PeerContext *pc = ps->peercontext; + GNUNET_assert(pc != NULL); +#if DEBUG_HTTP GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n", ps, ntohs(message->type), ntohs(message->size), GNUNET_i2s(&(ps->peercontext)->identity),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen)); - - pc->plugin->env->receive (ps->peercontext->plugin->env->cls, - &pc->identity, - message, 1, ps, - 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, + (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->reset_task); + + 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.rel_value); +#endif + pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc); + } } -static void curl_receive_mst_cb (void *cls, - void *client, - const struct GNUNET_MessageHeader *message) -{ - struct Session *ps = cls; - struct HTTP_PeerContext *pc = ps->peercontext; - GNUNET_assert(ps != NULL); - GNUNET_assert(pc != NULL); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n", - ntohs(message->type), - ntohs(message->size), - GNUNET_i2s(&(pc->identity)),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen)); - - pc->plugin->env->receive (pc->plugin->env->cls, - &pc->identity, - message, 1, ps, - ps->addr, - ps->addrlen); -} - - -/** - * Check if ip is allowed to connect. - */ -static int -mhd_accept_cb (void *cls, - const struct sockaddr *addr, socklen_t addr_len) +/** + * Check if incoming connection is accepted. + * NOTE: Here every connection is accepted + * @param cls plugin as closure + * @param addr address of incoming connection + * @param addr_len address length of incoming connection + * @return MHD_YES if connection is accepted, MHD_NO if connection is rejected + * + */ +static int +mhd_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len) { #if 0 struct Plugin *plugin = cls; @@ -547,16 +919,25 @@ mhd_accept_cb (void *cls, return MHD_YES; } -int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max) -{ - int bytes_read = 0; +/** + * Callback called by MHD when it needs data to send + * @param cls current session + * @param pos position in buffer + * @param buf the buffer to write data to + * @param max max number of bytes available in buffer + * @return bytes written to buffer + */ +static ssize_t +mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max) +{ struct Session * ps = cls; struct HTTP_PeerContext * pc; struct HTTP_Message * msg; - int res;res=5; + int bytes_read = 0; GNUNET_assert (ps!=NULL); + pc = ps->peercontext; msg = ps->pending_msgs_tail; if (ps->send_force_disconnect==GNUNET_YES) @@ -586,9 +967,13 @@ int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max) { if (NULL!=msg->transmit_cont) msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,GNUNET_OK); - res = remove_http_message(ps,msg); + ps->queue_length_cur -= msg->size; + remove_http_message(ps,msg); } } +#if DEBUG_CONNECTIONS + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: MHD has sent %u bytes\n", ps, bytes_read); +#endif return bytes_read; } @@ -600,13 +985,13 @@ int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max) * already exists and create a new one if not. */ static int -mdh_access_cb (void *cls, - struct MHD_Connection *mhd_connection, - const char *url, - const char *method, - const char *version, - const char *upload_data, - size_t * upload_data_size, void **httpSessionCache) +mhd_access_cb (void *cls, + struct MHD_Connection *mhd_connection, + const char *url, + const char *method, + const char *version, + const char *upload_data, + size_t * upload_data_size, void **httpSessionCache) { struct Plugin *plugin = cls; struct MHD_Response *response; @@ -622,14 +1007,14 @@ mdh_access_cb (void *cls, struct IPv4HttpAddress ipv4addr; struct IPv6HttpAddress ipv6addr; - struct HTTP_PeerContext *pc; - struct Session *ps; - struct Session *ps_tmp; + struct HTTP_PeerContext *pc = NULL; + struct Session *ps = NULL; + struct Session *ps_tmp = NULL; int res = GNUNET_NO; int send_error_to_client; - void * addr; - size_t addr_len; + void * addr = NULL; + size_t addr_len = 0 ; GNUNET_assert(cls !=NULL); send_error_to_client = GNUNET_NO; @@ -656,10 +1041,12 @@ mdh_access_cb (void *cls, response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE),HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO); res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response); MHD_destroy_response (response); +#if DEBUG_CONNECTIONS if (res == MHD_YES) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, sent HTTP 1.1/404\n"); else GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, could not send error\n"); +#endif return res; } } @@ -679,8 +1066,13 @@ mdh_access_cb (void *cls, pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext)); pc->plugin = plugin; pc->session_id_counter=1; + pc->last_session = NULL; memcpy(&pc->identity, &pi_in, sizeof(struct GNUNET_PeerIdentity)); GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# HTTP peers active"), + 1, + GNUNET_NO); } conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS ); @@ -705,8 +1097,9 @@ mdh_access_cb (void *cls, addr_len = sizeof(struct IPv6HttpAddress); } + GNUNET_assert (addr != NULL); + GNUNET_assert (addr_len != 0); - //ps = get_Session(plugin, pc, addr, addr_len); ps = NULL; /* only inbound sessions here */ @@ -737,25 +1130,32 @@ mdh_access_cb (void *cls, ps->recv_active=GNUNET_NO; ps->peercontext=pc; ps->session_id =id_num; + ps->queue_length_cur = 0; + ps->queue_length_max = GNUNET_SERVER_MAX_MESSAGE_SIZE; ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id); GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# HTTP inbound sessions for peers active"), + 1, + GNUNET_NO); } *httpSessionCache = ps; if (ps->msgtok==NULL) ps->msgtok = GNUNET_SERVER_mst_create (&mhd_write_mst_cb, ps); - +#if DEBUG_HTTP GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n", ps, method, GNUNET_i2s(&pc->identity), http_plugin_address_to_string(NULL, ps->addr, ps->addrlen)); +#endif } /* Is it a PUT or a GET request */ if (0 == strcmp (MHD_HTTP_METHOD_PUT, method)) { - if (ps->recv_force_disconnect) + if (ps->recv_force_disconnect == GNUNET_YES) { #if DEBUG_CONNECTIONS GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound connection was forced to disconnect\n",ps); @@ -768,6 +1168,7 @@ mdh_access_cb (void *cls, ps->recv_endpoint = mhd_connection; ps->recv_connected = GNUNET_YES; ps->recv_active = GNUNET_YES; + ps->recv_force_disconnect = GNUNET_NO; #if DEBUG_CONNECTIONS GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound PUT connection connected\n",ps); #endif @@ -790,8 +1191,20 @@ mdh_access_cb (void *cls, /* Recieving data */ if ((*upload_data_size > 0) && (ps->recv_active == GNUNET_YES)) { - res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data,*upload_data_size, GNUNET_NO, GNUNET_NO); - (*upload_data_size) = 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); +#endif + res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data, *upload_data_size, GNUNET_NO, GNUNET_NO); + (*upload_data_size) = 0; + } + 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.rel_value); +#endif + } return MHD_YES; } else @@ -799,7 +1212,7 @@ mdh_access_cb (void *cls, } if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) ) { - if (ps->send_force_disconnect) + if (ps->send_force_disconnect == GNUNET_YES) { #if DEBUG_CONNECTIONS GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection was forced to disconnect\n",ps); @@ -807,40 +1220,31 @@ mdh_access_cb (void *cls, ps->send_active = GNUNET_NO; return MHD_NO; } - ps->send_connected = GNUNET_YES; - ps->send_active = GNUNET_YES; - ps->send_endpoint = mhd_connection; + ps->send_connected = GNUNET_YES; + ps->send_active = GNUNET_YES; + ps->send_endpoint = mhd_connection; + ps->send_force_disconnect = GNUNET_NO; #if DEBUG_CONNECTIONS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET connection connected\n",ps); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET connection connected\n",ps); #endif - response = MHD_create_response_from_callback(-1,32 * 1024, &mhd_send_callback, ps, NULL); - res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response); - MHD_destroy_response (response); - return MHD_YES; + response = MHD_create_response_from_callback(-1,32 * 1024, &mhd_send_callback, ps, NULL); + res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response); + MHD_destroy_response (response); + return MHD_YES; } return MHD_NO; } - -/** - * Call MHD to process pending ipv4 requests and then go back - * and schedule the next run. - */ -static void http_server_daemon_v4_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); -/** - * Call MHD to process pending ipv6 requests and then go back - * and schedule the next run. - */ -static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); - /** * Function that queries MHD's select sets and * starts the task waiting for them. + * @param plugin plugin + * @param daemon_handle the MHD daemon handle + * @return gnunet task identifier */ static GNUNET_SCHEDULER_TaskIdentifier -http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle) +http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_handle) { - struct Plugin *plugin = cls; GNUNET_SCHEDULER_TaskIdentifier ret; fd_set rs; fd_set ws; @@ -853,7 +1257,6 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle) int haveto; struct GNUNET_TIME_Relative tv; - GNUNET_assert(cls !=NULL); ret = GNUNET_SCHEDULER_NO_TASK; FD_ZERO(&rs); FD_ZERO(&ws); @@ -870,16 +1273,21 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle) &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_FOREVER_REL; - GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max); - GNUNET_NETWORK_fdset_copy_native (wws, &ws, max); - GNUNET_NETWORK_fdset_copy_native (wes, &es, max); + tv = GNUNET_TIME_UNIT_SECONDS; + GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1); + GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1); + GNUNET_NETWORK_fdset_copy_native (wes, &es, max + 1); if (daemon_handle == plugin->http_server_daemon_v4) { - ret = GNUNET_SCHEDULER_add_select (plugin->env->sched, - GNUNET_SCHEDULER_PRIORITY_DEFAULT, + if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v4); + plugin->http_server_daemon_v4 = GNUNET_SCHEDULER_NO_TASK; + } + + ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, GNUNET_SCHEDULER_NO_TASK, tv, wrs, @@ -889,8 +1297,13 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle) } if (daemon_handle == plugin->http_server_daemon_v6) { - ret = GNUNET_SCHEDULER_add_select (plugin->env->sched, - GNUNET_SCHEDULER_PRIORITY_DEFAULT, + if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_server_task_v6); + plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; + } + + ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, GNUNET_SCHEDULER_NO_TASK, tv, wrs, @@ -905,69 +1318,84 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle) } /** - * Call MHD to process pending requests and then go back + * Call MHD IPv4 to process pending requests and then go back * and schedule the next run. + * @param cls plugin as closure + * @param tc task context */ static void http_server_daemon_v4_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct Plugin *plugin = cls; +#if DEBUG_SCHEDULING + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); +#endif + GNUNET_assert(cls !=NULL); - if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) - plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK; + plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) return; GNUNET_assert (MHD_YES == MHD_run (plugin->http_server_daemon_v4)); plugin->http_server_task_v4 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v4); - return; -} + } /** - * Call MHD to process pending requests and then go back + * Call MHD IPv6 to process pending requests and then go back * and schedule the next run. + * @param cls plugin as closure + * @param tc task context */ static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct Plugin *plugin = cls; + +#if DEBUG_SCHEDULING + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n"); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); +#endif GNUNET_assert(cls !=NULL); - if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) - plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; + plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) return; GNUNET_assert (MHD_YES == MHD_run (plugin->http_server_daemon_v6)); plugin->http_server_task_v6 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v6); - return; } -/** - * Function setting up curl handle and selecting message to send - * @param cls plugin - * @param ses session to send data to - * @param con connection - * @return bytes sent to peer - */ -static ssize_t send_check_connections (void *cls, struct Session *ps); - -static size_t curl_get_header_function( void *ptr, size_t size, size_t nmemb, void *stream) +static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *stream) { struct Session * ps = stream; - char * tmp; - size_t len = size * nmemb; long http_result = 0; int res; /* Getting last http result code */ + GNUNET_assert(NULL!=ps); if (ps->recv_connected==GNUNET_NO) { - GNUNET_assert(NULL!=ps); res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, &http_result); if (CURLE_OK == res) { @@ -984,6 +1412,9 @@ static size_t curl_get_header_function( void *ptr, size_t size, size_t nmemb, vo } } +#if DEBUG_CURL + char * tmp; + size_t len = size * nmemb; tmp = NULL; if ((size * nmemb) < SIZE_MAX) tmp = GNUNET_malloc (len+1); @@ -996,17 +1427,25 @@ static size_t curl_get_header_function( void *ptr, size_t size, size_t nmemb, vo if (tmp[len-2] == 13) tmp[len-2]= '\0'; } -#if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Header: `%s' %u \n",tmp, http_result); -#endif + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Header: %s\n",ps,tmp); } - if (NULL != tmp) - GNUNET_free (tmp); + GNUNET_free_non_null (tmp); +#endif return size * nmemb; } -static size_t curl_put_header_function( void *ptr, size_t size, size_t nmemb, void *stream) +/** + * Callback called by libcurl when new headers arrive + * Used to get HTTP result for curl operations + * @param ptr stream to read from + * @param size size of one char element + * @param nmemb number of char elements + * @param stream closure set by user + * @return bytes read by function + */ + +static size_t curl_put_header_cb( void *ptr, size_t size, size_t nmemb, void *stream) { struct Session * ps = stream; @@ -1050,12 +1489,9 @@ static size_t curl_put_header_function( void *ptr, size_t size, size_t nmemb, vo if (tmp[len-2] == 13) tmp[len-2]= '\0'; } -#if DEBUG_HTTP - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Header: `%s' %u \n",tmp, http_result); -#endif } - if (NULL != tmp) - GNUNET_free (tmp); + + GNUNET_free_non_null (tmp); return size * nmemb; } @@ -1076,6 +1512,11 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr) size_t bytes_sent; size_t len; + if (ps->send_active == GNUNET_NO) + { + return CURL_READFUNC_PAUSE; + } + if ((ps->pending_msgs_tail == NULL) && (ps->send_active == GNUNET_YES)) { #if DEBUG_CONNECTIONS @@ -1085,7 +1526,8 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr) return CURL_READFUNC_PAUSE; } - msg = ps->pending_msgs_tail; + GNUNET_assert (msg!=NULL); + /* data to send */ if (msg->pos < msg->size) { @@ -1114,16 +1556,63 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr) if ( msg->pos == msg->size) { #if DEBUG_CONNECTIONS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos); #endif /* Calling transmit continuation */ - if (( NULL != ps->pending_msgs_tail) && (NULL != ps->pending_msgs_tail->transmit_cont)) + if (NULL != ps->pending_msgs_tail->transmit_cont) msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK); + ps->queue_length_cur -= msg->size; remove_http_message(ps, msg); } return bytes_sent; } +static void curl_receive_mst_cb (void *cls, + void *client, + const struct GNUNET_MessageHeader *message) +{ + struct Session *ps = cls; + struct GNUNET_TIME_Relative delay; + GNUNET_assert(ps != NULL); + + struct HTTP_PeerContext *pc = ps->peercontext; + GNUNET_assert(pc != NULL); +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n", + ps, + ntohs(message->type), + 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, + (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->reset_task); + + 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.rel_value); +#endif + pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc); + } +} + + /** * Callback method used with libcurl * Method is called when libcurl needs to write data during sending @@ -1136,6 +1625,15 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr) static size_t curl_receive_cb( void *stream, size_t size, size_t nmemb, void *ptr) { struct Session * ps = ptr; + + 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.rel_value); +#endif + return (0); + } + #if DEBUG_CONNECTIONS GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: %u bytes received\n",ps, size*nmemb); #endif @@ -1144,31 +1642,283 @@ static size_t curl_receive_cb( void *stream, size_t size, size_t nmemb, void *pt } +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; + while (ps->pending_msgs_tail != NULL) + { + cur_msg = ps->pending_msgs_tail; + if ( NULL != cur_msg->transmit_cont) + cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR); + ps->queue_length_cur -= cur_msg->size; + remove_http_message(ps,cur_msg); + } + } + /* 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 */ + while (ps->pending_msgs_tail != NULL) + { + cur_msg = ps->pending_msgs_tail; + if ( 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->queue_length_cur -= cur_msg->size; + remove_http_message(ps,cur_msg); + } + + 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 + * @param tc gnunet scheduler task context + */ +static void curl_perform (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct Plugin *plugin = cls; + static unsigned int handles_last_run; + int running; + CURLMcode mret; + + GNUNET_assert(cls !=NULL); + + plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + return; + do + { + running = 0; + mret = curl_multi_perform (plugin->multi_handle, &running); + if ((running < handles_last_run) && (running>0)) + curl_handle_finished(plugin); + handles_last_run = running; + } + while (mret == CURLM_CALL_MULTI_PERFORM); + curl_schedule(plugin); +} + + /** * 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(void *cls, struct Session* ses ); +static int curl_schedule(struct Plugin *plugin) +{ + fd_set rs; + fd_set ws; + fd_set es; + int max; + struct GNUNET_NETWORK_FDSet *grs; + struct GNUNET_NETWORK_FDSet *gws; + long to; + CURLMcode mret; + + /* Cancel previous scheduled task */ + if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(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) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("%s failed at %s:%d: `%s'\n"), + "curl_multi_fdset", __FILE__, __LINE__, + curl_multi_strerror (mret)); + return GNUNET_SYSERR; + } + mret = curl_multi_timeout (plugin->multi_handle, &to); + 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; + } + + grs = GNUNET_NETWORK_fdset_create (); + 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 (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, + gws, + &curl_perform, + plugin); + GNUNET_NETWORK_fdset_destroy (gws); + GNUNET_NETWORK_fdset_destroy (grs); + return GNUNET_OK; +} +/** + * Function to log curl debug messages with GNUNET_log + * @param curl handle + * @param type curl_infotype + * @param data data + * @param size size + * @param cls closure + * @return 0 + */ +int curl_logger (CURL * curl, curl_infotype type , char * data, size_t size , void * cls) +{ + if (type == CURLINFO_TEXT) + { + char text[size+2]; + memcpy(text,data,size); + if (text[size-1] == '\n') + text[size] = '\0'; + else + { + text[size] = '\n'; + text[size+1] = '\0'; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"CURL: Connection %X - %s", cls, text); + } + return 0; +} /** * Function setting up curl handle and selecting message to send - * @param cls plugin - * @param ses session to send data to - * @param con connection + * + * @param plugin plugin + * @param ps session * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok */ -static ssize_t send_check_connections (void *cls, struct Session *ps) +static int send_check_connections (struct Plugin *plugin, struct Session *ps) { - struct Plugin *plugin = cls; CURLMcode mret; struct HTTP_Message * msg; - struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT; - GNUNET_assert(cls !=NULL); + struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT; if (ps->direction == OUTBOUND) { @@ -1176,39 +1926,56 @@ static ssize_t send_check_connections (void *cls, struct Session *ps) /* Check if session is connected to receive data, otherwise connect to peer */ if (ps->recv_connected == GNUNET_NO) { + int fresh = GNUNET_NO; if (ps->recv_endpoint == NULL) { - ps->recv_endpoint = curl_easy_init(); + fresh = GNUNET_YES; + ps->recv_endpoint = curl_easy_init(); + } #if DEBUG_CURL curl_easy_setopt(ps->recv_endpoint, CURLOPT_VERBOSE, 1L); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGDATA , ps->recv_endpoint); +#endif +#if BUILD_HTTPS + curl_easy_setopt (ps->recv_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYHOST, 0); #endif curl_easy_setopt(ps->recv_endpoint, CURLOPT_URL, ps->url); - curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_function); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_cb); curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEHEADER, ps); curl_easy_setopt(ps->recv_endpoint, CURLOPT_READFUNCTION, curl_send_cb); 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, GNUNET_SERVER_MAX_MESSAGE_SIZE); + curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, 2*GNUNET_SERVER_MAX_MESSAGE_SIZE); +#if CURL_TCP_NODELAY + curl_easy_setopt(ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1); +#endif - mret = curl_multi_add_handle(plugin->multi_handle, ps->recv_endpoint); - if (mret != CURLM_OK) + if (fresh==GNUNET_YES) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("%s failed at %s:%d: `%s'\n"), - "curl_multi_add_handle", __FILE__, __LINE__, - curl_multi_strerror (mret)); - return GNUNET_SYSERR; + mret = curl_multi_add_handle(plugin->multi_handle, ps->recv_endpoint); + if (mret != CURLM_OK) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Connection: %X: %s failed at %s:%d: `%s'\n"), + ps, + "curl_multi_add_handle", __FILE__, __LINE__, + curl_multi_strerror (mret)); + return GNUNET_SYSERR; + } } - if (curl_schedule (plugin, NULL) == GNUNET_SYSERR) - return GNUNET_SYSERR; -#if DEBUG_CONNECTIONS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not connected, initiating connection\n",ps); -#endif - } + if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); + plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + } + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); } /* waiting for receive direction */ @@ -1234,6 +2001,12 @@ static ssize_t send_check_connections (void *cls, struct Session *ps) if (CURLE_OK == curl_easy_pause(ps->send_endpoint,CURLPAUSE_CONT)) { ps->send_active=GNUNET_YES; + if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); + plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + } + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); return GNUNET_YES; } else @@ -1241,264 +2014,198 @@ static ssize_t send_check_connections (void *cls, struct Session *ps) } } /* not connected, initiate connection */ - if ((ps->send_connected==GNUNET_NO) && (NULL == ps->send_endpoint)) - ps->send_endpoint = curl_easy_init(); - GNUNET_assert (ps->send_endpoint != NULL); - GNUNET_assert (NULL != ps->pending_msgs_tail); + if (ps->send_connected==GNUNET_NO) + { + int fresh = GNUNET_NO; + if (NULL == ps->send_endpoint) + { + ps->send_endpoint = curl_easy_init(); + fresh = GNUNET_YES; + } + GNUNET_assert (ps->send_endpoint != NULL); + GNUNET_assert (NULL != ps->pending_msgs_tail); #if DEBUG_CONNECTIONS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound not connected, initiating connection\n",ps); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound not connected, initiating connection\n",ps); #endif - ps->send_active = GNUNET_NO; - msg = ps->pending_msgs_tail; - - #if DEBUG_CURL - curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L); - #endif - curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url); - curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L); - curl_easy_setopt(ps->send_endpoint, CURLOPT_HEADERFUNCTION, &curl_put_header_function); - curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEHEADER, ps); - curl_easy_setopt(ps->send_endpoint, CURLOPT_READFUNCTION, curl_send_cb); - 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_PRIVATE, ps); - curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT); - curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE); - - mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint); - if (mret != CURLM_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("%s failed at %s:%d: `%s'\n"), - "curl_multi_add_handle", __FILE__, __LINE__, - curl_multi_strerror (mret)); - return GNUNET_SYSERR; + ps->send_active = GNUNET_NO; + msg = ps->pending_msgs_tail; + +#if DEBUG_CURL + curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L); + curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger); + curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGDATA , ps->send_endpoint); +#endif +#if BUILD_HTTPS + curl_easy_setopt (ps->send_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYHOST, 0); +#endif + curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url); + curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L); + curl_easy_setopt(ps->send_endpoint, CURLOPT_HEADERFUNCTION, &curl_put_header_cb); + curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEHEADER, ps); + curl_easy_setopt(ps->send_endpoint, CURLOPT_READFUNCTION, curl_send_cb); + 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.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); +#if CURL_TCP_NODELAY + curl_easy_setopt(ps->send_endpoint, CURLOPT_TCP_NODELAY, 1); +#endif + + if (fresh==GNUNET_YES) + { + mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint); + if (mret != CURLM_OK) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Connection: %X: %s failed at %s:%d: `%s'\n"), + ps, + "curl_multi_add_handle", __FILE__, __LINE__, + curl_multi_strerror (mret)); + return GNUNET_SYSERR; + } + } } - if (curl_schedule (plugin, NULL) == GNUNET_SYSERR) - return GNUNET_SYSERR; + if (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); + plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + } + plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin); return GNUNET_YES; } if (ps->direction == INBOUND) { GNUNET_assert (NULL != ps->pending_msgs_tail); - msg = ps->pending_msgs_tail; - if ((ps->recv_connected==GNUNET_YES) && (ps->send_connected==GNUNET_YES)) + if ((ps->recv_connected==GNUNET_YES) && (ps->send_connected==GNUNET_YES) && + (ps->recv_force_disconnect==GNUNET_NO) && (ps->recv_force_disconnect==GNUNET_NO)) return GNUNET_YES; } return GNUNET_SYSERR; } -static void curl_perform (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +/** + * select best session to transmit data to peer + * + * @param pc peer context of target peer + * @param addr address of target peer + * @param addrlen address length + * @param force_address does transport service enforce address? + * @param session session passed by transport service + * @return selected session + * + */ +static struct Session * send_select_session (struct HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address, struct Session * session) { - struct Plugin *plugin = cls; - static unsigned int handles_last_run; - int running; - struct CURLMsg *msg; - CURLMcode mret; - struct Session *ps = NULL; - struct HTTP_PeerContext *pc = NULL; - struct HTTP_Message * cur_msg = NULL; - long http_result; - - GNUNET_assert(cls !=NULL); - - plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - 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, &running); - if (running == 0) - break; - /* get session for affected curl handle */ - GNUNET_assert ( msg->easy_handle != NULL ); - curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, (char *) &ps); - 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); - return; - default: - break; - } - - } - while ( (running > 0) ); - } - handles_last_run = running; - } - while (mret == CURLM_CALL_MULTI_PERFORM); - curl_schedule(plugin, cls); -} - - -/** - * Function setting up file descriptors and scheduling task to run - * @param ses session to send data to - * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok - */ -static int curl_schedule(void *cls, struct Session* ses ) -{ - struct Plugin *plugin = cls; - fd_set rs; - fd_set ws; - fd_set es; - int max; - struct GNUNET_NETWORK_FDSet *grs; - struct GNUNET_NETWORK_FDSet *gws; - long to; - CURLMcode mret; - - GNUNET_assert(cls !=NULL); - 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) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("%s failed at %s:%d: `%s'\n"), - "curl_multi_fdset", __FILE__, __LINE__, - curl_multi_strerror (mret)); - return GNUNET_SYSERR; - } - mret = curl_multi_timeout (plugin->multi_handle, &to); - 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; - } - - grs = GNUNET_NETWORK_fdset_create (); - 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, - GNUNET_SCHEDULER_NO_TASK, - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0), - grs, - gws, - &curl_perform, - plugin); - GNUNET_NETWORK_fdset_destroy (gws); - GNUNET_NETWORK_fdset_destroy (grs); - return GNUNET_OK; -} - + struct Session * tmp = NULL; + int addr_given = GNUNET_NO; + + if ((addr!=NULL) && (addrlen>0)) + addr_given = GNUNET_YES; + + if (force_address == GNUNET_YES) + { + /* check session given as argument */ + if ((session != NULL) && (addr_given == GNUNET_YES)) + { + if (0 == memcmp(session->addr, addr, addrlen)) + { + /* connection can not be used, since it is disconnected */ + if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send to forced address \n", session); +#endif + return session; + } + } + } + /* check last session used */ + if ((pc->last_session != NULL)&& (addr_given == GNUNET_YES)) + { + if (0 == memcmp(pc->last_session->addr, addr, addrlen)) + { + /* connection can not be used, since it is disconnected */ + if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session used to send to forced address \n", pc->last_session); +#endif + return pc->last_session; + } + } + } + /* find session in existing sessions */ + tmp = pc->head; + while ((tmp!=NULL) && (addr_given == GNUNET_YES)) + { + + if (0 == memcmp(tmp->addr, addr, addrlen)) + { + /* connection can not be used, since it is disconnected */ + if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to forced address \n", session); +#endif + return session; + } + + } + tmp=tmp->next; + } + /* no session to use */ + return NULL; + } + if ((force_address == GNUNET_NO) || (force_address == GNUNET_SYSERR)) + { + /* check session given as argument */ + if (session != NULL) + { + /* connection can not be used, since it is disconnected */ + if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send not-forced address \n", session); +#endif + return session; + } + + } + /* check last session used */ + if (pc->last_session != NULL) + { + /* connection can not be used, since it is disconnected */ + if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session to send to not-forced address \n", pc->last_session); +#endif + return pc->last_session; + } + } + /* find session in existing sessions */ + tmp = pc->head; + while (tmp!=NULL) + { + /* connection can not be used, since it is disconnected */ + if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO)) + { +#if DEBUG_SESSION_SELECTION + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to not-forced address \n", tmp); +#endif + return tmp; + } + tmp=tmp->next; + } + return NULL; + } + return NULL; +} /** * Function that can be used by the transport service to transmit @@ -1514,7 +2221,7 @@ static int curl_schedule(void *cls, struct Session* ses ) * @param msgbuf_size number of bytes in 'msgbuf' * @param priority how important is the message (most plugins will * ignore message priority and just FIFO) - * @param timeout how long to wait at most for the transmission (does not + * @param to how long to wait at most for the transmission (does not * require plugins to discard the message after the timeout, * just advisory for the desired delay; most plugins will ignore * this as well) @@ -1552,27 +2259,29 @@ http_plugin_send (void *cls, { struct Plugin *plugin = cls; struct HTTP_Message *msg; - struct HTTP_PeerContext * pc; struct Session * ps = NULL; - struct Session * ps_tmp = NULL; GNUNET_assert(cls !=NULL); - char * force = GNUNET_malloc(40); +#if DEBUG_HTTP + 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, GNUNET_i2s(target), force, http_plugin_address_to_string(NULL, addr, addrlen), session); + GNUNET_free(force); +#endif pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey); /* Peer unknown */ @@ -1581,114 +2290,95 @@ http_plugin_send (void *cls, pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext)); pc->plugin = plugin; pc->session_id_counter=1; + pc->last_session = NULL; memcpy(&pc->identity, target, sizeof(struct GNUNET_PeerIdentity)); GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# HTTP peers active"), + 1, + GNUNET_NO); } - /* Search for existing session using the passed address */ - if ((addr!=NULL) && (addrlen != 0)) - { - ps = get_Session(plugin, pc, addr, addrlen); - } - if (ps != NULL) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Found existing connection to peer %s with given address, using %X\n", GNUNET_i2s(target), ps); + ps = send_select_session (pc, addr, addrlen, force_address, session); - /* Search for existing session using the passed session */ - if ((ps==NULL) && (force_address != GNUNET_YES)) + /* session not existing, but address forced -> creating new session */ + if (ps==NULL) { - ps_tmp = pc->head; - while (ps_tmp!=NULL) - { - if ((ps_tmp==session) && (ps_tmp->recv_force_disconnect==GNUNET_NO) && (ps_tmp->send_force_disconnect==GNUNET_NO) && - (ps_tmp->recv_connected==GNUNET_YES) && (ps_tmp->send_connected==GNUNET_YES)) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Found existing connection to peer %s with given session, using inbound session %X\n", GNUNET_i2s(target), ps_tmp); - ps = ps_tmp; - break; - } - ps_tmp=ps_tmp->next; + if ((addr!=NULL) && (addrlen!=0)) + { + ps = GNUNET_malloc(sizeof (struct Session)); +#if DEBUG_SESSION_SELECTION + if (force_address == GNUNET_YES) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new session %X to peer %s\n", ps, GNUNET_i2s(target)); + 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 + 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; + ps->send_connected = GNUNET_NO; + ps->send_force_disconnect = GNUNET_NO; + ps->pending_msgs_head = NULL; + ps->pending_msgs_tail = NULL; + ps->peercontext=pc; + ps->session_id = pc->session_id_counter; + ps->queue_length_cur = 0; + ps->queue_length_max = GNUNET_SERVER_MAX_MESSAGE_SIZE; + pc->session_id_counter++; + ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id); + if (ps->msgtok == NULL) + ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps); + GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# HTTP outbound sessions for peers active"), + 1, + GNUNET_NO); + } + else + { +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session found & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target)); +#endif + return GNUNET_SYSERR; } } - /* session not existing, address not forced -> looking for other session */ - if ((ps==NULL) && (force_address != GNUNET_YES)) + if (msgbuf_size >= (ps->queue_length_max - ps->queue_length_cur)) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection, but free to choose existing, searching for existing connection to peer %s\n", GNUNET_i2s(target)); - /* Choosing different session to peer when possible */ - struct Session * tmp = pc->head; - while (tmp!=NULL) - { - if ((tmp->recv_connected) && (tmp->send_connected) && (tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO)) - { - ps = tmp; - } - tmp = tmp->next; - } - if (ps != NULL) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection to peer %s, selected connection %X\n", GNUNET_i2s(target),ps); - else - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection to peer %s, no connection found\n", GNUNET_i2s(target)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Queue %X full: %u bytes in queue available, message with %u is too big\n", ps, (ps->queue_length_max - ps->queue_length_cur), msgbuf_size); + //return GNUNET_SYSERR; } - /* session not existing, but address forced -> creating new session */ - if ((ps==NULL) || ((ps==NULL) && (force_address == GNUNET_YES))) - { - if ((addr!=NULL) && (addrlen!=0)) - { - if (force_address == GNUNET_YES) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new connection to peer %s\n", GNUNET_i2s(target)); - if (force_address != GNUNET_YES) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new connection to peer %s\n", GNUNET_i2s(target)); + /* create msg */ + msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size); + msg->next = NULL; + msg->size = msgbuf_size; + msg->pos = 0; + msg->buf = (char *) &msg[1]; + msg->transmit_cont = cont; + msg->transmit_cont_cls = cont_cls; + memcpy (msg->buf,msgbuf, msgbuf_size); - ps = GNUNET_malloc(sizeof (struct Session)); - if ((addrlen!=0) && (addr!=NULL)) - { - 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; - ps->send_connected = GNUNET_NO; - ps->send_force_disconnect = GNUNET_NO; - ps->pending_msgs_head = NULL; - ps->pending_msgs_tail = NULL; - ps->peercontext=pc; - ps->session_id = pc->session_id_counter; - pc->session_id_counter++; - ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id); - if (ps->msgtok == NULL) - ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps); - GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps); - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target)); - return GNUNET_SYSERR; - } - } + GNUNET_CONTAINER_DLL_insert(ps->pending_msgs_head,ps->pending_msgs_tail,msg); + ps->queue_length_cur += msgbuf_size; - /* create msg */ - msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size); - msg->next = NULL; - msg->size = msgbuf_size; - msg->pos = 0; - msg->buf = (char *) &msg[1]; - msg->transmit_cont = cont; - msg->transmit_cont_cls = cont_cls; - memcpy (msg->buf,msgbuf, msgbuf_size); - GNUNET_CONTAINER_DLL_insert(ps->pending_msgs_head,ps->pending_msgs_tail,msg); - - if (send_check_connections (plugin, ps) != GNUNET_SYSERR) - return msg->size; - else + if (send_check_connections (plugin, ps) == GNUNET_SYSERR) return GNUNET_SYSERR; + if (force_address != GNUNET_YES) + pc->last_session = ps; + + if (pc->last_session==NULL) + pc->last_session = ps; + return msg->size; } @@ -1706,6 +2396,7 @@ http_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target) { + struct Plugin *plugin = cls; struct HTTP_PeerContext *pc = NULL; struct Session *ps = NULL; @@ -1718,19 +2409,20 @@ http_plugin_disconnect (void *cls, while (ps!=NULL) { - + /* Telling transport that session is getting disconnected */ + plugin->env->session_end(plugin, target, ps); if (ps->direction==OUTBOUND) { if (ps->send_endpoint!=NULL) { - //curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint); + //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint)); //curl_easy_cleanup(ps->send_endpoint); //ps->send_endpoint=NULL; ps->send_force_disconnect = GNUNET_YES; } if (ps->recv_endpoint!=NULL) { - //curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint); + //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint)); //curl_easy_cleanup(ps->recv_endpoint); //ps->recv_endpoint=NULL; ps->recv_force_disconnect = GNUNET_YES; @@ -1811,11 +2503,11 @@ http_plugin_address_pretty_printer (void *cls, asc (asc_cls, NULL); return; } - res = GNUNET_asprintf(&ret,"http://%s:%u/",address,port); + res = GNUNET_asprintf(&ret,"%s://%s:%u/", PROTOCOL_PREFIX, address, port); GNUNET_free (address); GNUNET_assert(res != 0); - asc (asc_cls, ret); + GNUNET_free_non_null (ret); } @@ -1839,7 +2531,9 @@ http_plugin_address_suggested (void *cls, struct Plugin *plugin = cls; struct IPv4HttpAddress *v4; struct IPv6HttpAddress *v6; - unsigned int port; + + struct IPv4HttpAddress *tv4 = plugin->ipv4_addr_head; + struct IPv6HttpAddress *tv6 = plugin->ipv6_addr_head; GNUNET_assert(cls !=NULL); if ((addrlen != sizeof (struct IPv4HttpAddress)) && @@ -1850,31 +2544,50 @@ http_plugin_address_suggested (void *cls, if (addrlen == sizeof (struct IPv4HttpAddress)) { v4 = (struct IPv4HttpAddress *) addr; - if (INADDR_LOOPBACK == ntohl(v4->ipv4_addr)) + + if (plugin->bind4_address!=NULL) { - return GNUNET_SYSERR; + if (0 == memcmp (&plugin->bind4_address->sin_addr, &v4->ipv4_addr, sizeof(uint32_t))) + return GNUNET_OK; + else + return GNUNET_SYSERR; } - port = ntohs (v4->u_port); - if (port != plugin->port_inbound) + while (tv4!=NULL) { - return GNUNET_SYSERR; + if (0==memcmp (&tv4->ipv4_addr, &v4->ipv4_addr, sizeof(uint32_t))) + break; + tv4 = tv4->next; } + if (tv4 != NULL) + return GNUNET_OK; + else + return GNUNET_SYSERR; } if (addrlen == sizeof (struct IPv6HttpAddress)) { v6 = (struct IPv6HttpAddress *) addr; - if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) - { - return GNUNET_SYSERR; - } - port = ntohs (v6->u6_port); - if (port != plugin->port_inbound) + + if (plugin->bind6_address!=NULL) { - return GNUNET_SYSERR; + if (0 == memcmp (&plugin->bind6_address->sin6_addr, &v6->ipv6_addr, sizeof(struct in6_addr))) + return GNUNET_OK; + else + return GNUNET_SYSERR; } + + while (tv6!=NULL) + { + if (0 == memcmp (&tv6->ipv6_addr, &v6->ipv6_addr, sizeof(struct in6_addr))) + break; + tv6 = tv6->next; + } + if (tv6 !=NULL) + return GNUNET_OK; + else + return GNUNET_SYSERR; } - return GNUNET_OK; + return GNUNET_SYSERR; } @@ -1930,117 +2643,18 @@ http_plugin_address_to_string (void *cls, return ret; } -/** - * Add the IP of our network interface to the list of - * our external IP addresses. - * - * @param cls the 'struct Plugin*' - * @param name name of the interface - * @param isDefault do we think this may be our default interface - * @param addr address of the interface - * @param addrlen number of bytes in addr - * @return GNUNET_OK to continue iterating - */ -static int -process_interfaces (void *cls, - const char *name, - int isDefault, - const struct sockaddr *addr, socklen_t addrlen) -{ - struct Plugin *plugin = cls; - struct IPv4HttpAddress * t4; - struct IPv6HttpAddress * t6; - int af; - - GNUNET_assert(cls !=NULL); - af = addr->sa_family; - if (af == AF_INET) - { - t4 = GNUNET_malloc(sizeof(struct IPv4HttpAddress)); - if (INADDR_LOOPBACK == ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr)) - { - /* skip loopback addresses */ - return GNUNET_OK; - } - t4->ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; - t4->u_port = htons (plugin->port_inbound); - plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL); - - } - else if (af == AF_INET6) - { - t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress)); - if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) - { - /* skip link local addresses */ - return GNUNET_OK; - } - if (IN6_IS_ADDR_LOOPBACK (&((struct sockaddr_in6 *) addr)->sin6_addr)) - { - /* skip loopback addresses */ - return GNUNET_OK; - } - memcpy (&t6->ipv6_addr, - &((struct sockaddr_in6 *) addr)->sin6_addr, - sizeof (struct in6_addr)); - t6->u6_port = htons (plugin->port_inbound); - plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL); - } - return GNUNET_OK; -} - -int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value) -{ - struct HTTP_PeerContext * pc = value; - struct Session * ps = pc->head; - struct Session * tmp = NULL; - struct HTTP_Message * msg = NULL; - struct HTTP_Message * msg_tmp = NULL; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing context for peer `%s'\n",GNUNET_i2s(&pc->identity)); - - while (ps!=NULL) - { - tmp = ps->next; - - GNUNET_free_non_null (ps->addr); - GNUNET_free(ps->url); - if (ps->msgtok != NULL) - GNUNET_SERVER_mst_destroy (ps->msgtok); - - msg = ps->pending_msgs_head; - while (msg!=NULL) - { - msg_tmp = msg->next; - GNUNET_free(msg); - msg = msg_tmp; - } - if (ps->direction==OUTBOUND) - { - if (ps->send_endpoint!=NULL) - curl_easy_cleanup(ps->send_endpoint); - if (ps->recv_endpoint!=NULL) - curl_easy_cleanup(ps->recv_endpoint); - } - - GNUNET_free(ps); - ps=tmp; - } - GNUNET_free(pc); - return GNUNET_YES; -} - /** * Exit point from the plugin. */ void * -libgnunet_plugin_transport_http_done (void *cls) +LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) { struct GNUNET_TRANSPORT_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; CURLMcode mret; - + struct IPv4HttpAddress * ipv4addr; + struct IPv6HttpAddress * ipv6addr; GNUNET_assert(cls !=NULL); if (plugin->http_server_daemon_v4 != NULL) @@ -2054,65 +2668,135 @@ libgnunet_plugin_transport_http_done (void *cls) plugin->http_server_daemon_v6 = NULL; } - - 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; } - if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + while (plugin->ipv4_addr_head!=NULL) { - GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task); - plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + ipv4addr = plugin->ipv4_addr_head; + GNUNET_CONTAINER_DLL_remove(plugin->ipv4_addr_head,plugin->ipv4_addr_tail,ipv4addr); + GNUNET_free(ipv4addr); + } + + while (plugin->ipv6_addr_head!=NULL) + { + ipv6addr = plugin->ipv6_addr_head; + GNUNET_CONTAINER_DLL_remove(plugin->ipv6_addr_head,plugin->ipv6_addr_tail,ipv6addr); + GNUNET_free(ipv6addr); } /* free all peer information */ - if (map!=NULL) + if (plugin->peers!=NULL) { GNUNET_CONTAINER_multihashmap_iterate (plugin->peers, &remove_peer_context_Iterator, - NULL); + plugin); GNUNET_CONTAINER_multihashmap_destroy (plugin->peers); } + if (plugin->multi_handle!=NULL) + { + mret = curl_multi_cleanup(plugin->multi_handle); +#if DEBUG_HTTP + if ( CURLM_OK != mret) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up failed\n"); +#endif + plugin->multi_handle = NULL; + } + curl_global_cleanup(); - mret = curl_multi_cleanup(plugin->multi_handle); - if ( CURLM_OK != mret) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up failed"); - plugin->multi_handle = NULL; + if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel(plugin->http_curl_task); + plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK; + } + GNUNET_free_non_null (plugin->bind4_address); + GNUNET_free_non_null (plugin->bind6_address); + GNUNET_free_non_null(plugin->bind_hostname); +#if BUILD_HTTPS + GNUNET_free_non_null (plugin->crypto_init); + GNUNET_free_non_null (plugin->cert); + GNUNET_free_non_null (plugin->key); +#endif GNUNET_free (plugin); GNUNET_free (api); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Unload http plugin complete...\n"); +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Unload %s plugin complete...\n", PROTOCOL_PREFIX); +#endif return NULL; } +#if BUILD_HTTPS +static char * +load_certificate( const char * file ) +{ + struct GNUNET_DISK_FileHandle * gn_file; + + struct stat fstat; + char * text = NULL; + + if (0!=STAT(file, &fstat)) + return NULL; + text = GNUNET_malloc (fstat.st_size+1); + gn_file = GNUNET_DISK_file_open(file,GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_USER_READ); + if (gn_file==NULL) + { + GNUNET_free(text); + return NULL; + } + if (GNUNET_SYSERR == GNUNET_DISK_file_read(gn_file, text, fstat.st_size)) + { + GNUNET_free(text); + GNUNET_DISK_file_close(gn_file); + return NULL; + } + text[fstat.st_size] = '\0'; + GNUNET_DISK_file_close(gn_file); + + return text; +} +#endif + /** * Entry point for the plugin. */ void * -libgnunet_plugin_transport_http_init (void *cls) +LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) { struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; struct Plugin *plugin; struct GNUNET_TRANSPORT_PluginFunctions *api; struct GNUNET_TIME_Relative gn_timeout; long long unsigned int port; + char * component_name; +#if BUILD_HTTPS + char * key_file = NULL; + char * cert_file = NULL; +#endif GNUNET_assert(cls !=NULL); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting http plugin...\n"); +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting %s plugin...\n", PROTOCOL_PREFIX); +#endif + GNUNET_asprintf(&component_name,"transport-%s",PROTOCOL_PREFIX); plugin = GNUNET_malloc (sizeof (struct Plugin)); + plugin->stats = env->stats; plugin->env = env; plugin->peers = NULL; + plugin->bind4_address = NULL; + plugin->use_ipv6 = GNUNET_YES; + plugin->use_ipv4 = GNUNET_YES; api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions)); api->cls = plugin; @@ -2125,61 +2809,286 @@ libgnunet_plugin_transport_http_init (void *cls) /* Hashing our identity to use it in URLs */ GNUNET_CRYPTO_hash_to_enc ( &(plugin->env->my_identity->hashPubKey), &plugin->my_ascii_hash_ident); + /* Use IPv6? */ + if (GNUNET_CONFIGURATION_have_value (env->cfg, + component_name, "USE_IPv6")) + { + plugin->use_ipv6 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, + component_name, + "USE_IPv6"); + } + /* Use IPv4? */ + if (GNUNET_CONFIGURATION_have_value (env->cfg, + component_name, "USE_IPv4")) + { + plugin->use_ipv4 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, + component_name,"USE_IPv4"); + } /* Reading port number from config file */ if ((GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg, - "transport-http", + component_name, "PORT", &port)) || (port > 65535) ) { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "http", - _ - ("Require valid port number for transport plugin `%s' in configuration!\n"), - "transport-http"); - libgnunet_plugin_transport_http_done (api); + component_name, + _("Require valid port number for transport plugin `%s' in configuration!\n"), + PROTOCOL_PREFIX); + GNUNET_free(component_name); + LIBGNUNET_PLUGIN_TRANSPORT_DONE (api); return NULL; } + + /* Reading ipv4 addresse to bind to from config file */ + if ((plugin->use_ipv4==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg, + component_name, "BINDTO4"))) + { + GNUNET_break (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (env->cfg, + component_name, + "BINDTO4", + &plugin->bind_hostname)); + plugin->bind4_address = GNUNET_malloc(sizeof(struct sockaddr_in)); + plugin->bind4_address->sin_family = AF_INET; + plugin->bind4_address->sin_port = htons (port); + + if (plugin->bind_hostname!=NULL) + { + if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + component_name, + _("Misconfigured address to bind to in configuration!\n")); + GNUNET_free(plugin->bind4_address); + GNUNET_free(plugin->bind_hostname); + plugin->bind_hostname = NULL; + plugin->bind4_address = NULL; + } + } + } + + /* Reading ipv4 addresse to bind to from config file */ + if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg, + component_name, "BINDTO6"))) + { + if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, + component_name, + "BINDTO6", + &plugin->bind_hostname)) + { + plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6)); + plugin->bind6_address->sin6_family = AF_INET6; + plugin->bind6_address->sin6_port = htons (port); + if (plugin->bind_hostname!=NULL) + { + if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + component_name, + _("Misconfigured address to bind to in configuration!\n")); + GNUNET_free(plugin->bind6_address); + GNUNET_free(plugin->bind_hostname); + plugin->bind_hostname = NULL; + plugin->bind6_address = NULL; + } + } + } + } + +#if BUILD_HTTPS + /* Reading HTTPS crypto related configuration */ + /* Get crypto init string from config */ + if (GNUNET_CONFIGURATION_have_value (env->cfg, + "transport-https", "CRYPTO_INIT")) + { + GNUNET_CONFIGURATION_get_value_string (env->cfg, + "transport-https", + "CRYPTO_INIT", + &plugin->crypto_init); + } + else + { + GNUNET_asprintf(&plugin->crypto_init,"NORMAL"); + } + +/* Get private key file from config */ + if (GNUNET_CONFIGURATION_have_value (env->cfg, + "transport-https", "KEY_FILE")) + { + GNUNET_CONFIGURATION_get_value_string (env->cfg, + "transport-https", + "KEY_FILE", + &key_file); + } + if (key_file==NULL) + GNUNET_asprintf(&key_file,"https.key"); + +/* Get private key file from config */ + if (GNUNET_CONFIGURATION_have_value (env->cfg,"transport-https", "CERT_FILE")) + { + GNUNET_CONFIGURATION_get_value_string (env->cfg, + "transport-https", + "CERT_FILE", + &cert_file); + } + if (cert_file==NULL) + GNUNET_asprintf(&cert_file,"https.cert"); + + /* read key & certificates from file */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loading TLS certificate `%s' `%s'\n", key_file, cert_file); + + plugin->key = load_certificate( key_file ); + plugin->cert = load_certificate( cert_file ); + + if ((plugin->key==NULL) || (plugin->cert==NULL)) + { + char * cmd; + int ret = 0; + GNUNET_asprintf(&cmd,"gnunet-transport-certificate-creation %s %s", key_file, cert_file); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No usable TLS certificate found, creating certificate \n"); + ret = system(cmd); + + if (ret != 0) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "https", + _("Could not create a new TLS certificate, shell script `%s' failed!\n"),cmd, + "transport-https"); + GNUNET_free (key_file); + GNUNET_free (cert_file); + GNUNET_free (component_name); + + LIBGNUNET_PLUGIN_TRANSPORT_DONE(api); + GNUNET_free (cmd); + return NULL; + } + + GNUNET_free (cmd); + + plugin->key = load_certificate( key_file ); + plugin->cert = load_certificate( cert_file ); + + if ((plugin->key==NULL) || (plugin->cert==NULL)) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "https", + _("No usable TLS certificate found and creating one failed! \n"), + "transport-https"); + GNUNET_free (key_file); + GNUNET_free (cert_file); + GNUNET_free (component_name); + + LIBGNUNET_PLUGIN_TRANSPORT_DONE(api); + return NULL; + } + } + GNUNET_free (key_file); + GNUNET_free (cert_file); + + GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n"); +#endif + GNUNET_assert ((port > 0) && (port <= 65535)); plugin->port_inbound = port; gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT; - if ((plugin->http_server_daemon_v4 == NULL) && (plugin->http_server_daemon_v6 == NULL) && (port != 0)) - { - plugin->http_server_daemon_v6 = MHD_start_daemon (MHD_USE_IPv6 | MHD_USE_DEBUG, + 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; + plugin->http_server_daemon_v6 = MHD_start_daemon ( +#if DEBUG_MHD + MHD_USE_DEBUG | +#endif +#if BUILD_HTTPS + MHD_USE_SSL | +#endif + MHD_USE_IPv6, port, &mhd_accept_cb, - plugin , &mdh_access_cb, plugin, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16, - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1, - MHD_OPTION_CONNECTION_TIMEOUT, (gn_timeout.value / 1000), - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024), + plugin , &mhd_access_cb, plugin, + MHD_OPTION_SOCK_ADDR, tmp, + MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, + //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, +#if BUILD_HTTPS + MHD_OPTION_HTTPS_PRIORITIES, plugin->crypto_init, + MHD_OPTION_HTTPS_MEM_KEY, plugin->key, + MHD_OPTION_HTTPS_MEM_CERT, plugin->cert, +#endif + MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout, + MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (2 * GNUNET_SERVER_MAX_MESSAGE_SIZE), MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL, + MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log, MHD_OPTION_END); - plugin->http_server_daemon_v4 = MHD_start_daemon (MHD_NO_FLAG | MHD_USE_DEBUG, + } + if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0)) + { + plugin->http_server_daemon_v4 = MHD_start_daemon ( +#if DEBUG_MHD + MHD_USE_DEBUG | +#endif +#if BUILD_HTTPS + MHD_USE_SSL | +#endif + MHD_NO_FLAG, port, &mhd_accept_cb, - plugin , &mdh_access_cb, plugin, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16, - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1, - MHD_OPTION_CONNECTION_TIMEOUT, (gn_timeout.value / 1000), - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024), + plugin , &mhd_access_cb, plugin, + MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address, + MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32, + //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6, +#if BUILD_HTTPS + MHD_OPTION_HTTPS_PRIORITIES, plugin->crypto_init, + MHD_OPTION_HTTPS_MEM_KEY, plugin->key, + MHD_OPTION_HTTPS_MEM_CERT, plugin->cert, +#endif + MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout, + MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (2 * GNUNET_SERVER_MAX_MESSAGE_SIZE), MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL, + MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log, MHD_OPTION_END); - } + } if (plugin->http_server_daemon_v4 != NULL) plugin->http_server_task_v4 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v4); if (plugin->http_server_daemon_v6 != NULL) plugin->http_server_task_v6 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v6); + if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 on port %u\n",port); - else if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 on port %u\n",port); + { +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address",port); +#endif + } + else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)) + { +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port); +#endif + } + else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK)) + { +#if DEBUG_HTTP + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port); +#endif + } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n"); - libgnunet_plugin_transport_http_done (api); + char * tmp = NULL; + if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES)) + GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled"); + if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES)) + GNUNET_asprintf(&tmp,"with IPv4 enabled"); + if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO)) + GNUNET_asprintf(&tmp,"with IPv6 enabled"); + if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO)) + GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR,_("HTTP Server with %s could not be started on port %u! %s plugin failed!\n"),tmp, port, PROTOCOL_PREFIX); + GNUNET_free (tmp); + GNUNET_free (component_name); + LIBGNUNET_PLUGIN_TRANSPORT_DONE (api); return NULL; } @@ -2190,17 +3099,19 @@ libgnunet_plugin_transport_http_init (void *cls) if ( NULL == plugin->multi_handle ) { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "http", - _("Could not initialize curl multi handle, failed to start http plugin!\n"), - "transport-http"); - libgnunet_plugin_transport_http_done (api); + component_name, + _("Could not initialize curl multi handle, failed to start %s plugin!\n"), + PROTOCOL_PREFIX); + GNUNET_free(component_name); + LIBGNUNET_PLUGIN_TRANSPORT_DONE (api); return NULL; } plugin->peers = GNUNET_CONTAINER_multihashmap_create (10); GNUNET_OS_network_interfaces_list (&process_interfaces, plugin); + GNUNET_free(component_name); return api; } -/* end of plugin_transport_http.c */ +/* end of gnunet_transport_plugin.http.c */