Changeset 2041 for pjproject/trunk/pjnath/src/pjnath/stun_msg.c

Timestamp:

Jun 21, 2008 12:36:56 PM (16 years ago)

Author:

bennylp

Message:

Fixed bug with authenticating STUN messages when unrecognized/unknown non-mandatory STUN attribute is present in the message

File:

• pjproject/trunk/pjnath/src/pjnath/stun_msg.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_msg.c

@@ -1657 +1657 @@
     INIT_ATTR(attr, attr_type, length);
 
+    attr->magic = PJ_STUN_MAGIC;
+
     if (data && length) {
         attr->length = length;
@@ -2024 +2026 @@
         if (adesc == NULL) {
             /* Unrecognized attribute */
+            pj_stun_binary_attr *attr;
 
             PJ_LOG(4,(THIS_FILE, "Unrecognized attribute type %d", 
@@ -2047 +2050 @@
                 return PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_UNKNOWN_ATTRIBUTE);
             }
+
+            /* Make sure we have rooms for the new attribute */
+            if (msg->attr_count >= PJ_STUN_MAX_ATTR) {
+                if (p_response) {
+                    pj_stun_msg_create_response(pool, msg,
+                                                PJ_STUN_SC_SERVER_ERROR,
+                                                NULL, p_response);
+                }
+                return PJNATH_ESTUNTOOMANYATTR;
+            }
+
+            /* Create binary attribute to represent this */
+            status = pj_stun_binary_attr_create(pool, attr_type, pdu+4, 
+                                                GETVAL16H(pdu, 2), &attr);
+            if (status != PJ_SUCCESS) {
+                if (p_response) {
+                    pj_stun_msg_create_response(pool, msg,
+                                                PJ_STUN_SC_SERVER_ERROR,
+                                                NULL, p_response);
+                }
+
+                PJ_LOG(4,(THIS_FILE, 
+                          "Error parsing unknown STUN attribute type %d",
+                          attr_type));
+
+                return status;
+            }
+
+            /* Add the attribute */
+            msg->attr[msg->attr_count++] = &attr->hdr;
 
         } else {
@@ -2125 +2158 @@
                 if (p_response) {
                     pj_stun_msg_create_response(pool, msg,
-                                                PJ_STUN_SC_BAD_REQUEST,
+                                                PJ_STUN_SC_SERVER_ERROR,
                                                 NULL, p_response);
                 }
@@ -2135 +2168 @@
         }
 
+        /* Next attribute */
         if (attr_val_len + 4 >= pdu_len) {
             pdu += pdu_len;
@@ -2240 +2274 @@
 
         adesc = find_attr_desc(attr_hdr->type);
-        PJ_ASSERT_RETURN(adesc != NULL, PJ_EBUG);
-
-        status = adesc->encode_attr(attr_hdr, buf, buf_size, &printed);
+        if (adesc) {
+            status = adesc->encode_attr(attr_hdr, buf, buf_size, &printed);
+        } else {
+            /* This may be a generic attribute */
+            const pj_stun_binary_attr *bin_attr = (const pj_stun_binary_attr*) 
+                                                   attr_hdr;
+            PJ_ASSERT_RETURN(bin_attr->magic == PJ_STUN_MAGIC, PJ_EBUG);
+            status = encode_binary_attr(bin_attr, buf, buf_size, &printed);
+        }
+
         if (status != PJ_SUCCESS)
             return status;
@@ -2415 +2456 @@
     /* Get the attribute descriptor */
     adesc = find_attr_desc(attr->type);
-    PJ_ASSERT_RETURN(adesc != NULL, NULL);
-
-    return (pj_stun_attr_hdr*) (*adesc->clone_attr)(pool, attr);
-}
-
-
+    if (adesc) {
+        return (pj_stun_attr_hdr*) (*adesc->clone_attr)(pool, attr);
+    } else {
+        /* Clone generic attribute */
+        const pj_stun_binary_attr *bin_attr = (const pj_stun_binary_attr*)
+                                               attr;
+        PJ_ASSERT_RETURN(bin_attr->magic == PJ_STUN_MAGIC, NULL);
+        if (bin_attr->magic == PJ_STUN_MAGIC) {
+            return (pj_stun_attr_hdr*) clone_binary_attr(pool, attr);
+        } else {
+            return NULL;
+        }
+    }
+}
+
+