Mirror/markqvist___LXST
1
0
Fork 0
mirror of https://github.com/markqvist/LXST.git synced 2026-04-27 14:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync upstream.

Browse source
This commit is contained in:
Mark Qvist 2025-03-14 14:23:53 +01:00
commit 8b23d792a6
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
LXST/Primitives/Telephony.py
View file

@ -86,8 +86,8 @@ class Telephone(SignallingReceiver):
RNS.Transport.deregister_destination(self.destination) RNS.Transport.deregister_destination(self.destination)
self.destination = None self.destination = None
def announce(self): def announce(self, attached_interface=None):
self.destination.announce() self.destination.announce(attached_interface=attached_interface)
self.last_announce = time.time() self.last_announce = time.time()
def set_allowed(self, allowed): def set_allowed(self, allowed):

2
LXST/_version.py
View file

@ -1 +1 @@
__version__ = "0.2.5" __version__ = "0.2.7"

12
docs/rns_audio_call_calc.py
View file

@ -4,7 +4,7 @@ import RNS
import RNS.vendor.umsgpack as mp import RNS.vendor.umsgpack as mp
def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200, def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
signalling_bytes=14, method="msgpack"): signalling_bytes=14, token_overhead=48, method="msgpack"):
# Simulated on-air link speed # Simulated on-air link speed
LINK_SPEED = link_speed LINK_SPEED = link_speed
@ -51,13 +51,14 @@ def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
exit(1) exit(1)
# Calculate required encrypted token blocks # Calculate required encrypted token blocks
TOKEN_OVERHEAD = token_overhead
BLOCKSIZE = 16 BLOCKSIZE = 16
REQUIRED_BLOCKS = math.ceil((PL_LEN+1)/BLOCKSIZE) REQUIRED_BLOCKS = math.ceil((PL_LEN+1)/BLOCKSIZE)
ENCRYPTED_PAYLOAD_LEN = REQUIRED_BLOCKS*BLOCKSIZE ENCRYPTED_PAYLOAD_LEN = REQUIRED_BLOCKS*BLOCKSIZE
BLOCK_HEADROOM = (REQUIRED_BLOCKS*BLOCKSIZE) - PL_LEN - 1 BLOCK_HEADROOM = (REQUIRED_BLOCKS*BLOCKSIZE) - PL_LEN - 1
# The complete on-air packet length # The complete on-air packet length
PACKET_LEN = PHY_OVERHEAD+RNS_OVERHEAD+ENCRYPTED_PAYLOAD_LEN PACKET_LEN = PHY_OVERHEAD+RNS_OVERHEAD+ENCRYPTED_PAYLOAD_LEN+TOKEN_OVERHEAD
PACKET_LATENCY = round(PACKET_LEN*PER_BYTE_LATENCY_MS, 1) PACKET_LATENCY = round(PACKET_LEN*PER_BYTE_LATENCY_MS, 1)
# TODO: This should include any additional # TODO: This should include any additional
@ -71,6 +72,7 @@ def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
# Calculate latencies # Calculate latencies
TRANSPORT_LATENCY = round((PHY_OVERHEAD+RNS_OVERHEAD)*PER_BYTE_LATENCY_MS, 1) TRANSPORT_LATENCY = round((PHY_OVERHEAD+RNS_OVERHEAD)*PER_BYTE_LATENCY_MS, 1)
TOKEN_LATENCY = round((TOKEN_OVERHEAD)*PER_BYTE_LATENCY_MS, 1)
PAYLOAD_LATENCY = round(ENCRYPTED_PAYLOAD_LEN*PER_BYTE_LATENCY_MS, 1) PAYLOAD_LATENCY = round(ENCRYPTED_PAYLOAD_LEN*PER_BYTE_LATENCY_MS, 1)
RAW_DATA_LATENCY = round(AUDIO_LEN*PER_BYTE_LATENCY_MS, 1) RAW_DATA_LATENCY = round(AUDIO_LEN*PER_BYTE_LATENCY_MS, 1)
@ -94,6 +96,7 @@ def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
print(f" Payload length : {PL_LEN} bytes") print(f" Payload length : {PL_LEN} bytes")
print(f" AES blocks needed : {REQUIRED_BLOCKS}") print(f" AES blocks needed : {REQUIRED_BLOCKS}")
print(f" Encrypted payload : {ENCRYPTED_PAYLOAD_LEN} bytes") print(f" Encrypted payload : {ENCRYPTED_PAYLOAD_LEN} bytes")
print(f" Token overhead : {TOKEN_OVERHEAD} bytes")
print(f" Transport overhead : {TRANSPORT_OVERHEAD} bytes ({RNS_OVERHEAD} from RNS, {PHY_OVERHEAD} from PHY)") print(f" Transport overhead : {TRANSPORT_OVERHEAD} bytes ({RNS_OVERHEAD} from RNS, {PHY_OVERHEAD} from PHY)")
print(f" On-air length : {PACKET_LEN} bytes") print(f" On-air length : {PACKET_LEN} bytes")
print(f" Packet airtime : {round(PACKET_AIRTIME,2)}ms") print(f" Packet airtime : {round(PACKET_AIRTIME,2)}ms")
@ -107,6 +110,7 @@ def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
print(f" Audio data : contributes {RAW_DATA_LATENCY}ms") print(f" Audio data : contributes {RAW_DATA_LATENCY}ms")
print(f" Packing format : contributes {PACKING_LATENCY}ms") print(f" Packing format : contributes {PACKING_LATENCY}ms")
print(f" Encryption : contributes {ENCRYPTION_LATENCY}ms {E_OPT_STR}") print(f" Encryption : contributes {ENCRYPTION_LATENCY}ms {E_OPT_STR}")
print(f" Token overhead : contributes {TOKEN_LATENCY}ms")
print(f" RNS+PHY overhead : contributes {TRANSPORT_LATENCY}ms") print(f" RNS+PHY overhead : contributes {TRANSPORT_LATENCY}ms")
print(f"") print(f"")
print(f" Half-duplex airtime : {round(AIRTIME_PCT, 2)}% of link capacity") print(f" Half-duplex airtime : {round(AIRTIME_PCT, 2)}% of link capacity")
@ -133,8 +137,8 @@ def simulate(link_speed=2735, audio_slot_ms=400, codec_rate=1200,
#simulate(link_speed=60e3, audio_slot_ms=270, codec_rate=12000, #simulate(link_speed=60e3, audio_slot_ms=270, codec_rate=12000,
# signalling_bytes=18, method="msgpack") # signalling_bytes=18, method="msgpack")
simulate(link_speed=9600, audio_slot_ms=300, codec_rate=3200, simulate(link_speed=10e3, audio_slot_ms=353, codec_rate=6000,
signalling_bytes=2, method="msgpack") signalling_bytes=0, token_overhead=16+32*1, method="msgpack")
#print("\n\n= With protobuf ===============") #print("\n\n= With protobuf ===============")
#simulate(method="protobuf") #simulate(method="protobuf")