bind.h   bind.h 
skipping to change at line 102 skipping to change at line 102
* Returns: The length of the built message. * Returns: The length of the built message.
*/ */
size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg, size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
uint8_t *buffer, size_t buffer_len); uint8_t *buffer, size_t buffer_len);
/** /**
* stun_usage_bind_process: * stun_usage_bind_process:
* @msg: The #StunMessage to process * @msg: The #StunMessage to process
* @addr: A pointer to a #sockaddr structure to fill with the mapped addres s * @addr: A pointer to a #sockaddr structure to fill with the mapped addres s
* that the STUN server gives us * that the STUN server gives us
* @addrlen: The length of @addr * @addrlen: The length of @add. rMust be set to the size of the @addr sock
et
* address and will be set to the actual length of the socket address.
* @alternate_server: A pointer to a #sockaddr structure to fill with the * @alternate_server: A pointer to a #sockaddr structure to fill with the
* address of an alternate server to which we should send our new STUN * address of an alternate server to which we should send our new STUN
* binding request, in case the currently used STUN server is requesting th e use * binding request, in case the currently used STUN server is requesting th e use
* of an alternate server. This argument will only be filled if the return value * of an alternate server. This argument will only be filled if the return value
* of the function is #STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER * of the function is #STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER
* @alternate_server_len: The length of @alternate_server * @alternate_server_len: The length of @alternate_server. Must be set to
* the size of the @alternate_server socket address and will be set to the
* actual length of the socket address.
* *
* Process a STUN binding response and extracts the mapped address from the STUN * Process a STUN binding response and extracts the mapped address from the STUN
* message. Also checks for the ALTERNATE-SERVER attribute. * message. Also checks for the ALTERNATE-SERVER attribute.
* Returns: A #StunUsageBindReturn value. * Returns: A #StunUsageBindReturn value.
* Note that #STUN_USAGE_BIND_RETURN_TIMEOUT cannot be returned by this fun ction * Note that #STUN_USAGE_BIND_RETURN_TIMEOUT cannot be returned by this fun ction
*/ */
StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
struct sockaddr *addr, socklen_t *addrlen, struct sockaddr *addr, socklen_t *addrlen,
struct sockaddr *alternate_server, socklen_t *alternate_server_len); struct sockaddr *alternate_server, socklen_t *alternate_server_len);
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 lines changed or added


 ice.h   ice.h 
