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

[gnunet]

Author: wachs
Date: 2011-11-21 14:08:42 +0100 (Mon, 21 Nov 2011)
New Revision: 18234

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-21 
12:19:21 UTC (rev 18233)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-21 
13:08:42 UTC (rev 18234)
@@ -227,6 +227,7 @@
   FRESH,
 };
 
+
 /**
  * Entry in neighbours.
  */
@@ -246,11 +247,6 @@
   struct MessageQueue *messages_tail;
 
   /**
-   * Performance data for the peer.
-   */
-  //struct GNUNET_ATS_Information *ats;
-
-  /**
    * Are we currently trying to send a message? If so, which one?
    */
   struct MessageQueue *is_active;
@@ -329,6 +325,7 @@
    */
   GNUNET_SCHEDULER_TaskIdentifier state_reset;
 
+
   /**
    * How often has the other peer (recently) violated the inbound
    * traffic limit?  Incremented by 10 per violation, decremented by 1
@@ -455,6 +452,8 @@
 reset_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct NeighbourMapEntry *n = cls;
+  if (n == NULL)
+    return;
 
   n->state_reset = GNUNET_SCHEDULER_NO_TASK;
   if (n->state == S_CONNECTED)
@@ -471,8 +470,11 @@
   n->state = S_NOT_CONNECTED;
 
   /* destroying address */
-  GNUNET_assert (strlen(n->address->transport_name) > 0); 
-  GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
+  if (n->address != NULL)
+  {
+    GNUNET_assert (strlen(n->address->transport_name) > 0);
+    GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
+  }
 
   /* request new address */
   if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)