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

made a mesh

Browse Source
This commit is contained in:
Roel 2014-04-24 14:31:48 +02:00
parent b2e787bf32
commit fa67aba96e
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
main.py
View File

@ -50,11 +50,12 @@ class Meshenger:
for device in self.devices: for device in self.devices:
nodepath = self.ip_to_hash(device) #make a folder for the node (nodes/'hash'/) nodepath = self.ip_to_hash(device) #make a folder for the node (nodes/'hash'/)
nodeupdatepath = self.node_timestamp(device, nodepath) #contains the path to the update timestamp of the node (nodes/'hash'/lastupdate) nodeupdatepath = os.path.join(nodepath, 'lastupdate') #contains the path to the update timestamp of the node (nodes/'hash'/lastupdate)
print 'Checking age of foreign node index' print 'Checking age of foreign node index'
if self.devices[device] > nodeupdatepath: if self.devices[device][2] > open(nodeupdatepath).read():
print 'Foreign node"s index is newer, proceed to download index' print 'Foreign node"s index is newer, proceed to download index'
self.get_index(device, nodepath) self.get_index(device, nodepath)
print 'downloading messages' print 'downloading messages'
@ -64,7 +65,7 @@ class Meshenger:
time.sleep(5) #free process or ctrl+c time.sleep(5) #free process or ctrl+c
def node_timestamp(self, ip, path): def node_timestamp(self):
updatepath = os.path.join(path, 'lastupdate') updatepath = os.path.join(path, 'lastupdate')
with open(updatepath, 'wb') as lastupdate: with open(updatepath, 'wb') as lastupdate:
@ -101,23 +102,30 @@ class Meshenger:
if foreign_node_ip not in self.devices and foreign_node_ip != self.own_ip: if foreign_node_ip not in self.devices and foreign_node_ip != self.own_ip:
print 'voor het eerst toegevoegd' print 'voor het eerst toegevoegd'
timestamp = result[0] timestamp = result[0] #get the timestamp that foreign node announced
oldtimestamp = timestamp oldtimestamp = timestamp
localtimestamp = str(int(time.time())) localtimestamp = str(int(time.time()))
self.devices[foreign_node_ip] = (timestamp, oldtimestamp, localtimestamp) self.devices[foreign_node_ip] = (timestamp, oldtimestamp, localtimestamp) #add everything to dictionary
if foreign_node_ip in self.devices and foreign_node_ip != self.own_ip: with open(os.path.join(self.ip_to_hash(foreign_node_ip), 'lastupdate'),'wb') as lastupdate:
timestamp = result[0] lastupdate.write(localtimestamp) #convert what node announced to local time and save for node in nodes/hash/lastupdate
if foreign_node_ip in self.devices and foreign_node_ip != self.own_ip:
timestamp = result[0] # we already know the node, so we update timestamp (might now give difference between old and new timestamp)
oldtimestamp = self.devices[foreign_node_ip][1] oldtimestamp = self.devices[foreign_node_ip][1]
self.devices[foreign_node_ip] = (timestamp, oldtimestamp, localtimestamp) self.devices[foreign_node_ip] = (timestamp, oldtimestamp, localtimestamp)
print 'timestamp update' print 'timestamp update'
print self.devices[foreign_node_ip] #print self.devices[foreign_node_ip]
if timestamp != oldtimestamp: if timestamp != oldtimestamp:
localtimestamp = str(int(time.time())) localtimestamp = str(int(time.time()))
self.devices[foreign_node_ip] = (timestamp, timestamp, localtimestamp) self.devices[foreign_node_ip] = (timestamp, timestamp, localtimestamp)
print 'timestamp check'
print self.devices[foreign_node_ip] with open(os.path.join(self.ip_to_hash(foreign_node_ip), 'lastupdate'),'wb') as lastupdate:
lastupdate.write(localtimestamp)
print 'local tijd aangepast'
#print self.devices[foreign_node_ip]
#self.devices.append(result[1][0]) #self.devices.append(result[1][0])

2
meshenger_serve.py
View File

@ -64,7 +64,7 @@ class MeshengerServe():
def main(): def main():
clientServe = MeshengerServe(80) #clientServe = MeshengerServe(80)
nodeServe = MeshengerServe(13338) nodeServe = MeshengerServe(13338)
if __name__ == '__main__': if __name__ == '__main__':