rra/meshenger
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed hardcode in wgets, fixed wrong path for msg dir in meshenger_serve

Browse Source
This commit is contained in:
Roel 2014-04-24 12:54:15 +02:00
parent fb023f8a8b
commit e4996cdda7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.py
View File

@ -4,12 +4,12 @@ import socket, os, time, select, urllib, sys, threading
class Meshenger: class Meshenger:
devices = {} #the dictionary of all the nodes this this node has seen devices = {} #the dictionary 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/') msg_dir = os.path.relpath('msg/')
exitapp = False #to kill all threads on exitapp = False #to kill all threads on
index_last_update = '' index_last_update = str(time.time())
def __init__(self): def __init__(self):
@ -94,7 +94,7 @@ class Meshenger:
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP) s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
s.bind(('::', self.announce_port)) s.bind(('::', self.announce_port))
s.setblocking(0) s.setblocking(0)
print select.select([s],[],[]).recvfrom(bufferSize)
while not self.exitapp: while not self.exitapp:
result = select.select([s],[],[])[0][0].recvfrom(bufferSize) result = select.select([s],[],[])[0][0].recvfrom(bufferSize)
if result[1][0] not in self.devices and result[1][0] != self.own_ip: if result[1][0] not in self.devices and result[1][0] != self.own_ip:
@ -116,6 +116,10 @@ class Meshenger:
Make an index file of all the messages present on the node. Make an index file of all the messages present on the node.
Save the time of the last update. Save the time of the last update.
""" """
if not os.path.exists('index'):
with open('index','wb') as index:
index.write('')
previous_index = [] previous_index = []
current_index = os.listdir(self.msg_dir) current_index = os.listdir(self.msg_dir)
@ -137,7 +141,7 @@ class Meshenger:
Download the indices from other nodes. Download the indices from other nodes.
""" """
os.system('wget http://['+ip+'%adhoc0]:13338/index -O '+os.path.join(path,'index')) os.system('wget http://['+ip+'%adhoc0]:'+self.serve_port+'/index -O '+os.path.join(path,'index'))
def get_messages(self, ip, path): def get_messages(self, ip, path):
@ -151,7 +155,7 @@ class Meshenger:
messagepath = os.path.join(os.path.abspath(self.msg_dir), message) messagepath = os.path.join(os.path.abspath(self.msg_dir), message)
if not os.path.exists(messagepath): if not os.path.exists(messagepath):
print 'downloading', message, 'to', messagepath print 'downloading', message, 'to', messagepath
os.system('wget http://['+ip+'%adhoc0]:13338/msg/'+message+' -O '+messagepath) os.system('wget http://['+ip+'%adhoc0]:'+self.serve_port+'/msg/'+message+' -O '+messagepath)
except: except:
pass pass

2
meshenger_serve.py
View File

@ -11,7 +11,7 @@ import urlparse
class MeshengerHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): class MeshengerHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
messageDir = "msg" messageDir = "/msg"
""" """
Serve index and messages Serve index and messages