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

Timestamp:

Feb 21, 2008 3:38:36 PM (16 years ago)

Author:

bennylp

Message:

Ticket #485: initial modification in STUN messaging in accordance to TURN-06

File:

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

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

@@ -34 +34 @@
 static int padding_char;
 
-static const char *stun_method_names[] = 
+static const char *stun_method_names[PJ_STUN_METHOD_MAX] = 
 {
     "Unknown",                  /* 0 */
@@ -40 +40 @@
     "Shared Secret",            /* 2 */
     "Allocate",                 /* 3 */
-    "Send",                     /* 4 */
-    "Data",                     /* 5 */
-    "Set Active Destination",   /* 6 */
-    "Connect",                  /* 7 */
-    "Connect Status"            /* 8 */
+    "Refresh",                  /* 4 */
 };
 
@@ -64 +60 @@
     //{ PJ_STUN_SC_MISSING_NONCE,           "Missing Nonce"},
     //{ PJ_STUN_SC_UNKNOWN_USERNAME,        "Unknown Username"},
-    { PJ_STUN_SC_NO_BINDING,                "No Binding"},
+    { PJ_STUN_SC_ALLOCATION_MISMATCH,       "Allocation Mismatch"},
     { PJ_STUN_SC_STALE_NONCE,               "Stale Nonce"},
     { PJ_STUN_SC_TRANSITIONING,             "Active Destination Already Set"},
@@ -217 +213 @@
     },
     {
-        /* ID 0x000C is not assigned */
-        NULL,
-        NULL,
-        NULL
+        /* PJ_STUN_ATTR_CHANNEL_NUMBER (0x000C) */
+        "CHANNEL-NUMBER",
+        &decode_uint_attr,
+        &encode_uint_attr
     },
     {
@@ -253 +249 @@
     },
     {
-        /* PJ_STUN_ATTR_REMOTE_ADDRESS, */
-        "REMOTE-ADDRESS",
-        &decode_sockaddr_attr,
+        /* PJ_STUN_ATTR_PEER_ADDRESS, */
+        "PEER-ADDRESS",
+        &decode_xored_sockaddr_attr,
         &encode_sockaddr_attr
     },
@@ -279 +275 @@
         /* PJ_STUN_ATTR_RELAY_ADDRESS, */
         "RELAY-ADDRESS",
-        &decode_sockaddr_attr,
+        &decode_xored_sockaddr_attr,
         &encode_sockaddr_attr
     },
@@ -351 +347 @@
         /* PJ_STUN_ATTR_REQUESTED_IP, */
         "REQUESTED-IP",
-        &decode_sockaddr_attr,
+        &decode_xored_sockaddr_attr,
         &encode_sockaddr_attr
     },
@@ -1732 +1728 @@
         msg_type |= PJ_STUN_ERROR_RESPONSE_BIT;
     else
-        msg_type |= PJ_STUN_RESPONSE_BIT;
+        msg_type |= PJ_STUN_SUCCESS_RESPONSE_BIT;
 
     status = pj_stun_msg_create(pool, msg_type, req_msg->hdr.magic,