Commit 3368dc9b authored by Ulysse Beaugnon's avatar Ulysse Beaugnon

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

Conflicts:
	TODO
	plib.py
parents 224f7b28 03e3061a
...@@ -11,10 +11,6 @@ To be done : ...@@ -11,10 +11,6 @@ To be done :
|-> number of routes / tunnel : doesn't work |-> number of routes / tunnel : doesn't work
|-> favorise most used roads ? |-> 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 Replace comments at the beginning of functions with docstrings & give all
fn docstrings fn docstrings
......
...@@ -17,7 +17,7 @@ def openvpn(hello_interval, *args, **kw): ...@@ -17,7 +17,7 @@ def openvpn(hello_interval, *args, **kw):
utils.log(str(args), 5) utils.log(str(args), 5)
return subprocess.Popen(args, **kw) 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) utils.log('Starting server', 3)
return openvpn(hello_interval, return openvpn(hello_interval,
'--tls-server', '--tls-server',
......
...@@ -122,7 +122,7 @@ def main(): ...@@ -122,7 +122,7 @@ def main():
os.O_WRONLY|os.O_CREAT|os.O_TRUNC), stderr=subprocess.STDOUT) os.O_WRONLY|os.O_CREAT|os.O_TRUNC), stderr=subprocess.STDOUT)
# Establish connections # 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, config.connection_count, config.dh, write_pipe, config.internal_port,
proto, config.hello, '--dev', 'vifibnet', *openvpn_args, proto, config.hello, '--dev', 'vifibnet', *openvpn_args,
stdout=os.open(os.path.join(config.log, stdout=os.open(os.path.join(config.log,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment