mirror of
https://github.com/BOSWatch/BW3-Core.git
synced 2025-12-06 07:12:04 +01:00
Fix POCSAG decoding crash caused by invalid subric parsing
Errorcode führte zu Programmexit:
> 12.10.2025 02:20:39,918 - inputThread sdrInput _runThread [ERROR] error in sdr input routine
Traceback (most recent call last):
> File "/opt/boswatch3/boswatch/inputSource/sdrInput.py", line 65, in _runThread
> self.addToQueue(line)
> ...
> ValueError: invalid literal for int() with base 10: ' '
Ursache:
Die Funktion `_getBitrateRicSubric()` in `pocsagDecoder.py` griff fest auf `data[40]` zu, um den SubRIC-Wert zu ermitteln. Bei Fehlerhaften Datensätzen von multimon-ng kann sich die Position jedoch verschieben, wodurch an dieser Stelle ein Leerzeichen (' ') statt einer Ziffer stand. Dies führte zu einem ValueError und damit zum Abbruch des gesamten SDR-Threads.
Änderung:
Die Funktion wurde auf robuste Regex-Analyse umgestellt (analog fmsDecoder.py und pocsagDecoder.py):
- Bitrate, Address (RIC) und Function (SubRIC) werden nun mit regulären Ausdrücken extrahiert.
- Die ursprüngliche Logik (`subric = int(Function) + 1`) bleibt vollständig erhalten.
- Enthält die Zeile keine gültige Function, wird eine Warnung geloggt ("Invalid POCSAG function (not 0–3)")
- Zusätzliche Fehlerabsicherung durch try/except.
Ergebnis:
Der Decoder ist nun tolerant gegenüber Formatabweichungen und verhindert Abstürze bei fehlerhaften oder unvollständigen multimon-ng-Zeilen.
This commit is contained in:
parent
017e882363
commit
23d1b1a328
|
|
@ -9,8 +9,8 @@ r"""!
|
||||||
German BOS Information Script
|
German BOS Information Script
|
||||||
by Bastian Schroll
|
by Bastian Schroll
|
||||||
|
|
||||||
@file: pocsag.py
|
@file: pocsagDecoder.py
|
||||||
@date: 06.01.2018
|
@date: 15.10.2025
|
||||||
@author: Bastian Schroll
|
@author: Bastian Schroll
|
||||||
@description: Decoder class for pocsag
|
@description: Decoder class for pocsag
|
||||||
"""
|
"""
|
||||||
|
|
@ -38,10 +38,15 @@ class PocsagDecoder:
|
||||||
@return BOSWatch POCSAG packet or None"""
|
@return BOSWatch POCSAG packet or None"""
|
||||||
bitrate, ric, subric = PocsagDecoder._getBitrateRicSubric(data)
|
bitrate, ric, subric = PocsagDecoder._getBitrateRicSubric(data)
|
||||||
|
|
||||||
if re.search("[0-9]{7}", ric) and re.search("[1-4]", subric):
|
# If no valid SubRIC (Function 0–3) detected → abort
|
||||||
|
if subric is None:
|
||||||
|
logging.warning("Invalid POCSAG function (not 0–3)")
|
||||||
|
return None
|
||||||
|
|
||||||
|
if ric and len(ric) == 7:
|
||||||
if "Alpha:" in data:
|
if "Alpha:" in data:
|
||||||
message = data.split('Alpha:')[1].strip()
|
message = data.split('Alpha:')[1].strip()
|
||||||
message = message.replace('<NUL>', '').replace('<NUL', '').replace('< NUL>', '').replace('<EOT>', '').strip()
|
message = re.sub(r'<\s*(?:NUL|EOT)\s*>?', '', message).strip()
|
||||||
else:
|
else:
|
||||||
message = ""
|
message = ""
|
||||||
subricText = subric.replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d")
|
subricText = subric.replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d")
|
||||||
|
|
@ -63,27 +68,27 @@ class PocsagDecoder:
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _getBitrateRicSubric(data):
|
def _getBitrateRicSubric(data):
|
||||||
r"""!Gets the Bitrate, Ric and Subric from data
|
"""Gets the Bitrate, Ric and Subric from data using robust regex parsing."""
|
||||||
|
bitrate = "0"
|
||||||
@param data: POCSAG data string
|
ric = None
|
||||||
@return bitrate
|
subric = None
|
||||||
@return ric
|
|
||||||
@return subric"""
|
|
||||||
bitrate, ric, subric = "0", "0", "0"
|
|
||||||
|
|
||||||
|
# determine bitrate
|
||||||
if "POCSAG512:" in data:
|
if "POCSAG512:" in data:
|
||||||
bitrate = "512"
|
bitrate = "512"
|
||||||
ric = data[20:27].replace(" ", "").zfill(7)
|
|
||||||
subric = str(int(data[39]) + 1)
|
|
||||||
|
|
||||||
elif "POCSAG1200:" in data:
|
elif "POCSAG1200:" in data:
|
||||||
bitrate = "1200"
|
bitrate = "1200"
|
||||||
ric = data[21:28].replace(" ", "").zfill(7)
|
|
||||||
subric = str(int(data[40]) + 1)
|
|
||||||
|
|
||||||
elif "POCSAG2400:" in data:
|
elif "POCSAG2400:" in data:
|
||||||
bitrate = "2400"
|
bitrate = "2400"
|
||||||
ric = data[21:28].replace(" ", "").zfill(7)
|
|
||||||
subric = str(int(data[40]) + 1)
|
# extract RIC (address)
|
||||||
|
m_ric = re.search(r'Address:\s*(\d{1,7})(?=\s|$)', data)
|
||||||
|
if m_ric:
|
||||||
|
ric = m_ric.group(1).zfill(7)
|
||||||
|
|
||||||
|
# extract SubRIC (function)
|
||||||
|
m_sub = re.search(r'Function:\s*([0-3])', data)
|
||||||
|
if m_sub:
|
||||||
|
subric = str(int(m_sub.group(1)) + 1)
|
||||||
|
|
||||||
return bitrate, ric, subric
|
return bitrate, ric, subric
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue