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

Conflicts:
	TODO
	plib.py

TODO

@@ -11,10 +11,6 @@ To be done :
         |-> number of routes / tunnel : doesn't work
         |-> favorise most used roads ?
 
-    Find a name for the project : the projet is ( or should be ) independant
-    from vifib, openvpn, babel, and so should the name; btw we aim to build a
-    distributed, scalable, resilient VPN.... ( if it helps with the name )
-
     Replace comments at the beginning of functions with docstrings & give all
     fn docstrings
 

plib.py

@@ -17,7 +17,7 @@ def openvpn(hello_interval, *args, **kw):
     utils.log(str(args), 5)
     return subprocess.Popen(args, **kw)
 
-def server(server_ip, network, max_clients, dh_path, pipe_fd, port, proto, hello_interval, *args, **kw):
+def server(server_ip, ip_length, max_clients, dh_path, pipe_fd, port, proto, hello_interval, *args, **kw):
     utils.log('Starting server', 3)
     return openvpn(hello_interval,
         '--tls-server',

vifibnet.py

@@ -122,7 +122,7 @@ def main():
                 os.O_WRONLY|os.O_CREAT|os.O_TRUNC), stderr=subprocess.STDOUT)
 
    # Establish connections
-    server_process = list(plib.server(internal_ip, network,
+    server_process = list(plib.server(internal_ip, len(network) + len(prefix),
         config.connection_count, config.dh, write_pipe, config.internal_port,
         proto, config.hello, '--dev', 'vifibnet', *openvpn_args,
         stdout=os.open(os.path.join(config.log,