Ignore:
Timestamp:
Aug 22, 2008 5:46:33 PM (13 years ago)
Author:
bennylp
Message:

Ticket #598: Update to draft-ietf-behave-rfc3489bis-18 and draft-ietf-behave-turn-09, and fix other things as well. Please see the ticket for more info

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjnath/include/pjnath/stun_msg.h

    r2044 r2234  
    291291    PJ_STUN_ATTR_LIFETIME           = 0x000D,/**< TURN LIFETIME attr.       */ 
    292292    PJ_STUN_ATTR_MAGIC_COOKIE       = 0x000F,/**< MAGIC-COOKIE attr (deprec)*/ 
    293     PJ_STUN_ATTR_BANDWIDTH          = 0x0010,/**< TURN BANDWIDTH attr.      */ 
     293    PJ_STUN_ATTR_BANDWIDTH          = 0x0010,/**< TURN BANDWIDTH (deprec)   */ 
    294294    PJ_STUN_ATTR_PEER_ADDR          = 0x0012,/**< TURN PEER-ADDRESS attr.   */ 
    295295    PJ_STUN_ATTR_DATA               = 0x0013,/**< DATA attribute.           */ 
    296296    PJ_STUN_ATTR_REALM              = 0x0014,/**< REALM attribute.          */ 
    297297    PJ_STUN_ATTR_NONCE              = 0x0015,/**< NONCE attribute.          */ 
    298     PJ_STUN_ATTR_RELAY_ADDR         = 0x0016,/**< RELAY-ADDRESS attribute.  */ 
     298    PJ_STUN_ATTR_RELAYED_ADDR       = 0x0016,/**< RELAYED-ADDRESS attribute.*/ 
    299299    PJ_STUN_ATTR_REQ_ADDR_TYPE      = 0x0017,/**< REQUESTED-ADDRESS-TYPE    */ 
    300300    PJ_STUN_ATTR_REQ_PROPS          = 0x0018,/**< REQUESTED-PROPS           */ 
     
    306306    PJ_STUN_ATTR_PRIORITY           = 0x0024,/**< PRIORITY                  */ 
    307307    PJ_STUN_ATTR_USE_CANDIDATE      = 0x0025,/**< USE-CANDIDATE             */ 
    308     PJ_STUN_ATTR_XOR_INTERNAL_ADDR  = 0x0026,/**< XOR-INTERNAL-ADDRESS      */ 
     308    PJ_STUN_ATTR_ICMP               = 0x0030,/**< ICMP (TURN)               */ 
    309309 
    310310    PJ_STUN_ATTR_END_MANDATORY_ATTR, 
     
    312312    PJ_STUN_ATTR_START_EXTENDED_ATTR= 0x8021, 
    313313 
    314     PJ_STUN_ATTR_SERVER             = 0x8022,/**< SERVER attribute.         */ 
     314    PJ_STUN_ATTR_SOFTWARE           = 0x8022,/**< SOFTWARE attribute.       */ 
    315315    PJ_STUN_ATTR_ALTERNATE_SERVER   = 0x8023,/**< ALTERNATE-SERVER.         */ 
    316316    PJ_STUN_ATTR_REFRESH_INTERVAL   = 0x8024,/**< REFRESH-INTERVAL.         */ 
     
    346346    PJ_STUN_SC_STALE_NONCE              = 438,  /**< Stale Nonce            */ 
    347347    PJ_STUN_SC_TRANSITIONING            = 439,  /**< Transitioning.         */ 
     348    PJ_STUN_SC_WRONG_CREDENTIALS        = 441,  /**< TURN Wrong Credentials */ 
    348349    PJ_STUN_SC_UNSUPP_TRANSPORT_PROTO   = 442,  /**< Unsupported Transport or 
    349350                                                     Protocol (TURN) */ 
     
    515516/** 
    516517 * This structure represents generic STUN string attributes, such as STUN 
    517  * USERNAME, PASSWORD, SERVER, REALM, and NONCE attributes. Note that for REALM and 
    518  * NONCE attributes, the text MUST be quoted with. 
     518 * USERNAME, PASSWORD, SOFTWARE, REALM, and NONCE attributes. 
    519519 */ 
    520520typedef struct pj_stun_string_attr 
     
    740740 
    741741/** 
    742  * This describes STUN SERVER attribute. 
    743  * The server attribute contains a textual description of the software 
    744  * being used by the server, including manufacturer and version number. 
    745  * The attribute has no impact on operation of the protocol, and serves 
    746  * only as a tool for diagnostic and debugging purposes.  The value of 
    747  * SERVER is variable length. 
    748  */ 
    749 typedef struct pj_stun_string_attr pj_stun_server_attr; 
     742 * This describes STUN SOFTWARE attribute. 
     743 * The SOFTWARE attribute contains a textual description of the software 
     744 * being used by the agent sending the message.  It is used by clients 
     745 * and servers.  Its value SHOULD include manufacturer and version 
     746 * number. */ 
     747typedef struct pj_stun_string_attr pj_stun_software_attr; 
    750748 
    751749 
     
    933931 
    934932/** 
    935  * This describes the STUN RELAY-ADDRESS attribute. 
    936  * The RELAY-ADDRESS is present in Allocate responses.  It specifies the 
     933 * This describes the STUN RELAYED-ADDRESS attribute. 
     934 * The RELAYED-ADDRESS is present in Allocate responses.  It specifies the 
    937935 * address and port that the server allocated to the client.  It is 
    938936 * encoded in the same way as XOR-MAPPED-ADDRESS. 
    939937 */ 
    940 typedef struct pj_stun_sockaddr_attr pj_stun_relay_addr_attr; 
     938typedef struct pj_stun_sockaddr_attr pj_stun_relayed_addr_attr; 
    941939 
    942940 
     
    965963 * #PJ_STUN_SET_PROP_TYPE(). 
    966964 *  
    967  * This attribute allows the client to request certain properties for 
    968  * the relayed transport address that is allocated by the server.  The 
    969  * attribute is 32 bits long.  Its format is: 
     965 * This attribute allows the client to request that the allocation have 
     966 * certain properties, and by the server to indicate which properties 
     967 * are supported.  The attribute is 32 bits long.  Its format is: 
    970968 
    971969 \verbatim 
     
    982980 * desired property.  The rest of the attribute is RFFU (Reserved For 
    983981 * Future Use) and MUST be set to 0 on transmission and ignored on 
    984  * reception.  The values of the "Prop-type" field are: 
    985  *  
    986  *    0x00  (Reserved) 
    987  *    0x01  Even port number 
    988  *    0x02  Pair of ports  
     982 * reception. 
     983 * 
     984 * The "Prop-type" field is formatted as follows: 
     985 
     986 \verbatim 
     987 
     988      0 1 2 3 4 5 6 7  
     989     +-+-+-+-+-+-+-+-+ 
     990     |E|R|P|         | 
     991     +-+-+-+-+-+-+-+-+ 
     992 
     993 \endverbatim 
     994 
     995   The bits in "Prop-type" are: 
     996 
     997   E: If 1, the port number for the relayed-transport-address must be 
     998      even.  If 0, the port number can be even or odd. 
     999 
     1000   R: If 1, the server must reserve the next highest port for a 
     1001      subsequent allocation.  If 0, no such reservation is requested. 
     1002      If the client sets the R bit to 1, it MUST also set the E bit to 1 
     1003      (however, the E bit may be 1 when the R bit is 0). 
     1004 
     1005   P: If 1, the allocation must be a Preserving allocation.  If 0, the 
     1006      allocation can be either Preserving or Non-Preserving. 
     1007 
    9891008 */ 
    9901009typedef struct pj_stun_uint_attr pj_stun_req_props_attr; 
     
    10911110 
    10921111/** 
    1093  * This structure describes STUN XOR-INTERNAL-ADDRESS attribute from 
    1094  * draft-wing-behave-nat-control-stun-usage-00. 
    1095  * This attribute MUST be present in a Binding Response and may be used 
    1096  * in other responses as well.  This attribute is necessary to allow a 
    1097  * STUN client to 'walk backwards' and communicate directly with all of 
    1098  * the STUN-aware NATs along the path. 
    1099  */ 
    1100 typedef pj_stun_sockaddr_attr pj_stun_xor_internal_addr_attr; 
    1101  
    1102 /** 
    11031112 * This describes the STUN TIMER-VAL attribute. 
    11041113 * The TIMER-VAL attribute is used only in conjunction with the Set 
     
    11171126 */ 
    11181127typedef struct pj_stun_uint64_attr pj_stun_ice_controlled_attr; 
     1128 
     1129/** 
     1130 * This describes TURN ICMP attribute 
     1131 */ 
     1132typedef struct pj_stun_uint_attr pj_stun_icmp_attr; 
    11191133 
    11201134/** 
Note: See TracChangeset for help on using the changeset viewer.