Changeset 3119 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Mar 10, 2010 1:33:25 PM (14 years ago)

Author:

bennylp

Message:

More #1032 (new SIP TCP/TLS transport callback):

• PJSUA-LIB transport callback, if installed, will call the previously registered callback, to allow multiple transport callbacks to be installed
• there seem to be a bug with the use of "pjsip_tp_state_callback" everywhere (the "pjsip_tp_state_callback" type is pointer, but most variables of this type are declared to pointer too)

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

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

@@ -1526 +1526 @@
 }
 
+/* Callback to receive transport state notifications */
+static void on_tp_state_callback(pjsip_transport *tp,
+                                 pjsip_transport_state state,
+                                 const pjsip_transport_state_info *info)
+{
+    if (pjsua_var.ua_cfg.cb.on_transport_state) {
+        (*pjsua_var.ua_cfg.cb.on_transport_state)(tp, state, info);
+    }
+    if (pjsua_var.old_tp_cb) {
+        (*pjsua_var.old_tp_cb)(tp, state, info);
+    }
+}
+
 /*
  * Create and initialize SIP socket (and possibly resolve public
@@ -1867 +1880 @@
     /* Set transport state callback */
     if (pjsua_var.ua_cfg.cb.on_transport_state) {
-        pjsip_tpmgr_set_status_cb(pjsip_endpt_get_tpmgr(pjsua_var.endpt),
-                                  &pjsua_var.ua_cfg.cb.on_transport_state);
+        pjsip_tp_state_callback tpcb;
+        pjsip_tpmgr *tpmgr;
+
+        tpmgr = pjsip_endpt_get_tpmgr(pjsua_var.endpt);
+        tpcb = pjsip_tpmgr_get_status_cb(tpmgr);
+
+        if (tpcb != &on_tp_state_callback) {
+            pjsua_var.old_tp_cb = tpcb;
+            pjsip_tpmgr_set_status_cb(tpmgr, &on_tp_state_callback);
+        }
     }