Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
	tunnelmanager.py

TODO

@@ -4,6 +4,7 @@ Bugs :
 To be done :
     Replace comments at the beginning of functions with docstrings
     Do a clean-up in the import
+    Remove the parameters to choose the number of clients
 
 To be discuss:
     Remove the --no-boot option since we know when no node is avalaible

tunnelmanager.py

@@ -5,55 +5,56 @@ import plib, utils, db
 
 class TunnelManager:
 
-    def __init__(self, write_pipe, peers_db, client_count, refresh_count):
-        self.write_pipe = write_pipe
-        self.peers_db = peers_db
-        self.connection_dict = {}
+    def __init__(self, write_pipe, peers_db):
+        self._write_pipe = write_pipe
+        self._peers_db = peers_db
+        self._connection_dict = {}
         self.client_count = client_count
         self.refresh_count = refresh_count
         self.free_interface_set = set(('client1', 'client2', 'client3', 'client4', 'client5',
                                        'client6', 'client7', 'client8', 'client9', 'client10'))
 
     def refresh(self):
-        self.cleanDeads()
-        self.removeSomeTunnels()
-        self.makeNewTunnels()
+        self._cleanDeads()
+        self._removeSomeTunnels()
+        self._makeNewTunnels()
 
-    def cleanDeads(self):
-        for id in self.connection_dict.keys():
-            p, iface = self.connection_dict[id]
+    def _cleanDeads(self):
+        for id in self._connection_dict.keys():
+            p, iface = self._connection_dict[id]
             if p.poll() != None:
                 utils.log('Connection with %s has failed with return code %s' % (id, p.returncode), 3)
                 self.free_interface_set.add(iface)
                 self.peers_db.unusePeer(id)
                 del self.connection_dict[id]
 
-    def removeSomeTunnels(self):
-        for i in range(0, max(0, len(self.connection_dict) - self.client_count + self.refresh_count)):
-            peer_id = random.choice(self.connection_dict.keys())
+    def _removeSomeTunnels(self):
+        for i in range(0, max(0, len(self._connection_dict) - self._clientCount + self._refresh_count)):
+            peer_id = random.choice(self._connection_dict.keys())
             kill(peer_id)
 
-    def kill(self, peer_id):
+    def _kill(self, peer_id):
         utils.log('Killing the connection with id ' + str(peer_id), 2)
-        p, iface = self.connection_dict.pop(peer_id)
+        p, iface = self._connection_dict.pop(peer_id)
         p.kill()
         self.free_interface_set.add(iface)
-        self.peers_db.unusePeer(peer_id)
+        self._peers_db.unusePeer(peer_id)
 
-    def makeNewTunnels(self):
+    def _makeNewTunnels(self):
         try:
-            for peer_id, ip, port, proto in self.peers_db.getUnusedPeers(self.client_count - len(self.connection_dict), self.write_pipe):
+            for peer_id, ip, port, proto in self._peers_db.getUnusedPeers(self._client_count - len(self._connection_dict), self._write_pipe):
                 utils.log('Establishing a connection with id %s (%s:%s)' % (peer_id, ip, port), 2)
                 iface = self.free_interface_set.pop()
-                self.connection_dict[peer_id] = ( plib.client( ip, write_pipe, '--dev', iface, '--proto', proto, '--rport', str(port),
-                    stdout=os.open(os.path.join(utils.config.log, 'vifibnet.client.%s.log' % (peer_id,)),
-                                   os.O_WRONLY|os.O_CREAT|os.O_TRUNC) ), iface)
-                self.peers_db.usePeer(peer_id)
+                self._connection_dict[peer_id] = ( openvpn.client( ip, write_pipe, '--dev', iface, '--proto', proto, '--rport', str(port),
+                    stdout=os.open(os.path.join(utils.config.log, 'vifibnet.client.%s.log' % (peer_id,)), 
+                                   os.O_WRONLY|os.O_CREAT|os.O_TRUNC) ),
+                                   iface)
+                self._peers_db.usePeer(peer_id)
         except KeyError:
             utils.log("Can't establish connection with %s : no available interface" % ip, 2)
         except Exception:
             traceback.print_exc()
-            
+
     def handle_message(msg):
         script_type, arg = msg.split()
         if script_type == 'client-connect':

vifibnet.py

@@ -75,7 +75,7 @@ def main():
             if ready:
                 tunnelManager.handle_message(read_pipe.readline())
             if time.time() >= next_refresh:
-                peers_db.populate(10)
+                peers_db.populate(100)
                 tunnelManager.refresh()
                 next_refresh = time.time() + utils.config.refresh_time
     except KeyboardInterrupt: