indentation

This commit is contained in:
Generic Username 2014-04-04 16:23:33 +02:00
parent 5b098ceb09
commit 7e9e68ed93

226
main.py
View File

@ -6,139 +6,141 @@ class Meshenger:
devices = [] #the list of all the nodes this this node has seen devices = [] #the list of all the nodes this this node has seen
serve_port = 13338 serve_port = 13338
announce_port = 13337 announce_port = 13337
own_ip = "0.0.0.0" #own_ip = "0.0.0.0"
msg_dir = os.path.relpath('msg/')
def __init__(self): def __init__(self):
os.system("echo 1 >> /proc/sys/net/ipv6/conf/br-lan/disable_ipv6") os.system("echo 1 >> /proc/sys/net/ipv6/conf/br-lan/disable_ipv6")
#self.own_ip = self.get_ip_adress() self.own_ip = self.get_ip_adress()
self.own_ip = "192.168.2.196" #self.own_ip = "192.168.2.196"
while True: while True:
print 'discovering devices' print 'discovering devices'
time.sleep(1) time.sleep(1)
self.discover() self.discover()
if len(self.devices) > 0: if len(self.devices) > 0:
print 'found', len(self.devices),'device(s) retreiving indices' print 'found', len(self.devices),'device(s) retreiving indices'
for device in self.devices: for device in self.devices:
nodepath = ip_to_hash(device) nodepath = ip_to_hash(device)
self.get_index(device, nodepath) self.get_index(device, nodepath)
self.get_messages(device, nodepath) self.get_messages(device, nodepath)
print 'updating own index' print 'updating own index'
self.build_index() self.build_index()
#voeg toe aan eigen index --> build_index()
time.sleep(5) time.sleep(5)
def announce(self):
#announces it's existance to other nodes
sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
sock.sendto(bericht, ("ff02::1", self.announce_port))
sock.close()
def index(self):
a = ''
# builds the latest index of all the messages that are on this node
def discover(self):
# discovers other nodes by listening to the Meshenger announce port
#own_ip = get_ip_adress()
#port = 13337 # where do you expect to get a msg?
bufferSize = 1024 # whatever you need
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
s.bind(('::', self.announce_port))
s.setblocking(0)
#global devices
while True:
result = select.select([s],[],[])[0][0].recvfrom(bufferSize)
if result not in self.devices and result[1][0] != self.own_ip:
self.devices.append(result[1][0])
return
time.sleep(1)
def serve(self):
a = ''
# serves both the index and the messages on the node over http
# plus manages the client-side web interface
def build_index(self):
previous_index = []
current_index = os.listdir('msg/')
if current_index != previous_index:
with open('index', 'wb') as index:
for message in os.listdir('msg/'):
index.write(message)
index.write('\n')
current_index = previous_index
def get_index(self,ip, path):
os.system('wget http://['+ip+'%adhoc0]:13338/index -O '+os.path.join(path,'index'))
# downloads the index from other nodes and then proceeds to downloads messages it doesn't have already
def get_messages(self, ip, path):
with open(os.path.join(path,'index')) as index:
index = index.read().split('\n')
for message in index:
messagepath = os.path.join(os.path.abspath('msg/'), message)
if not os.path.exists(messagepath):
print 'downloading', message, 'to', messagepath
os.system('wget http://['+ip+'%adhoc0]:13338/msg/'+message+' -O '+messagepath)
# s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) def announce(self):
# s.connect(('http://[fe80::6666:b3ff:feeb:68c2%adhoc0]/lijst', 13338)) #announces it's existance to other nodes
sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
sock.sendto(bericht, ("ff02::1", self.announce_port))
sock.close()
# s.send("GET / HTTP/1.0\r\n\r\n") def index(self):
# while 1: a = ''
# buf = s.recv(1000) # builds the latest index of all the messages that are on this node
# if not buf:
# break
# sys.stdout.write(buf)
# s.close() def discover(self):
def ip_to_hash(self, ip): # discovers other nodes by listening to the Meshenger announce port
import hashlib bufferSize = 1024 # whatever you need
hasj = hashlib.md5(ip).hexdigest()
nodepath = os.path.join(os.path.abspath('nodes/'), hasj)
if not os.path.exists(nodepath):
os.mkdir(nodepath)
return nodepath s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
s.bind(('::', self.announce_port))
s.setblocking(0)
#global devices
while True:
result = select.select([s],[],[])[0][0].recvfrom(bufferSize)
if result not in self.devices and result[1][0] != self.own_ip:
self.devices.append(result[1][0])
return
time.sleep(1)
def serve(self):
a = ''
# serves both the index and the messages on the node over http
# plus manages the client-side web interface
def build_index(self):
previous_index = []
current_index = os.listdir(msg_dir)
if current_index != previous_index:
with open('index', 'wb') as index:
for message in os.listdir(msg_dir):
index.write(message)
index.write('\n')
with open('index_last_update', 'wb') as indexupdate:
indexupdate.write(str(int(time.time())))
current_index = previous_index
def get_index(self,ip, path):
os.system('wget http://['+ip+'%adhoc0]:13338/index -O '+os.path.join(path,'index'))
# downloads the index from other nodes and then proceeds to downloads messages it doesn't have already
def get_messages(self, ip, path):
with open(os.path.join(path,'index')) as index:
index = index.read().split('\n')
for message in index:
messagepath = os.path.join(os.path.abspath(msg_dir), message)
if not os.path.exists(messagepath):
print 'downloading', message, 'to', messagepath
os.system('wget http://['+ip+'%adhoc0]:13338/msg/'+message+' -O '+messagepath)
def clientsite(self): # s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
a = ''
#tools # s.connect(('http://[fe80::6666:b3ff:feeb:68c2%adhoc0]/lijst', 13338))
def get_ip_adress(self): # s.send("GET / HTTP/1.0\r\n\r\n")
if not os.path.isfile('interfaceip6adress'):
os.system('ifconfig -a adhoc0 | grep inet6 > interfaceip6adress')
with open('interfaceip6adress', 'r') as a: # while 1:
return a.read().split()[2].split('/')[0] # buf = s.recv(1000)
# if not buf:
# break
# sys.stdout.write(buf)
# s.close()
def ip_to_hash(self, ip):
import hashlib
hasj = hashlib.md5(ip).hexdigest()
nodepath = os.path.join(os.path.abspath('nodes/'), hasj)
if not os.path.exists(nodepath):
os.mkdir(nodepath)
return nodepath
def clientsite(self):
a = ''
#tools
def get_ip_adress(self):
if not os.path.isfile('interfaceip6adress'):
os.system('ifconfig -a adhoc0 | grep inet6 > interfaceip6adress')
with open('interfaceip6adress', 'r') as a:
return a.read().split()[2].split('/')[0]
if __name__ == "__main__": if __name__ == "__main__":
print "test" print "test"
meshenger = Meshenger() meshenger = Meshenger()