Changeset 3235

Timestamp:

Jul 6, 2010 8:11:04 AM (14 years ago)

Author:

nanang

Message:

Fix #1078: added XOR_MAPPED_ADDRESS parsing capability to the resolver.

Location:

pjproject/trunk/pjlib-util

Files:

• include/pjlib-util/stun_simple.h (modified) (1 diff)
• src/pjlib-util/stun_simple.c (modified) (2 diffs)
• src/pjlib-util/stun_simple_client.c (modified) (2 diffs)

pjproject/trunk/pjlib-util/include/pjlib-util/stun_simple.h

@@ -61 +61 @@
     PJSTUN_ATTR_ERROR_CODE,
     PJSTUN_ATTR_UNKNOWN_ATTRIBUTES,
-    PJSTUN_ATTR_REFLECTED_FORM
+    PJSTUN_ATTR_REFLECTED_FROM,
+    PJSTUN_ATTR_XOR_MAPPED_ADDR = 0x0020
 } pjstun_attr_type;
 

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

@@ -87 +87 @@
         pjstun_attr_hdr **attr = &msg->attr[msg->attr_count];
         pj_uint32_t len;
+        pj_uint16_t attr_type;
 
         *attr = (pjstun_attr_hdr*)p_attr;
@@ -98 +99 @@
         }
 
-        if (pj_ntohs((*attr)->type) > PJSTUN_ATTR_REFLECTED_FORM) {
+        attr_type = pj_ntohs((*attr)->type);
+        if (attr_type > PJSTUN_ATTR_REFLECTED_FROM &&
+            attr_type != PJSTUN_ATTR_XOR_MAPPED_ADDR)
+        {
             PJ_LOG(5,(THIS_FILE, "Warning: unknown attr type %x in attr %d. "
                                  "Attribute was ignored.",
-                                 pj_ntohs((*attr)->type), msg->attr_count));
+                                 attr_type, msg->attr_count));
         }
 

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

@@ -30 +30 @@
 enum { MAX_REQUEST = 4 };
 static int stun_timer[] = {1000, 1000, 1000, 1000 };
+#define STUN_MAGIC 0x2112A442
 
 #define THIS_FILE       "stun_client.c"
@@ -224 +225 @@
                        pjstun_msg_find_attr(&msg, PJSTUN_ATTR_MAPPED_ADDR);
                 if (!attr) {
-                    status = PJLIB_UTIL_ESTUNNOMAP;
-                    continue;
+                    attr = (pjstun_mapped_addr_attr*) 
+                           pjstun_msg_find_attr(&msg, PJSTUN_ATTR_XOR_MAPPED_ADDR);
+                    if (!attr || attr->family != 1) {
+                        status = PJLIB_UTIL_ESTUNNOMAP;
+                        continue;
+                    }
                 }
 
                 rec[sock_idx].srv[srv_idx].mapped_addr = attr->addr;
                 rec[sock_idx].srv[srv_idx].mapped_port = attr->port;
+                if (pj_ntohs(attr->hdr.type) == PJSTUN_ATTR_XOR_MAPPED_ADDR) {
+                    rec[sock_idx].srv[srv_idx].mapped_addr ^= pj_htonl(STUN_MAGIC);
+                    rec[sock_idx].srv[srv_idx].mapped_port ^= pj_htons(STUN_MAGIC >> 16);
+                }
             }
         }