From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 2 Jul 2013 11:44:27 +0000 (+0000)
Subject: fix: do not assert if plugin sends you invalid network type
X-Git-Tag: initial-import-from-subversion-38251~8541
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99706d4043a7b4e58496b1b73cd070890b895374;p=oweals%2Fgnunet.git

fix: do not assert if plugin sends you invalid network type
---

diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index d6b277406..bd5caa849 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -667,6 +667,7 @@ get_network (struct GAS_PROPORTIONAL_Handle *s, uint32_t type)
   {
       if (s->network_entries[c].type == type)
         return &s->network_entries[c];
+
   }
   return NULL;
 }
@@ -1109,7 +1110,16 @@ GAS_proportional_address_update (void *solver,
 
         /* set new network type */
         new_net = get_network (solver, addr_net);
-        GNUNET_assert (NULL != new_net);
+        if (NULL == new_net)
+        {
+          /* Address changed to invalid network... */
+          LOG (GNUNET_ERROR_TYPE_ERROR, _("Cannot find network of type `%u' %s\n"),
+          		addr_net, GNUNET_ATS_print_network_type (addr_net));
+          address->assigned_bw_in = GNUNET_BANDWIDTH_value_init (0);
+          address->assigned_bw_out = GNUNET_BANDWIDTH_value_init (0);
+          s->bw_changed  (s->bw_changed_cls, address);
+          return;
+        }
         address->solver_information = new_net;
 
         /* Add to new network and update*/