X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_tcp.c;h=e79440e5e59a368fe41657d4650c6df59a68e08a;hb=f181f6eaf8cdb1fdb47dc98cf171ad1be842b441;hp=bd2f4aa6a4ab59f40da947ab5458300c4d48645b;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index bd2f4aa6a..e79440e5e 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -39,9 +39,11 @@ #include "gnunet_transport_plugin.h" #include "transport.h" -#define DEBUG_TCP GNUNET_NO +#define DEBUG_TCP GNUNET_EXTRA_LOGGING -#define DEBUG_TCP_NAT GNUNET_NO +#define DEBUG_TCP_NAT GNUNET_EXTRA_LOGGING + +GNUNET_NETWORK_STRUCT_BEGIN /** * Initial handshake message for a session. @@ -78,7 +80,7 @@ struct TCP_NAT_ProbeMessage struct GNUNET_PeerIdentity clientIdentity; }; - +GNUNET_NETWORK_STRUCT_END /** * Context for sending a NAT probe via TCP. @@ -118,6 +120,8 @@ struct TCPProbeContext }; +GNUNET_NETWORK_STRUCT_BEGIN + /** * Network format for IPv4 addresses. */ @@ -152,7 +156,7 @@ struct IPv6TcpAddress uint16_t t6_port GNUNET_PACKED; }; - +GNUNET_NETWORK_STRUCT_END /** * Encapsulation of all of the state of the plugin. @@ -295,6 +299,10 @@ struct Session */ int is_nat; + /** + * ATS network type in NBO + */ + uint32_t ats_address_network_type; }; @@ -323,6 +331,8 @@ struct Plugin */ struct Session *sessions; + struct GNUNET_CONTAINER_MultiHashMap * sessionmap; + /** * Handle to the network service. */ @@ -385,7 +395,7 @@ struct Plugin /** * Function to check if an inbound connection is acceptable. - * Mostly used to limit the total number of open connections + * Mostly used to limit the total number of open connections * we can have. * * @param cls the 'struct Plugin' @@ -419,8 +429,7 @@ plugin_tcp_access_check (void *cls, * @param addrlen actual lenght of the address */ static void -tcp_nat_port_map_callback (void *cls, - int add_remove, +tcp_nat_port_map_callback (void *cls, int add_remove, const struct sockaddr *addr, socklen_t addrlen) { struct Plugin *plugin = cls; @@ -429,10 +438,9 @@ tcp_nat_port_map_callback (void *cls, void *arg; size_t args; - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", - "NPMC called with %d for address `%s'\n", - add_remove, GNUNET_a2s (addr, addrlen)); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "NPMC called with %d for address `%s'\n", add_remove, + GNUNET_a2s (addr, addrlen)); /* convert 'addr' to our internal format */ switch (addr->sa_family) { @@ -445,8 +453,7 @@ tcp_nat_port_map_callback (void *cls, break; case AF_INET6: GNUNET_assert (addrlen == sizeof (struct sockaddr_in6)); - memcpy (&t6.ipv6_addr, - &((struct sockaddr_in6 *) addr)->sin6_addr, + memcpy (&t6.ipv6_addr, &((struct sockaddr_in6 *) addr)->sin6_addr, sizeof (struct in6_addr)); t6.t6_port = ((struct sockaddr_in6 *) addr)->sin6_port; arg = &t6; @@ -503,8 +510,7 @@ tcp_address_to_string (void *cls, const void *addr, size_t addrlen) } else { - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp", _("Unexpected address length: %u bytes\n"), (unsigned int) addrlen); GNUNET_break (0); @@ -515,9 +521,8 @@ tcp_address_to_string (void *cls, const void *addr, size_t addrlen) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop"); return NULL; } - GNUNET_snprintf (rbuf, - sizeof (rbuf), - (af == AF_INET6) ? "[%s]:%u" : "%s:%u", buf, port); + GNUNET_snprintf (rbuf, sizeof (rbuf), (af == AF_INET6) ? "[%s]:%u" : "%s:%u", + buf, port); return rbuf; } @@ -554,8 +559,7 @@ find_session_by_client (struct Plugin *plugin, * @return new session object */ static struct Session * -create_session (struct Plugin *plugin, - const struct GNUNET_PeerIdentity *target, +create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target, struct GNUNET_SERVER_Client *client, int is_nat) { struct Session *ret; @@ -567,8 +571,7 @@ create_session (struct Plugin *plugin, else GNUNET_assert (client == NULL); #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Creating new session for peer `%4s'\n", GNUNET_i2s (target)); #endif @@ -584,6 +587,7 @@ create_session (struct Plugin *plugin, ret->client = client; ret->target = *target; ret->expecting_welcome = GNUNET_YES; + ret->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED); pm = GNUNET_malloc (sizeof (struct PendingMessage) + sizeof (struct WelcomeMessage)); pm->msg = (const char *) &pm[1]; @@ -600,8 +604,8 @@ create_session (struct Plugin *plugin, ret->pending_messages_tail, pm); if (is_nat != GNUNET_YES) GNUNET_STATISTICS_update (plugin->env->stats, - gettext_noop ("# TCP sessions active"), - 1, GNUNET_NO); + gettext_noop ("# TCP sessions active"), 1, + GNUNET_NO); return ret; } @@ -612,7 +616,8 @@ create_session (struct Plugin *plugin, * * @param session for which session should we do this */ -static void process_pending_messages (struct Session *session); +static void +process_pending_messages (struct Session *session); /** @@ -645,8 +650,7 @@ do_transmit (void *cls, size_t size, void *buf) if (buf == NULL) { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Timeout trying to transmit to peer `%4s', discarding message queue.\n", GNUNET_i2s (&session->target)); #endif @@ -661,8 +665,7 @@ do_transmit (void *cls, size_t size, void *buf) GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, session->pending_messages_tail, pos); #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Failed to transmit %u byte message to `%4s'.\n", pos->message_size, GNUNET_i2s (&session->target)); #endif @@ -704,12 +707,15 @@ do_transmit (void *cls, size_t size, void *buf) GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, session->pending_messages_tail, pos); GNUNET_assert (size >= pos->message_size); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Transmitting message of type %u\n", + ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type)); /* FIXME: this memcpy can be up to 7% of our total runtime */ memcpy (cbuf, pos->msg, pos->message_size); cbuf += pos->message_size; ret += pos->message_size; size -= pos->message_size; - GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos); + GNUNET_CONTAINER_DLL_insert_tail (hd, tl, pos); } /* schedule 'continuation' before callbacks so that callbacks that * cancel everything don't cause us to use a session that no longer @@ -729,15 +735,15 @@ do_transmit (void *cls, size_t size, void *buf) GNUNET_assert (hd == NULL); GNUNET_assert (tl == NULL); #if DEBUG_TCP > 1 - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", "Transmitting %u bytes\n", ret); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Transmitting %u bytes\n", + ret); #endif GNUNET_STATISTICS_update (plugin->env->stats, gettext_noop ("# bytes currently in TCP buffers"), -(int64_t) ret, GNUNET_NO); GNUNET_STATISTICS_update (plugin->env->stats, - gettext_noop ("# bytes transmitted via TCP"), - ret, GNUNET_NO); + gettext_noop ("# bytes transmitted via TCP"), ret, + GNUNET_NO); return ret; } @@ -759,12 +765,11 @@ process_pending_messages (struct Session *session) if (NULL == (pm = session->pending_messages_head)) return; - session->transmit_handle - = GNUNET_SERVER_notify_transmit_ready (session->client, - pm->message_size, - GNUNET_TIME_absolute_get_remaining - (pm->timeout), - &do_transmit, session); + session->transmit_handle = + GNUNET_SERVER_notify_transmit_ready (session->client, pm->message_size, + GNUNET_TIME_absolute_get_remaining + (pm->timeout), &do_transmit, + session); } @@ -783,14 +788,14 @@ disconnect_session (struct Session *session) struct PendingMessage *pm; #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Disconnecting from `%4s' at %s.\n", GNUNET_i2s (&session->target), - (session->connect_addr != NULL) ? - tcp_address_to_string (session->plugin, - session->connect_addr, - session->connect_alen) : "*"); + (session->connect_addr != + NULL) ? tcp_address_to_string (session->plugin, + session->connect_addr, + session->connect_alen) : + "*"); #endif /* remove from session list */ prev = NULL; @@ -816,11 +821,10 @@ disconnect_session (struct Session *session) while (NULL != (pm = session->pending_messages_head)) { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", - pm->transmit_cont != NULL - ? "Could not deliver message to `%4s'.\n" - : "Could not deliver message to `%4s', notifying.\n", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + pm->transmit_cont != + NULL ? "Could not deliver message to `%4s'.\n" : + "Could not deliver message to `%4s', notifying.\n", GNUNET_i2s (&session->target)); #endif GNUNET_STATISTICS_update (session->plugin->env->stats, @@ -833,8 +837,8 @@ disconnect_session (struct Session *session) GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, session->pending_messages_tail, pm); if (NULL != pm->transmit_cont) - pm->transmit_cont (pm->transmit_cont_cls, - &session->target, GNUNET_SYSERR); + pm->transmit_cont (pm->transmit_cont_cls, &session->target, + GNUNET_SYSERR); GNUNET_free (pm); } GNUNET_break (session->client != NULL); @@ -850,8 +854,8 @@ disconnect_session (struct Session *session) session->client = NULL; } GNUNET_STATISTICS_update (session->plugin->env->stats, - gettext_noop ("# TCP sessions active"), - -1, GNUNET_NO); + gettext_noop ("# TCP sessions active"), -1, + GNUNET_NO); GNUNET_free_non_null (session->connect_addr); GNUNET_assert (NULL == session->transmit_handle); GNUNET_free (session); @@ -928,16 +932,10 @@ select_better_session (struct Session *s1, struct Session *s2) * and does NOT mean that the message was not transmitted (DV and NAT) */ static ssize_t -tcp_plugin_send (void *cls, - const struct GNUNET_PeerIdentity *target, - const char *msg, - size_t msgbuf_size, - uint32_t priority, - struct GNUNET_TIME_Relative timeout, - struct Session *session, - const void *addr, - size_t addrlen, - int force_address, +tcp_plugin_send (void *cls, const struct GNUNET_PeerIdentity *target, + const char *msg, size_t msgbuf_size, uint32_t priority, + struct GNUNET_TIME_Relative timeout, struct Session *session, + const void *addr, size_t addrlen, int force_address, GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls) { struct Plugin *plugin = cls; @@ -969,8 +967,9 @@ tcp_plugin_send (void *cls, { next = session->next; GNUNET_assert (session->client != NULL); - if (0 != memcmp (target, - &session->target, sizeof (struct GNUNET_PeerIdentity))) + if (0 != + memcmp (target, &session->target, + sizeof (struct GNUNET_PeerIdentity))) continue; if (((GNUNET_SYSERR == force_address) && (session->expecting_welcome == GNUNET_NO)) || @@ -989,18 +988,17 @@ tcp_plugin_send (void *cls, } if ((addrlen != session->connect_alen) && (session->is_nat == GNUNET_NO)) continue; - if ((0 != memcmp (session->connect_addr, - addr, addrlen)) && (session->is_nat == GNUNET_NO)) + if ((0 != memcmp (session->connect_addr, addr, addrlen)) && + (session->is_nat == GNUNET_NO)) continue; cand_session = select_better_session (cand_session, session); } session = cand_session; } - if ((session == NULL) && (addr == NULL)) + if ((session == NULL) && (addrlen == 0)) { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Asked to transmit to `%4s' without address and I have no existing connection (failing).\n", GNUNET_i2s (target)); #endif @@ -1014,6 +1012,7 @@ tcp_plugin_send (void *cls, { if (addrlen == sizeof (struct IPv6TcpAddress)) { + GNUNET_assert (NULL != addr); /* make static analysis happy */ t6 = addr; af = AF_INET6; memset (&a6, 0, sizeof (a6)); @@ -1030,6 +1029,7 @@ tcp_plugin_send (void *cls, } else if (addrlen == sizeof (struct IPv4TcpAddress)) { + GNUNET_assert (NULL != addr); /* make static analysis happy */ t4 = addr; af = AF_INET; memset (&a4, 0, sizeof (a4)); @@ -1046,8 +1046,8 @@ tcp_plugin_send (void *cls, } else { - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "tcp", _("Address of unexpected length: %u\n"), addrlen); + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp", + _("Address of unexpected length: %u\n"), addrlen); GNUNET_break (0); return -1; } @@ -1057,15 +1057,13 @@ tcp_plugin_send (void *cls, if (0 == plugin->max_connections) return -1; /* saturated */ - if ((is_natd == GNUNET_YES) && - (NULL != plugin->nat) && + if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) && (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (plugin->nat_wait_conns, &target->hashPubKey))) { #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", _("Found valid IPv4 NAT address (creating session)!\n")); #endif session = create_session (plugin, target, NULL, GNUNET_YES); @@ -1084,18 +1082,15 @@ tcp_plugin_send (void *cls, pm->transmit_cont_cls = cont_cls; /* append pm to pending_messages list */ - GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head, - session->pending_messages_tail, - session->pending_messages_tail, pm); - - GNUNET_assert (GNUNET_CONTAINER_multihashmap_put (plugin->nat_wait_conns, - &target->hashPubKey, - session, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) - == GNUNET_OK); + GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, + session->pending_messages_tail, pm); + + GNUNET_assert (GNUNET_CONTAINER_multihashmap_put + (plugin->nat_wait_conns, &target->hashPubKey, session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == + GNUNET_OK); #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Created NAT WAIT connection to `%4s' at `%s'\n", GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); #endif @@ -1114,8 +1109,7 @@ tcp_plugin_send (void *cls, if (sa == NULL) { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Failed to create connection to `%4s' at `%s'\n", GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); #endif @@ -1128,35 +1122,131 @@ tcp_plugin_send (void *cls, GNUNET_assert (0 != plugin->max_connections); plugin->max_connections--; #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Asked to transmit to `%4s', creating fresh session using address `%s'.\n", GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); #endif - session = create_session (plugin, - target, - GNUNET_SERVER_connect_socket (plugin->server, - sa), GNUNET_NO); + session = + create_session (plugin, target, + GNUNET_SERVER_connect_socket (plugin->server, sa), + GNUNET_NO); session->connect_addr = GNUNET_malloc (addrlen); memcpy (session->connect_addr, addr, addrlen); session->connect_alen = addrlen; + if (addrlen != 0) + { + struct GNUNET_ATS_Information ats; + ats = plugin->env->get_address_type (plugin->env->cls, sb ,sbs); + session->ats_address_network_type = ats.value; + } + else + GNUNET_break (0); } else /* session != NULL */ { /* check if session is valid */ struct Session *ses = plugin->sessions; + if (0 != + memcmp (target, &session->target, sizeof (struct GNUNET_PeerIdentity))) + { + GNUNET_break (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Got session %p for `%s', but should be for peer `%s'!\n", + session, GNUNET_i2s (&session->target), + GNUNET_h2s (&target->hashPubKey)); + return -1; + } + while ((ses != NULL) && (ses != session)) ses = ses->next; if (ses == NULL) { - GNUNET_break (0); return -1; } } GNUNET_assert (session != NULL); GNUNET_assert (session->client != NULL); + GNUNET_SERVER_client_set_timeout (session->client, + GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), + msgbuf_size, GNUNET_NO); + /* create new message entry */ + pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size); + pm->msg = (const char *) &pm[1]; + memcpy (&pm[1], msg, msgbuf_size); + pm->message_size = msgbuf_size; + pm->timeout = GNUNET_TIME_relative_to_absolute (timeout); + pm->transmit_cont = cont; + pm->transmit_cont_cls = cont_cls; + /* append pm to pending_messages list */ + GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, + session->pending_messages_tail, pm); +#if DEBUG_TCP + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Asked to transmit %u bytes to `%s', added message to list.\n", + msgbuf_size, GNUNET_i2s (target)); +#endif + process_pending_messages (session); + return msgbuf_size; +} + +/** + * Function that can be used by the transport service to transmit + * a message using the plugin. Note that in the case of a + * peer disconnecting, the continuation MUST be called + * prior to the disconnect notification itself. This function + * will be called with this peer's HELLO message to initiate + * a fresh connection to another peer. + * + * @param cls closure + * @param target who should receive this message + * @param msg the message to transmit + * @param msgbuf_size number of bytes in 'msg' + * @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 + * require plugins to discard the message after the timeout, + * just advisory for the desired delay; most plugins will ignore + * this as well) + * @param session which session must be used (or NULL for "any") + * @param addr the address to use (can be NULL if the plugin + * is "on its own" (i.e. re-use existing TCP connection)) + * @param addrlen length of the address in bytes + * @param force_address GNUNET_YES if the plugin MUST use the given address, + * GNUNET_NO means the plugin may use any other address and + * GNUNET_SYSERR means that only reliable existing + * bi-directional connections should be used (regardless + * of address) + * @param cont continuation to call once the message has + * been transmitted (or if the transport is ready + * for the next transmission call; or if the + * peer disconnected...); can be NULL + * @param cont_cls closure for cont + * @return number of bytes used (on the physical network, with overheads); + * -1 on hard errors (i.e. address invalid); 0 is a legal value + * and does NOT mean that the message was not transmitted (DV and NAT) + */ +static ssize_t +tcp_plugin_send_new (void *cls, + const struct + GNUNET_PeerIdentity * + target, + const char *msg, + size_t msgbuf_size, + uint32_t priority, + struct GNUNET_TIME_Relative timeout, + struct Session * session, + GNUNET_TRANSPORT_TransmitContinuation + cont, void *cont_cls) +{ + struct Plugin * plugin = cls; + struct PendingMessage *pm; + + GNUNET_assert (session != NULL); + GNUNET_assert (session->client != NULL); GNUNET_SERVER_client_set_timeout (session->client, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); @@ -1173,12 +1263,10 @@ tcp_plugin_send (void *cls, pm->transmit_cont_cls = cont_cls; /* append pm to pending_messages list */ - GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head, - session->pending_messages_tail, - session->pending_messages_tail, pm); + GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, + session->pending_messages_tail, pm); #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Asked to transmit %u bytes to `%s', added message to list.\n", msgbuf_size, GNUNET_i2s (target)); #endif @@ -1186,6 +1274,192 @@ tcp_plugin_send (void *cls, return msgbuf_size; } +struct SessionItCtx +{ + void * addr; + size_t addrlen; + struct Session * result; +}; + +int session_it (void *cls, + const GNUNET_HashCode * key, + void *value) +{ + struct SessionItCtx * si_ctx = cls; + struct Session * session = value; + + if (session->connect_alen != si_ctx->addrlen) + return GNUNET_YES; + if (0 != memcmp (&session->connect_addr, si_ctx->addr, si_ctx->addrlen)) + return GNUNET_YES; + + /* Found existing session */ + si_ctx->result = session; + return GNUNET_NO; +} + + +/** + * Create a new session to transmit data to the target + * This session will used to send data to this peer and the plugin will + * notify us by calling the env->session_end function + * + * @param cls closure + * @param target the neighbour id + * @param addr pointer to the address + * @param addrlen length of addr + * @return the session if the address is valid, NULL otherwise + */ +const void * tcp_plugin_create_session (void *cls, + const struct GNUNET_PeerIdentity *target, + const void *addr, + size_t addrlen) +{ + struct Plugin * plugin = cls; + struct Session * session = NULL; + + int af; + const void *sb; + size_t sbs; + struct GNUNET_CONNECTION_Handle *sa; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4TcpAddress *t4; + const struct IPv6TcpAddress *t6; + unsigned int is_natd; + + if (addrlen == sizeof (struct IPv6TcpAddress)) + { + GNUNET_assert (NULL != addr); /* make static analysis happy */ + t6 = addr; + af = AF_INET6; + memset (&a6, 0, sizeof (a6)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_family = AF_INET6; + a6.sin6_port = t6->t6_port; + if (t6->t6_port == 0) + is_natd = GNUNET_YES; + memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof (struct in6_addr)); + sb = &a6; + sbs = sizeof (a6); + } + else if (addrlen == sizeof (struct IPv4TcpAddress)) + { + GNUNET_assert (NULL != addr); /* make static analysis happy */ + t4 = addr; + af = AF_INET; + memset (&a4, 0, sizeof (a4)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_family = AF_INET; + a4.sin_port = t4->t4_port; + if (t4->t4_port == 0) + is_natd = GNUNET_YES; + a4.sin_addr.s_addr = t4->ipv4_addr; + sb = &a4; + sbs = sizeof (a4); + } + else + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp", + _("Address of unexpected length: %u\n"), addrlen); + GNUNET_break (0); + return NULL; + } + + /* look for existing session */ + if (GNUNET_CONTAINER_multihashmap_contains(plugin->sessionmap, &target->hashPubKey)) + { + struct SessionItCtx si_ctx; + si_ctx.addr = &sbs; + si_ctx.addrlen = sbs; + GNUNET_CONTAINER_multihashmap_get_multiple(plugin->sessionmap, &target->hashPubKey, &session_it, &si_ctx); + if (si_ctx.result != NULL) + session = si_ctx.result; + return session; + } + + if ((is_natd == GNUNET_YES) && (addrlen == sizeof (struct IPv6TcpAddress))) + return NULL; /* NAT client only works with IPv4 addresses */ + + if (0 == plugin->max_connections) + return NULL; /* saturated */ + + if ((is_natd == GNUNET_YES) && + (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_contains (plugin->nat_wait_conns, + &target->hashPubKey))) + return NULL; /* Only do one NAT punch attempt per peer identity */ + + if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) && + (GNUNET_NO == + GNUNET_CONTAINER_multihashmap_contains (plugin->nat_wait_conns, + &target->hashPubKey))) + { +#if DEBUG_TCP_NAT + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + _("Found valid IPv4 NAT address (creating session)!\n")); +#endif + session = create_session (plugin, target, NULL, GNUNET_YES); + GNUNET_assert (session != NULL); + + GNUNET_assert (GNUNET_CONTAINER_multihashmap_put + (plugin->nat_wait_conns, &target->hashPubKey, session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == GNUNET_OK); +#if DEBUG_TCP_NAT + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Created NAT WAIT connection to `%4s' at `%s'\n", + GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); +#endif + GNUNET_NAT_run_client (plugin->nat, &a4); + return session; + } + + /* create new outbound session */ + GNUNET_assert (0 != plugin->max_connections); + sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs); + if (sa == NULL) + { +#if DEBUG_TCP + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Failed to create connection to `%4s' at `%s'\n", + GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); +#endif + return NULL; + } + plugin->max_connections--; +#if DEBUG_TCP_NAT + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Asked to transmit to `%4s', creating fresh session using address `%s'.\n", + GNUNET_i2s (target), GNUNET_a2s (sb, sbs)); +#endif + session = create_session (plugin, + target, + GNUNET_SERVER_connect_socket (plugin->server, sa), + GNUNET_NO); + session->connect_addr = GNUNET_malloc (addrlen); + memcpy (session->connect_addr, addr, addrlen); + session->connect_alen = addrlen; + if (addrlen != 0) + { + struct GNUNET_ATS_Information ats; + ats = plugin->env->get_address_type (plugin->env->cls, sb ,sbs); + session->ats_address_network_type = ats.value; + } + else + GNUNET_break (0); + + GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &target->hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + + /* Send TCP Welcome */ + process_pending_messages (session); + + return session; +} + /** * Function that can be called to force a disconnect from the @@ -1212,16 +1486,15 @@ tcp_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target) struct PendingMessage *pm; #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Asked to cancel session with `%4s'\n", GNUNET_i2s (target)); #endif next = plugin->sessions; while (NULL != (session = next)) { next = session->next; - if (0 != memcmp (target, - &session->target, sizeof (struct GNUNET_PeerIdentity))) + if (0 != + memcmp (target, &session->target, sizeof (struct GNUNET_PeerIdentity))) continue; pm = session->pending_messages_head; while (pm != NULL) @@ -1300,10 +1573,8 @@ append_port (void *cls, const char *hostname) * @param asc_cls closure for asc */ static void -tcp_plugin_address_pretty_printer (void *cls, - const char *type, - const void *addr, - size_t addrlen, +tcp_plugin_address_pretty_printer (void *cls, const char *type, + const void *addr, size_t addrlen, int numeric, struct GNUNET_TIME_Relative timeout, GNUNET_TRANSPORT_AddressStringCallback asc, @@ -1408,8 +1679,8 @@ tcp_plugin_check_address (void *cls, const void *addr, size_t addrlen) if (GNUNET_OK != check_port (plugin, ntohs (v4->t4_port))) return GNUNET_SYSERR; if (GNUNET_OK != - GNUNET_NAT_test_address (plugin->nat, - &v4->ipv4_addr, sizeof (struct in_addr))) + GNUNET_NAT_test_address (plugin->nat, &v4->ipv4_addr, + sizeof (struct in_addr))) return GNUNET_SYSERR; } else @@ -1423,8 +1694,8 @@ tcp_plugin_check_address (void *cls, const void *addr, size_t addrlen) if (GNUNET_OK != check_port (plugin, ntohs (v6->t6_port))) return GNUNET_SYSERR; if (GNUNET_OK != - GNUNET_NAT_test_address (plugin->nat, - &v6->ipv6_addr, sizeof (struct in6_addr))) + GNUNET_NAT_test_address (plugin->nat, &v6->ipv6_addr, + sizeof (struct in6_addr))) return GNUNET_SYSERR; } return GNUNET_OK; @@ -1441,8 +1712,7 @@ tcp_plugin_check_address (void *cls, const void *addr, size_t addrlen) * @param message the actual message */ static void -handle_tcp_nat_probe (void *cls, - struct GNUNET_SERVER_Client *client, +handle_tcp_nat_probe (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { struct Plugin *plugin = cls; @@ -1472,34 +1742,36 @@ handle_tcp_nat_probe (void *cls, } tcp_nat_probe = (const struct TCP_NAT_ProbeMessage *) message; - if (0 == memcmp (&tcp_nat_probe->clientIdentity, - plugin->env->my_identity, - sizeof (struct GNUNET_PeerIdentity))) + if (0 == + memcmp (&tcp_nat_probe->clientIdentity, plugin->env->my_identity, + sizeof (struct GNUNET_PeerIdentity))) { /* refuse connections from ourselves */ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - session = GNUNET_CONTAINER_multihashmap_get (plugin->nat_wait_conns, - &tcp_nat_probe-> - clientIdentity.hashPubKey); + session = + GNUNET_CONTAINER_multihashmap_get (plugin->nat_wait_conns, + &tcp_nat_probe-> + clientIdentity.hashPubKey); if (session == NULL) { #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", "Did NOT find session for NAT probe!\n"); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Did NOT find session for NAT probe!\n"); #endif GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", "Found session for NAT probe!\n"); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Found session for NAT probe!\n"); #endif - GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove (plugin->nat_wait_conns, - &tcp_nat_probe->clientIdentity.hashPubKey, - session) == GNUNET_YES); + GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove + (plugin->nat_wait_conns, + &tcp_nat_probe->clientIdentity.hashPubKey, + session) == GNUNET_YES); if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) { GNUNET_break (0); @@ -1514,8 +1786,7 @@ handle_tcp_nat_probe (void *cls, session->inbound = GNUNET_NO; #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Found address `%s' for incoming connection\n", GNUNET_a2s (vaddr, alen)); #endif @@ -1540,8 +1811,8 @@ handle_tcp_nat_probe (void *cls, default: GNUNET_break_op (0); #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", "Bad address for incoming connection!\n"); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Bad address for incoming connection!\n"); #endif GNUNET_free (vaddr); GNUNET_SERVER_client_drop (client); @@ -1554,8 +1825,8 @@ handle_tcp_nat_probe (void *cls, session->next = plugin->sessions; plugin->sessions = session; GNUNET_STATISTICS_update (plugin->env->stats, - gettext_noop ("# TCP sessions active"), - 1, GNUNET_NO); + gettext_noop ("# TCP sessions active"), 1, + GNUNET_NO); process_pending_messages (session); GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -1570,8 +1841,7 @@ handle_tcp_nat_probe (void *cls, * @param message the actual message */ static void -handle_tcp_welcome (void *cls, - struct GNUNET_SERVER_Client *client, +handle_tcp_welcome (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { struct Plugin *plugin = cls; @@ -1584,30 +1854,28 @@ handle_tcp_welcome (void *cls, const struct sockaddr_in *s4; const struct sockaddr_in6 *s6; - if (0 == memcmp (&wm->clientIdentity, - plugin->env->my_identity, - sizeof (struct GNUNET_PeerIdentity))) + if (0 == + memcmp (&wm->clientIdentity, plugin->env->my_identity, + sizeof (struct GNUNET_PeerIdentity))) { /* refuse connections from ourselves */ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", - "Received %s message from `%4s'.\n", - "WELCOME", GNUNET_i2s (&wm->clientIdentity)); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", + "Received %s message from `%4s'.\n", "WELCOME", + GNUNET_i2s (&wm->clientIdentity)); #endif GNUNET_STATISTICS_update (plugin->env->stats, - gettext_noop ("# TCP WELCOME messages received"), - 1, GNUNET_NO); + gettext_noop ("# TCP WELCOME messages received"), 1, + GNUNET_NO); session = find_session_by_client (plugin, client); if (session == NULL) { #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Received %s message from a `%4s', creating new session\n", "WELCOME", GNUNET_i2s (&wm->clientIdentity)); #endif @@ -1617,11 +1885,11 @@ handle_tcp_welcome (void *cls, if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) { #if DEBUG_TCP_NAT - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Found address `%s' for incoming connection\n", GNUNET_a2s (vaddr, alen)); #endif + if (alen == sizeof (struct sockaddr_in)) { s4 = vaddr; @@ -1641,13 +1909,16 @@ handle_tcp_welcome (void *cls, session->connect_alen = sizeof (struct IPv6TcpAddress); } + struct GNUNET_ATS_Information ats; + ats = plugin->env->get_address_type (plugin->env->cls, vaddr ,alen); + session->ats_address_network_type = ats.value; + GNUNET_free (vaddr); } else { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Did not obtain TCP socket address for incoming connection\n"); #endif } @@ -1658,8 +1929,7 @@ handle_tcp_welcome (void *cls, #if DEBUG_TCP_NAT if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Found address `%s' (already have session)\n", GNUNET_a2s (vaddr, alen)); GNUNET_free (vaddr); @@ -1693,11 +1963,13 @@ delayed_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct Session *session = cls; struct GNUNET_TIME_Relative delay; + struct GNUNET_ATS_Information ats; session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK; - delay = session->plugin->env->receive (session->plugin->env->cls, - &session->target, - NULL, NULL, 0, session, NULL, 0); + delay = + session->plugin->env->receive (session->plugin->env->cls, + &session->target, NULL, &ats, 0, session, + NULL, 0); if (delay.rel_value == 0) GNUNET_SERVER_receive_done (session->client, GNUNET_OK); else @@ -1715,8 +1987,7 @@ delayed_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param message the actual message */ static void -handle_tcp_data (void *cls, - struct GNUNET_SERVER_Client *client, +handle_tcp_data (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { struct Plugin *plugin = cls; @@ -1739,9 +2010,8 @@ handle_tcp_data (void *cls, return; } session->last_activity = GNUNET_TIME_absolute_get (); -#if DEBUG_TCP > 1 - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", +#if DEBUG_TCP + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Passing %u bytes of type %u from `%4s' to transport service.\n", (unsigned int) ntohs (message->size), (unsigned int) ntohs (message->type), @@ -1750,20 +2020,22 @@ handle_tcp_data (void *cls, GNUNET_STATISTICS_update (plugin->env->stats, gettext_noop ("# bytes received via TCP"), ntohs (message->size), GNUNET_NO); - struct GNUNET_TRANSPORT_ATS_Information distance[2]; + struct GNUNET_ATS_Information distance[2]; - distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE); + distance[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); distance[0].value = htonl (1); - distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR); - distance[1].value = htonl (0); - delay = plugin->env->receive (plugin->env->cls, &session->target, message, - (const struct GNUNET_TRANSPORT_ATS_Information - *) &distance, 2, session, - (GNUNET_YES == - session-> - inbound) ? NULL : session->connect_addr, - (GNUNET_YES == - session->inbound) ? 0 : session->connect_alen); + distance[1].type = htonl (GNUNET_ATS_NETWORK_TYPE); + distance[1].value = session->ats_address_network_type; + GNUNET_break (ntohl(session->ats_address_network_type) != GNUNET_ATS_NET_UNSPECIFIED); + + delay = + plugin->env->receive (plugin->env->cls, &session->target, message, + (const struct GNUNET_ATS_Information *) &distance, + 1, session, + (GNUNET_YES == + session->inbound) ? NULL : session->connect_addr, + (GNUNET_YES == + session->inbound) ? 0 : session->connect_alen); if (delay.rel_value == 0) { GNUNET_SERVER_receive_done (client, GNUNET_OK); @@ -1771,8 +2043,7 @@ handle_tcp_data (void *cls, else { #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Throttling receiving from `%s' for %llu ms\n", GNUNET_i2s (&session->target), (unsigned long long) delay.rel_value); @@ -1804,14 +2075,14 @@ disconnect_notify (void *cls, struct GNUNET_SERVER_Client *client) if (session == NULL) return; /* unknown, nothing to do */ #if DEBUG_TCP - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp", "Destroying session of `%4s' with %s due to network-level disconnect.\n", GNUNET_i2s (&session->target), - (session->connect_addr != NULL) ? - tcp_address_to_string (session->plugin, - session->connect_addr, - session->connect_alen) : "*"); + (session->connect_addr != + NULL) ? tcp_address_to_string (session->plugin, + session->connect_addr, + session->connect_alen) : + "*"); #endif GNUNET_STATISTICS_update (session->plugin->env->stats, gettext_noop @@ -1837,8 +2108,8 @@ notify_send_probe (void *cls, size_t size, void *buf) size_t ret; tcp_probe_ctx->transmit_handle = NULL; - GNUNET_CONTAINER_DLL_remove (plugin->probe_head, - plugin->probe_tail, tcp_probe_ctx); + GNUNET_CONTAINER_DLL_remove (plugin->probe_head, plugin->probe_tail, + tcp_probe_ctx); if (buf == NULL) { GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock, GNUNET_NO); @@ -1865,8 +2136,8 @@ notify_send_probe (void *cls, size_t size, void *buf) * @param addrlen number of bytes in addr */ static void -try_connection_reversal (void *cls, - const struct sockaddr *addr, socklen_t addrlen) +try_connection_reversal (void *cls, const struct sockaddr *addr, + socklen_t addrlen) { struct Plugin *plugin = cls; struct GNUNET_CONNECTION_Handle *sock; @@ -1886,23 +2157,23 @@ try_connection_reversal (void *cls, /* FIXME: do we need to track these probe context objects so that * we can clean them up on plugin unload? */ tcp_probe_ctx = GNUNET_malloc (sizeof (struct TCPProbeContext)); - tcp_probe_ctx->message.header.size - = htons (sizeof (struct TCP_NAT_ProbeMessage)); - tcp_probe_ctx->message.header.type - = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE); - memcpy (&tcp_probe_ctx->message.clientIdentity, - plugin->env->my_identity, sizeof (struct GNUNET_PeerIdentity)); + tcp_probe_ctx->message.header.size = + htons (sizeof (struct TCP_NAT_ProbeMessage)); + tcp_probe_ctx->message.header.type = + htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE); + memcpy (&tcp_probe_ctx->message.clientIdentity, plugin->env->my_identity, + sizeof (struct GNUNET_PeerIdentity)); tcp_probe_ctx->plugin = plugin; tcp_probe_ctx->sock = sock; - GNUNET_CONTAINER_DLL_insert (plugin->probe_head, - plugin->probe_tail, tcp_probe_ctx); - tcp_probe_ctx->transmit_handle - = GNUNET_CONNECTION_notify_transmit_ready (sock, - ntohs (tcp_probe_ctx-> - message.header.size), - GNUNET_TIME_UNIT_FOREVER_REL, - ¬ify_send_probe, - tcp_probe_ctx); + GNUNET_CONTAINER_DLL_insert (plugin->probe_head, plugin->probe_tail, + tcp_probe_ctx); + tcp_probe_ctx->transmit_handle = + GNUNET_CONNECTION_notify_transmit_ready (sock, + ntohs (tcp_probe_ctx-> + message.header.size), + GNUNET_TIME_UNIT_FOREVER_REL, + ¬ify_send_probe, + tcp_probe_ctx); } @@ -1938,27 +2209,21 @@ libgnunet_plugin_transport_tcp_init (void *cls) socklen_t *addrlens; if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (env->cfg, - "transport-tcp", + GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp", "MAX_CONNECTIONS", &max_connections)) max_connections = 128; aport = 0; if ((GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (env->cfg, - "transport-tcp", - "PORT", - &bport)) || - (bport > 65535) || + GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp", "PORT", + &bport)) || (bport > 65535) || ((GNUNET_OK == - GNUNET_CONFIGURATION_get_value_number (env->cfg, - "transport-tcp", - "ADVERTISED-PORT", - &aport)) && (aport > 65535))) + GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp", + "ADVERTISED-PORT", &aport)) && + (aport > 65535))) { - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp", _ ("Require valid port number for service `%s' in configuration!\n"), "transport-tcp"); @@ -1973,8 +2238,8 @@ libgnunet_plugin_transport_tcp_init (void *cls) service = GNUNET_SERVICE_start ("transport-tcp", env->cfg); if (service == NULL) { - GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, - "tcp", _("Failed to start service.\n")); + GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp", + _("Failed to start service.\n")); return NULL; } } @@ -1984,6 +2249,7 @@ libgnunet_plugin_transport_tcp_init (void *cls) plugin = GNUNET_malloc (sizeof (struct Plugin)); + plugin->sessionmap = GNUNET_CONTAINER_multihashmap_create(max_connections); plugin->max_connections = max_connections; plugin->open_port = bport; plugin->adv_port = aport; @@ -1991,18 +2257,15 @@ libgnunet_plugin_transport_tcp_init (void *cls) plugin->lsock = NULL; if ((service != NULL) && (GNUNET_SYSERR != - (ret = GNUNET_SERVICE_get_server_addresses ("transport-tcp", - env->cfg, - &addrs, &addrlens)))) + (ret = + GNUNET_SERVICE_get_server_addresses ("transport-tcp", env->cfg, &addrs, + &addrlens)))) { - plugin->nat = GNUNET_NAT_register (env->cfg, - GNUNET_YES, - aport, - (unsigned int) ret, - (const struct sockaddr **) addrs, - addrlens, - &tcp_nat_port_map_callback, - &try_connection_reversal, plugin); + plugin->nat = + GNUNET_NAT_register (env->cfg, GNUNET_YES, aport, (unsigned int) ret, + (const struct sockaddr **) addrs, addrlens, + &tcp_nat_port_map_callback, + &try_connection_reversal, plugin); while (ret > 0) { ret--; @@ -2014,15 +2277,17 @@ libgnunet_plugin_transport_tcp_init (void *cls) } else { - plugin->nat = GNUNET_NAT_register (env->cfg, - GNUNET_YES, - 0, - 0, NULL, NULL, - NULL, &try_connection_reversal, plugin); + plugin->nat = + GNUNET_NAT_register (env->cfg, GNUNET_YES, 0, 0, NULL, NULL, NULL, + &try_connection_reversal, plugin); } api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions)); api->cls = plugin; api->send = &tcp_plugin_send; + + api->send_with_session = &tcp_plugin_send_new; + api->create_session = &tcp_plugin_create_session; + api->disconnect = &tcp_plugin_disconnect; api->address_pretty_printer = &tcp_plugin_address_pretty_printer; api->check_address = &tcp_plugin_check_address; @@ -2035,12 +2300,10 @@ libgnunet_plugin_transport_tcp_init (void *cls) else { if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_time (env->cfg, - "transport-tcp", + GNUNET_CONFIGURATION_get_value_time (env->cfg, "transport-tcp", "TIMEOUT", &idle_timeout)) { - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp", _("Failed to find option %s in section %s!\n"), "TIMEOUT", "transport-tcp"); if (plugin->nat != NULL) @@ -2063,16 +2326,14 @@ libgnunet_plugin_transport_tcp_init (void *cls) GNUNET_SERVER_disconnect_notify (plugin->server, &disconnect_notify, plugin); plugin->nat_wait_conns = GNUNET_CONTAINER_multihashmap_create (16); if (bport != 0) - GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, - "tcp", _("TCP transport listening on port %llu\n"), bport); + GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "tcp", + _("TCP transport listening on port %llu\n"), bport); else - GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "tcp", _ ("TCP transport not listening on any port (client only)\n")); if (aport != bport) - GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, - "tcp", + GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "tcp", _ ("TCP transport advertises itself as being on port %llu\n"), aport); @@ -2102,12 +2363,13 @@ libgnunet_plugin_transport_tcp_done (void *cls) GNUNET_NAT_unregister (plugin->nat); while (NULL != (tcp_probe = plugin->probe_head)) { - GNUNET_CONTAINER_DLL_remove (plugin->probe_head, - plugin->probe_tail, tcp_probe); + GNUNET_CONTAINER_DLL_remove (plugin->probe_head, plugin->probe_tail, + tcp_probe); GNUNET_CONNECTION_destroy (tcp_probe->sock, GNUNET_NO); GNUNET_free (tcp_probe); } GNUNET_CONTAINER_multihashmap_destroy (plugin->nat_wait_conns); + GNUNET_CONTAINER_multihashmap_destroy (plugin->sessionmap); GNUNET_free (plugin); GNUNET_free (api); return NULL;