Changeset 3222 for pjproject

Timestamp:

Jun 24, 2010 12:33:18 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1081: Implement ICE option tag (RFC 5678)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (4 diffs)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -296 +296 @@
     PJSIP_INV_SUPPORT_UPDATE    = 4,
 
+    /**
+     * Indicate support for ICE
+     */
+    PJSIP_INV_SUPPORT_ICE       = 8,
+
+    /**
+     * Require ICE support.
+     */
+    PJSIP_INV_REQUIRE_ICE       = 16,
+
     /** 
      * Require reliable provisional response extension. 
@@ -310 +320 @@
      * support/want session timer.
      */
-    PJSIP_INV_ALWAYS_USE_TIMER  = 128,
+    PJSIP_INV_ALWAYS_USE_TIMER  = 128
 
 };

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

@@ -305 +305 @@
 
 #endif
+
+/**
+ * Controls whether PJSUA-LIB should add ICE media feature tag
+ * parameter (the ";+sip.ice" parameter) to Contact header if ICE
+ * is enabled in the config.
+ *
+ * Default: 1
+ */
+#ifndef PJSUA_ADD_ICE_TAGS
+#   define PJSUA_ADD_ICE_TAGS           1
+#endif
+
 
 /**

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -778 +778 @@
     if (*options & PJSIP_INV_REQUIRE_TIMER)
         *options |= PJSIP_INV_SUPPORT_TIMER;
+    if (*options & PJSIP_INV_REQUIRE_ICE)
+        *options |= PJSIP_INV_SUPPORT_ICE;
 
     /* Get the message in rdata */
@@ -949 +951 @@
         const pj_str_t STR_100REL = { "100rel", 6};
         const pj_str_t STR_TIMER = { "timer", 5};
+        const pj_str_t STR_ICE = { "ice", 3 };
 
         for (i=0; i<sup_hdr->count; ++i) {
             if (pj_stricmp(&sup_hdr->values[i], &STR_100REL)==0)
                 rem_option |= PJSIP_INV_SUPPORT_100REL;
-            if (pj_stricmp(&sup_hdr->values[i], &STR_TIMER)==0)
+            else if (pj_stricmp(&sup_hdr->values[i], &STR_TIMER)==0)
                 rem_option |= PJSIP_INV_SUPPORT_TIMER;
+            else if (pj_stricmp(&sup_hdr->values[i], &STR_ICE)==0)
+                rem_option |= PJSIP_INV_SUPPORT_ICE;
         }
     }
@@ -966 +971 @@
         const pj_str_t STR_REPLACES = { "replaces", 8 };
         const pj_str_t STR_TIMER = { "timer", 5 };
+        const pj_str_t STR_ICE = { "ice", 3 };
         unsigned unsupp_cnt = 0;
         pj_str_t unsupp_tags[PJSIP_GENERIC_ARRAY_MAX_COUNT];
@@ -987 +993 @@
                 if (!supp)
                     unsupp_tags[unsupp_cnt++] = req_hdr->values[i];
+            } else if ((*options & PJSIP_INV_SUPPORT_ICE) &&
+                pj_stricmp(&req_hdr->values[i], &STR_ICE)==0)
+            {
+                rem_option |= PJSIP_INV_REQUIRE_ICE;
 
             } else if (!pjsip_endpt_has_capability(endpt, PJSIP_H_SUPPORTED,

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

@@ -237 +237 @@
         acc->cred[acc->cred_cnt++] = pjsua_var.ua_cfg.cred_info[i];
     }
+
+    /* If ICE is enabled, add "+sip.ice" media feature tag in account's
+     * contact params.
+     */
+#if PJSUA_ADD_ICE_TAGS
+    if (pjsua_var.media_cfg.enable_ice) {
+        unsigned new_len;
+        pj_str_t new_prm;
+
+        new_len = acc_cfg->contact_params.slen + 10;
+        new_prm.ptr = (char*)pj_pool_alloc(acc->pool, new_len);
+        pj_strcpy(&new_prm, &acc_cfg->contact_params);
+        pj_strcat2(&new_prm, ";+sip.ice");
+        acc_cfg->contact_params = new_prm;
+    }
+#endif
 
     status = pjsua_pres_init_acc(acc_id);

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

@@ -841 +841 @@
     if (pjsua_var.acc[acc_id].cfg.require_timer)
         options |= PJSIP_INV_REQUIRE_TIMER;
+    if (pjsua_var.media_cfg.enable_ice)
+        options |= PJSIP_INV_SUPPORT_ICE;
 
     status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,