skipping to change at line 85 skipping to change at line 86
* @STUN_USAGE_ICE_RETURN_SUCCESS: The function succeeded * @STUN_USAGE_ICE_RETURN_SUCCESS: The function succeeded
* @STUN_USAGE_ICE_RETURN_ERROR: There was an unspecified error * @STUN_USAGE_ICE_RETURN_ERROR: There was an unspecified error
* @STUN_USAGE_ICE_RETURN_INVALID: The message is invalid for processing * @STUN_USAGE_ICE_RETURN_INVALID: The message is invalid for processing
* @STUN_USAGE_ICE_RETURN_ROLE_CONFLICT: A role conflict was detected * @STUN_USAGE_ICE_RETURN_ROLE_CONFLICT: A role conflict was detected
* @STUN_USAGE_ICE_RETURN_INVALID_REQUEST: The message is an not a request * @STUN_USAGE_ICE_RETURN_INVALID_REQUEST: The message is an not a request
* @STUN_USAGE_ICE_RETURN_INVALID_METHOD: The method of the request is inva lid * @STUN_USAGE_ICE_RETURN_INVALID_METHOD: The method of the request is inva lid
* @STUN_USAGE_ICE_RETURN_MEMORY_ERROR: The buffer size is too small to hol d * @STUN_USAGE_ICE_RETURN_MEMORY_ERROR: The buffer size is too small to hol d
* the STUN reply * the STUN reply
* @STUN_USAGE_ICE_RETURN_INVALID_ADDRESS: The mapped address argument has * @STUN_USAGE_ICE_RETURN_INVALID_ADDRESS: The mapped address argument has
* an invalid address family * an invalid address family
* @STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS: The response is valid but no
* MAPPED-ADDRESS or XOR-MAPPED-ADDRESS attribute was found
* *
* Return value of stun_usage_ice_conncheck_process() and * Return value of stun_usage_ice_conncheck_process() and
* stun_usage_ice_conncheck_create_reply() which allows you to see what * stun_usage_ice_conncheck_create_reply() which allows you to see what
* status the function call returned. * status the function call returned.
*/ */
typedef enum { typedef enum {
STUN_USAGE_ICE_RETURN_SUCCESS, STUN_USAGE_ICE_RETURN_SUCCESS,
STUN_USAGE_ICE_RETURN_ERROR, STUN_USAGE_ICE_RETURN_ERROR,
STUN_USAGE_ICE_RETURN_INVALID, STUN_USAGE_ICE_RETURN_INVALID,
STUN_USAGE_ICE_RETURN_ROLE_CONFLICT, STUN_USAGE_ICE_RETURN_ROLE_CONFLICT,
STUN_USAGE_ICE_RETURN_INVALID_REQUEST, STUN_USAGE_ICE_RETURN_INVALID_REQUEST,
STUN_USAGE_ICE_RETURN_INVALID_METHOD, STUN_USAGE_ICE_RETURN_INVALID_METHOD,
STUN_USAGE_ICE_RETURN_MEMORY_ERROR, STUN_USAGE_ICE_RETURN_MEMORY_ERROR,
STUN_USAGE_ICE_RETURN_INVALID_ADDRESS, STUN_USAGE_ICE_RETURN_INVALID_ADDRESS,
STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS,
} StunUsageIceReturn; } StunUsageIceReturn;
/** /**
* stun_usage_ice_conncheck_create: * stun_usage_ice_conncheck_create:
* @agent: The #StunAgent to use to build the request * @agent: The #StunAgent to use to build the request
* @msg: The #StunMessage to build * @msg: The #StunMessage to build
* @buffer: The buffer to use for creating the #StunMessage * @buffer: The buffer to use for creating the #StunMessage
* @buffer_len: The size of the @buffer * @buffer_len: The size of the @buffer
* @username: The username to use in the request * @username: The username to use in the request
* @username_len: The length of @username * @username_len: The length of @username
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 stunmessage.h   stunmessage.h 
skipping to change at line 582 skipping to change at line 582
* *
*/ */
StunMessageReturn stun_message_find_string (const StunMessage *msg, StunMessageReturn stun_message_find_string (const StunMessage *msg,
StunAttribute type, char *buf, size_t buflen); StunAttribute type, char *buf, size_t buflen);
/** /**
* stun_message_find_addr: * stun_message_find_addr:
* @msg: The #StunMessage * @msg: The #StunMessage
* @type: The #StunAttribute to find * @type: The #StunAttribute to find
* @addr: The #sockaddr to be filled * @addr: The #sockaddr to be filled
* @addrlen: The size of the @addr variable. Will be set to the size of the * @addrlen: The size of the @addr variable. Must be set to the size of the
* extracted socket address. * @addr socket address and will be set to the size of the extracted socket
* address.
* *
* Extracts a network address attribute from a STUN message. * Extracts a network address attribute from a STUN message.
* *
* Returns: A #StunMessageReturn value. * Returns: A #StunMessageReturn value.
* %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s * %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s
* wrong or if the @addrlen is too small * wrong or if the @addrlen is too small
* %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn. * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn.
*/ */
StunMessageReturn stun_message_find_addr (const StunMessage *msg, StunMessageReturn stun_message_find_addr (const StunMessage *msg,
StunAttribute type, struct sockaddr *addr, socklen_t *addrlen); StunAttribute type, struct sockaddr *addr, socklen_t *addrlen);
/** /**
* stun_message_find_xor_addr: * stun_message_find_xor_addr:
* @msg: The #StunMessage * @msg: The #StunMessage
* @type: The #StunAttribute to find * @type: The #StunAttribute to find
* @addr: The #sockaddr to be filled * @addr: The #sockaddr to be filled
* @addrlen: The size of the @addr variable. Will be set to the size of the * @addrlen: The size of the @addr variable. Must be set to the size of the
* @addr socket address and will be set to the size of the
* extracted socket address. * extracted socket address.
* *
* Extracts an obfuscated network address attribute from a STUN message. * Extracts an obfuscated network address attribute from a STUN message.
* *
* Returns: A #StunMessageReturn value. * Returns: A #StunMessageReturn value.
* %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s * %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s
* wrong or if the @addrlen is too small * wrong or if the @addrlen is too small
* %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn. * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn.
*/ */
StunMessageReturn stun_message_find_xor_addr (const StunMessage *msg, StunMessageReturn stun_message_find_xor_addr (const StunMessage *msg,
StunAttribute type, struct sockaddr *addr, socklen_t *addrlen); StunAttribute type, struct sockaddr *addr, socklen_t *addrlen);
/** /**
* stun_message_find_xor_addr_full: * stun_message_find_xor_addr_full:
* @msg: The #StunMessage * @msg: The #StunMessage
* @type: The #StunAttribute to find * @type: The #StunAttribute to find
* @addr: The #sockaddr to be filled * @addr: The #sockaddr to be filled
* @addrlen: The size of the @addr variable. Will be set to the size of the * @addrlen: The size of the @addr variable. Must be set to the size of the
* @addr socket address and will be set to the size of the
* extracted socket address. * extracted socket address.
* @magic_cookie: The magic cookie to use to XOR the address. * @magic_cookie: The magic cookie to use to XOR the address.
* *
* Extracts an obfuscated network address attribute from a STUN message. * Extracts an obfuscated network address attribute from a STUN message.
* *
* Returns: A #StunMessageReturn value. * Returns: A #StunMessageReturn value.
* %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s * %STUN_MESSAGE_RETURN_INVALID is returned if the attribute payload size i s
* wrong or if the @addrlen is too small * wrong or if the @addrlen is too small
* %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn. * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESSS if the address family is unkno wn.
*/ */
 End of changes. 3 change blocks. 
4 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/