diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-01-25 09:20:39 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-01-25 09:20:39 +0000 |
commit | 525c97aefa44e2952b9b13b1f6f735d9db4dbd40 (patch) | |
tree | 912e9fc97dde452ae9e3f821d9a5699427165b39 /src | |
parent | 7bc0e6e52b2573917d77554d33a1bdcbc961aa69 (diff) | |
download | gnunet-525c97aefa44e2952b9b13b1f6f735d9db4dbd40.tar.gz gnunet-525c97aefa44e2952b9b13b1f6f735d9db4dbd40.zip |
why didn't I commit this yesterday?
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index ca1d376da..31b6584e9 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -73,7 +73,7 @@ | |||
73 | * Besides, if a single request to an address takes a long time, | 73 | * Besides, if a single request to an address takes a long time, |
74 | * then the peer is unlikely worthwhile anyway. | 74 | * then the peer is unlikely worthwhile anyway. |
75 | */ | 75 | */ |
76 | #define HELLO_VERIFICATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) | 76 | #define HELLO_VERIFICATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * How long will we allow sending of a ping to be delayed? | 79 | * How long will we allow sending of a ping to be delayed? |
@@ -1593,7 +1593,7 @@ handle_pong (void *cls, const struct GNUNET_MessageHeader *message, | |||
1593 | struct ValidationAddress *va; | 1593 | struct ValidationAddress *va; |
1594 | struct GNUNET_PeerIdentity id; | 1594 | struct GNUNET_PeerIdentity id; |
1595 | struct TransportPongMessage *pong = (struct TransportPongMessage *)message; | 1595 | struct TransportPongMessage *pong = (struct TransportPongMessage *)message; |
1596 | 1596 | int count = 0; | |
1597 | unsigned int challenge = ntohl(pong->challenge); | 1597 | unsigned int challenge = ntohl(pong->challenge); |
1598 | pos = pending_validations; | 1598 | pos = pending_validations; |
1599 | while (pos != NULL) | 1599 | while (pos != NULL) |
@@ -1605,14 +1605,15 @@ handle_pong (void *cls, const struct GNUNET_MessageHeader *message, | |||
1605 | if (0 == memcmp (peer, &id, sizeof (struct GNUNET_PeerIdentity))) | 1605 | if (0 == memcmp (peer, &id, sizeof (struct GNUNET_PeerIdentity))) |
1606 | break; | 1606 | break; |
1607 | pos = pos->next; | 1607 | pos = pos->next; |
1608 | count++; | ||
1608 | } | 1609 | } |
1609 | if (pos == NULL) | 1610 | if (pos == NULL) |
1610 | { | 1611 | { |
1611 | /* TODO: call statistics (unmatched PONG) */ | 1612 | /* TODO: call statistics (unmatched PONG) */ |
1612 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1613 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1613 | _ | 1614 | _ |
1614 | ("Received validation response but have no record of any validation request for `%4s'. Ignoring.\n"), | 1615 | ("Received validation response but have no record of any validation request for `%4s' (out of %d). Ignoring.\n"), |
1615 | GNUNET_i2s (peer)); | 1616 | GNUNET_i2s (peer), count); |
1616 | return; | 1617 | return; |
1617 | } | 1618 | } |
1618 | not_done = 0; | 1619 | not_done = 0; |
@@ -2757,7 +2758,7 @@ client_disconnect_notification (void *cls, | |||
2757 | struct TransportClient *prev; | 2758 | struct TransportClient *prev; |
2758 | struct ClientMessageQueueEntry *mqe; | 2759 | struct ClientMessageQueueEntry *mqe; |
2759 | 2760 | ||
2760 | if (client == NULL) | 2761 | if (client == NULL) |
2761 | return; | 2762 | return; |
2762 | #if DEBUG_TRANSPORT | 2763 | #if DEBUG_TRANSPORT |
2763 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, | 2764 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, |