From 3bf5694238eb16b2b6b21869d465e2dc5ad32803 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 23 May 2022 08:54:07 +0200 Subject: [PATCH] Fixed naming conflict in resource advertisements --- RNS/Link.py | 6 +++--- RNS/Resource.py | 6 +++--- setup.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RNS/Link.py b/RNS/Link.py index 586c4b0..9e3592a 100644 --- a/RNS/Link.py +++ b/RNS/Link.py @@ -687,12 +687,12 @@ class Link: if RNS.ResourceAdvertisement.is_request(packet): RNS.Resource.accept(packet, callback=self.request_resource_concluded) 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: 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) - pending_request.response_size = RNS.ResourceAdvertisement.get_size(packet) - pending_request.response_transfer_size = RNS.ResourceAdvertisement.get_transfer_size(packet) + pending_request.response_size = RNS.ResourceAdvertisement.read_size(packet) + pending_request.response_transfer_size = RNS.ResourceAdvertisement.read_transfer_size(packet) pending_request.started_at = time.time() elif self.resource_strategy == Link.ACCEPT_NONE: pass diff --git a/RNS/Resource.py b/RNS/Resource.py index 6d40e44..a7148b8 100644 --- a/RNS/Resource.py +++ b/RNS/Resource.py @@ -896,19 +896,19 @@ class ResourceAdvertisement: @staticmethod - def get_request_id(advertisement_packet): + def read_request_id(advertisement_packet): adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext) return adv.q @staticmethod - def get_transfer_size(advertisement_packet): + def read_transfer_size(advertisement_packet): adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext) return adv.t @staticmethod - def get_size(advertisement_packet): + def read_size(advertisement_packet): adv = ResourceAdvertisement.unpack(advertisement_packet.plaintext) return adv.d diff --git a/setup.py b/setup.py index 62ad8af..23074fe 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setuptools.setup( 'rnstatus=RNS.Utilities.rnstatus:main', 'rnprobe=RNS.Utilities.rnprobe:main', 'rnpath=RNS.Utilities.rnpath:main', - + 'rncp=RNS.Utilities.rncp:main', ] }, install_requires=['cryptography>=3.4.7', 'pyserial>=3.5', 'netifaces'],