From 9468ceb6fc3e4b0555938e661c454e0cf6433e27 Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Mon, 5 Dec 2022 16:57:45 +0100
Subject: [PATCH] fixed a bug in callsign parsing

---
 tnc/data_handler.py | 17 ++++++++++-------
 tnc/sock.py         | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index 02e9985c..a259c6de 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -239,13 +239,15 @@ class DATA:
 
             # Dispatch commands that need more arguments.
             elif data[0] == "CONNECT":
-                # [1] dxcallsign
-                # [2] attempts
+                # [1] mycallsign
+                # [2] dxcallsign
+                # [3] attempts
                 self.arq_session_handler(data[1], data[2], data[3])
 
             elif data[0] == "PING":
-                # [1] dxcallsign
-                self.transmit_ping(data[1])
+                # [1] mycallsign
+                # [2] dxcallsign
+                self.transmit_ping(data[1], data[2])
 
             elif data[0] == "BEACON":
                 # [1] INTERVAL int
@@ -2183,10 +2185,11 @@ class DATA:
             self.arq_cleanup()
 
     # ---------- PING
-    def transmit_ping(self, dxcallsign: bytes) -> None:
+    def transmit_ping(self, mycallsign: bytes, dxcallsign: bytes) -> None:
         """
         Funktion for controlling pings
         Args:
+          mycallsign:bytes:
           dxcallsign:bytes:
 
         """
@@ -2200,7 +2203,7 @@ class DATA:
         self.send_data_to_socket_queue(freedata="tnc-message", ping="transmitting")
         self.log.info(
             "[TNC] PING REQ ["
-            + str(self.mycallsign, "UTF-8")
+            + str(mycallsign, "UTF-8")
             + "] >>> ["
             + str(dxcallsign, "UTF-8")
             + "]"
@@ -2210,7 +2213,7 @@ class DATA:
         ping_frame[:1] = bytes([FR_TYPE.PING.value])
         ping_frame[1:4] = static.DXCALLSIGN_CRC
         ping_frame[4:7] = static.MYCALLSIGN_CRC
-        ping_frame[7:13] = helpers.callsign_to_bytes(self.mycallsign)
+        ping_frame[7:13] = helpers.callsign_to_bytes(mycallsign)
 
         self.log.info("[TNC] ENABLE FSK", state=static.ENABLE_FSK)
         if static.ENABLE_FSK:
diff --git a/tnc/sock.py b/tnc/sock.py
index 03c2e4ae..67ce967b 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -333,13 +333,22 @@ def process_tnc_commands(data):
                 if not str(dxcallsign).strip():
                     raise NoCallsign
 
-                # additional step for beeing sure our callsign is correctly
+                # additional step for being sure our callsign is correctly
                 # in case we are not getting a station ssid
                 # then we are forcing a station ssid = 0
                 dxcallsign = helpers.callsign_to_bytes(dxcallsign)
                 dxcallsign = helpers.bytes_to_callsign(dxcallsign)
 
-                DATA_QUEUE_TRANSMIT.put(["PING", dxcallsign])
+                # check if specific callsign is set with different SSID than the TNC is initialized
+                try:
+                    mycallsign = received_json["mycallsign"]
+                    mycallsign = helpers.callsign_to_bytes(mycallsign)
+                    mycallsign = helpers.bytes_to_callsign(mycallsign)
+
+                except Exception:
+                    mycallsign = static.MYCALLSIGN
+
+                DATA_QUEUE_TRANSMIT.put(["PING", mycallsign, dxcallsign])
                 command_response("ping", True)
             except NoCallsign:
                 command_response("ping", False)
@@ -367,7 +376,7 @@ def process_tnc_commands(data):
 
             # check if specific callsign is set with different SSID than the TNC is initialized
             try:
-                mycallsign = received_json["parameter"][0]["mycallsign"]
+                mycallsign = received_json["mycallsign"]
                 mycallsign = helpers.callsign_to_bytes(mycallsign)
                 mycallsign = helpers.bytes_to_callsign(mycallsign)