Commit c68e6109 authored by Youness Alaoui's avatar Youness Alaoui

Merge branch 'nice-kakaroto' of /home/kakaroto/coding/nice-refactor/ into nice-kakaroto

parents 2657d62a e5e9801c
...@@ -103,7 +103,10 @@ test_ipv6 (void) ...@@ -103,7 +103,10 @@ test_ipv6 (void)
memset (&sin, 0, sizeof (sin)); memset (&sin, 0, sizeof (sin));
memset (&sin2, 0, sizeof (sin2)); memset (&sin2, 0, sizeof (sin2));
memset (&addr, 0, sizeof (NiceAddress));
memset (&other, 0, sizeof (NiceAddress));
nice_address_init (&addr); nice_address_init (&addr);
nice_address_init (&other);
nice_address_set_ipv6 (&addr, (guchar *) nice_address_set_ipv6 (&addr, (guchar *)
"\x00\x11\x22\x33" "\x00\x11\x22\x33"
"\x44\x55\x66\x77" "\x44\x55\x66\x77"
...@@ -120,10 +123,11 @@ test_ipv6 (void) ...@@ -120,10 +123,11 @@ test_ipv6 (void)
nice_address_copy_to_sockaddr (&other, (struct sockaddr*)&sin2); nice_address_copy_to_sockaddr (&other, (struct sockaddr*)&sin2);
nice_address_copy_to_sockaddr (&addr, (struct sockaddr*)&sin); nice_address_copy_to_sockaddr (&addr, (struct sockaddr*)&sin);
g_assert (memcmp (&sin, &sin2, sizeof(sin)) == 0); g_assert (nice_address_equal (&addr, &other) == TRUE);
nice_address_to_string (&addr, str); nice_address_to_string (&addr, str);
nice_address_to_string (&other, str); nice_address_to_string (&other, str);
g_assert (nice_address_equal (&addr, &other) == TRUE);
g_assert (memcmp (&sin, &sin2, sizeof(sin)) == 0);
/* private IPv6 address */ /* private IPv6 address */
nice_address_set_ipv6 (&addr, (guchar *) nice_address_set_ipv6 (&addr, (guchar *)
......
...@@ -38,9 +38,6 @@ nice_candidate_new ...@@ -38,9 +38,6 @@ nice_candidate_new
nice_candidate_pair_priority nice_candidate_pair_priority
nice_debug_disable nice_debug_disable
nice_debug_enable nice_debug_enable
nice_interface_free
nice_interface_new
nice_list_local_interfaces
nice_rng_free nice_rng_free
nice_rng_generate_bytes nice_rng_generate_bytes
nice_rng_generate_bytes_print nice_rng_generate_bytes_print
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h>
#endif #endif
typedef struct stun_message_t StunMessage; typedef struct stun_message_t StunMessage;
......
...@@ -177,7 +177,7 @@ static void numb (void) ...@@ -177,7 +177,7 @@ static void numb (void)
req_len = stun_usage_turn_create (&agent, &req_msg, req, sizeof(req), req_len = stun_usage_turn_create (&agent, &req_msg, req, sizeof(req),
NULL, NULL,
STUN_USAGE_TURN_REQUEST_PORT_NORMAL, STUN_USAGE_TURN_REQUEST_PORT_NORMAL,
0, 0, -1, -1,
username, strlen (username), password, strlen(password), username, strlen (username), password, strlen(password),
STUN_USAGE_TURN_COMPATIBILITY_DRAFT9); STUN_USAGE_TURN_COMPATIBILITY_DRAFT9);
assert (req_len > 0); assert (req_len > 0);
...@@ -202,7 +202,7 @@ static void numb (void) ...@@ -202,7 +202,7 @@ static void numb (void)
req_len = stun_usage_turn_create (&agent, &req_msg, req, sizeof(req), req_len = stun_usage_turn_create (&agent, &req_msg, req, sizeof(req),
&msg, &msg,
STUN_USAGE_TURN_REQUEST_PORT_NORMAL, STUN_USAGE_TURN_REQUEST_PORT_NORMAL,
0, 0, -1, -1,
username, strlen (username), password, strlen(password), username, strlen (username), password, strlen(password),
STUN_USAGE_TURN_COMPATIBILITY_DRAFT9); STUN_USAGE_TURN_COMPATIBILITY_DRAFT9);
assert (req_len > 0); assert (req_len > 0);
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h>
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment