Changeset 1559

Timestamp:

Nov 8, 2007 9:13:34 AM (16 years ago)

Author:

bennylp

Message:

Parse ICE SDP attribute without case sensitivity, and ignore malformed candidate line for more robustness

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -23 +23 @@
 #include <pj/rand.h>
 
+#define THIS_FILE   "transport_ice.c"
 
 struct transport_ice
@@ -349 +350 @@
     /* Foundation */
     token = strtok(input.ptr, " ");
-    if (!token)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE foundation in candidate"));
+        goto on_return;
+    }
     pj_strdup2(pool, &cand->foundation, token);
 
     /* Component ID */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE component ID in candidate"));
+        goto on_return;
+    }
     cand->comp_id = atoi(token);
 
     /* Transport */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
-    if (pj_ansi_stricmp(token, "UDP") != 0)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE transport in candidate"));
+        goto on_return;
+    }
+    if (pj_ansi_stricmp(token, "UDP") != 0) {
+        PJ_LOG(5,(THIS_FILE, 
+                  "Expecting ICE UDP transport only in candidate"));
+        goto on_return;
+    }
 
     /* Priority */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE priority in candidate"));
+        goto on_return;
+    }
     cand->prio = atoi(token);
 
     /* Host */
     host = strtok(NULL, " ");
-    if (!host)
-        goto on_return;
-    if (pj_sockaddr_in_init(&cand->addr.ipv4, pj_cstr(&s, host), 0))
-        goto on_return;
+    if (!host) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE host in candidate"));
+        goto on_return;
+    }
+    if (pj_sockaddr_in_init(&cand->addr.ipv4, pj_cstr(&s, host), 0)) {
+        PJ_LOG(5,(THIS_FILE, 
+                  "Expecting ICE IPv4 transport address in candidate"));
+        goto on_return;
+    }
 
     /* Port */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE port number in candidate"));
+        goto on_return;
+    }
     cand->addr.ipv4.sin_port = pj_htons((pj_uint16_t)atoi(token));
 
     /* typ */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
-    if (pj_ansi_stricmp(token, "typ") != 0)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE \"typ\" in candidate"));
+        goto on_return;
+    }
+    if (pj_ansi_stricmp(token, "typ") != 0) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE \"typ\" in candidate"));
+        goto on_return;
+    }
 
     /* candidate type */
     token = strtok(NULL, " ");
-    if (!token)
-        goto on_return;
+    if (!token) {
+        PJ_LOG(5,(THIS_FILE, "Expecting ICE candidate type in candidate"));
+        goto on_return;
+    }
 
     if (pj_ansi_stricmp(token, "host") == 0) {
@@ -410 +435 @@
 
     } else {
+        PJ_LOG(5,(THIS_FILE, "Invalid ICE candidate type %s in candidate", 
+                  token));
         goto on_return;
     }
@@ -527 +554 @@
         /* Parse candidate */
         status = parse_cand(pool, &attr->value, &cand[cand_cnt]);
-        if (status != PJ_SUCCESS)
-            return status;
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(4,(THIS_FILE, 
+                      "Error in parsing SDP candidate attribute, "
+                      "candidate is ignored"));
+            continue;
+        }
 
         /* Check if this candidate is equal to the connection line */