[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37785 - gnunet/src/exit
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37785 - gnunet/src/exit |
Date: |
Thu, 25 Aug 2016 13:50:54 +0200 |
Author: grothoff
Date: 2016-08-25 13:50:54 +0200 (Thu, 25 Aug 2016)
New Revision: 37785
Modified:
gnunet/src/exit/gnunet-daemon-exit.c
Log:
-fix indent
Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c 2016-08-25 11:33:14 UTC (rev
37784)
+++ gnunet/src/exit/gnunet-daemon-exit.c 2016-08-25 11:50:54 UTC (rev
37785)
@@ -166,6 +166,7 @@
};
+
/**
* Information we use to track a connection (the classical 6-tuple of
* IP-version, protocol, source-IP, destination-IP, source-port and
@@ -629,7 +630,7 @@
/**
* Given IP information about a connection, calculate the respective
- * hash we would use for the 'connections_map'.
+ * hash we would use for the #connections_map.
*
* @param hash resulting hash
* @param ri information about the connection
@@ -742,10 +743,12 @@
ri.local_address.address.ipv6 = * ((struct in6_addr*) local_ip);
ri.local_address.port = local_port;
ri.local_address.proto = protocol;
- hash_redirect_info (&key, &ri);
+ hash_redirect_info (&key,
+ &ri);
if (NULL != state_key)
*state_key = key;
- state = GNUNET_CONTAINER_multihashmap_get (connections_map, &key);
+ state = GNUNET_CONTAINER_multihashmap_get (connections_map,
+ &key);
if (NULL == state)
return NULL;
/* Mark this connection as freshly used */
@@ -1079,19 +1082,26 @@
switch (protocol)
{
case IPPROTO_ICMP:
- state = get_redirect_state (af, IPPROTO_ICMP,
- source_ip, 0,
- destination_ip, 0,
+ state = get_redirect_state (af,
+ IPPROTO_ICMP,
+ source_ip,
+ 0,
+ destination_ip,
+ 0,
NULL);
break;
case IPPROTO_ICMPV6:
- state = get_redirect_state (af, IPPROTO_ICMPV6,
- source_ip, 0,
- destination_ip, 0,
+ state = get_redirect_state (af,
+ IPPROTO_ICMPV6,
+ source_ip,
+ 0,
+ destination_ip,
+ 0,
NULL);
break;
case IPPROTO_UDP:
- state = get_redirect_state (af, IPPROTO_UDP,
+ state = get_redirect_state (af,
+ IPPROTO_UDP,
source_ip,
source_port,
destination_ip,
@@ -1099,7 +1109,8 @@
NULL);
break;
case IPPROTO_TCP:
- state = get_redirect_state (af, IPPROTO_TCP,
+ state = get_redirect_state (af,
+ IPPROTO_TCP,
source_ip,
source_port,
destination_ip,
@@ -1109,7 +1120,8 @@
default:
GNUNET_STATISTICS_update (stats,
gettext_noop ("# ICMP packets dropped (not
allowed)"),
- 1, GNUNET_NO);
+ 1,
+ GNUNET_NO);
return;
}
if (NULL == state)
@@ -1182,7 +1194,8 @@
GNUNET_break (0);
return;
}
- state = get_redirect_state (af, IPPROTO_UDP,
+ state = get_redirect_state (af,
+ IPPROTO_UDP,
source_ip,
ntohs (udp->source_port),
destination_ip,
@@ -1256,7 +1269,8 @@
GNUNET_break (0);
return;
}
- state = get_redirect_state (af, IPPROTO_TCP,
+ state = get_redirect_state (af,
+ IPPROTO_TCP,
source_ip,
ntohs (tcp->source_port),
destination_ip,
@@ -1585,13 +1599,14 @@
setup_fresh_address (state->specifics.tcp_udp.serv->address.af,
state->specifics.tcp_udp.serv->address.proto,
&state->specifics.tcp_udp.ri.local_address);
- } while (NULL != get_redirect_state
(state->specifics.tcp_udp.ri.remote_address.af,
-
state->specifics.tcp_udp.ri.remote_address.proto,
-
&state->specifics.tcp_udp.ri.remote_address.address,
-
state->specifics.tcp_udp.ri.remote_address.port,
-
&state->specifics.tcp_udp.ri.local_address.address,
-
state->specifics.tcp_udp.ri.local_address.port,
- &key));
+ } while (NULL !=
+ get_redirect_state (state->specifics.tcp_udp.ri.remote_address.af,
+
state->specifics.tcp_udp.ri.remote_address.proto,
+
&state->specifics.tcp_udp.ri.remote_address.address,
+ state->specifics.tcp_udp.ri.remote_address.port,
+
&state->specifics.tcp_udp.ri.local_address.address,
+ state->specifics.tcp_udp.ri.local_address.port,
+ &key));
{
char buf[INET6_ADDRSTRLEN];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1598,7 +1613,8 @@
"Picked local address %s:%u for new connection\n",
inet_ntop (state->specifics.tcp_udp.ri.local_address.af,
&state->specifics.tcp_udp.ri.local_address.address,
- buf, sizeof (buf)),
+ buf,
+ sizeof (buf)),
(unsigned int) state->specifics.tcp_udp.ri.local_address.port);
}
state->specifics.tcp_udp.state_key = key;
@@ -1790,7 +1806,9 @@
pkt6_udp,
payload,
payload_length);
- GNUNET_memcpy (&pkt6_udp[1], payload, payload_length);
+ GNUNET_memcpy (&pkt6_udp[1],
+ payload,
+ payload_length);
}
break;
case IPPROTO_TCP:
@@ -1805,7 +1823,9 @@
pkt6_tcp,
payload,
payload_length);
- GNUNET_memcpy (&pkt6_tcp[1], payload, payload_length);
+ GNUNET_memcpy (&pkt6_tcp[1],
+ payload,
+ payload_length);
}
break;
default:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37785 - gnunet/src/exit,
gnunet <=