Changeset 3570 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

May 19, 2011 4:36:01 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1259: Option to use of 100rel in UAS if UAC supports it (thanks Marcus Froeschl for the suggestion)

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -500 +500 @@
     /* Create the INVITE session: */
     options |= PJSIP_INV_SUPPORT_100REL;
-    if (acc->cfg.require_100rel)
+    if (acc->cfg.require_100rel == PJSUA_100REL_MANDATORY)
         options |= PJSIP_INV_REQUIRE_100REL;
     if (acc->cfg.use_timer != PJSUA_SIP_TIMER_INACTIVE) {
@@ -849 +849 @@
     options |= PJSIP_INV_SUPPORT_100REL;
     options |= PJSIP_INV_SUPPORT_TIMER;
-    if (pjsua_var.acc[acc_id].cfg.require_100rel)
+    if (pjsua_var.acc[acc_id].cfg.require_100rel == PJSUA_100REL_MANDATORY)
         options |= PJSIP_INV_REQUIRE_100REL;
     if (pjsua_var.media_cfg.enable_ice)
@@ -930 +930 @@
     {
         options &= ~(PJSIP_INV_SUPPORT_TIMER);
+    }
+
+    /* If 100rel is optional and UAC supports it, use it. */
+    if ((options & PJSIP_INV_REQUIRE_100REL)==0 &&
+        pjsua_var.acc[acc_id].cfg.require_100rel == PJSUA_100REL_OPTIONAL)
+    {
+        const pj_str_t token = { "100rel", 6};
+        pjsip_dialog_cap_status cap_status;
+
+        cap_status = pjsip_dlg_remote_has_cap(dlg, PJSIP_H_SUPPORTED, NULL,
+                                              &token);
+        if (cap_status == PJSIP_DIALOG_CAP_SUPPORTED)
+            options |= PJSIP_INV_REQUIRE_100REL;
     }