bugfix: in server.Server, inside the message read loop, a break was donde after a...

diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index 3a3cfec..5c0b8da 100644 (file)
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -406,8 +406,8 @@ class ExperimentController(object):
 
         steps_to_configure(self, to_restart)
 
-        self._logger.debug("ExperimentController: Resolving netreffed testbeds")
         if self._netreffed_testbeds:
+            self._logger.debug("ExperimentController: Resolving netreffed testbeds")
             # initally resolve netrefs
             self.do_netrefs(data, fail_if_undefined=False)
             
@@ -443,6 +443,7 @@ class ExperimentController(object):
        
         # Only now, that netref dependencies have been solve, it is safe to
         # program cross_connections
+        self._logger.debug("ExperimentController: Programming testbed cross-connections")
         self._program_testbed_cross_connections(data)
  
         # perform do_configure in parallel for al testbeds
@@ -1018,6 +1019,8 @@ class ExperimentController(object):
                                     cross_testbed_guid, cross_testbed_id, cross_factory_id, 
                                     cross_connector_type_name)
                             # save cross data for later
+                            self._logger.debug("ExperimentController: adding cross_connection data tbd=%d:guid=%d - tbd=%d:guid=%d" % \
+                                    (testbed_guid, guid, cross_testbed_guid, cross_guid))
                             self._add_crossdata(testbed_guid, guid, cross_testbed_guid,
                                     cross_guid)
 

diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index 1fa1774..a084705 100644 (file)
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -227,7 +227,7 @@ class Server(object):
                     msg = self.recv_msg(conn)
                 except socket.timeout, e:
                     self.log_error("SERVER recv_msg: connection timedout ")
-                    break
+                    continue
                 
                 if not msg:
                     self.log_error("CONNECTION LOST")

diff --git a/src/nepi/util/tunchannel_impl.py b/src/nepi/util/tunchannel_impl.py
index be1192e..1a38aef 100644 (file)
--- a/src/nepi/util/tunchannel_impl.py
+++ b/src/nepi/util/tunchannel_impl.py
@@ -65,7 +65,7 @@ class TunChannel(object):
         # They're part of the TUN standard attribute set
         self.tun_port = None
         self.tun_addr = None
-        self.tun_cipher = None
+        self.tun_cipher = 'AES'
         
         # These get initialized when the channel is connected to its peer
         self.peer_proto = None