Do ref for nua handles when intercepting query results. Allow override. (#291)

andywolk · web-flow · commit 28636e1b30cc · 2025-04-04T20:38:41.000+03:00
* Do ref for nua handles when intercepting query results.

* nua_handle can override nua handle defaults
diff --git a/libsofia-sip-ua/nta/nta.c b/libsofia-sip-ua/nta/nta.c
@@ -8196,6 +8196,7 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
     SU_DEBUG_3(("nta outgoing create: %s\n",
 		invalid < 0 ? "invalid URI" :
 		!orq->orq_branch ? "no branch" : "invalid message"));
+    orq->orq_intercept_query_results = 0; /* Let the caller do nua_handle_unref for it */
     outgoing_free(orq);
     return NULL;
   }
@@ -8221,8 +8222,10 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
 
     if (orq->orq_status < 300)
       retval = (void *)-1;	/* NONE */
-    else
-      retval = NULL, orq->orq_request = NULL;
+    else {
+        retval = NULL, orq->orq_request = NULL;
+        orq->orq_intercept_query_results = 0; /* Let the caller do nua_handle_unref (su_home_unref) for it */
+    }
 
     outgoing_free(orq);
 
@@ -8920,6 +8923,11 @@ void outgoing_reclaim(nta_outgoing_t *orq)
   if (orq->orq_resolver)
     outgoing_destroy_resolver(orq);
 #endif
+  if (orq->orq_intercept_query_results) {
+      su_home_unref((su_home_t *)orq->orq_intercept_query_results);
+      orq->orq_intercept_query_results = 0;
+  }
+
   su_free(orq->orq_agent->sa_home, orq);
 }
 
@@ -11048,7 +11056,7 @@ void outgoing_answer_a(sres_context_t *orq, sres_query_t *q,
   outgoing_query_results(orq, sq, results, found);
 }
 
-int nua_client_intercept_query_results(const void *nua_handle, void *cr, nta_outgoing_t *orq, sip_t const *sip);
+int nua_client_intercept_query_results(const void *handle, void *cr, nta_outgoing_t *orq, sip_t const *sip);
 
 /** Store A/AAAA query results */
 static void
