Solved bug with MLLP socket

Author: tiagoepr

mllp_http_https/https2mllp.py

@@ -81,7 +81,7 @@ def send(self, data):
         if connection is None:
             connection = self._connect()
         response = connection.send(data)
-        if self.options.max_messages <= connection.message_count and self.options.max_messages >= 0:
+        if connection.message_count >= self.options.max_messages >= 0:
             connection.close()
         else:
             connection.last_update = time.monotonic()
@@ -148,6 +148,10 @@ def __init__(self, request, address, server, mllp_client,
         self.mllp_parser = mllp_parser
         super().__init__(request, address, server)
 
+    # Disable log from handler
+    def log_message(self, format, *args):
+        pass
+
     # For Authentication
     def do_AUTHHEAD(self):
         self.send_response(401)
@@ -264,6 +268,7 @@ def serve(address, options, mllp_address, mllp_options):
     try:
         server = http.server.ThreadingHTTPServer(address, handler)
 
+
         # >> Dealing with SSL/TLS on the HTTP server side
         # For Python > 3.7
         context = ssl.SSLContext(ssl.PROTOCOL_TLS)

mllp_http_https/main.py

@@ -537,4 +537,4 @@ def mllp2https():
 
 # For debugging reasons
 #mllp2https()
-#https2mllp()
+https2mllp()

mllp_http_https/mllp.py

@@ -108,6 +108,18 @@ def send_mllp(socket, content):
     socket.sendall(bytes([Format.END_BLOCK, Format.CARRIAGE_RETURN]))
 
     # Wait for the ACK/NACK
-    response = socket.recv(4096)
-    return response
+    response = bytearray()
+    end_block = bytes([Format.END_BLOCK])
+    while True:
+        if end_block in response:
+            # print('finished', bytes(response))
+            break
+        else:
+            packet = socket.recv(1024)
+            if not packet:
+                break
+            else:
+                response.extend(packet)
+                # print(bytes(response))
+    return bytes(response)
 

mllp_http_https/version.py

@@ -1 +1 @@
-__version__ = "1.2.39"
+__version__ = "1.2.40"