diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2017-01-18 03:50:32 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2017-01-18 03:50:32 +0000 |
| commit | e442279e097eefc1febc85ae12c0120645f18f1f (patch) | |
| tree | f353a011b4cf3706579fe6070bc3ab748fa9c3df | |
| parent | fdc4c3a0f337e3405a0a72b2394250cc8e04020f (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5527 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/include/pjnath/stun_msg.h | 8 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h index 68872837..7efdf57a 100644 --- a/pjnath/include/pjnath/stun_msg.h +++ b/pjnath/include/pjnath/stun_msg.h @@ -323,6 +323,7 @@ typedef enum pj_stun_attr_type PJ_STUN_ATTR_NONCE = 0x0015,/**< NONCE attribute. */ 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 */ PJ_STUN_ATTR_DONT_FRAGMENT = 0x001A,/**< TURN DONT-FRAGMENT */ @@ -963,10 +964,11 @@ typedef struct pj_stun_sockaddr_attr pj_stun_xor_relayed_addr_attr; /** - * 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 diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index aaacf9ed..896848b7 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -343,8 +343,8 @@ static struct attr_desc mandatory_attr_desc[] = &clone_sockaddr_attr }, { - /* PJ_STUN_ATTR_REQUESTED_ADDR_TYPE, */ - "REQUESTED-ADDRESS-TYPE", + /* PJ_STUN_ATTR_REQUESTED_ADDR_FAMILY, */ + "REQUESTED-ADDRESS-FAMILY", &decode_uint_attr, &encode_uint_attr, &clone_uint_attr |