X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Fnat_test.c;h=b6e2a744c4571728c92d1f4687c0b3f9202c466a;hb=aa9d926aadca2a8a67ed09f9031f7652297cad44;hp=74b2dddecbd66e672da41aa894d1d43462e5d830;hpb=490cf7e092613f7c511b46332710187336eb3a6a;p=oweals%2Fgnunet.git diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c index 74b2dddec..b6e2a744c 100644 --- a/src/nat/nat_test.c +++ b/src/nat/nat_test.c @@ -28,6 +28,7 @@ #include "gnunet_nat_lib.h" #include "nat.h" +#define LOG(kind,...) GNUNET_log_from (kind, "nat", __VA_ARGS__) /** * Entry we keep for each incoming connection. @@ -61,6 +62,29 @@ struct NatActivity }; +/** + * Entry we keep for each connection to the gnunet-nat-service. + */ +struct ClientActivity +{ + /** + * This is a doubly-linked list. + */ + struct ClientActivity *next; + + /** + * This is a doubly-linked list. + */ + struct ClientActivity *prev; + + /** + * Socket of the incoming connection. + */ + struct GNUNET_CLIENT_Connection *client; + +}; + + /** * Handle to a NAT test. */ @@ -76,7 +100,7 @@ struct GNUNET_NAT_Test * Function to call with success report */ GNUNET_NAT_TestCallback report; - + /** * Closure for 'report'. */ @@ -95,12 +119,22 @@ struct GNUNET_NAT_Test /** * Head of list of nat activities. */ - struct NatActivity *head; + struct NatActivity *na_head; /** * Tail of list of nat activities. */ - struct NatActivity *tail; + struct NatActivity *na_tail; + + /** + * Head of list of client activities. + */ + struct ClientActivity *ca_head; + + /** + * Tail of list of client activities. + */ + struct ClientActivity *ca_tail; /** * Identity of task for the listen socket (if any) @@ -134,9 +168,7 @@ struct GNUNET_NAT_Test * @param addrlen actual lenght of the address */ static void -reversal_cb (void *cls, - const struct sockaddr *addr, - socklen_t addrlen) +reversal_cb (void *cls, const struct sockaddr *addr, socklen_t addrlen) { struct GNUNET_NAT_Test *h = cls; const struct sockaddr_in *sa; @@ -145,11 +177,13 @@ reversal_cb (void *cls, return; sa = (const struct sockaddr_in *) addr; if (h->data != sa->sin_port) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received connection reversal request for wrong port\n"); - return; /* wrong port */ - } + { +#if DEBUG_NAT + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Received connection reversal request for wrong port\n"); +#endif + return; /* wrong port */ + } /* report success */ h->report (h->report_cls, GNUNET_OK); } @@ -163,8 +197,44 @@ reversal_cb (void *cls, * @param tc scheduler context */ static void -do_read (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_udp_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct GNUNET_NAT_Test *tst = cls; + uint16_t data; + + tst->ltask = + GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, tst->lsock, + &do_udp_read, tst); + if ((NULL != tc->write_ready) && + (GNUNET_NETWORK_fdset_isset (tc->read_ready, tst->lsock)) && + (sizeof (data) == + GNUNET_NETWORK_socket_recv (tst->lsock, &data, sizeof (data)))) + { + if (data == tst->data) + tst->report (tst->report_cls, GNUNET_OK); +#if DEBUG_NAT + else + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Received data mismatches expected value\n"); +#endif + } +#if DEBUG_NAT + else + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to receive data from inbound connection\n"); +#endif +} + + +/** + * Activity on our incoming socket. Read data from the + * incoming connection. + * + * @param cls the 'struct NatActivity' + * @param tc scheduler context + */ +static void +do_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct NatActivity *na = cls; struct GNUNET_NAT_Test *tst; @@ -172,26 +242,25 @@ do_read (void *cls, na->rtask = GNUNET_SCHEDULER_NO_TASK; tst = na->h; - GNUNET_CONTAINER_DLL_remove (tst->head, - tst->tail, - na); - if ( (NULL != tc->write_ready) && - (GNUNET_NETWORK_fdset_isset (tc->read_ready, - na->sock)) && - (sizeof (data) == - GNUNET_NETWORK_socket_recv (na->sock, - &data, - sizeof (data))) ) - { - if (data == tst->data) - tst->report (tst->report_cls, GNUNET_OK); - else - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received data mismatches expected value\n"); - } + GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, na); + if ((NULL != tc->write_ready) && + (GNUNET_NETWORK_fdset_isset (tc->read_ready, na->sock)) && + (sizeof (data) == + GNUNET_NETWORK_socket_recv (na->sock, &data, sizeof (data)))) + { + if (data == tst->data) + tst->report (tst->report_cls, GNUNET_OK); +#if DEBUG_NAT + else + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Received data mismatches expected value\n"); +#endif + } +#if DEBUG_NAT else - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Failed to receive data from inbound connection\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to receive data from inbound connection\n"); +#endif GNUNET_NETWORK_socket_close (na->sock); GNUNET_free (na); } @@ -205,8 +274,7 @@ do_read (void *cls, * @param tc scheduler context */ static void -do_accept (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_NAT_Test *tst = cls; struct GNUNET_NETWORK_Handle *s; @@ -214,29 +282,27 @@ do_accept (void *cls, tst->ltask = GNUNET_SCHEDULER_NO_TASK; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; - tst->ltask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, - tst->lsock, - &do_accept, - tst); + return; + tst->ltask = + GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, tst->lsock, + &do_accept, tst); s = GNUNET_NETWORK_socket_accept (tst->lsock, NULL, NULL); if (NULL == s) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "accept"); - return; /* odd error */ - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Got an inbound connection, waiting for data\n"); + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "accept"); + return; /* odd error */ + } +#if DEBUG_NAT + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Got an inbound connection, waiting for data\n"); +#endif wl = GNUNET_malloc (sizeof (struct NatActivity)); wl->sock = s; wl->h = tst; - wl->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, - wl->sock, - &do_read, - wl); - GNUNET_CONTAINER_DLL_insert (tst->head, - tst->tail, - wl); + wl->rtask = + GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, wl->sock, + &do_read, wl); + GNUNET_CONTAINER_DLL_insert (tst->na_head, tst->na_tail, wl); } @@ -249,13 +315,12 @@ do_accept (void *cls, * @param addr either the previous or the new public IP address * @param addrlen actual lenght of the address */ -static void -addr_cb (void *cls, - int add_remove, - const struct sockaddr *addr, - socklen_t addrlen) +static void +addr_cb (void *cls, int add_remove, const struct sockaddr *addr, + socklen_t addrlen) { struct GNUNET_NAT_Test *h = cls; + struct ClientActivity *ca; struct GNUNET_CLIENT_Connection *client; struct GNUNET_NAT_TestMessage msg; const struct sockaddr_in *sa; @@ -263,24 +328,34 @@ addr_cb (void *cls, if (GNUNET_YES != add_remove) return; if (addrlen != sizeof (struct sockaddr_in)) - return; /* ignore IPv6 here */ - sa = (const struct sockaddr_in*) addr; - msg.header.size = htons (sizeof(struct GNUNET_NAT_TestMessage)); + return; /* ignore IPv6 here */ +#if DEBUG_NAT + LOG (GNUNET_ERROR_TYPE_DEBUG, "Asking gnunet-nat-server to connect to `%s'\n", + GNUNET_a2s (addr, addrlen)); +#endif + sa = (const struct sockaddr_in *) addr; + msg.header.size = htons (sizeof (struct GNUNET_NAT_TestMessage)); msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAT_TEST); msg.dst_ipv4 = sa->sin_addr.s_addr; msg.dport = sa->sin_port; msg.data = h->data; msg.is_tcp = htonl ((uint32_t) h->is_tcp); - client = GNUNET_CLIENT_connect ("gnunet-nat-server", - h->cfg); + client = GNUNET_CLIENT_connect ("gnunet-nat-server", h->cfg); + if (NULL == client) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to connect to `gnunet-nat-server'\n")); + return; + } + ca = GNUNET_malloc (sizeof (struct ClientActivity)); + ca->client = client; + GNUNET_CONTAINER_DLL_insert (h->ca_head, h->ca_tail, ca); GNUNET_break (GNUNET_OK == - GNUNET_CLIENT_transmit_and_get_response (client, - &msg.header, - GNUNET_TIME_UNIT_SECONDS, - GNUNET_YES, - NULL, NULL)); - GNUNET_CLIENT_disconnect (client, GNUNET_YES); + GNUNET_CLIENT_transmit_and_get_response (client, &msg.header, + GNUNET_TIME_UNIT_SECONDS, + GNUNET_YES, NULL, + NULL)); } @@ -298,23 +373,21 @@ addr_cb (void *cls, */ struct GNUNET_NAT_Test * GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, - int is_tcp, - uint16_t bnd_port, - uint16_t adv_port, - GNUNET_NAT_TestCallback report, - void *report_cls) + int is_tcp, uint16_t bnd_port, uint16_t adv_port, + GNUNET_NAT_TestCallback report, void *report_cls) { struct GNUNET_NAT_Test *ret; struct sockaddr_in sa; - const struct sockaddr *addrs[] = { (const struct sockaddr*) &sa }; + const struct sockaddr *addrs[] = { (const struct sockaddr *) &sa }; const socklen_t addrlens[] = { sizeof (sa) }; memset (&sa, 0, sizeof (sa)); + sa.sin_family = AF_INET; sa.sin_port = htons (bnd_port); #if HAVE_SOCKADDR_IN_SIN_LEN sa.sin_len = sizeof (sa); #endif - + ret = GNUNET_malloc (sizeof (struct GNUNET_NAT_Test)); ret->cfg = cfg; ret->is_tcp = is_tcp; @@ -323,39 +396,50 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, ret->report = report; ret->report_cls = report_cls; if (bnd_port == 0) - { - ret->nat = GNUNET_NAT_register (cfg, is_tcp, - 0, - 0, NULL, NULL, - &addr_cb, &reversal_cb, ret); - } + { + ret->nat = + GNUNET_NAT_register (cfg, is_tcp, 0, 0, NULL, NULL, &addr_cb, + &reversal_cb, ret); + } else + { + ret->lsock = + GNUNET_NETWORK_socket_create (AF_INET, + (is_tcp == + GNUNET_YES) ? SOCK_STREAM : SOCK_DGRAM, + 0); + if ((ret->lsock == NULL) || + (GNUNET_OK != + GNUNET_NETWORK_socket_bind (ret->lsock, (const struct sockaddr *) &sa, + sizeof (sa)))) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ + ("Failed to create listen socket bound to `%s' for NAT test: %s\n"), + GNUNET_a2s ((const struct sockaddr *) &sa, sizeof (sa)), + STRERROR (errno)); + if (NULL != ret->lsock) + GNUNET_NETWORK_socket_close (ret->lsock); + GNUNET_free (ret); + return NULL; + } + if (GNUNET_YES == is_tcp) + { + GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_listen (ret->lsock, 5)); + ret->ltask = + GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, + ret->lsock, &do_accept, ret); + } + else { - ret->lsock = GNUNET_NETWORK_socket_create (AF_INET, - (is_tcp==GNUNET_YES) ? SOCK_STREAM : SOCK_DGRAM, 0); - if ( (ret->lsock == NULL) || - (GNUNET_OK != GNUNET_NETWORK_socket_bind (ret->lsock, - (const struct sockaddr*) &sa, - sizeof (sa))) ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to create listen socket for NAT test\n")); - if (NULL != ret->lsock) - GNUNET_NETWORK_socket_close (ret->lsock); - GNUNET_free (ret); - return NULL; - } - GNUNET_break (GNUNET_OK == - GNUNET_NETWORK_socket_listen (ret->lsock, 5)); - ret->ltask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, - ret->lsock, - &do_accept, - ret); - ret->nat = GNUNET_NAT_register (cfg, is_tcp, - adv_port, - 1, addrs, addrlens, - &addr_cb, NULL, ret); + ret->ltask = + GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, + ret->lsock, &do_udp_read, ret); } + ret->nat = + GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens, + &addr_cb, NULL, ret); + } return ret; } @@ -369,16 +453,21 @@ void GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst) { struct NatActivity *pos; - - while (NULL != (pos = tst->head)) - { - GNUNET_CONTAINER_DLL_remove (tst->head, - tst->tail, - pos); - GNUNET_SCHEDULER_cancel (pos->rtask); - GNUNET_NETWORK_socket_close (pos->sock); - GNUNET_free (pos); - } + struct ClientActivity *cpos; + + while (NULL != (cpos = tst->ca_head)) + { + GNUNET_CONTAINER_DLL_remove (tst->ca_head, tst->ca_tail, cpos); + GNUNET_CLIENT_disconnect (cpos->client, GNUNET_NO); + GNUNET_free (cpos); + } + while (NULL != (pos = tst->na_head)) + { + GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, pos); + GNUNET_SCHEDULER_cancel (pos->rtask); + GNUNET_NETWORK_socket_close (pos->sock); + GNUNET_free (pos); + } if (GNUNET_SCHEDULER_NO_TASK != tst->ltask) GNUNET_SCHEDULER_cancel (tst->ltask); if (NULL != tst->lsock)