Assigning socket correctly

Author: davidtrihy-genesys

modules/topology_hiding/th_no_dlg_logic.c

@@ -1438,8 +1438,10 @@ static int th_no_dlg_seq_handling(struct sip_msg *msg, str *info, decode_info_fn
 
 	param = NULL;
 
-	if (!sock) {
-		sock = msg->force_send_socket;
+	if (sock != NULL) {
+		msg->force_send_socket = sock;
+	} else {
+		LM_WARN("Socket is NULL, using default ingress socket\n");
 	}
 
     one_way_hiding = th_no_dlg_one_way_hiding(sock);

modules/topology_hiding/topology_hiding.c

@@ -568,8 +568,4 @@ static int pv_topo_decoded_contact(struct sip_msg *msg, pv_param_t *param, pv_va
 		return pv_get_null(msg, param, res);
 
 	return pv_topo_decoded_uri(msg, param, res, 0);
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> 76e1a95621 (Ported user changes)