Changeset 2929 for pjproject/branches/adhocs/1.4.5

Timestamp:

Oct 7, 2009 8:42:28 AM (15 years ago)

Author:

bennylp

Message:

More #962: STUN compatibility problem with RFC 3489 servers (in encoding SERVER-NAME or SOFTWARE attribute):

• backported r2928

Location:

pjproject/branches/adhocs/1.4.5

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath-test/stun.c (modified) (3 diffs)
• pjnath/src/pjnath/stun_msg.c (modified) (1 diff)
• third_party/build/g7221/output (modified) (1 prop)

pjproject/branches/adhocs/1.4.5/pjnath/src/pjnath-test/stun.c

@@ -480 +480 @@
         "",
         &create_msgint1
-    },
+    }
+    /* disabled: see http://trac.pjsip.org/repos/ticket/960
+    ,
     {
         PJ_STUN_BINDING_RESPONSE,
@@ -504 +506 @@
         &create_msgint2
     }
+    */
+
+    /* disabled: see http://trac.pjsip.org/repos/ticket/960
 #if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
     ,
@@ -543 +548 @@
     }
 #endif
+    */
 };
 

pjproject/branches/adhocs/1.4.5/pjnath/src/pjnath/stun_msg.c

@@ -1236 +1236 @@
     PUTVAL16H(buf, 0, ca->hdr.type);
 
-    /* Set the length to be 4-bytes aligned so that we can
-     * communicate with RFC 3489 endpoints
+    /* Special treatment for SOFTWARE attribute:
+     * This attribute had caused interop problem when talking to 
+     * legacy RFC 3489 STUN servers, due to different "length"
+     * rules with RFC 5389.
      */
-    PUTVAL16H(buf, 2, (pj_uint16_t)((ca->value.slen + 3) & (~3)));
+    if (msghdr->magic != PJ_STUN_MAGIC ||
+        ca->hdr.type == PJ_STUN_ATTR_SOFTWARE)
+    {
+        /* Set the length to be 4-bytes aligned so that we can
+         * communicate with RFC 3489 endpoints
+         */
+        PUTVAL16H(buf, 2, (pj_uint16_t)((ca->value.slen + 3) & (~3)));
+    } else {
+        /* Use RFC 5389 rule */
+        PUTVAL16H(buf, 2, (pj_uint16_t)ca->value.slen);
+    }
 
     /* Copy the string */