aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-11-22 09:49:33 +0100
committerChristian Grothoff <christian@grothoff.org>2021-11-22 09:49:33 +0100
commit15ef9b6aca7d4a2ac1db80ab22ca551b0e5e16a9 (patch)
treeed020db3b80eab695add7f8656ad54adb7d75a2c
parentbdee350c4258c10c409a189cf44f697586a0a4be (diff)
downloadgnunet-15ef9b6aca7d4a2ac1db80ab22ca551b0e5e16a9.tar.gz
gnunet-15ef9b6aca7d4a2ac1db80ab22ca551b0e5e16a9.zip
-indent
-rw-r--r--src/transport/gnunet-communicator-tcp.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index a595812e0..6f7e67d7b 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -3403,19 +3403,16 @@ nat_register ()
3403 struct sockaddr **saddrs; 3403 struct sockaddr **saddrs;
3404 socklen_t *saddr_lens; 3404 socklen_t *saddr_lens;
3405 int i; 3405 int i;
3406 struct Addresses *pos;
3407 size_t len; 3406 size_t len;
3408 3407
3409 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3408 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3410 "starting nat register!\n"); 3409 "starting nat register!\n");
3411
3412 len = 0; 3410 len = 0;
3413 i = 0; 3411 i = 0;
3414 saddrs = GNUNET_malloc ((addrs_lens) * sizeof(struct sockaddr *)); 3412 saddrs = GNUNET_malloc ((addrs_lens) * sizeof(struct sockaddr *));
3415 saddr_lens = GNUNET_malloc ((addrs_lens) * sizeof(socklen_t)); 3413 saddr_lens = GNUNET_malloc ((addrs_lens) * sizeof(socklen_t));
3416 for (pos = addrs_head; NULL != pos; pos = pos->next) 3414 for (struct Addresses *pos = addrs_head; NULL != pos; pos = pos->next)
3417 { 3415 {
3418
3419 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3416 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3420 "registering address %s\n", 3417 "registering address %s\n",
3421 GNUNET_a2s (addrs_head->addr, addrs_head->addr_len)); 3418 GNUNET_a2s (addrs_head->addr, addrs_head->addr_len));
@@ -3423,9 +3420,7 @@ nat_register ()
3423 saddr_lens[i] = addrs_head->addr_len; 3420 saddr_lens[i] = addrs_head->addr_len;
3424 len += saddr_lens[i]; 3421 len += saddr_lens[i];
3425 saddrs[i] = GNUNET_memdup (addrs_head->addr, saddr_lens[i]); 3422 saddrs[i] = GNUNET_memdup (addrs_head->addr, saddr_lens[i]);
3426
3427 i++; 3423 i++;
3428
3429 } 3424 }
3430 3425
3431 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3426 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3443,9 +3438,6 @@ nat_register ()
3443 &nat_address_cb, 3438 &nat_address_cb,
3444 NULL /* FIXME: support reversal: #5529 */, 3439 NULL /* FIXME: support reversal: #5529 */,
3445 NULL /* closure */); 3440 NULL /* closure */);
3446
3447 // i = 0;
3448
3449 for (i = addrs_lens - 1; i >= 0; i--) 3441 for (i = addrs_lens - 1; i >= 0; i--)
3450 GNUNET_free (saddrs[i]); 3442 GNUNET_free (saddrs[i]);
3451 GNUNET_free (saddrs); 3443 GNUNET_free (saddrs);
@@ -3478,7 +3470,7 @@ init_socket_resolv (void *cls,
3478 struct sockaddr *in; 3470 struct sockaddr *in;
3479 3471
3480 (void) cls; 3472 (void) cls;
3481 if (NULL != addr) 3473 if (NULL != addr)
3482 { 3474 {
3483 if (AF_INET == addr->sa_family) 3475 if (AF_INET == addr->sa_family)
3484 { 3476 {
@@ -3512,7 +3504,6 @@ init_socket_resolv (void *cls,
3512 return; 3504 return;
3513 } 3505 }
3514 nat_register (); 3506 nat_register ();
3515
3516 } 3507 }
3517} 3508}
3518 3509
@@ -3584,25 +3575,19 @@ run (void *cls,
3584 if (1 == sscanf (bindto, "%u%1s", &bind_port, dummy)) 3575 if (1 == sscanf (bindto, "%u%1s", &bind_port, dummy))
3585 { 3576 {
3586 po = tcp_address_to_sockaddr_port_only (bindto, &bind_port); 3577 po = tcp_address_to_sockaddr_port_only (bindto, &bind_port);
3587
3588 addr_len_ipv4 = po->addr_len_ipv4; 3578 addr_len_ipv4 = po->addr_len_ipv4;
3589
3590
3591 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3579 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3592 "address po %s\n", 3580 "address po %s\n",
3593 GNUNET_a2s (po->addr_ipv4, addr_len_ipv4)); 3581 GNUNET_a2s (po->addr_ipv4, addr_len_ipv4));
3594
3595 if (NULL != po->addr_ipv4) 3582 if (NULL != po->addr_ipv4)
3596 { 3583 {
3597 init_socket (po->addr_ipv4, addr_len_ipv4); 3584 init_socket (po->addr_ipv4, addr_len_ipv4);
3598 } 3585 }
3599
3600 if (NULL != po->addr_ipv6) 3586 if (NULL != po->addr_ipv6)
3601 { 3587 {
3602 addr_len_ipv6 = po->addr_len_ipv6; 3588 addr_len_ipv6 = po->addr_len_ipv6;
3603 init_socket (po->addr_ipv6, addr_len_ipv6); 3589 init_socket (po->addr_ipv6, addr_len_ipv6);
3604 } 3590 }
3605
3606 GNUNET_free (po); 3591 GNUNET_free (po);
3607 nat_register (); 3592 nat_register ();
3608 GNUNET_free (bindto); 3593 GNUNET_free (bindto);
@@ -3634,10 +3619,9 @@ run (void *cls,
3634 return; 3619 return;
3635 } 3620 }
3636 3621
3637
3638 bind_port = extract_port (bindto); 3622 bind_port = extract_port (bindto);
3639 3623 resolve_request_handle = GNUNET_RESOLVER_ip_get (strtok_r (bindto,
3640 resolve_request_handle = GNUNET_RESOLVER_ip_get (strtok_r (bindto, ":", 3624 ":",
3641 &rest), 3625 &rest),
3642 AF_UNSPEC, 3626 AF_UNSPEC,
3643 GNUNET_TIME_UNIT_MINUTES, 3627 GNUNET_TIME_UNIT_MINUTES,