Changeset 5686 for pjproject

Timestamp:

Nov 9, 2017 1:49:06 AM (7 years ago)

Author:

ming

Message:

Fixed #2058: New PJSUA API to register a transport factory

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2761 +2761 @@
 
 /**
+ * Register transport factory that has been created by application.
+ * This function is useful if application wants to implement custom SIP
+ * transport and use it with pjsua.
+ *
+ * @param tf            Transport factory instance.
+ * @param p_id          Optional pointer to receive transport ID.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DEF(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
+                                              pjsua_transport_id *p_id);
+
+/**
  * Enumerate all transports currently created in the system. This function
  * will return all transport IDs, and application may then call 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2069 +2069 @@
     }
     pjsua_acc_on_tp_state_changed(tp, state, info);
+}
+
+/* Set transport state callback */
+static void set_tp_state_cb()
+{
+    pjsip_tp_state_callback tpcb;
+    pjsip_tpmgr *tpmgr;
+
+    tpmgr = pjsip_endpt_get_tpmgr(pjsua_var.endpt);
+    tpcb = pjsip_tpmgr_get_state_cb(tpmgr);
+
+    if (tpcb != &on_tp_state_callback) {
+        pjsua_var.old_tp_cb = tpcb;
+        pjsip_tpmgr_set_state_cb(tpmgr, &on_tp_state_callback);
+    }
 }
 
@@ -2452 +2467 @@
 
     /* Set transport state callback */
-    {
-        pjsip_tp_state_callback tpcb;
-        pjsip_tpmgr *tpmgr;
-
-        tpmgr = pjsip_endpt_get_tpmgr(pjsua_var.endpt);
-        tpcb = pjsip_tpmgr_get_state_cb(tpmgr);
-
-        if (tpcb != &on_tp_state_callback) {
-            pjsua_var.old_tp_cb = tpcb;
-            pjsip_tpmgr_set_state_cb(tpmgr, &on_tp_state_callback);
-        }
-    }
+    set_tp_state_cb();
 
     /* Return the ID */
@@ -2504 +2508 @@
     pjsua_var.tpdata[id].local_name = tp->local_name;
     pjsua_var.tpdata[id].data.tp = tp;
+
+    /* Set transport state callback */
+    set_tp_state_cb();
+
+    /* Return the ID */
+    if (p_id) *p_id = id;
+
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Register transport factory that has been created by application.
+ */
+PJ_DEF(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
+                                              pjsua_transport_id *p_id)
+{
+    unsigned id;
+
+    PJSUA_LOCK();
+
+    /* Find empty transport slot */
+    for (id=0; id < PJ_ARRAY_SIZE(pjsua_var.tpdata); ++id) {
+        if (pjsua_var.tpdata[id].data.ptr == NULL)
+            break;
+    }
+
+    if (id == PJ_ARRAY_SIZE(pjsua_var.tpdata)) {
+        pjsua_perror(THIS_FILE, "Error creating transport", PJ_ETOOMANY);
+        PJSUA_UNLOCK();
+        return PJ_ETOOMANY;
+    }
+
+    /* Save the transport */
+    pjsua_var.tpdata[id].type = (pjsip_transport_type_e) tf->type;
+    pjsua_var.tpdata[id].local_name = tf->addr_name;
+    pjsua_var.tpdata[id].data.factory = tf;
+
+    /* Set transport state callback */
+    set_tp_state_cb();
 
     /* Return the ID */