From a8a643f15a6ca84ab3954c4818ba0f580853d35c Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Sun, 20 Nov 2022 11:54:43 +0100
Subject: [PATCH] first test run with overriding connection attempts #288

---
 gui/sock.js         | 4 ++--
 tnc/data_handler.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gui/sock.js b/gui/sock.js
index 1fc57fc8..13ba113b 100644
--- a/gui/sock.js
+++ b/gui/sock.js
@@ -525,7 +525,7 @@ exports.sendMessage = function(dxcallsign, mode, frames, data, checksum, uuid, c
     data = btoa(data)
 
     //command = '{"type" : "arq", "command" : "send_message", "parameter" : [{ "dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" :  "' + data + '" , "checksum" : "' + checksum + '"}]}'
-    command = '{"type" : "arq", "command" : "send_raw",  "uuid" : "'+ uuid +'", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '", attempts: "15"}]}'
+    command = '{"type" : "arq", "command" : "send_raw",  "uuid" : "'+ uuid +'", "parameter" : [{"dxcallsign" : "' + dxcallsign + '", "mode" : "' + mode + '", "n_frames" : "' + frames + '", "data" : "' + data + '", "attempts": "15"}]}'
     socketLog.info(command)
     socketLog.info("-------------------------------------")
     writeTncCommand(command)
@@ -563,7 +563,7 @@ exports.stopBeacon = function() {
 
 // OPEN ARQ SESSION
 exports.connectARQ = function(dxcallsign) {
-    command = '{"type" : "arq", "command" : "connect", "dxcallsign": "'+ dxcallsign + '", attempts: "15"}'
+    command = '{"type" : "arq", "command" : "connect", "dxcallsign": "'+ dxcallsign + '", "attempts": "15"}'
     writeTncCommand(command)
 }
 
diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index d520e44d..59fc3fd1 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -256,7 +256,8 @@ class DATA:
                 # [3] N_FRAMES_PER_BURST int
                 # [4] self.transmission_uuid str
                 # [5] mycallsign with ssid
-                self.open_dc_and_transmit(data[1], data[2], data[3], data[4], data[5])
+                # [6] attempts
+                self.open_dc_and_transmit(data[1], data[2], data[3], data[4], data[5], data[6])
 
             else:
                 self.log.error(
@@ -1594,7 +1595,7 @@ class DATA:
             n_frames_per_burst: int,
             transmission_uuid: str,
             mycallsign,
-            attempts,
+            attempts:int,
     ) -> bool:
         """
         Open data channel and transmit data
@@ -1605,6 +1606,7 @@ class DATA:
           n_frames_per_burst:int:
           transmission_uuid:str:
           mycallsign:bytes:
+          attempts:int: Overriding number of attempts initiating a connection
 
         Returns:
             True if the data session was opened and the data was sent