Changeset 1030 for pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c

Timestamp:

Mar 1, 2007 11:39:08 PM (18 years ago)

Author:

bennylp

Message:

More STUN work

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c (modified) (5 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c

@@ -989 +989 @@
 
     /* Check that struct size is valid */
-    pj_assert(sizeof(pj_stun_msg_integrity_attr)==STUN_MSG_INTEGRITY_LEN);
+    pj_assert(sizeof(pj_stun_msg_integrity_attr)==ATTR_LEN);
 
     /* Create attribute */
@@ -1857 +1857 @@
     for (i=0; i<msg->attr_count; ++i) {
         const struct attr_desc *adesc;
-        const pj_stun_attr_hdr *attr_hdr;
-
-        attr_hdr = msg->attr[i];
+        const pj_stun_attr_hdr *attr_hdr = msg->attr[i];
 
         if (attr_hdr->type == PJ_STUN_ATTR_MESSAGE_INTEGRITY) {
@@ -1890 +1888 @@
         buf += printed;
         buf_size -= printed;
+    }
+
+    /* We may have stopped printing attribute because we found
+     * MESSAGE-INTEGRITY or FINGERPRINT. Scan the rest of the
+     * attributes.
+     */
+    for ( ++i; i<msg->attr_count; ++i) {
+        const pj_stun_attr_hdr *attr_hdr = msg->attr[i];
+
+        /* There mustn't any attribute after FINGERPRINT */
+        PJ_ASSERT_RETURN(afingerprint == NULL, PJLIB_UTIL_ESTUNFINGERPOS);
+
+        if (attr_hdr->type == PJ_STUN_ATTR_MESSAGE_INTEGRITY) {
+            /* There mustn't be MESSAGE-INTEGRITY before */
+            PJ_ASSERT_RETURN(amsg_integrity == NULL, 
+                             PJLIB_UTIL_ESTUNMSGINTPOS);
+            amsg_integrity = (pj_stun_msg_integrity_attr*) attr_hdr;
+
+        } else if (attr_hdr->type == PJ_STUN_ATTR_FINGERPRINT) {
+            afingerprint = (pj_stun_fingerprint_attr*) attr_hdr;
+        }
     }
 
@@ -1922 +1941 @@
             /* Should not happen for message generated by us */
             pj_assert(PJ_FALSE);
-            return PJLIB_UTIL_ESTUNMSGINT;
+            return PJLIB_UTIL_ESTUNMSGINTPOS;
 
         } else if (i == msg->attr_count-2)  {
@@ -1928 +1947 @@
                 /* Should not happen for message generated by us */
                 pj_assert(PJ_FALSE);
-                return PJLIB_UTIL_ESTUNMSGINT;
+                return PJLIB_UTIL_ESTUNMSGINTPOS;
             } else {
                 afingerprint = (pj_stun_fingerprint_attr*) msg->attr[i+1];