proto_*: move TCP request in shm, not pkg

This is because TCP connection might get re-balanced on different nodes

Thanks go to ConnexCS for reporting this!

(cherry picked from commit c49ba70)

modules/proto_bin/bin_common.h

@@ -89,7 +89,8 @@ static inline int bin_handle_req(struct tcp_req *req,
 		if (!size && req != &_bin_common_current_req) {
 			/* if we no longer need this tcp_req
 			 * we can free it now */
-			pkg_free(req);
+			shm_free(req);
+			con->con_req = NULL;
 		}
 
 		con->msg_attempts = 0;
@@ -121,7 +122,7 @@ static inline int bin_handle_req(struct tcp_req *req,
 			/* let's duplicate this - most likely another conn will come in */
 
 			LM_DBG("We didn't manage to read a full request\n");
-			con->con_req = pkg_malloc(sizeof(struct tcp_req));
+			con->con_req = shm_malloc(sizeof(struct tcp_req));
 			if (con->con_req == NULL) {
 				LM_ERR("No more mem for dynamic con request buffer\n");
 				goto error;

modules/proto_hep/proto_hep.c

@@ -652,7 +652,8 @@ static inline int hep_handle_req(struct tcp_req *req,
 		if (!size && req != &hep_current_req) {
 			/* if we no longer need this tcp_req
 			 * we can free it now */
-			pkg_free(req);
+			shm_free(req);
+			con->con_req = NULL;
 		}
 
 		con->msg_attempts = 0;
@@ -681,7 +682,7 @@ static inline int hep_handle_req(struct tcp_req *req,
 			/* let's duplicate this - most likely another conn will come in */
 
 			LM_DBG("We didn't manage to read a full request\n");
-			con->con_req = pkg_malloc(sizeof(struct tcp_req));
+			con->con_req = shm_malloc(sizeof(struct tcp_req));
 			if (con->con_req == NULL) {
 				LM_ERR("No more mem for dynamic con request buffer\n");
 				goto error;

modules/proto_msrp/msrp_common.c

@@ -354,7 +354,7 @@ static int msrp_handle_req(struct msrp_req *req,
 		if (req != &msrp_current_req) {
 			/* if we no longer need this tcp_req
 			 * we can free it now */
-			pkg_free(req);
+			shm_free(req);
 			con->con_req = NULL;
 		}
 	} else {
@@ -375,7 +375,7 @@ static int msrp_handle_req(struct msrp_req *req,
 			/* let's duplicate this - most likely another conn will come in */
 
 			LM_DBG("We didn't manage to read a full request\n");
-			con_req = pkg_malloc(sizeof(struct msrp_req));
+			con_req = shm_malloc(sizeof(struct msrp_req));
 			if (con_req == NULL) {
 				LM_ERR("No more mem for dynamic con request buffer\n");
 				goto error;

modules/proto_smpp/proto_smpp.c

@@ -279,7 +279,8 @@ static int smpp_handle_req(struct tcp_req *req, struct tcp_connection *con)
 		if (!size && req != &smpp_current_req) {
 			/* if we no longer need this tcp_req
 			 * we can free it now */
-			pkg_free(req);
+			shm_free(req);
+			con->con_req = NULL;
 		}
 
 		con->msg_attempts = 0;
@@ -307,7 +308,7 @@ static int smpp_handle_req(struct tcp_req *req, struct tcp_connection *con)
 			/* let's duplicate this - most likely another conn will come in */
 
 			LM_DBG("We didn't manage to read a full request\n");
-			con->con_req = pkg_malloc(sizeof(struct tcp_req));
+			con->con_req = shm_malloc(sizeof(struct tcp_req));
 			if (con->con_req == NULL) {
 				LM_ERR("No more mem for dynamic con request buffer\n");
 				return -1;

modules/proto_ws/ws_common.h

@@ -556,7 +556,7 @@ static int ws_process(struct tcp_connection *con)
 		if (req != &_ws_common_current_req) {
 			/* make sure we cleanup the request in the connection */
 			con->con_req = NULL;
-			pkg_free(req);
+			shm_free(req);
 		}
 
 	} else {
@@ -573,7 +573,7 @@ static int ws_process(struct tcp_connection *con)
 			/* let's duplicate this - most likely another conn will come in */
 
 			LM_DBG("We didn't manage to read a full request\n");
-			newreq = pkg_malloc(sizeof(struct ws_req));
+			newreq = shm_malloc(sizeof(struct ws_req));
 			if (newreq == NULL) {
 				LM_ERR("No more mem for dynamic con request buffer\n");
 				goto error;

modules/proto_ws/ws_handshake_common.h

@@ -523,8 +523,10 @@ static int ws_server_handshake(struct tcp_connection *con)
 		}
 
 		con->msg_attempts = 0;
-		if (req != &_ws_common_tcp_current_req)
-			pkg_free(req);
+		if (req != &_ws_common_tcp_current_req) {
+			shm_free(req);
+			con->con_req = NULL;
+		}
 
 		/* handshake now completed, destroy the handshake data */
 		WS_STATE(con) = WS_CON_HANDSHAKE_DONE;
@@ -549,7 +551,7 @@ static int ws_server_handshake(struct tcp_connection *con)
 	if (!req->complete && (req == &_ws_common_tcp_current_req)) {
 		/* let's duplicate this - most likely another conn will come in */
 
-		con->con_req = pkg_malloc(sizeof(struct tcp_req));
+		con->con_req = shm_malloc(sizeof(struct tcp_req));
 		if (con->con_req == NULL) {
 			LM_ERR("No more mem for dynamic con request buffer\n");
 			goto error;
@@ -596,7 +598,7 @@ static int ws_server_handshake(struct tcp_connection *con)
 	if (WS_STATE(con) == WS_CON_BAD_REQ)
 		ws_bad_handshake(con);
 	if (req != &_ws_common_tcp_current_req) {
-		pkg_free(req);
+		shm_free(req);
 		con->con_req = NULL;
 	}
 	return -1;