gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r31839 - gnunet/src/testbed


From: gnunet
Subject: [GNUnet-SVN] r31839 - gnunet/src/testbed
Date: Wed, 8 Jan 2014 15:59:17 +0100

Author: harsha
Date: 2014-01-08 15:59:17 +0100 (Wed, 08 Jan 2014)
New Revision: 31839

Modified:
   gnunet/src/testbed/generate-underlay-topology.c
   gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
Log:
- allow peers to connect in both directions


Modified: gnunet/src/testbed/generate-underlay-topology.c
===================================================================
--- gnunet/src/testbed/generate-underlay-topology.c     2014-01-08 14:14:52 UTC 
(rev 31838)
+++ gnunet/src/testbed/generate-underlay-topology.c     2014-01-08 14:59:17 UTC 
(rev 31839)
@@ -114,6 +114,19 @@
   FPRINTF (stdout, "%u -> %u\n", A, B);
   GNUNET_break (SQLITE_OK == sqlite3_reset (stmt_insert));
   //GNUNET_break (SQLITE_OK == sqlite3_clear_bindings (stmt_insert));
+  if ( (SQLITE_OK != sqlite3_bind_int (stmt_insert, 1, B)) ||
+       (SQLITE_OK != sqlite3_bind_int (stmt_insert, 2, A)) )
+  {
+    LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_bind_int");
+    return GNUNET_SYSERR;
+  }
+  if (SQLITE_DONE != sqlite3_step (stmt_insert))
+  {
+    LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_step");
+    return GNUNET_SYSERR;
+  }
+  FPRINTF (stdout, "%u -> %u\n", B, A);
+  GNUNET_break (SQLITE_OK == sqlite3_reset (stmt_insert));
   return GNUNET_OK;
 }
 
@@ -254,7 +267,7 @@
     }
     break;
   default:
-    GNUNET_assert (0);
+    break;
   }
   /* parse for second TOPOOPT.  Only required for SCALE_FREE topology */
   switch (topology)

Modified: gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-08 14:14:52 UTC 
(rev 31838)
+++ gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-08 14:59:17 UTC 
(rev 31839)
@@ -463,7 +463,7 @@
 #endif
   ret =
       (GNUNET_OK ==
-       GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-testbed-underlay",
+       GNUNET_PROGRAM_run (argc, argv, "testbed-underlay",
                            _
                            ("Daemon to restrict underlay network in testbed 
deployments"),
                            options, &run, NULL)) ? 0 : 1;




reply via email to

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