diff --git a/libsofia-sip-ua/nua/nua_client.c b/libsofia-sip-ua/nua/nua_client.c
@@ -942,11 +942,12 @@ int nua_base_client_request(nua_client_request_t *cr, msg_t *msg, sip_t *sip,
 			    tagi_t const *tags)
 {
   nua_handle_t *nh = cr->cr_owner;
+  nua_handle_t *intercept_nh = NULL;
   int proxy_is_set = NH_PISSET(nh, proxy);
   url_string_t * proxy = NH_PGET(nh, proxy);
   int call_tls_orq_connect_timeout_is_set = NH_PISSET(nh, call_tls_orq_connect_timeout);
   uint32_t call_tls_orq_connect_timeout = NH_PGET(nh, call_tls_orq_connect_timeout);
-  int intercept_query_results_is_set = NUA_PISSET(nh->nh_nua, nh, intercept_query_results);
+  int intercept_query_results_is_set = NH_PGET(nh, intercept_query_results);
 
   if (nh->nh_auth) {
     if (cr->cr_challenged ||
@@ -960,13 +961,17 @@ int nua_base_client_request(nua_client_request_t *cr, msg_t *msg, sip_t *sip,
 
   assert(cr->cr_orq == NULL);
 
+  if (intercept_query_results_is_set) {
+      intercept_nh = nua_handle_ref(nh);
+  }
+
   cr->cr_orq = nta_outgoing_mcreate(nh->nh_nua->nua_nta,
 				    nua_client_orq_response,
 				    nua_client_request_ref(cr),
 				    NULL,
 				    msg,
 				    TAG_IF(intercept_query_results_is_set,
-					   NTATAG_INTERCEPT_QUERY_RESULTS(nh)),
+					   NTATAG_INTERCEPT_QUERY_RESULTS(intercept_nh)),
 				    TAG_IF(proxy_is_set,
 					   NTATAG_DEFAULT_PROXY(proxy)),
 				    TAG_IF(call_tls_orq_connect_timeout_is_set,
@@ -975,6 +980,9 @@ int nua_base_client_request(nua_client_request_t *cr, msg_t *msg, sip_t *sip,
 
   if (cr->cr_orq == NULL) {
     nua_client_request_unref(cr);
+    if (intercept_nh) {
+        nua_handle_unref(intercept_nh);
+    }
     return -1;
   }
 
@@ -989,7 +997,7 @@ static inline void nua_client_intercept_response(nua_client_request_t *cr,
   nua_handle_t *nh = cr->cr_owner;
   nua_t *nua = nh ? nh->nh_nua : NULL;
   nua_dialog_usage_t *du = cr->cr_usage;
-  unsigned intercept_query_results = nh ? NUA_PISSET(nh->nh_nua, nh, intercept_query_results) : 0;
+  unsigned intercept_query_results = nh ? NH_PGET(nh, intercept_query_results) : 0;
 
   if (intercept_query_results && sip && status != 408 && nua) {
     /* At this point we have a successful response */
@@ -1013,7 +1021,7 @@ static inline void nua_client_intercept_response(nua_client_request_t *cr,
   }
 }
 
-int nua_client_intercept_query_results(const void *nua_handle, void *_cr,
+int nua_client_intercept_query_results(const void *handle, void *_cr,
                                         nta_outgoing_t *orq,
                                         sip_t const *sip)
 {
@@ -1023,28 +1031,43 @@ int nua_client_intercept_query_results(const void *nua_handle, void *_cr,
 
   if (nta_outgoing_query_results(orq, &results, &found) != NULL) {
     /* See NTATAG_INTERCEPT_QUERY_RESULTS and NUTAG_INTERCEPT_QUERY_RESULTS */
-    nua_handle_t *nh = nua_handle ? (nua_handle_t *)nua_handle : cr->cr_owner;
+    nua_handle_t *nh = handle ? (nua_handle_t *)handle : (cr ? cr->cr_owner : NULL);
     nua_dialog_usage_t *du = cr ? cr->cr_usage : NULL;
     nua_dialog_state_t *ds = du ? du->du_dialog : NULL;
 
     SU_DEBUG_0(("Query results have been intercepted. Trying to override...\n" VA_NONE));
 
     if (!ds && nh) {
-      ds = nh->nh_ds;
+        if (NH_IS_VALID(nh)) {
+            ds = nh->nh_ds;
+        } else {
+            SU_DEBUG_0(("Warning! nh is not valid! Can not intercept! No ds!\n" VA_NONE));
+        }
     }
 
     if (ds && ds->ds_intercepted_ip) {
       if (found) {
-        msg_t *response = nta_outgoing_getresponse(orq);
-        su_home_t *home = response ? msg_home(response) : msg_home(nh);
+        msg_t *request = nta_outgoing_getrequest(orq);
+        su_home_t *home = request ? msg_home(request) : NULL;
+
+        if (!home) {
+            if (NH_IS_VALID(nh)) {
+                home = msg_home(nh);
+            } else {
+                SU_DEBUG_0(("Warning! nh is not valid! Can not intercept! No home!\n" VA_NONE));
+            }
+        }
 
-        SU_DEBUG_0(("Intercepted IP address: [%s]->[%s]\n", results[0], ds->ds_intercepted_ip));
-        results[0] = su_strdup(home, ds->ds_intercepted_ip);
-        msg_destroy(response);
+        if (home) {
+            SU_DEBUG_0(("Intercepted IP address: [%s]->[%s]\n", results[0], ds->ds_intercepted_ip));
+            results[0] = su_strdup(home, ds->ds_intercepted_ip);
 
-        if (found > 1) {
-          results[1] = NULL;
+            if (found > 1) {
+                results[1] = NULL;
+            }
         }
+
+        msg_destroy(request);
       }
     }
 
diff --git a/libsofia-sip-ua/nua/nua_session.c b/libsofia-sip-ua/nua/nua_session.c
@@ -1229,6 +1229,7 @@ static
 int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
 {
   nua_handle_t *nh = cr->cr_owner;
+  nua_handle_t *intercept_nh = NULL;
   nua_dialog_state_t *ds = nh->nh_ds;
   nua_session_usage_t *ss = nua_dialog_usage_private(cr->cr_usage);
 
@@ -1360,13 +1361,16 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
 
     proxy_is_set = NH_PISSET(nh, proxy);
     proxy = NH_PGET(nh, proxy);
-    intercept_query_results_is_set = NUA_PISSET(nh->nh_nua, nh, intercept_query_results);
+    intercept_query_results_is_set = NH_PGET(nh, intercept_query_results);
+    if (intercept_query_results_is_set) {
+        intercept_nh = nua_handle_ref(nh);
+    }
 
     if ((ack = nta_outgoing_mcreate(nh->nh_nua->nua_nta, NULL, NULL, NULL,
 				    msg,
 				    NTATAG_ACK_BRANCH(invite_branch),
 				    TAG_IF(intercept_query_results_is_set,
-					   NTATAG_INTERCEPT_QUERY_RESULTS(nh)),
+					   NTATAG_INTERCEPT_QUERY_RESULTS(intercept_nh)),
 				    TAG_IF(proxy_is_set,
 					   NTATAG_DEFAULT_PROXY(proxy)),
 				    SIPTAG_END(),
@@ -1384,6 +1388,11 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
       reason = "SIP;cause=500;text=\"Internal Error\"";
     }
 
+    if (!ack && intercept_nh) {
+        /* Unref in case of outgoing create error */
+        nua_handle_unref(intercept_nh);
+    }
+
     if (ss && reason)
       ss->ss_reason = reason;
 
