From 948002b2d3132a59d807dc1e281a1714016dd7c5 Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Tue, 30 Jul 2024 18:07:44 -0700
Subject: [PATCH] fixTCP

issue https://github.com/SpudGunMan/meshing-around/issues/25
---
 mesh_bot.py | 30 +++++++++++++++++++-----------
 pong_bot.py | 30 +++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/mesh_bot.py b/mesh_bot.py
index 9871d8b..66ffeb4 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -148,19 +148,27 @@ def auto_response(message, snr, rssi, hop, message_from_id, channel_number, devi
     return bot_response
 
 def onReceive(packet, interface):
-    # extract interface from interface object
-    if interface2_enabled:
-        rxInterface = interface.__dict__.get('devPath')
-        if rxInterface == port2:
+    # extract interface  defailts from interface object
+    rxType = type(interface).__name__
+    rxNode = 0
+    # Debug print the interface object
+    #for item in interface.__dict__.items(): print (item)
+
+    if rxType == 'SerialInterface':
+        rxInterface = interface.__dict__.get('devPath', 'unknown')
+        if port1 in rxInterface:
+            rxNode = 1
+        elif interface2_enabled and port2 in rxInterface:
+            rxNode = 2
+    
+    if rxType == 'TCPInterface':
+        rxHost = interface.__dict__.get('hostname', 'unknown')
+        if hostname1 in rxHost and interface1_type == 'tcp':
+            rxNode = 1
+        elif interface2_enabled and hostname2 in rxHost and interface2_type == 'tcp':
             rxNode = 2
-        else:
-            rxNode = 0
-    else:
-        rxNode = 1
 
-    # receive a packet and process it, main instruction loop
-
-    # print the packet for debugging
+    # Debug print the packet for debugging
     #print(f"Packet Received\n {packet} \n END of packet \n")
     message_from_id = 0
 
diff --git a/pong_bot.py b/pong_bot.py
index ae0c958..b575b94 100755
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -56,19 +56,27 @@ def auto_response(message, snr, rssi, hop, message_from_id, channel_number, devi
     return bot_response
 
 def onReceive(packet, interface):
-    # extract interface from interface object
-    if interface2_enabled:
-        rxInterface = interface.__dict__.get('devPath')
-        if rxInterface == port2:
+    # extract interface  defailts from interface object
+    rxType = type(interface).__name__
+    rxNode = 0
+    # Debug print the interface object
+    #for item in interface.__dict__.items(): print (item)
+
+    if rxType == 'SerialInterface':
+        rxInterface = interface.__dict__.get('devPath', 'unknown')
+        if port1 in rxInterface:
+            rxNode = 1
+        elif interface2_enabled and port2 in rxInterface:
+            rxNode = 2
+    
+    if rxType == 'TCPInterface':
+        rxHost = interface.__dict__.get('hostname', 'unknown')
+        if hostname1 in rxHost and interface1_type == 'tcp':
+            rxNode = 1
+        elif interface2_enabled and hostname2 in rxHost and interface2_type == 'tcp':
             rxNode = 2
-        else:
-            rxNode = 0
-    else:
-        rxNode = 1
 
-    # receive a packet and process it, main instruction loop
-
-    # print the packet for debugging
+    # Debug print the packet for debugging
     #print(f"Packet Received\n {packet} \n END of packet \n")
     message_from_id = 0