-fix bug introduced when STAR topology was added, STAR must only be once in the topology_strings[]-array

2 files changed, 6 insertions, 7 deletions

diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 1b6656234..eaa1656ba 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -1366,6 +1366,9 @@ GNUNET_TESTBED_run (const char *host_filename,
       goto error_cleanup;
     }
     goto warn_ignore;
+  case GNUNET_TESTBED_TOPOLOGY_OPTION_END:
+    /* not allowed! */
+    GNUNET_assert (0);
   default:
   warn_ignore:
     /* Warn if OVERLAY_RANDOM_LINKS is present that it will be ignored */
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index b7722b9c7..c86dd2739 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -260,7 +260,7 @@ struct TopologyContext
  * A array of names representing topologies. Should be in sync with enum
  * GNUNET_TESTBED_TopologyOption
  */
-const char *topology_strings[] = {
+static const char *topology_strings[] = {
 
     /**
      * A clique (everyone connected to everyone else).  No options. If there are N
@@ -268,7 +268,7 @@ const char *topology_strings[] = {
      */
   "CLIQUE",
 
-    /**
+    /*
      * Small-world network (2d torus plus random links).  Followed
      * by the number of random links to add (unsigned int).
      */
@@ -321,11 +321,6 @@ const char *topology_strings[] = {
   "LINE",
 
     /**
-     * Star topology.  No options.
-     */
-  "STAR",
-
-    /**
      * Read a topology from a given file.  Followed by the name of the file (const char *).
      */
   "FROM_FILE",
@@ -1476,6 +1471,7 @@ GNUNET_TESTBED_topology_get_ (enum GNUNET_TESTBED_TopologyOption *topology,
     {
       if (NULL != topology)
         *topology = (enum GNUNET_TESTBED_TopologyOption) cnt;
+      GNUNET_assert (GNUNET_TESTBED_TOPOLOGY_OPTION_END != *topology);
       return GNUNET_YES;
     }
   }