[GNUnet-SVN] r35220 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2015-02-11 17:16:14 +0100 (Wed, 11 Feb 2015)
New Revision: 35220

Modified:
   gnunet/src/ats/ats_api_scheduling.c
Log:
-check for in_destroy when looking up session IDs

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-02-11 13:46:18 UTC (rev 35219)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-02-11 16:16:14 UTC (rev 35220)
@@ -307,6 +307,7 @@
   }
   for (i = 1; i < sh->session_array_size; i++)
     if ( (NULL != sh->session_array[i]) &&
+         (GNUNET_NO == sh->session_array[i]->in_destroy) &&
          ( (session == sh->session_array[i]->session) ||
            (NULL == sh->session_array[i]->session) ) &&
          (0 == GNUNET_HELLO_address_cmp (address,
@@ -397,7 +398,9 @@
     force_reconnect (sh);
     return;
   }
-  ar = find_session (sh, session_id, &m->peer);
+  ar = find_session (sh,
+                     session_id,
+                     &m->peer);
   if (NULL == ar)
   {
     GNUNET_break (0);
@@ -730,7 +733,7 @@
 GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
                                 struct Session *session)
 {
-  GNUNET_break (session == ar->session);
+  GNUNET_assert (session == ar->session);
   ar->session = NULL;
   if (GNUNET_HELLO_address_check_option (ar->address,
                                          GNUNET_HELLO_ADDRESS_INFO_INBOUND))