Commit 2c071ec5 authored by Ulysse Beaugnon's avatar Ulysse Beaugnon

Removed propagation references in vifibnet.py since we will not be using it

parent 6dc66be1
......@@ -29,7 +29,7 @@ class Ring:
if entryPoint == None:
self.successor = self.me
else:
self.send('FIND_SUCCESSOR ' + str(self.me.id) + ' ' + self.me.toString(), entrypoint)
self.send('FIND_SUCCESSOR ' + str(self.me.id) + ' ' + self.me.toString(), entryPoint)
log.log('Init the ring with me = ' + self.me.toString(), 3)
# TODO :
......@@ -41,7 +41,7 @@ class Ring:
def send(self, message, target):
# TODO : switch to log
log.log('Sending : ' + message + ' to ' + target.toString(), 5)
self.sock.sendTo(message, (target.ip, target.port))
self.sock.sendto(message, (target.ip, target.port))
def findSuccessor(self, id, sender):
if self.id < id and id <= self.successor:
......
......@@ -4,7 +4,6 @@ import traceback
import upnpigd
import openvpn
import random
import propagation
import log
VIFIB_NET = "2001:db8:42::/48"
......@@ -88,8 +87,6 @@ def getConfig():
# Temporary args - to be removed
_('--ip', required=True,
help='IPv6 of the server')
_('--entry-ip', default=None, help='entrypoint for the ring')
_('--entry-port', default=None, help='entrypoint for the ring')
# Openvpn options
_('openvpn_args', nargs=argparse.REMAINDER,
help="Common OpenVPN options (e.g. certificates)")
......@@ -186,9 +183,6 @@ def main():
# Timed refresh initializing
next_refresh = time.time() + config.refresh_time
# initializing the ring to propagate the peers
ring = propagation.Ring(None)
# main loop
try:
while True:
......@@ -206,4 +200,4 @@ if __name__ == "__main__":
main()
# TODO : remove incomming connections from avalaible peers
# maybe not needed : it doesn't append often
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