Merge pull request #19 from VultureProject/dev

Version 1.2

Author: HugoSoszynski

darwin/darwinapi.py

@@ -248,7 +248,7 @@ def low_level_call(self, **kwargs):
                 ))
 
             if darwin_body is not None:
-                darwin_header.body_size = len(darwin_body)
+                darwin_header.body_size = len(darwin_body) + 1 # See l. 270
 
             else:
                 darwin_header.body_size = 0
@@ -267,6 +267,15 @@ def low_level_call(self, **kwargs):
             self.socket.sendall(darwin_header)
 
             if darwin_body is not None:
+                #
+                # This '\n' is added to make sure the packets are correctly forwarded to Darwin with all TCP forwarder.
+                # This addition does not interfere with the json parsing made by Darwin.
+                #
+                # Some TCP forwarder are holding on the TCP packet unless the packet contains a newline '\n'.
+                # This behavior was observed with :
+                #   - HAProxy 2.2.5
+                #
+                darwin_body += '\n'
                 if self.verbose:
                     print("DarwinApi:: low_level_call:: Sending body \"{darwin_body}\" to Darwin...".format(
                         darwin_body=darwin_body,

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="darwin",
-    version="1.1",
+    version="1.2",
     description="Call Darwin with your Python code!",
     url="https://github.com/VultureProject/darwin-client-python",
     author="Guillaume Catto",