Commit 4e71e097 authored by Kai Vehmanen's avatar Kai Vehmanen

Added new symbols to the public API. Fixed the unit tests to compile with the...

Added new symbols to the public API. Fixed the unit tests to compile with the update full-mode enable nice/agent API.

darcs-hash:20070521153534-77cd4-0b76cc848c25f98c5f1420b479922f1fb24b4d7c.gz
parent 3b01388d
...@@ -146,9 +146,10 @@ OUT: ...@@ -146,9 +146,10 @@ OUT:
int int
main (gint argc, gchar *argv[]) main (gint argc, gchar *argv[])
{ {
struct sockaddr_in sin = {0,}; struct sockaddr_in sin;
gint sock; gint sock;
memset (&sin, 0, sizeof (sin));
sock = socket (AF_INET, SOCK_STREAM, 0); sock = socket (AF_INET, SOCK_STREAM, 0);
if (argc != 2) if (argc != 2)
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* *
* Contributors: * Contributors:
* Dafydd Harries, Collabora Ltd. * Dafydd Harries, Collabora Ltd.
* Kai Vehmanen, Nokia
* *
* Alternatively, the contents of this file may be used under the terms of the * Alternatively, the contents of this file may be used under the terms of the
* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which * the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
...@@ -54,6 +55,8 @@ handle_recv ( ...@@ -54,6 +55,8 @@ handle_recv (
gchar *buf, gpointer user_data) gchar *buf, gpointer user_data)
{ {
g_debug ("got media"); g_debug ("got media");
(void)agent; (void)stream_id; (void)component_id; (void)len; (void)buf;
(void)user_data;
} }
/* create an agent and give it one fixed local IP address */ /* create an agent and give it one fixed local IP address */
...@@ -80,12 +83,12 @@ make_agent ( ...@@ -80,12 +83,12 @@ make_agent (
candidates = nice_agent_get_local_candidates (agent, 1, 1); candidates = nice_agent_get_local_candidates (agent, 1, 1);
g_assert (candidates != NULL); g_assert (candidates != NULL);
candidate = candidates->data; candidate = candidates->data;
g_debug ("allocated socket %d port %d for candidate %d", g_debug ("allocated socket %d port %d for candidate %s",
candidate->sock.fileno, candidate->sock.addr.port, candidate->id); candidate->sockptr->fileno, candidate->sockptr->addr.port, candidate->foundation);
g_slist_free (candidates); g_slist_free (candidates);
*ret_agent = agent; *ret_agent = agent;
*ret_sock = &(candidate->sock); *ret_sock = candidate->sockptr;
return TRUE; return TRUE;
} }
......
...@@ -182,9 +182,10 @@ main (void) ...@@ -182,9 +182,10 @@ main (void)
{ {
NiceUDPSocketFactory factory; NiceUDPSocketFactory factory;
NiceUDPSocket sock; NiceUDPSocket sock;
NiceAddress addr = {0,}; NiceAddress addr;
guint ret; guint ret;
memset (&addr, 0, sizeof (addr));
g_type_init (); g_type_init ();
addr.port = 1234; addr.port = 1234;
......
T nice_address_copy_to_sockaddr
T nice_address_dup T nice_address_dup
T nice_address_equal T nice_address_equal
T nice_address_free T nice_address_free
T nice_address_is_private T nice_address_is_private
T nice_address_new T nice_address_new
T nice_address_set_from_sockaddr_in T nice_address_set_from_sockaddr
T nice_address_set_ipv4 T nice_address_set_ipv4
T nice_address_set_ipv4_from_string T nice_address_set_ipv4_from_string
T nice_address_set_ipv6 T nice_address_set_ipv6
...@@ -13,6 +14,7 @@ T nice_agent_add_local_address ...@@ -13,6 +14,7 @@ T nice_agent_add_local_address
T nice_agent_add_remote_candidate T nice_agent_add_remote_candidate
T nice_agent_add_stream T nice_agent_add_stream
T nice_agent_get_local_candidates T nice_agent_get_local_candidates
T nice_agent_get_local_credentials
T nice_agent_get_remote_candidates T nice_agent_get_remote_candidates
T nice_agent_get_type T nice_agent_get_type
T nice_agent_main_context_attach T nice_agent_main_context_attach
...@@ -23,11 +25,14 @@ T nice_agent_recv_sock ...@@ -23,11 +25,14 @@ T nice_agent_recv_sock
T nice_agent_remove_stream T nice_agent_remove_stream
T nice_agent_send T nice_agent_send
T nice_agent_set_remote_candidates T nice_agent_set_remote_candidates
T nice_agent_set_remote_credentials
T nice_candidate_free T nice_candidate_free
T nice_candidate_ice_priority T nice_candidate_ice_priority
T nice_candidate_ice_priority_full
T nice_candidate_jingle_priority T nice_candidate_jingle_priority
T nice_candidate_new T nice_candidate_new
T nice_candidate_pair_priority
T nice_interface_free T nice_interface_free
T nice_interface_new T nice_interface_new
......
...@@ -43,10 +43,11 @@ ...@@ -43,10 +43,11 @@
int int
main (void) main (void)
{ {
NiceAddress addr = {0,}; NiceAddress addr;
NiceCandidate *candidate; NiceCandidate *candidate;
gchar *str; gchar *str;
memset (&addr, 0, sizeof (addr));
candidate = nice_candidate_from_string ("x"); candidate = nice_candidate_from_string ("x");
g_assert (candidate == NULL); g_assert (candidate == NULL);
......
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