[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18255 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18255 - gnunet/src/transport |
Date: |
Tue, 22 Nov 2011 15:21:52 +0100 |
Author: wachs
Date: 2011-11-22 15:21:52 +0100 (Tue, 22 Nov 2011)
New Revision: 18255
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
fix for mantis 1928 in combination with rev 18254
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-22
13:29:25 UTC (rev 18254)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-11-22
14:21:52 UTC (rev 18255)
@@ -531,7 +531,6 @@
return GNUNET_SYSERR;
}
#if DEBUG_TRANSPORT
-
{
char *old = GNUNET_strdup (print_state (n->state));
char *new = GNUNET_strdup (print_state (state));
@@ -1081,7 +1080,7 @@
n->ats_suggest = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " ATS did not suggested address to connect to peer `%s'\n",
+ "ATS did not suggested address to connect to peer `%s'\n",
GNUNET_i2s (&n->id));
disconnect_neighbour (n);
@@ -2504,6 +2503,7 @@
if (n->state != S_CONNECT_RECV)
change_state (n, S_CONNECT_RECV);
+
/* Ask ATS for an address to connect via that address */
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (n->ats_suggest);
@@ -2534,8 +2534,8 @@
uint32_t ats_count)
{
const struct SessionConnectMessage *scm;
+ struct BlackListCheckContext *bcc = NULL;
struct NeighbourMapEntry *n;
- struct BlackListCheckContext *bcc = NULL;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2551,15 +2551,16 @@
scm = (const struct SessionConnectMessage *) message;
GNUNET_break_op (ntohl (scm->reserved) == 0);
+ GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count);
+
n = lookup_neighbour (peer);
- if ( (n != NULL) &&
- (S_CONNECTED == n->state) )
+ if ( (n != NULL) && (S_CONNECTED == n->state) )
{
- /* connected peer switches addresses */
- GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count);
- return;
+ /* connected peer switches addresses */
+ return;
}
+
/* we are not connected to this peer */
/* do blacklist check */
bcc =
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18255 - gnunet/src/transport,
gnunet <=