From 3da688532c45cb067c8fa58cb8e1bdbb33752c1f Mon Sep 17 00:00:00 2001 From: t3sserakt Date: Wed, 6 May 2020 18:22:12 +0200 Subject: [PATCH] run uncrustify. minor config changes. --- src/transport/gnunet-communicator-tcp.c | 248 +++++++++--------- .../test_communicator_tcp_basic_peer1.conf | 3 +- .../test_communicator_tcp_basic_peer2.conf | 2 +- 3 files changed, 124 insertions(+), 129 deletions(-) diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c index 7c19a31f6..a25328658 100644 --- a/src/transport/gnunet-communicator-tcp.c +++ b/src/transport/gnunet-communicator-tcp.c @@ -1104,50 +1104,51 @@ queue_read (void *cls) } static struct sockaddr * -tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port, socklen_t *sock_len) +tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port, + socklen_t *sock_len) { struct sockaddr *in; /* interpreting value as just a PORT number */ - if (*port > UINT16_MAX) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "BINDTO specification `%s' invalid: value too large for port\n", - bindto); - return NULL; - } - if ((GNUNET_NO == GNUNET_NETWORK_test_pf (PF_INET6)) || - (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_yesno (cfg, - COMMUNICATOR_CONFIG_SECTION, - "DISABLE_V6"))) - { - struct sockaddr_in *i4; + if (*port > UINT16_MAX) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "BINDTO specification `%s' invalid: value too large for port\n", + bindto); + return NULL; + } + if ((GNUNET_NO == GNUNET_NETWORK_test_pf (PF_INET6)) || + (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_yesno (cfg, + COMMUNICATOR_CONFIG_SECTION, + "DISABLE_V6"))) + { + struct sockaddr_in *i4; - i4 = GNUNET_malloc (sizeof(struct sockaddr_in)); - i4->sin_family = AF_INET; - i4->sin_port = htons ((uint16_t) *port); + i4 = GNUNET_malloc (sizeof(struct sockaddr_in)); + i4->sin_family = AF_INET; + i4->sin_port = htons ((uint16_t) *port); #if HAVE_SOCKADDR_IN_SIN_LEN - i4->sin_len = sizeof(sizeof(struct sockaddr_in)); + i4->sin_len = sizeof(sizeof(struct sockaddr_in)); #endif - *sock_len = sizeof(struct sockaddr_in); - in = (struct sockaddr *) i4; - } - else - { - struct sockaddr_in6 *i6; + *sock_len = sizeof(struct sockaddr_in); + in = (struct sockaddr *) i4; + } + else + { + struct sockaddr_in6 *i6; - i6 = GNUNET_malloc (sizeof(struct sockaddr_in6)); - i6->sin6_family = AF_INET6; - i6->sin6_port = htons ((uint16_t) *port); + i6 = GNUNET_malloc (sizeof(struct sockaddr_in6)); + i6->sin6_family = AF_INET6; + i6->sin6_port = htons ((uint16_t) *port); #if HAVE_SOCKADDR_IN_SIN_LEN - i6->sin6_len = sizeof(sizeof(struct sockaddr_in6)); + i6->sin6_len = sizeof(sizeof(struct sockaddr_in6)); #endif - *sock_len = sizeof(struct sockaddr_in6); - in = (struct sockaddr *) i6; - } - return in; + *sock_len = sizeof(struct sockaddr_in6); + in = (struct sockaddr *) i6; + } + return in; } static char * @@ -1157,10 +1158,11 @@ extract_address (const char *bindto) char *start; char *token; char *cp; + char *rest = NULL; if (NULL == bindto) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "bindto is NULL\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "bindto is NULL\n"); cp = GNUNET_strdup (bindto); start = cp; @@ -1168,11 +1170,12 @@ extract_address (const char *bindto) { start++; /* skip over '['*/ cp[strlen (cp) - 1] = '\0'; /* eat ']'*/ - }else { - token = strtok(cp, "]"); - if (strlen(bindto) == strlen(token)) + } + else { + token = strtok_r (cp, "]", &rest); + if (strlen (bindto) == strlen (token)) { - token = strtok(cp, ":"); + token = strtok_r (cp, ":", &rest); } else { @@ -1181,13 +1184,13 @@ extract_address (const char *bindto) } } - //GNUNET_free(cp); + // GNUNET_free(cp); return start; } static unsigned int -extract_port(const char *addr_and_port) +extract_port (const char *addr_and_port) { unsigned int port; char dummy[2]; @@ -1195,12 +1198,13 @@ extract_port(const char *addr_and_port) char *addr; char *colon; char *cp; + char *rest = NULL; if (NULL != addr_and_port) { - cp = GNUNET_strdup(addr_and_port); - token = strtok(cp, "]"); - if (strlen(addr_and_port) == strlen(token)) + cp = GNUNET_strdup (addr_and_port); + token = strtok_r (cp, "]", &rest); + if (strlen (addr_and_port) == strlen (token)) { colon = strrchr (cp, ':'); if (NULL == colon) @@ -1212,7 +1216,7 @@ extract_port(const char *addr_and_port) } else { - token = strtok(NULL, "]"); + token = strtok_r (NULL, "]", &rest); if (NULL == token) { return 0; @@ -1231,9 +1235,9 @@ extract_port(const char *addr_and_port) if (port > UINT16_MAX) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Port `%u' invalid: value too large for port\n", + "Port `%u' invalid: value too large for port\n", port); - //GNUNET_free (cp); + // GNUNET_free (cp); return 0; } } @@ -1241,7 +1245,7 @@ extract_port(const char *addr_and_port) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "BINDTO specification invalid: last ':' not followed by number\n"); - //GNUNET_free (cp); + // GNUNET_free (cp); return 0; } } @@ -1258,33 +1262,35 @@ extract_port(const char *addr_and_port) } static struct sockaddr * -tcp_address_to_sockaddr_numeric_v6 (socklen_t *sock_len, struct sockaddr_in6 v6, unsigned int port) +tcp_address_to_sockaddr_numeric_v6 (socklen_t *sock_len, struct sockaddr_in6 v6, + unsigned int port) { - struct sockaddr *in; + struct sockaddr *in; - v6.sin6_family = AF_INET6; - v6.sin6_port = htons ((uint16_t) port); + v6.sin6_family = AF_INET6; + v6.sin6_port = htons ((uint16_t) port); #if HAVE_SOCKADDR_IN_SIN_LEN - v6.sin6_len = sizeof(sizeof(struct sockaddr_in6)); + v6.sin6_len = sizeof(sizeof(struct sockaddr_in6)); #endif - in = GNUNET_memdup (&v6, sizeof(v6)); - *sock_len = sizeof(struct sockaddr_in6); - return in; + in = GNUNET_memdup (&v6, sizeof(v6)); + *sock_len = sizeof(struct sockaddr_in6); + return in; } static struct sockaddr * -tcp_address_to_sockaddr_numeric_v4 (socklen_t *sock_len, struct sockaddr_in v4, unsigned int port) +tcp_address_to_sockaddr_numeric_v4 (socklen_t *sock_len, struct sockaddr_in v4, + unsigned int port) { - struct sockaddr *in; + struct sockaddr *in; - v4.sin_family = AF_INET; - v4.sin_port = htons ((uint16_t) port); + v4.sin_family = AF_INET; + v4.sin_port = htons ((uint16_t) port); #if HAVE_SOCKADDR_IN_SIN_LEN - v4.sin_len = sizeof(struct sockaddr_in); + v4.sin_len = sizeof(struct sockaddr_in); #endif - in = GNUNET_memdup (&v4, sizeof(v4)); - *sock_len = sizeof(struct sockaddr_in); - return in; + in = GNUNET_memdup (&v4, sizeof(v4)); + *sock_len = sizeof(struct sockaddr_in); + return in; } /** @@ -1304,25 +1310,25 @@ tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len) struct sockaddr_in6 v6; const char *start; - //cp = GNUNET_strdup (bindto); + // cp = GNUNET_strdup (bindto); start = extract_address (bindto); if (1 == sscanf (bindto, "%u%1s", &port, dummy)) { - //colon = strrchr (cp, ':'); - //port = extract_port(cp); + // colon = strrchr (cp, ':'); + // port = extract_port(cp); in = tcp_address_to_sockaddr_port_only (bindto, &port, sock_len); } else if (1 == inet_pton (AF_INET, start, &v4.sin_addr)) { - //colon = strrchr (cp, ':'); - port = extract_port(bindto); + // colon = strrchr (cp, ':'); + port = extract_port (bindto); in = tcp_address_to_sockaddr_numeric_v4 (sock_len, v4, port); } else if (1 == inet_pton (AF_INET6, start, &v6.sin6_addr)) { - //colon = strrchr (cp, ':'); - port = extract_port(bindto); + // colon = strrchr (cp, ':'); + port = extract_port (bindto); in = tcp_address_to_sockaddr_numeric_v6 (sock_len, v6, port); } return in; @@ -2005,8 +2011,6 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address) socklen_t in_len; struct GNUNET_NETWORK_Handle *sock; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Connecting to %s\n", address); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to %s\n", address); if (0 != strncmp (address, @@ -2054,7 +2058,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address) queue->address_len = in_len; queue->sock = sock; boot_queue (queue, GNUNET_TRANSPORT_CS_OUTBOUND); - //queue->mq_awaits_continue = GNUNET_YES; + // queue->mq_awaits_continue = GNUNET_YES; queue->read_task = GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, queue->sock, @@ -2215,8 +2219,8 @@ nat_address_cb (void *cls, static void init_socket (void *cls, - const struct sockaddr *addr, - socklen_t in_len) + const struct sockaddr *addr, + socklen_t in_len) { struct sockaddr_storage in_sto; socklen_t sto_len; @@ -2228,9 +2232,6 @@ init_socket (void *cls, return; } - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "address %s\n", - GNUNET_a2s (addr, in_len)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "address %s\n", GNUNET_a2s (addr, in_len)); @@ -2242,7 +2243,7 @@ init_socket (void *cls, GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); GNUNET_free ((struct sockaddr *) addr); return; - } + } if (GNUNET_OK != GNUNET_NETWORK_socket_bind (listen_sock, addr, in_len)) { @@ -2250,7 +2251,7 @@ init_socket (void *cls, GNUNET_NETWORK_socket_close (listen_sock); listen_sock = NULL; return; - } + } if (GNUNET_OK != GNUNET_NETWORK_socket_listen (listen_sock, @@ -2261,7 +2262,7 @@ init_socket (void *cls, GNUNET_NETWORK_socket_close (listen_sock); listen_sock = NULL; return; - } + } /* We might have bound to port 0, allowing the OS to figure it out; thus, get the real IN-address from the socket */ @@ -2317,8 +2318,8 @@ init_socket (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - //TODO Shall we register all addresses the resolver sends us. Them we have - //to call GNUNET_NAT_register, when the resolver signals resolving ended. + // TODO Shall we register all addresses the resolver sends us. Them we have + // to call GNUNET_NAT_register, when the resolver signals resolving ended. nat = GNUNET_NAT_register (cfg, COMMUNICATOR_CONFIG_SECTION, IPPROTO_TCP, @@ -2331,27 +2332,23 @@ init_socket (void *cls, if (NULL == nat) - { - GNUNET_break (0); - GNUNET_RESOLVER_request_cancel (resolve_request_handle); - GNUNET_SCHEDULER_shutdown (); - return; - } + { + GNUNET_break (0); + GNUNET_RESOLVER_request_cancel (resolve_request_handle); + GNUNET_SCHEDULER_shutdown (); + return; + } - //TODO Remove this, if we like to handle more then one address. + // TODO Remove this, if we like to handle more then one address. if (NULL != resolve_request_handle) GNUNET_RESOLVER_request_cancel (resolve_request_handle); - - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "init_own finished %s\n", - GNUNET_a2s (addr, in_len)); } static void init_socket_resolv (void *cls, - const struct sockaddr *addr, - socklen_t in_len) + const struct sockaddr *addr, + socklen_t in_len) { struct sockaddr_in *v4; struct sockaddr_in6 *v6; @@ -2362,18 +2359,14 @@ init_socket_resolv (void *cls, if (AF_INET == addr->sa_family) { v4 = (struct sockaddr_in *) addr; - /* v4->sin_port = htons ((uint16_t) port_global);*/ in = tcp_address_to_sockaddr_numeric_v4 (&in_len, *v4, port_global); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "ipv4 \n"); - }else if (AF_INET6 == addr->sa_family) + } + else if (AF_INET6 == addr->sa_family) { - v6 = (struct sockaddr_in6 *) addr; - /*v6->sin6_port = htons ((uint16_t) port_global);*/ + v6 = (struct sockaddr_in6 *) addr; in = tcp_address_to_sockaddr_numeric_v6 (&in_len, *v6, port_global); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "ipv6 \n"); - }else + } + else { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address family %u not suitable (not AF_INET %u nor AF_INET6 %u \n", @@ -2382,15 +2375,15 @@ init_socket_resolv (void *cls, AF_INET6); return; } - }else + init_socket (cls, + in, + in_len); + } + else { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address is NULL. This might be an error or the resolver finished resolving.\n"); - } - - init_socket (cls, - in, - in_len); + } } /** @@ -2415,6 +2408,7 @@ run (void *cls, char *start; unsigned int port; char dummy[2]; + char *rest = NULL; (void) cls; @@ -2438,12 +2432,12 @@ run (void *cls, max_queue_length = DEFAULT_MAX_QUEUE_LENGTH; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, - COMMUNICATOR_CONFIG_SECTION, - "REKEY_INTERVAL", - &rekey_interval)) + COMMUNICATOR_CONFIG_SECTION, + "REKEY_INTERVAL", + &rekey_interval)) rekey_interval = DEFAULT_REKEY_INTERVAL; - //cp = GNUNET_strdup (bindto); + // cp = GNUNET_strdup (bindto); start = extract_address (bindto); if (1 == sscanf (bindto, "%u%1s", &port, dummy)) @@ -2454,29 +2448,31 @@ run (void *cls, } else if (1 == inet_pton (AF_INET, start, &v4.sin_addr)) { - port = extract_port(bindto); + port = extract_port (bindto); port_global = port; in = tcp_address_to_sockaddr_numeric_v4 (&in_len, v4, port); init_socket (&port, in, in_len); } else if (1 == inet_pton (AF_INET6, start, &v6.sin6_addr)) { - port = extract_port(bindto); + port = extract_port (bindto); port_global = port; in = tcp_address_to_sockaddr_numeric_v6 (&in_len, v6, port); init_socket (&port, in, in_len); - }else + } + else { - port = extract_port(bindto); + port = extract_port (bindto); port_global = port; - resolve_request_handle = GNUNET_RESOLVER_ip_get (strtok(bindto, ":"), - AF_UNSPEC, - GNUNET_TIME_UNIT_MINUTES, - &init_socket_resolv, - NULL); + resolve_request_handle = GNUNET_RESOLVER_ip_get (strtok_r (bindto, ":", + &rest), + AF_UNSPEC, + GNUNET_TIME_UNIT_MINUTES, + &init_socket_resolv, + NULL); } GNUNET_free (bindto); - //GNUNET_free (cp); + // GNUNET_free (cp); } diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf b/src/transport/test_communicator_tcp_basic_peer1.conf index 55809f251..d0293ff51 100644 --- a/src/transport/test_communicator_tcp_basic_peer1.conf +++ b/src/transport/test_communicator_tcp_basic_peer1.conf @@ -18,13 +18,12 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock [nat] UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock -ENABLE_IPSCAN = YES [communicator-unix] UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock [communicator-tcp] -BINDTO = 192.168.178.24:60002 +BINDTO = 60002 DISABLE_V6 = NO [communicator-udp] diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf b/src/transport/test_communicator_tcp_basic_peer2.conf index 06eb849f3..5b9050547 100644 --- a/src/transport/test_communicator_tcp_basic_peer2.conf +++ b/src/transport/test_communicator_tcp_basic_peer2.conf @@ -25,7 +25,7 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock [communicator-tcp] BINDTO = 60003 -DISABLE_V6 = YES +DISABLE_V6 = NO [communicator-udp] BINDTO = 60003 -- 2.25.1