[GNUnet-SVN] r19330 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-01-23 16:43:15 +0100 (Mon, 23 Jan 2012)
New Revision: 19330

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
fixing: mantis 0002098: transport did not propagate session to ats


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-01-23 
14:54:55 UTC (rev 19329)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-01-23 
15:43:15 UTC (rev 19330)
@@ -1246,10 +1246,10 @@
   case S_CONNECTED:
     if (n->address_state == FRESH)
     {
-      n->address_state = USED;
       GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES);
       GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
       GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, 
GNUNET_YES);
+      n->address_state = USED;
     }
     break;
   case S_FAST_RECONNECT:
@@ -1265,10 +1265,10 @@
 
     if (n->address_state == FRESH)
     {
-      n->address_state = USED;
       GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES);
       GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
       GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, 
GNUNET_YES);
+      n->address_state = USED;
     }
 
     if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK)
@@ -2337,11 +2337,12 @@
   GNUNET_assert (NULL != n->address);
   if ((n->address_state == FRESH) && (0 == GNUNET_HELLO_address_cmp(address, 
n->address)))
   {
-    n->address_state = USED;
+    if (n->session == NULL)
+      n->session = session;
     GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
     GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
-    if (n->session == NULL)
-      n->session = session;
+    n->address_state = USED;
+
   }
 
   GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in);
@@ -2426,11 +2427,11 @@
   GNUNET_assert (n->address != NULL);
   if ((n->address_state == FRESH) && (0 == GNUNET_HELLO_address_cmp(address, 
n->address)))
   {
-    n->address_state = USED;
+    if (n->session == NULL)
+      n->session = session;
     GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
     GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
-    if (n->session == NULL)
-      n->session = session;
+    n->address_state = USED;
   }
 
   neighbours_connected++;