mirror of
https://github.com/markqvist/Reticulum.git
synced 2024-11-05 13:50:14 +00:00
Fixed naming conflict in resource advertisements
This commit is contained in:
parent
9e6a5d5d91
commit
3bf5694238
@ -687,12 +687,12 @@ class Link:
|
|||||||
if RNS.ResourceAdvertisement.is_request(packet):
|
if RNS.ResourceAdvertisement.is_request(packet):
|
||||||
RNS.Resource.accept(packet, callback=self.request_resource_concluded)
|
RNS.Resource.accept(packet, callback=self.request_resource_concluded)
|
||||||
elif RNS.ResourceAdvertisement.is_response(packet):
|
elif RNS.ResourceAdvertisement.is_response(packet):
|
||||||
request_id = RNS.ResourceAdvertisement.get_request_id(packet)
|
request_id = RNS.ResourceAdvertisement.read_request_id(packet)
|
||||||
for pending_request in self.pending_requests:
|
for pending_request in self.pending_requests:
|
||||||
if pending_request.request_id == request_id:
|
if pending_request.request_id == request_id:
|
||||||
RNS.Resource.accept(packet, callback=self.response_resource_concluded, progress_callback=pending_request.response_resource_progress, request_id = request_id)
|
RNS.Resource.accept(packet, callback=self.response_resource_concluded, progress_callback=pending_request.response_resource_progress, request_id = request_id)
|
||||||
pending_request.response_size = RNS.ResourceAdvertisement.get_size(packet)
|
pending_request.response_size = RNS.ResourceAdvertisement.read_size(packet)
|
||||||
pending_request.response_transfer_size = RNS.ResourceAdvertisement.get_transfer_size(packet)
|
pending_request.response_transfer_size = RNS.ResourceAdvertisement.read_transfer_size(packet)
|
||||||
pending_request.started_at = time.time()
|
pending_request.started_at = time.time()
|
||||||
elif self.resource_strategy == Link.ACCEPT_NONE:
|
elif self.resource_strategy == Link.ACCEPT_NONE:
|
||||||
pass
|
pass
|
||||||
|
@ -896,19 +896,19 @@ class ResourceAdvertisement:
|
|||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_request_id(advertisement_packet):
|
def read_request_id(advertisement_packet):
|
||||||
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
||||||
return adv.q
|
return adv.q
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_transfer_size(advertisement_packet):
|
def read_transfer_size(advertisement_packet):
|
||||||
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
||||||
return adv.t
|
return adv.t
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_size(advertisement_packet):
|
def read_size(advertisement_packet):
|
||||||
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext)
|
||||||
return adv.d
|
return adv.d
|
||||||
|
|
||||||
|
2
setup.py
2
setup.py
@ -26,7 +26,7 @@ setuptools.setup(
|
|||||||
'rnstatus=RNS.Utilities.rnstatus:main',
|
'rnstatus=RNS.Utilities.rnstatus:main',
|
||||||
'rnprobe=RNS.Utilities.rnprobe:main',
|
'rnprobe=RNS.Utilities.rnprobe:main',
|
||||||
'rnpath=RNS.Utilities.rnpath:main',
|
'rnpath=RNS.Utilities.rnpath:main',
|
||||||
|
'rncp=RNS.Utilities.rncp:main',
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
install_requires=['cryptography>=3.4.7', 'pyserial>=3.5', 'netifaces'],
|
install_requires=['cryptography>=3.4.7', 'pyserial>=3.5', 'netifaces'],
|
||||||
|
Loading…
Reference in New Issue
Block a user