fixes

[hippotat.git] / client

diff --git a/client b/client
index 931cb1f4c5fdcdd983407a2d9d7835d4e7bf6baf..922242d3bca8fe1cb447a19ca73698f5c70057d4 100755 (executable)
--- a/client
+++ b/client
@@ -48,7 +48,7 @@ outstanding = 0
 def start_client():
   global queue
   global agent
-  queue = PacketQueue(c.max_queue_time)
+  queue = PacketQueue('up', c.max_queue_time)
   agent = twisted.web.client.Agent(reactor, connectTimeout = c.http_timeout)
 
 def outbound(packet, saddr, daddr):
@@ -102,17 +102,25 @@ def check_outbound():
                   c.max_batch_up)
     
     crlf = b'\r\n'
+    lf   =   b'\n'
     mime = (b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="m"' + crlf +
-            password                                    + crlf +
+            b'Content-Disposition: form-data; name="m"' + crlf + crlf +
             str(c.client)             .encode('ascii')  + crlf +
+            password                                    + crlf +
             str(c.target_outstanding) .encode('ascii')  + crlf +
+          ((
             b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="d"' + crlf +
-            mime_translate(d)                           + crlf +
+            b'Content-Disposition: form-data; name="d"' + crlf + crlf +
+            mime_translate(d)                           + crlf
+           ) if len(d) else b'')                               +
             b'--b--'                                    + crlf)
 
-    print('REQUESTING ', mime, file=sys.stderr)
+    #df = open('data.dump.dbg', mode='wb')
+    #df.write(mime)
+    #df.close()
+    # POST -use -c 'multipart/form-data; boundary="b"' http://localhost:8099/ <data.dump.dbg
+
+    log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
 
     hh = { 'User-Agent': ['hippotat'],
            'Content-Type': ['multipart/form-data; boundary="b"'] }