William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored Resource method names

Browse Source
This commit is contained in:
Mark Qvist 2021-05-16 16:43:34 +02:00
parent 55c0f44e58
commit 8496ee19d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RNS/Resource.py
View File

@ -245,7 +245,7 @@ class Resource:
collision_guard_list = [] collision_guard_list = []
for i in range(0,hashmap_entries): for i in range(0,hashmap_entries):
data = self.data[i*Resource.SDU:(i+1)*Resource.SDU] data = self.data[i*Resource.SDU:(i+1)*Resource.SDU]
map_hash = self.getMapHash(data) map_hash = self.get_map_hash(data)
if map_hash in collision_guard_list: if map_hash in collision_guard_list:
RNS.log("Found hash collision in resource map, remapping...", RNS.LOG_VERBOSE) RNS.log("Found hash collision in resource map, remapping...", RNS.LOG_VERBOSE)
@ -293,7 +293,7 @@ class Resource:
self.waiting_for_hmu = False self.waiting_for_hmu = False
self.request_next() self.request_next()
def getMapHash(self, data): def get_map_hash(self, data):
# TODO: This will break if running unencrypted, # TODO: This will break if running unencrypted,
# uncompressed transfers on streams with long blocks # uncompressed transfers on streams with long blocks
# of identical bytes. Doing so would be very silly # of identical bytes. Doing so would be very silly
@ -524,7 +524,7 @@ class Resource:
if not self.status == Resource.FAILED: if not self.status == Resource.FAILED:
self.status = Resource.TRANSFERRING self.status = Resource.TRANSFERRING
part_data = packet.data part_data = packet.data
part_hash = self.getMapHash(part_data) part_hash = self.get_map_hash(part_data)
i = self.consecutive_completed_height i = self.consecutive_completed_height
for map_hash in self.hashmap[self.consecutive_completed_height:self.consecutive_completed_height+self.window]: for map_hash in self.hashmap[self.consecutive_completed_height:self.consecutive_completed_height+self.window]: