Changeset 5527

Timestamp:

Jan 18, 2017 3:50:32 AM (8 years ago)

Author:

ming

Message:

Re #1945 (misc): Add an alias REQUESTED-ADDRESS-FAMILY (which is used in the RFC 6156) for REQUESTED-ADDRESS-TYPE (which is used in the draft). Change the string literal to use the RFC version.

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_msg.h (modified) (2 diffs)
• src/pjnath/stun_msg.c (modified) (1 diff)

pjproject/trunk/pjnath/include/pjnath/stun_msg.h

@@ -324 +324 @@
     PJ_STUN_ATTR_XOR_RELAYED_ADDR   = 0x0016,/**< TURN XOR-RELAYED-ADDRESS  */
     PJ_STUN_ATTR_REQ_ADDR_TYPE      = 0x0017,/**< REQUESTED-ADDRESS-TYPE    */
+    PJ_STUN_ATTR_REQ_ADDR_FAMILY    = 0x0017,/**< REQUESTED-ADDRESS-FAMILY  */
     PJ_STUN_ATTR_EVEN_PORT          = 0x0018,/**< TURN EVEN-PORT            */
     PJ_STUN_ATTR_REQ_TRANSPORT      = 0x0019,/**< TURN REQUESTED-TRANSPORT  */
@@ -964 +965 @@
 
 /**
- * This describes the REQUESTED-ADDRESS-TYPE attribute.
- * The REQUESTED-ADDRESS-TYPE attribute is used by clients to request
+ * According to RFC 6156, this describes the REQUESTED-ADDRESS-FAMILY
+ * attribute (formerly known as REQUESTED-ADDRESS-TYPE in the draft).
+ * The REQUESTED-ADDRESS-FAMILY attribute is used by clients to request
  * the allocation of a specific address type from a server.  The
- * following is the format of the REQUESTED-ADDRESS-TYPE attribute.
+ * following is the format of the REQUESTED-ADDRESS-FAMILY attribute.
 
  \verbatim

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

@@ -344 +344 @@
     },
     {
-        /* PJ_STUN_ATTR_REQUESTED_ADDR_TYPE, */
-        "REQUESTED-ADDRESS-TYPE",
+        /* PJ_STUN_ATTR_REQUESTED_ADDR_FAMILY, */
+        "REQUESTED-ADDRESS-FAMILY",
         &decode_uint_attr,
         &encode_uint_attr,