Merge pull request #1221 from MetPX/another_am_send_bug

ANOTHER AM U18.04 adaptation + another AM sender problem found in satnet testings
MetPX · Sep 23, 2024 · 5c6f954 · 5c6f954
2 parents ffb91f7 + 684fb7b
commit 5c6f954
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/sarracenia/examples/flow/amserver.conf b/sarracenia/examples/flow/amserver.conf
@@ -17,7 +17,9 @@ directory /tmp/am_receiver
 accept .*
 sum sha512
 AllowIPs 127.0.0.1 
-AllowIPs 199.212.17.131/24
+AllowIPs 199.212.17.131
+AllowIPs 199.212.17.132
+AllowIPs 199.212.17.133
 
-sendTo am://0.0.0.0:5003
+sendTo am://0.0.0.0:5005
 debug on
diff --git a/sarracenia/flowcb/gather/am.py b/sarracenia/flowcb/gather/am.py
@@ -261,7 +261,7 @@ def addBuffer(self):
 
         # We don't want to wait on a hanging connection. We use the timeout error to exit out of the reception if there is nothing.
         # This in turn makes the whole flow the same as any other sarracenia flow.
-        except TimeoutError:
+        except (TimeoutError,socket.timeout):
             return
 
         except Exception as e:

diff --git a/sarracenia/flowcb/send/am.py b/sarracenia/flowcb/send/am.py
@@ -70,8 +70,8 @@ def wrapbulletin(self, sarra_msg):
         s = struct.Struct(self.patternAM)
         size = struct.calcsize('80s')
 
-        msg_path = sarra_msg['new_relPath']
-        msg_file = open(os.sep + msg_path, 'rb')
+        msg_path = sarra_msg['new_dir'] + '/' + sarra_msg['new_file']
+        msg_file = open(msg_path, 'rb')
         data = msg_file.read()
         msg_file.close()