agent.h | agent.h | |||
---|---|---|---|---|
skipping to change at line 226 | skipping to change at line 226 | |||
*/ | */ | |||
typedef enum | typedef enum | |||
{ | { | |||
NICE_COMPATIBILITY_DRAFT19 = 0, | NICE_COMPATIBILITY_DRAFT19 = 0, | |||
NICE_COMPATIBILITY_GOOGLE, | NICE_COMPATIBILITY_GOOGLE, | |||
NICE_COMPATIBILITY_MSN, | NICE_COMPATIBILITY_MSN, | |||
NICE_COMPATIBILITY_LAST = NICE_COMPATIBILITY_MSN | NICE_COMPATIBILITY_LAST = NICE_COMPATIBILITY_MSN | |||
} NiceCompatibility; | } NiceCompatibility; | |||
/** | /** | |||
* NiceProxyType: | ||||
* @NICE_PROXY_TYPE_NONE: Do not use a proxy | ||||
* @NICE_PROXY_TYPE_SOCKS5: Use a SOCKS5 proxy | ||||
* @NICE_PROXY_TYPE_HTTP: Use an HTTP proxy | ||||
* @NICE_PROXY_TYPE_LAST: Dummy last proxy type | ||||
* | ||||
* An enum to specify which proxy type to use for relaying. | ||||
* Note that the proxies will only be used with TCP TURN relaying. | ||||
* See #NiceAgent:proxy-type | ||||
*/ | ||||
typedef enum | ||||
{ | ||||
NICE_PROXY_TYPE_NONE = 0, | ||||
NICE_PROXY_TYPE_SOCKS5, | ||||
NICE_PROXY_TYPE_HTTP, | ||||
NICE_PROXY_TYPE_LAST = NICE_PROXY_TYPE_HTTP, | ||||
} NiceProxyType; | ||||
/** | ||||
* NiceAgentRecvFunc: | * NiceAgentRecvFunc: | |||
* @agent: The #NiceAgent Object | * @agent: The #NiceAgent Object | |||
* @stream_id: The id of the stream | * @stream_id: The id of the stream | |||
* @component_id: The id of the component of the stream | * @component_id: The id of the component of the stream | |||
* which received the data | * which received the data | |||
* @len: The length of the data | * @len: The length of the data | |||
* @buf: The buffer containing the data received | * @buf: The buffer containing the data received | |||
* @user_data: The user data set in nice_agent_attach_recv() | * @user_data: The user data set in nice_agent_attach_recv() | |||
* | * | |||
* Callback function when data is received on a component | * Callback function when data is received on a component | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 19 lines changed or added | |||
socket.h | socket.h | |||
---|---|---|---|---|
skipping to change at line 72 | skipping to change at line 72 | |||
gchar *buf); | gchar *buf); | |||
gboolean (*send) (NiceSocket *sock, const NiceAddress *to, guint len, | gboolean (*send) (NiceSocket *sock, const NiceAddress *to, guint len, | |||
const gchar *buf); | const gchar *buf); | |||
gboolean (*is_reliable) (NiceSocket *sock); | gboolean (*is_reliable) (NiceSocket *sock); | |||
void (*close) (NiceSocket *sock); | void (*close) (NiceSocket *sock); | |||
void *priv; | void *priv; | |||
}; | }; | |||
G_GNUC_WARN_UNUSED_RESULT | G_GNUC_WARN_UNUSED_RESULT | |||
gint | gint | |||
nice_socket_recv ( | nice_socket_recv (NiceSocket *sock, NiceAddress *from, guint len, gchar *bu | |||
NiceSocket *sock, | f); | |||
NiceAddress *from, | ||||
guint len, | ||||
gchar *buf); | ||||
gboolean | gboolean | |||
nice_socket_send ( | nice_socket_send (NiceSocket *sock, const NiceAddress *to, | |||
NiceSocket *sock, | guint len, const gchar *buf); | |||
const NiceAddress *to, | ||||
guint len, | ||||
const gchar *buf); | ||||
gboolean | gboolean | |||
nice_socket_is_reliable (NiceSocket *sock); | nice_socket_is_reliable (NiceSocket *sock); | |||
void | void | |||
nice_socket_free (NiceSocket *sock); | nice_socket_free (NiceSocket *sock); | |||
#include "udp-bsd.h" | #include "udp-bsd.h" | |||
#include "udp-turn.h" | #include "tcp-bsd.h" | |||
#include "pseudossl.h" | ||||
#include "socks5.h" | ||||
#include "turn.h" | ||||
#include "tcp-turn.h" | #include "tcp-turn.h" | |||
G_END_DECLS | G_END_DECLS | |||
#endif /* _SOCKET_H */ | #endif /* _SOCKET_H */ | |||
End of changes. 3 change blocks. | ||||
11 lines changed or deleted | 8 lines changed or added | |||
tcp-turn.h | tcp-turn.h | |||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
#ifndef _TCP_TURN_H | #ifndef _TCP_TURN_H | |||
#define _TCP_TURN_H | #define _TCP_TURN_H | |||
#include "socket.h" | #include "socket.h" | |||
#include "agent.h" | #include "agent.h" | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
NiceSocket * | NiceSocket * | |||
nice_tcp_turn_socket_new ( | nice_tcp_turn_socket_new (NiceAgent *agent, NiceSocket *base_socket, | |||
NiceAgent *agent, | NiceTurnSocketCompatibility compatibility); | |||
GMainContext *ctx, | ||||
NiceAddress *addr, | ||||
NiceUdpTurnSocketCompatibility compatibility); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif /* _TCP_TURN_H */ | #endif /* _TCP_TURN_H */ | |||
End of changes. 1 change blocks. | ||||
5 lines changed or deleted | 2 lines changed or added | |||