Changeset 882

Timestamp:

Jan 14, 2007 12:39:45 AM (18 years ago)

Author:

bennylp

Message:

Continuing work on ticket #50: make explicit transport selection works for sending response

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsip/sip_dialog.h (modified) (1 diff)
• pjsip/include/pjsip/sip_transaction.h (modified) (1 diff)
• pjsip/include/pjsip/sip_transport.h (modified) (1 diff)
• pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2892 +2892 @@
     }
 
+    /* Add UDP transport unless it's disabled. */
+    if (!app_config.no_udp) {
+        pjsua_acc_id aid;
+
+        status = pjsua_transport_create(PJSIP_TRANSPORT_UDP,
+                                        &app_config.udp_cfg, 
+                                        &transport_id);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Add local account */
+        pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
+        //pjsua_acc_set_transport(aid, transport_id);
+        pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+    }
+
     /* Add TCP transport unless it's disabled */
     if (!app_config.no_tcp) {
@@ -2906 +2922 @@
     }
 
-    /* Add UDP transport unless it's disabled. */
-    if (!app_config.no_udp) {
-        status = pjsua_transport_create(PJSIP_TRANSPORT_UDP,
-                                        &app_config.udp_cfg, 
-                                        &transport_id);
-        if (status != PJ_SUCCESS)
-            goto on_error;
-
-        /* Add local account */
-        pjsua_acc_add_local(transport_id, PJ_TRUE, NULL);
-        pjsua_acc_set_online_status(current_acc, PJ_TRUE);
-    }
 
 #if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0

pjproject/trunk/pjsip/include/pjsip/sip_dialog.h

@@ -231 +231 @@
  * Lock/bind dialog to a specific transport/listener. This is optional,
  * as normally transport will be selected automatically based on the 
- * destination of requests upon resolver completion. When the dialog is 
- * explicitly bound to the specific transport/listener, all UAC transactions
+ * destination of messages upon resolver completion. When the dialog is 
+ * explicitly bound to the specific transport/listener, all transactions
  * originated by this dialog will use the specified transport/listener
  * when sending outgoing requests.

pjproject/trunk/pjsip/include/pjsip/sip_transaction.h

@@ -219 +219 @@
  * Lock/bind transaction to a specific transport/listener. This is optional,
  * as normally transport will be selected automatically based on the 
- * destination of the request upon resolver completion. Also it's only valid
- * for UAC transaction (to send outgoing request), since for UAS the
- * transport will be selected according to rules about handling incoming
- * request (most likely it will use the transport where the request is
- * coming from if ";rport" parameter is present in Via header).
- *
- * @param tsx       The UAC transaction.
+ * destination of the message upon resolver completion.
+ *
+ * @param tsx       The transaction.
  * @param sel       Transport selector containing the specification of
  *                  transport or listener to be used by this transaction

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -212 +212 @@
         pjsip_transport *transport;
         pjsip_tpfactory *listener;
+        void            *ptr;
     } u;
 

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -1326 +1326 @@
     pjsip_dlg_inc_lock(dlg);
 
+    /* If the dialog is locked to transport, make sure that transaction
+     * is locked to the same transport too.
+     */
+    if (dlg->tp_sel.type != tsx->tp_sel.type ||
+        dlg->tp_sel.u.ptr != tsx->tp_sel.u.ptr)
+    {
+        status = pjsip_tsx_set_transport(tsx, &dlg->tp_sel);
+        pj_assert(status == PJ_SUCCESS);
+    }
+
+    /* Ask transaction to send the response */
     status = pjsip_tsx_send_msg(tsx, tdata);
 

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -1375 +1375 @@
 
     /* Must be UAC transaction */
-    PJ_ASSERT_RETURN(tsx && sel && tsx->role == PJSIP_ROLE_UAC, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tsx && sel, PJ_EINVAL);
 
     /* Start locking the transaction. */