diff options
-rw-r--r-- | src/transport/gnunet-service-tng.c | 18 | ||||
-rw-r--r-- | src/transport/transport-testing2.c | 5 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c index bfa5ca772..a4c7f0517 100644 --- a/src/transport/gnunet-service-tng.c +++ b/src/transport/gnunet-service-tng.c | |||
@@ -4230,7 +4230,7 @@ route_via_neighbour (const struct Neighbour *n, | |||
4230 | for (struct Queue *pos = n->queue_head; NULL != pos; | 4230 | for (struct Queue *pos = n->queue_head; NULL != pos; |
4231 | pos = pos->next_neighbour) | 4231 | pos = pos->next_neighbour) |
4232 | { | 4232 | { |
4233 | if ((0 == (options & RMO_UNCONFIRMED_ALLOWED)) || | 4233 | if ((0 != (options & RMO_UNCONFIRMED_ALLOWED)) || |
4234 | (pos->validated_until.abs_value_us > now.abs_value_us)) | 4234 | (pos->validated_until.abs_value_us > now.abs_value_us)) |
4235 | candidates++; | 4235 | candidates++; |
4236 | } | 4236 | } |
@@ -4259,7 +4259,7 @@ route_via_neighbour (const struct Neighbour *n, | |||
4259 | for (struct Queue *pos = n->queue_head; NULL != pos; | 4259 | for (struct Queue *pos = n->queue_head; NULL != pos; |
4260 | pos = pos->next_neighbour) | 4260 | pos = pos->next_neighbour) |
4261 | { | 4261 | { |
4262 | if ((0 == (options & RMO_UNCONFIRMED_ALLOWED)) || | 4262 | if ((0 != (options & RMO_UNCONFIRMED_ALLOWED)) || |
4263 | (pos->validated_until.abs_value_us > now.abs_value_us)) | 4263 | (pos->validated_until.abs_value_us > now.abs_value_us)) |
4264 | { | 4264 | { |
4265 | if ((sel1 == candidates) || (sel2 == candidates)) | 4265 | if ((sel1 == candidates) || (sel2 == candidates)) |
@@ -7696,8 +7696,6 @@ handle_hello_for_incoming (void *cls, | |||
7696 | } | 7696 | } |
7697 | 7697 | ||
7698 | 7698 | ||
7699 | |||
7700 | |||
7701 | /** | 7699 | /** |
7702 | * Communicator gave us a transport address validation challenge. Process the | 7700 | * Communicator gave us a transport address validation challenge. Process the |
7703 | * request. | 7701 | * request. |
@@ -7761,12 +7759,15 @@ handle_validation_challenge ( | |||
7761 | route_control_message_without_fc (&cmc->im.sender, | 7759 | route_control_message_without_fc (&cmc->im.sender, |
7762 | &tvr.header, | 7760 | &tvr.header, |
7763 | RMO_ANYTHING_GOES | RMO_REDUNDANT); | 7761 | RMO_ANYTHING_GOES | RMO_REDUNDANT); |
7764 | } else { | 7762 | } |
7763 | else | ||
7764 | { | ||
7765 | /* Use route via neighbour */ | 7765 | /* Use route via neighbour */ |
7766 | n = lookup_neighbour (&sender); | 7766 | n = lookup_neighbour (&sender); |
7767 | if (NULL != n) | 7767 | if (NULL != n) |
7768 | route_via_neighbour (n, &tvr.header, | 7768 | route_via_neighbour (n, &tvr.header, |
7769 | RMO_ANYTHING_GOES | RMO_REDUNDANT); | 7769 | RMO_ANYTHING_GOES | RMO_REDUNDANT |
7770 | | RMO_UNCONFIRMED_ALLOWED); | ||
7770 | } | 7771 | } |
7771 | 7772 | ||
7772 | finish_cmc_handling (cmc); | 7773 | finish_cmc_handling (cmc); |
@@ -8992,8 +8993,8 @@ handle_send_message_ack (void *cls, | |||
8992 | if (0 != GNUNET_memcmp (&queue->neighbour->pid, &sma->receiver)) | 8993 | if (0 != GNUNET_memcmp (&queue->neighbour->pid, &sma->receiver)) |
8993 | continue; | 8994 | continue; |
8994 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 8995 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
8995 | "Found PID %s\n", | 8996 | "Found PID %s\n", |
8996 | GNUNET_i2s (&queue->neighbour->pid)); | 8997 | GNUNET_i2s (&queue->neighbour->pid)); |
8997 | 8998 | ||
8998 | 8999 | ||
8999 | for (struct QueueEntry *qep = queue->queue_head; NULL != qep; | 9000 | for (struct QueueEntry *qep = queue->queue_head; NULL != qep; |
@@ -9667,7 +9668,6 @@ handle_update_queue_message (void *cls, | |||
9667 | } | 9668 | } |
9668 | 9669 | ||
9669 | 9670 | ||
9670 | |||
9671 | /** | 9671 | /** |
9672 | * Communicator tells us that our request to create a queue "worked", that | 9672 | * Communicator tells us that our request to create a queue "worked", that |
9673 | * is setting up the queue is now in process. | 9673 | * is setting up the queue is now in process. |
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 23173e763..513b030b8 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c | |||
@@ -696,6 +696,11 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct | |||
696 | GNUNET_ATS_connectivity_done (p->ats); | 696 | GNUNET_ATS_connectivity_done (p->ats); |
697 | p->ats = NULL; | 697 | p->ats = NULL; |
698 | } | 698 | } |
699 | if (NULL != p->ph) | ||
700 | { | ||
701 | GNUNET_PEERSTORE_disconnect (p->ph, GNUNET_NO); | ||
702 | p->ph = NULL; | ||
703 | } | ||
699 | if (NULL != p->hello) | 704 | if (NULL != p->hello) |
700 | { | 705 | { |
701 | GNUNET_free (p->hello); | 706 | GNUNET_free (p->hello); |