Changeset 3222 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (4 diffs)

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,