aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-05-11 19:25:57 +0000
committerChristian Grothoff <christian@grothoff.org>2012-05-11 19:25:57 +0000
commitbc1a73bd43fd43a91735a8eec05ac1191991a55a (patch)
treeaf76a0bc12e5a3166ebbbe051925af3cb3a5b1df /src
parenta780a28bec75567ad46fc4a27bb91f3dc5dc4ccf (diff)
downloadgnunet-bc1a73bd43fd43a91735a8eec05ac1191991a55a.tar.gz
gnunet-bc1a73bd43fd43a91735a8eec05ac1191991a55a.zip
-minor stylistic fixes
Diffstat (limited to 'src')
-rw-r--r--src/transport/gnunet-service-transport_neighbours.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index bdb67dbca..9ee0bcfdb 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -56,7 +56,6 @@
56 */ 56 */
57#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) 57#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
58 58
59
60#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) 59#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
61 60
62#define FAST_RECONNECT_RATE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100) 61#define FAST_RECONNECT_RATE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100)
@@ -1652,8 +1651,8 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
1652 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1651 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1653 "Sending CONNECT message to %s\n", 1652 "Sending CONNECT message to %s\n",
1654 GNUNET_i2s (&n->id)); 1653 GNUNET_i2s (&n->id));
1655 if (n->state != S_CONNECT_RECV) 1654 if (n->state != S_CONNECT_SENT)
1656 change_state (n, S_CONNECT_RECV); 1655 change_state (n, S_CONNECT_SENT);
1657 ret = send_with_session (n, 1656 ret = send_with_session (n,
1658 (const char *) &connect_msg, msg_len, 1657 (const char *) &connect_msg, msg_len,
1659 UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, 1658 UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
@@ -1865,7 +1864,7 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
1865 /* This can happen during shutdown */ 1864 /* This can happen during shutdown */
1866 return; 1865 return;
1867 } 1866 }
1868 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %X to peer `%s' ended \n", 1867 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
1869 session, GNUNET_i2s (peer)); 1868 session, GNUNET_i2s (peer));
1870 n = lookup_neighbour (peer); 1869 n = lookup_neighbour (peer);
1871 if (NULL == n) 1870 if (NULL == n)
@@ -2503,8 +2502,8 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
2503 } 2502 }
2504 2503
2505 if ((NULL == n->address) || 2504 if ((NULL == n->address) ||
2506 ((n->state != S_CONNECT_SENT) && 2505 ((n->state != S_CONNECT_SENT) &&
2507 ((n->state != S_CONNECT_RECV) && (n->address != NULL)))) 2506 (n->state != S_CONNECT_RECV)))
2508 { 2507 {
2509 GNUNET_STATISTICS_update (GST_stats, 2508 GNUNET_STATISTICS_update (GST_stats,
2510 gettext_noop 2509 gettext_noop