diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-27 09:35:27 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-03-27 09:35:27 +0000 |
commit | 0421c0f35e2b395311837a94ea642e8e31f7e389 (patch) | |
tree | be1bc8b4ad9cf4d24e1d75b7d02b63db74650692 | |
parent | d6f2620f564effbb3a562ec8c47b46a90580d137 (diff) | |
download | gnunet-0421c0f35e2b395311837a94ea642e8e31f7e389.tar.gz gnunet-0421c0f35e2b395311837a94ea642e8e31f7e389.zip |
some testing code for debugging
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index c2430e008..7775c6afa 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -3041,7 +3041,7 @@ master_task (void *cls, | |||
3041 | 3041 | ||
3042 | n->task = GNUNET_SCHEDULER_NO_TASK; | 3042 | n->task = GNUNET_SCHEDULER_NO_TASK; |
3043 | delay = GNUNET_TIME_absolute_get_remaining (n->timeout); | 3043 | delay = GNUNET_TIME_absolute_get_remaining (n->timeout); |
3044 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3044 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3045 | "Master task runs for neighbour `%s' in state %s with timeout in %s\n", | 3045 | "Master task runs for neighbour `%s' in state %s with timeout in %s\n", |
3046 | GNUNET_i2s (&n->id), | 3046 | GNUNET_i2s (&n->id), |
3047 | GNUNET_TRANSPORT_ps2s(n->state), | 3047 | GNUNET_TRANSPORT_ps2s(n->state), |
@@ -3418,6 +3418,8 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3418 | GST_plugins_a2s (n->primary_address.address), | 3418 | GST_plugins_a2s (n->primary_address.address), |
3419 | n->primary_address.session, | 3419 | n->primary_address.session, |
3420 | GNUNET_i2s (peer)); | 3420 | GNUNET_i2s (peer)); |
3421 | |||
3422 | /* Destroy the address since it cannot be used */ | ||
3421 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); | 3423 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); |
3422 | unset_primary_address (n); | 3424 | unset_primary_address (n); |
3423 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS, | 3425 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS, |
@@ -3445,6 +3447,8 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3445 | GST_plugins_a2s (n->primary_address.address), | 3447 | GST_plugins_a2s (n->primary_address.address), |
3446 | n->primary_address.session, | 3448 | n->primary_address.session, |
3447 | GNUNET_i2s (peer)); | 3449 | GNUNET_i2s (peer)); |
3450 | |||
3451 | /* Destroy the address since it cannot be used */ | ||
3448 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); | 3452 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); |
3449 | unset_primary_address (n); | 3453 | unset_primary_address (n); |
3450 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS, | 3454 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_RECONNECT_ATS, |
@@ -3453,6 +3457,8 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3453 | case GNUNET_TRANSPORT_PS_CONNECTED_SWITCHING_CONNECT_SENT: | 3457 | case GNUNET_TRANSPORT_PS_CONNECTED_SWITCHING_CONNECT_SENT: |
3454 | /* primary went down while we were waiting for CONNECT_ACK on secondary; | 3458 | /* primary went down while we were waiting for CONNECT_ACK on secondary; |
3455 | secondary as primary */ | 3459 | secondary as primary */ |
3460 | |||
3461 | /* Destroy the address since it cannot be used */ | ||
3456 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); | 3462 | GNUNET_ATS_address_destroyed (GST_ats, n->primary_address.address, NULL); |
3457 | free_address (&n->primary_address); | 3463 | free_address (&n->primary_address); |
3458 | n->primary_address = n->alternative_address; | 3464 | n->primary_address = n->alternative_address; |
@@ -3522,15 +3528,14 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message, | |||
3522 | 3528 | ||
3523 | /* TODO I have no idea we we should state GNUNET_TRANSPORT_PS_CONNECT_SENT | 3529 | /* TODO I have no idea we we should state GNUNET_TRANSPORT_PS_CONNECT_SENT |
3524 | * Perhaps SWITCHING? Have to check */ | 3530 | * Perhaps SWITCHING? Have to check */ |
3525 | if ( /*(*/ (GNUNET_TRANSPORT_PS_CONNECT_RECV_ACK != n->state) /* && | 3531 | if ( (GNUNET_TRANSPORT_PS_CONNECT_RECV_ACK != n->state) /*&& |
3526 | (GNUNET_TRANSPORT_PS_CONNECT_SENT != n->state) ) || | 3532 | (GNUNET_TRANSPORT_PS_RECONNECT_SENT != n->state) ) || |
3527 | (ACK_SEND_SESSION_ACK != n->ack_state) */) | 3533 | (ACK_SEND_SESSION_ACK != n->ack_state)*/) |
3528 | { | 3534 | { |
3529 | if (GNUNET_TRANSPORT_PS_CONNECT_SENT != n->state) | 3535 | GNUNET_break (0); /* TESTING */ |
3530 | GNUNET_break (0); /* TESTING */ | ||
3531 | 3536 | ||
3532 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3537 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
3533 | "Received SESSION_ACK message from peer `%s' in state %s/%s\n", | 3538 | "Received unexpected SESSION_ACK message from peer `%s' in state %s/%s\n", |
3534 | GNUNET_i2s (peer), | 3539 | GNUNET_i2s (peer), |
3535 | GNUNET_TRANSPORT_ps2s (n->state), | 3540 | GNUNET_TRANSPORT_ps2s (n->state), |
3536 | print_ack_state (n->ack_state)); | 3541 | print_ack_state (n->ack_state)); |
@@ -3539,6 +3544,7 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message, | |||
3539 | GNUNET_NO); | 3544 | GNUNET_NO); |
3540 | return GNUNET_OK; | 3545 | return GNUNET_OK; |
3541 | } | 3546 | } |
3547 | |||
3542 | /* We are connected */ | 3548 | /* We are connected */ |
3543 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT)); | 3549 | set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT)); |
3544 | GNUNET_STATISTICS_set (GST_stats, | 3550 | GNUNET_STATISTICS_set (GST_stats, |