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

Timestamp:

Jun 21, 2010 1:28:55 PM (14 years ago)

Author:

bennylp

Message:

Fixes #1047 (Don't send UPDATE if remote doesn't support it (thanks Bogdan Krakowski for the report)) and fixes #1097 (Support sending UPDATE without SDP). Details:

• Session timer fixes:
  • will look at remote capability in Allow header
  • if UPDATE is supported, will send UPDATE without SDP first. If this fails, will send UPDATE with SDP
  • otherwise will send re-INVITE
• PJSUA-LIB will look at dialog's remote capability to determine whether re-INVITE or UPDATE should be sent to change default addresses after ICE negotiation.
• pjsip_inv_update() now allows NULL offer, in which case the UPDATE will be sent without SDP.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -856 +856 @@
                                 &pjsua_var.calls[id].med_rtp_addr))
             {
+                pj_bool_t use_update;
+                const pj_str_t STR_UPDATE = { "UPDATE", 6 };
+                pjsip_dialog_cap_status support_update;
+                pjsip_dialog *dlg;
+
+                dlg = pjsua_var.calls[id].inv->dlg;
+                support_update = pjsip_dlg_remote_has_cap(dlg, PJSIP_H_ALLOW,
+                                                          NULL, &STR_UPDATE);
+                use_update = (support_update == PJSIP_DIALOG_CAP_SUPPORTED);
+
                 PJ_LOG(4,(THIS_FILE, 
                           "ICE default transport address has changed for "
-                          "call %d, sending UPDATE", id));
-                pjsua_call_update(id, 0, NULL);
+                          "call %d, sending %s", id,
+                          (use_update ? "UPDATE" : "re-INVITE")));
+
+                if (use_update)
+                    pjsua_call_update(id, 0, NULL);
+                else
+                    pjsua_call_reinvite(id, 0, NULL);
             }
         }