Commit 990c8b4b authored by Ulysse Beaugnon's avatar Ulysse Beaugnon

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

parents ef210bab 44eab543
Note (for U): logs haven't changed. I just added some logs messages to notify
when a task has been finished
Vifibnet is a daemon setting up a resilient virtual private network over the
internet
......@@ -20,6 +16,10 @@ The organisation of the code
tunnel.py To choose wich connection delete/keep/...
upnpigd.py To open a port
Note: On certain version of python (e.g. 2.7.3~rc2-2.1 ) dns lookup is
performed for each request, and cause a delay in response.
To avoid this, one can either upgrade python, or fix their resolv.conf
OPTIONS : REGISTRY.PY
usage : ./registry port [options...]
port
......@@ -229,4 +229,4 @@ def not_insane_address_string(self):
BaseHTTPServer.BaseHTTPRequestHandler.address_string = not_insane_address_string
--------------------------------------------------------------------------------
\ No newline at end of file
--------------------------------------------------------------------------------
......@@ -161,11 +161,11 @@ class TunnelManager:
ip = bin(int(ip, 16))[2:].rjust(128, '0')
if ip.startswith(self._network):
iface = iface.replace(' ', '')
iface = iface.strip()
subnet_size = int(subnet_size, 16)
utils.log('Route on iface %s detected to %s/%s'
% (iface, ip, subnet_size), 8)
if iface in self._iface_to_prefix.keys() and subnet_size <= 64:
if iface in self._iface_to_prefix.keys():
self._connection_dict[self._iface_to_prefix[iface]].routes += 1
if iface in self._iface_list and self._net_len < subnet_size < 128:
prefix = ip[self._net_len:subnet_size]
......
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