From 171e14ddc3ad2f236323f3e4b0dd15a2d4c56af0 Mon Sep 17 00:00:00 2001
From: icex2 <djh.icex2@gmail.com>
Date: Sat, 23 Jan 2021 20:47:04 +0100
Subject: [PATCH] prinet-proxy: Handle uni-directional messages + bugfix
 cleanup

Allow handling of uni-directional messages not closing the
connection.

This also fixes cleanup of buffers on each iteration which wasn't
done properly before when the inner loop was successful.
The labeled cleanup part was skipped.
---
 src/main/pumpnet/prinet-proxy/main.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/pumpnet/prinet-proxy/main.c b/src/main/pumpnet/prinet-proxy/main.c
index f0760a8..40f6cf9 100644
--- a/src/main/pumpnet/prinet-proxy/main.c
+++ b/src/main/pumpnet/prinet-proxy/main.c
@@ -236,7 +236,11 @@ int main(int argc, char** argv)
             continue;
         }
 
-        while (true) {
+        bool inner_loop;
+
+        inner_loop = true;
+
+        do {
             struct pumpnet_prinet_proxy_packet* source_req = NULL;
             struct util_iobuf pumpnet_data_req;
             struct util_iobuf pumpnet_data_resp;
@@ -246,6 +250,7 @@ int main(int argc, char** argv)
 
             if (!source_req) {
                 log_error("Receiving request from source failed");
+                inner_loop = false;
                 goto cleanup_iteration;
             }
 
@@ -254,6 +259,7 @@ int main(int argc, char** argv)
 
             if (!_transform_data_request(source_req, &pumpnet_data_req)) {
                 log_error("Transforming data request for destination failed");
+                inner_loop = false;
                 goto cleanup_iteration;
             }
 
@@ -265,8 +271,16 @@ int main(int argc, char** argv)
                 pumpnet_data_resp.bytes,
                 pumpnet_data_resp.nbytes);
 
+            // Uni-directional message, no response received
+            // Skip response processing because there is nothing to process
+            if (pumpnet_recv_size == -1) {
+                log_debug("Request was uni-directional message, skipping response");
+                goto cleanup_iteration;
+            }
+
             if (pumpnet_recv_size < 0) {
                 log_error("Request to pumpnet failed");
+                inner_loop = false;
                 goto cleanup_iteration;
             }
 
@@ -277,16 +291,16 @@ int main(int argc, char** argv)
 
             if (!_transform_data_response(source_req, &pumpnet_data_resp, source_resp)) {
                 log_error("Transforming data response for source failed");
+                inner_loop = false;
                 goto cleanup_iteration;
             }
 
             if (!_send_response_source(source_con, source_resp)) {
                 log_error("Sending response to source failed");
+                inner_loop = false;
                 goto cleanup_iteration;
             }
 
-            continue;
-
         cleanup_iteration:
             if (source_req != NULL) {
                 util_xfree((void**) &source_req);
@@ -303,9 +317,7 @@ int main(int argc, char** argv)
             if (source_resp != NULL) {
                 util_xfree((void**) &source_resp);
             }
-
-            break;
-        }
+        } while (inner_loop);
 
         util_sock_tcp_close(source_con);
     }