diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-04 22:29:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-04 22:29:23 +0000 |
commit | 957edb9803c88b05f42120433b78ea0a48f6bc9b (patch) | |
tree | e249c336322583e6f896c5e0a75a321955ca642e /src/transport/gnunet-service-transport.c | |
parent | b22e23b08ffd14a0396cfe17c4f5a0571b7fc258 (diff) | |
download | gnunet-957edb9803c88b05f42120433b78ea0a48f6bc9b.tar.gz gnunet-957edb9803c88b05f42120433b78ea0a48f6bc9b.zip |
fixes
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 419647e8e..981be7b79 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -1976,21 +1976,21 @@ find_ready_address(struct NeighbourList *neighbour) | |||
1976 | head = head->next; | 1976 | head = head->next; |
1977 | } | 1977 | } |
1978 | if (unix_address != NULL) | 1978 | if (unix_address != NULL) |
1979 | { | 1979 | { |
1980 | best_address = unix_address; | 1980 | best_address = unix_address; |
1981 | #if DEBUG_TRANSPORT | 1981 | #if DEBUG_TRANSPORT |
1982 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found unix address, forced this address\n"); | 1982 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1983 | "Found UNIX address, forced this address\n"); | ||
1983 | #endif | 1984 | #endif |
1984 | } | 1985 | } |
1985 | if (best_address != NULL) | 1986 | if (best_address != NULL) |
1986 | { | 1987 | { |
1987 | #if DEBUG_TRANSPORT | 1988 | #if DEBUG_TRANSPORT |
1988 | 1989 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
1989 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
1990 | "Best address found (`%s') has latency of %llu ms.\n", | 1990 | "Best address found (`%s') has latency of %llu ms.\n", |
1991 | (best_address->addrlen > 0) | 1991 | (best_address->addrlen > 0) |
1992 | ? a2s (best_address->ready_list->plugin->short_name, | 1992 | ? a2s (best_address->ready_list->plugin->short_name, |
1993 | best_address->addr, | 1993 | best_address->addr, |
1994 | best_address->addrlen) | 1994 | best_address->addrlen) |
1995 | : "<inbound>", | 1995 | : "<inbound>", |
1996 | best_address->latency.rel_value); | 1996 | best_address->latency.rel_value); |
@@ -3314,7 +3314,6 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer, | |||
3314 | "Setting up state for neighbour `%4s'\n", | 3314 | "Setting up state for neighbour `%4s'\n", |
3315 | GNUNET_i2s (peer)); | 3315 | GNUNET_i2s (peer)); |
3316 | #endif | 3316 | #endif |
3317 | GNUNET_assert (our_hello != NULL); | ||
3318 | GNUNET_STATISTICS_update (stats, | 3317 | GNUNET_STATISTICS_update (stats, |
3319 | gettext_noop ("# active neighbours"), | 3318 | gettext_noop ("# active neighbours"), |
3320 | 1, | 3319 | 1, |
@@ -3365,10 +3364,11 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer, | |||
3365 | gettext_noop ("# HELLO's sent to new neighbors"), | 3364 | gettext_noop ("# HELLO's sent to new neighbors"), |
3366 | 1, | 3365 | 1, |
3367 | GNUNET_NO); | 3366 | GNUNET_NO); |
3368 | transmit_to_peer (NULL, NULL, 0, | 3367 | if (NULL != our_hello) |
3369 | HELLO_ADDRESS_EXPIRATION, | 3368 | transmit_to_peer (NULL, NULL, 0, |
3370 | (const char *) our_hello, GNUNET_HELLO_size(our_hello), | 3369 | HELLO_ADDRESS_EXPIRATION, |
3371 | GNUNET_NO, n); | 3370 | (const char *) our_hello, GNUNET_HELLO_size(our_hello), |
3371 | GNUNET_NO, n); | ||
3372 | } | 3372 | } |
3373 | return n; | 3373 | return n; |
3374 | } | 3374 | } |