gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [GNUnet-SVN] r25279 - gnunet/src/ats
Date: Thu, 6 Dec 2012 02:34:18 +0100

Author: LRN
Date: 2012-12-06 02:34:18 +0100 (Thu, 06 Dec 2012)
New Revision: 25279

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
Log:
Don't crash when address suggestor fails

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-05 22:34:47 UTC 
(rev 25278)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-06 01:34:18 UTC 
(rev 25279)
@@ -775,19 +775,20 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Cannot suggest address for peer `%s'\n", GNUNET_i2s (peer));
   else
+  {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Suggesting address %p for peer `%s'\n", aa, GNUNET_i2s 
(peer));
 
-  ats_count = assemble_ats_information (aa, &ats);
-  GAS_scheduling_transmit_address_suggestion (peer,
-                                              aa->plugin,
-                                              aa->addr, aa->addr_len,
-                                              aa->session_id,
-                                              ats, ats_count,
-                                              aa->assigned_bw_out,
-                                              aa->assigned_bw_in);
-  GNUNET_free (ats);
-
+    ats_count = assemble_ats_information (aa, &ats);
+    GAS_scheduling_transmit_address_suggestion (peer,
+                                                aa->plugin,
+                                                aa->addr, aa->addr_len,
+                                                aa->session_id,
+                                                ats, ats_count,
+                                                aa->assigned_bw_out,
+                                                aa->assigned_bw_in);
+    GNUNET_free (ats);
+  }
 }
 
 

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-05 
22:34:47 UTC (rev 25278)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-06 
01:34:18 UTC (rev 25279)
@@ -262,13 +262,15 @@
   if (NULL == aa)
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Cannot suggest address for peer `%s'\n", 
GNUNET_i2s (peer));
   else
+  {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n", aa, 
GNUNET_i2s (peer));
 
-  if (GNUNET_NO == aa->active)
-  {
-    aa->active = GNUNET_YES;
-    s->active_addresses++;
-    recalculate_assigned_bw (s, addresses);
+    if (GNUNET_NO == aa->active)
+    {
+      aa->active = GNUNET_YES;
+      s->active_addresses++;
+      recalculate_assigned_bw (s, addresses);
+    }
   }
 
   return aa;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]