Changeset 2945 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Oct 14, 2009 1:13:18 PM (15 years ago)

Author:

bennylp

Message:

Ticket #881: send UPDATE or re-INVITE after ICE negotiation, if the default candidate has changed

• done
• added pj_ice_strans_state (to be used for informational purposes for now)
• added pjmedia ICE transport specific info, and display it in call dump output
• misc fixes (changed pjmedia_transport_info.spec_info_cnt from int to unsigned)

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

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

@@ -822 +822 @@
                 pjsua_var.ua_cfg.cb.on_call_media_state(id);
             }
+        } else {
+            /* Send UPDATE if default transport address is different than
+             * what was advertised (ticket #881)
+             */
+            pjmedia_transport_info tpinfo;
+            pjmedia_ice_transport_info *ii = NULL;
+            unsigned i;
+
+            pjmedia_transport_info_init(&tpinfo);
+            pjmedia_transport_get_info(tp, &tpinfo);
+            for (i=0; i<tpinfo.specific_info_cnt; ++i) {
+                if (tpinfo.spc_info[i].type==PJMEDIA_TRANSPORT_TYPE_ICE) {
+                    ii = (pjmedia_ice_transport_info*)
+                         tpinfo.spc_info[i].buffer;
+                    break;
+                }
+            }
+
+            if (ii && ii->role==PJ_ICE_SESS_ROLE_CONTROLLING &&
+                pj_sockaddr_cmp(&tpinfo.sock_info.rtp_addr_name,
+                                &pjsua_var.calls[id].med_rtp_addr))
+            {
+                PJ_LOG(4,(THIS_FILE, 
+                          "ICE default transport address has changed for "
+                          "call %d, sending UPDATE", id));
+                pjsua_call_update(id, 0, NULL);
+            }
         }
         break;
@@ -1321 +1348 @@
     }
 
+    /* Update currently advertised RTP source address */
+    pj_memcpy(&call->med_rtp_addr, &tpinfo.sock_info.rtp_addr_name, 
+              sizeof(pj_sockaddr));
+
     *p_sdp = sdp;
     return PJ_SUCCESS;
@@ -1483 +1514 @@
         pjmedia_transport_get_info(call->med_tp, &tp_info);
         if (tp_info.specific_info_cnt > 0) {
-            int i;
+            unsigned i;
             for (i = 0; i < tp_info.specific_info_cnt; ++i) {
                 if (tp_info.spc_info[i].type == PJMEDIA_TRANSPORT_TYPE_SRTP)