Index of new symbols in 0.1.6

StunMessageReturn stun_message_find_addr (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen);

StunMessageReturn stun_message_find_xor_addr (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen);

StunMessageReturn stun_message_find_xor_addr_full (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen, uint32_t magic_cookie);

StunMessageReturn stun_message_append_xor_addr (StunMessage *msg, StunAttribute type, - const struct sockaddr *addr, + const struct sockaddr_storage *addr, socklen_t addrlen);

StunMessageReturn stun_message_append_xor_addr_full (StunMessage *msg, StunAttribute type, - const struct sockaddr *addr, + const struct sockaddr_storage *addr, socklen_t addrlen, uint32_t magic_cookie);

StunUsageTurnReturn stun_usage_turn_process (StunMessage *msg, - struct sockaddr *relay_addr, + struct sockaddr_storage *relay_addr, socklen_t *relay_addrlen, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen, - struct sockaddr *alternate_server, + struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len, uint32_t *bandwidth, uint32_t *lifetime, @@ -581,7 +581,7 @@ size_t realm_len, uint8_t *nonce, size_t nonce_len, - struct sockaddr *peer, + struct sockaddr_storage *peer, StunUsageTurnCompatibility compatibility);

gboolean nice_agent_forget_relays (NiceAgent *agent, + guint stream_id, + guint component_id);

libnice Reference Manual

StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv, socklen_t srvlen, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen);

StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg, - struct sockaddr *addr, + struct sockaddr_storage *addr, socklen_t *addrlen, StunUsageIceCompatibility compatibility);

struct TurnServer { + gint ref_count; + NiceAddress server; /**< TURN server address */ gchar *username; /**< TURN username */ gchar *password; /**< TURN password */ @@ -241,6 +243,10 @@

Property Details

@@ -2892,8 +3003,8 @@

The `"upnp-timeout"` property

  "upnp-timeout"             guint                 : Read / Write / Construct

-The maximum amount of time to wait for UPnP discovery to finish before -signaling the "candidate-gathering-done" signal +The maximum amount of time (in milliseconds) to wait for UPnP discovery to +finish before signaling the "candidate-gathering-done" signal

Allowed values: [100,60000]

Default value: 200

@@ -3012,7 +3123,7 @@ gchar *foundation, gpointer user_data) : Run Last

-This signal is fired when the agent discovers a new candidate +This signal is fired when the agent discovers a new local candidate.

The `"streams-removed"` signal

void                user_function                      (NiceAgent *agent,
-                                                        gpointer   stream_ids,
-                                                        gpointer   user_data)       : Run Last

void                user_function                      (NiceAgent           *agent,
+                                                        _NiceAgentStreamIds *stream_ids,
+                                                        gpointer             user_data)       : Run Last

This signal is fired whenever one or more streams are removed from the agent. diff -Nru libnice-0.1.5/docs/reference/libnice/html/pt04.html libnice-0.1.7/docs/reference/libnice/html/pt04.html --- libnice-0.1.5/docs/reference/libnice/html/pt04.html 2014-03-07 02:22:50.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/html/pt04.html 2014-05-05 18:59:30.000000000 +0000 @@ -35,6 +35,7 @@

Index of new symbols in 0.0.11

Index of new symbols in 0.1.4

Index of new symbols in 0.1.5

Index of new symbols in 0.1.6

Annotation Glossary

diff -Nru libnice-0.1.5/docs/reference/libnice/libnice-docs.sgml libnice-0.1.7/docs/reference/libnice/libnice-docs.sgml --- libnice-0.1.5/docs/reference/libnice/libnice-docs.sgml 2014-03-07 02:14:00.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/libnice-docs.sgml 2014-04-29 01:09:49.000000000 +0000 @@ -93,6 +93,10 @@ Index of new symbols in 0.1.5 + + Index of new symbols in 0.1.6 + + diff -Nru libnice-0.1.5/docs/reference/libnice/libnice-sections.txt libnice-0.1.7/docs/reference/libnice/libnice-sections.txt --- libnice-0.1.5/docs/reference/libnice/libnice-sections.txt 2014-03-07 02:22:50.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/libnice-sections.txt 2014-05-05 18:59:30.000000000 +0000 @@ -17,6 +17,7 @@ nice_agent_add_stream nice_agent_remove_stream nice_agent_set_relay_info +nice_agent_forget_relays nice_agent_gather_candidates nice_agent_set_remote_credentials nice_agent_get_local_credentials @@ -36,6 +37,7 @@ nice_agent_set_stream_tos nice_agent_set_software nice_agent_restart +nice_agent_restart_stream nice_agent_set_stream_name nice_agent_get_stream_name nice_agent_get_default_local_candidate @@ -47,6 +49,7 @@ nice_agent_parse_remote_candidate_sdp nice_agent_get_io_stream nice_agent_get_selected_socket +nice_component_state_to_string NICE_AGENT NICE_IS_AGENT diff -Nru libnice-0.1.5/docs/reference/libnice/Makefile.am libnice-0.1.7/docs/reference/libnice/Makefile.am --- libnice-0.1.5/docs/reference/libnice/Makefile.am 2014-03-07 02:14:00.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/Makefile.am 2014-04-04 03:52:17.000000000 +0000 @@ -55,7 +55,7 @@ # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES= conncheck.h discovery.h stream.h component.h agent-priv.h \ - agent-signals-marshal.h iostream.h inputstream.h outputstream.h \ + iostream.h inputstream.h outputstream.h \ gstnice.h gstnicesrc.h gstnicesink.h \ md5.h sha1.h stunhmac.h utils.h rand.h stun5389.h stuncrc32.h diff -Nru libnice-0.1.5/docs/reference/libnice/Makefile.in libnice-0.1.7/docs/reference/libnice/Makefile.in --- libnice-0.1.5/docs/reference/libnice/Makefile.in 2014-03-07 02:21:09.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/Makefile.in 2014-05-05 18:58:19.000000000 +0000 @@ -316,7 +316,7 @@ # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES = conncheck.h discovery.h stream.h component.h agent-priv.h \ - agent-signals-marshal.h iostream.h inputstream.h outputstream.h \ + iostream.h inputstream.h outputstream.h \ gstnice.h gstnicesrc.h gstnicesink.h \ md5.h sha1.h stunhmac.h utils.h rand.h stun5389.h stuncrc32.h diff -Nru libnice-0.1.5/docs/reference/libnice/tmpl/agent.sgml libnice-0.1.7/docs/reference/libnice/tmpl/agent.sgml --- libnice-0.1.5/docs/reference/libnice/tmpl/agent.sgml 2014-03-07 02:22:50.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/tmpl/agent.sgml 2014-05-05 18:59:30.000000000 +0000 @@ -340,6 +340,17 @@ @Returns: + + + + + +@agent: +@stream_id: +@component_id: +@Returns: + + @@ -576,6 +587,16 @@ @Returns: + + + + + +@agent: +@stream_id: +@Returns: + + @@ -694,3 +715,12 @@ @Returns: + + + + + +@state: +@Returns: + + diff -Nru libnice-0.1.5/docs/reference/libnice/tmpl/candidate.sgml libnice-0.1.7/docs/reference/libnice/tmpl/candidate.sgml --- libnice-0.1.5/docs/reference/libnice/tmpl/candidate.sgml 2014-03-07 02:22:50.000000000 +0000 +++ libnice-0.1.7/docs/reference/libnice/tmpl/candidate.sgml 2014-05-05 18:59:30.000000000 +0000 @@ -60,6 +60,7 @@ +@ref_count: @server: @username: @password: diff -Nru libnice-0.1.5/examples/simple-example.c libnice-0.1.7/examples/simple-example.c --- libnice-0.1.5/examples/simple-example.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/examples/simple-example.c 2014-04-25 01:46:20.000000000 +0000 @@ -77,7 +77,7 @@ { NiceAgent *agent; gchar *stun_addr = NULL; - guint stun_port; + guint stun_port = 0; gboolean controlling; // Parse arguments @@ -308,6 +308,7 @@ cand->stream_id = _stream_id; cand->transport = NICE_CANDIDATE_TRANSPORT_UDP; strncpy(cand->foundation, tokens[0], NICE_CANDIDATE_MAX_FOUNDATION); + cand->foundation[NICE_CANDIDATE_MAX_FOUNDATION - 1] = 0; cand->priority = atoi (tokens[1]); if (!nice_address_set_from_string(&cand->addr, tokens[2])) { diff -Nru libnice-0.1.5/examples/threaded-example.c libnice-0.1.7/examples/threaded-example.c --- libnice-0.1.5/examples/threaded-example.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/examples/threaded-example.c 2014-04-29 03:10:30.000000000 +0000 @@ -331,6 +331,7 @@ cand->stream_id = stream_id; cand->transport = NICE_CANDIDATE_TRANSPORT_UDP; strncpy(cand->foundation, tokens[0], NICE_CANDIDATE_MAX_FOUNDATION); + cand->foundation[NICE_CANDIDATE_MAX_FOUNDATION - 1] = 0; cand->priority = atoi (tokens[1]); if (!nice_address_set_from_string(&cand->addr, tokens[2])) { diff -Nru libnice-0.1.5/NEWS libnice-0.1.7/NEWS --- libnice-0.1.5/NEWS 2014-03-07 02:18:47.000000000 +0000 +++ libnice-0.1.7/NEWS 2014-05-05 18:57:37.000000000 +0000 @@ -1,6 +1,20 @@ -libnice 0.1.5 (2014-03-06) +libnice 0.1.7 (2014-05-05) ========================== +Fix undesired API change that broke Farstream unit testsx +libnice 0.1.6 (2014-04-28) +========================== +API: nice_agent_restart_stream() to do a ICE restart on a single strema +API: nice_component_state_to_string() to get a printable name for a component + state +API: nice_agent_forget_relays() to forget the relays set for a + specific component, along with nice_agent_restart_stream(), it allows + changing the current relay without dropping the connection. +It is now possible to add relays after the initial candidate gathering. +Many bug fixes + +libnice 0.1.5 (2014-03-06) +========================== API: nice_agent_recv() and nice_agent_recv_nonblocking() as an alternative to the nice_agent_attach_recv() @@ -13,7 +27,6 @@ Improve performance Build fixes - libnice 0.1.4 (2013-02-22) ========================== @@ -33,7 +46,6 @@ Add support for GStreamer 1.0, will compile plugins for both 1.0 and 0.10 by default Cache GSocketAddress in UdpBsdSocket, creating it is very slow - libnice 0.1.2 (2012-04-03) ========================== diff -Nru libnice-0.1.5/nice/libnice.sym libnice-0.1.7/nice/libnice.sym --- libnice-0.1.5/nice/libnice.sym 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/nice/libnice.sym 2014-04-25 01:09:45.000000000 +0000 @@ -21,6 +21,7 @@ nice_agent_recv_nonblocking nice_agent_recv_messages_nonblocking nice_agent_attach_recv +nice_agent_forget_relays nice_agent_gather_candidates nice_agent_generate_local_candidate_sdp nice_agent_generate_local_sdp @@ -41,6 +42,7 @@ nice_agent_parse_remote_stream_sdp nice_agent_remove_stream nice_agent_restart +nice_agent_restart_stream nice_agent_send nice_agent_send_messages_nonblocking nice_agent_set_port_range @@ -55,6 +57,7 @@ nice_candidate_copy nice_candidate_free nice_candidate_new +nice_component_state_to_string nice_debug_disable nice_debug_enable nice_interfaces_get_ip_for_interface diff -Nru libnice-0.1.5/socket/tcp-bsd.c libnice-0.1.7/socket/tcp-bsd.c --- libnice-0.1.5/socket/tcp-bsd.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/socket/tcp-bsd.c 2014-04-09 03:14:47.000000000 +0000 @@ -106,23 +106,21 @@ nice_address_copy_to_sockaddr (addr, &name.addr); - if (gsock == NULL) { - if (name.storage.ss_family == AF_UNSPEC || name.storage.ss_family == AF_INET) { - gsock = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, - G_SOCKET_PROTOCOL_TCP, NULL); + if (name.storage.ss_family == AF_UNSPEC || name.storage.ss_family == AF_INET) { + gsock = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, + G_SOCKET_PROTOCOL_TCP, NULL); - name.storage.ss_family = AF_INET; + name.storage.ss_family = AF_INET; #ifdef HAVE_SA_LEN - name.storage.ss_len = sizeof (struct sockaddr_in); + name.storage.ss_len = sizeof (struct sockaddr_in); #endif - } else if (name.storage.ss_family == AF_INET6) { - gsock = g_socket_new (G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM, - G_SOCKET_PROTOCOL_TCP, NULL); - name.storage.ss_family = AF_INET6; + } else if (name.storage.ss_family == AF_INET6) { + gsock = g_socket_new (G_SOCKET_FAMILY_IPV6, G_SOCKET_TYPE_STREAM, + G_SOCKET_PROTOCOL_TCP, NULL); + name.storage.ss_family = AF_INET6; #ifdef HAVE_SA_LEN - name.storage.ss_len = sizeof (struct sockaddr_in6); + name.storage.ss_len = sizeof (struct sockaddr_in6); #endif - } } if (gsock == NULL) { @@ -130,24 +128,28 @@ return NULL; } + gaddr = g_socket_address_new_from_native (&name.addr, sizeof (name)); + if (gaddr == NULL) { + g_object_unref (gsock); + g_slice_free (NiceSocket, sock); + return NULL; + } + /* GSocket: All socket file descriptors are set to be close-on-exec. */ g_socket_set_blocking (gsock, false); - gaddr = g_socket_address_new_from_native (&name.addr, sizeof (name)); - - if (gaddr != NULL) { - gret = g_socket_connect (gsock, gaddr, NULL, &gerr); - g_object_unref (gaddr); - } + gret = g_socket_connect (gsock, gaddr, NULL, &gerr); + g_object_unref (gaddr); if (gret == FALSE) { if (g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_PENDING) == FALSE) { + g_error_free (gerr); g_socket_close (gsock, NULL); g_object_unref (gsock); g_slice_free (NiceSocket, sock); return NULL; } - g_error_free(gerr); + g_error_free (gerr); } gaddr = g_socket_get_local_address (gsock, NULL); @@ -164,6 +166,8 @@ sock->priv = priv = g_slice_new0 (TcpPriv); + if (ctx == NULL) + ctx = g_main_context_default (); priv->context = g_main_context_ref (ctx); priv->server_addr = *addr; priv->error = FALSE; @@ -389,8 +393,7 @@ } if (ret < 0) { - if (gerr != NULL && - g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + if (g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { GOutputVector local_buf = { tbs->buf, tbs->length }; NiceOutputMessage local_message = {&local_buf, 1}; @@ -399,7 +402,7 @@ g_error_free (gerr); break; } - g_error_free (gerr); + g_clear_error (&gerr); } else if (ret < (int) tbs->length) { GOutputVector local_buf = { tbs->buf + ret, tbs->length - ret }; NiceOutputMessage local_message = {&local_buf, 1}; diff -Nru libnice-0.1.5/socket/tcp-turn.c libnice-0.1.7/socket/tcp-turn.c --- libnice-0.1.5/socket/tcp-turn.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/socket/tcp-turn.c 2014-04-09 02:44:13.000000000 +0000 @@ -196,7 +196,7 @@ } static gint -socket_recv_messages (NiceSocket *socket, +socket_recv_messages (NiceSocket *nicesock, NiceInputMessage *recv_messages, guint n_recv_messages) { guint i; @@ -205,7 +205,7 @@ for (i = 0; i < n_recv_messages; i++) { gssize len; - len = socket_recv_message (socket, &recv_messages[i]); + len = socket_recv_message (nicesock, &recv_messages[i]); recv_messages[i].length = MAX (len, 0); if (len < 0) @@ -234,6 +234,7 @@ gint ret; guint n_bufs; guint16 header_buf; + guint offset = 0; /* Count the number of buffers. */ if (message->n_buffers == -1) { @@ -247,30 +248,16 @@ /* Allocate a new array of buffers, covering all the buffers in the input * @message, but with an additional one for a header and one for a footer. */ - local_bufs = g_malloc_n (n_bufs + 2, sizeof (GOutputVector)); + local_bufs = g_malloc_n (n_bufs + 1, sizeof (GOutputVector)); local_message.buffers = local_bufs; - local_message.n_buffers = n_bufs + 2; + local_message.n_buffers = n_bufs + 1; - /* Copy the existing buffers across. */ - for (j = 0; j < n_bufs; j++) { - local_bufs[j + 1].buffer = message->buffers[j].buffer; - local_bufs[j + 1].size = message->buffers[j].size; - } - - /* Header buffer. */ if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE) { header_buf = htons (output_message_get_size (message)); - local_bufs[0].buffer = &header_buf; local_bufs[0].size = sizeof (header_buf); - } else { - /* Skip over the allocated header buffer. */ - local_message.buffers++; - local_message.n_buffers--; - } - - /* Tail buffer. */ - if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || + offset = 1; + } else if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { gsize message_len = output_message_get_size (message); gsize padlen = (message_len % 4) ? 4 - (message_len % 4) : 0; @@ -278,16 +265,23 @@ local_bufs[n_bufs].buffer = &padbuf; local_bufs[n_bufs].size = padlen; } else { - /* Skip over the allocated tail buffer. */ - local_message.n_buffers--; + local_message.n_buffers = n_bufs; } + /* Copy the existing buffers across. */ + for (j = 0; j < n_bufs; j++) { + local_bufs[j + offset].buffer = message->buffers[j].buffer; + local_bufs[j + offset].size = message->buffers[j].size; + } + + ret = nice_socket_send_messages (priv->base_socket, to, &local_message, 1); + if (ret == 1) + ret = output_message_get_size (&local_message); + g_free (local_bufs); - if (ret == 1) - return output_message_get_size (&local_message); return ret; } diff -Nru libnice-0.1.5/socket/turn.c libnice-0.1.7/socket/turn.c --- libnice-0.1.5/socket/turn.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/socket/turn.c 2014-05-02 21:47:09.000000000 +0000 @@ -67,7 +67,7 @@ NiceAddress peer; uint16_t channel; gboolean renew; - guint timeout_source; + GSource *timeout_source; } ChannelBinding; typedef struct { @@ -83,9 +83,9 @@ NiceSocket *base_socket; NiceAddress server_addr; uint8_t *username; - size_t username_len; + gsize username_len; uint8_t *password; - size_t password_len; + gsize password_len; NiceTurnSocketCompatibility compatibility; GQueue *send_requests; uint8_t ms_realm[STUN_MAX_MS_REALM_LEN + 1]; @@ -96,7 +96,7 @@ there is an installed permission */ GList *sent_permissions; /* ongoing permission installed */ GHashTable *send_data_queues; /* stores a send data queue for per peer */ - guint permission_timeout_source; /* timer used to invalidate + GSource *permission_timeout_source; /* timer used to invalidate permissions */ } TurnPriv; @@ -209,13 +209,13 @@ priv->password = g_base64_decode (password, &priv->password_len); } else { priv->username = (uint8_t *)g_strdup (username); - priv->username_len = (size_t) strlen (username); + priv->username_len = (gsize) strlen (username); if (compatibility == NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE) { priv->password = NULL; priv->password_len = 0; } else { priv->password = (uint8_t *)g_strdup (password); - priv->password_len = (size_t) strlen (password); + priv->password_len = (gsize) strlen (password); } } priv->server_addr = *server_addr; @@ -247,8 +247,10 @@ for (i = priv->channels; i; i = i->next) { ChannelBinding *b = i->data; - if (b->timeout_source) - g_source_remove (b->timeout_source); + if (b->timeout_source) { + g_source_destroy (b->timeout_source); + g_source_unref (b->timeout_source); + } g_free (b); } g_list_free (priv->channels); @@ -288,8 +290,11 @@ g_list_free (priv->sent_permissions); g_hash_table_destroy (priv->send_data_queues); - if (priv->permission_timeout_source) - g_source_remove (priv->permission_timeout_source); + if (priv->permission_timeout_source) { + g_source_destroy (priv->permission_timeout_source); + g_source_unref (priv->permission_timeout_source); + priv->permission_timeout_source = NULL; + } if (priv->ctx) g_main_context_unref (priv->ctx); @@ -339,6 +344,9 @@ n_valid_messages = 1; + if (message->length == 0) + continue; + /* Compact the message’s buffers into a single one for parsing. Avoid this * in the (hopefully) common case of a single-element buffer vector. */ if (message->n_buffers == 1 || @@ -346,7 +354,7 @@ message->buffers[0].buffer != NULL && message->buffers[1].buffer == NULL)) { buffer = message->buffers[0].buffer; - buffer_length = message->buffers[0].size; + buffer_length = message->length; } else { nice_debug ("%s: **WARNING: SLOW PATH**", G_STRFUNC); @@ -366,6 +374,8 @@ /* A TURN control message which needs ignoring. Re-use this * NiceInputMessage in the next loop iteration. */ n_valid_messages = 0; + } else { + *message->from = from; } /* Split up the monolithic buffer again into the caller-provided buffers. */ @@ -391,13 +401,16 @@ static GSource * priv_timeout_add_with_context (TurnPriv *priv, guint interval, - GSourceFunc function, gpointer data) + gboolean seconds, GSourceFunc function, gpointer data) { GSource *source; g_return_val_if_fail (function != NULL, NULL); - source = g_timeout_source_new (interval); + if (seconds) + source = g_timeout_source_new_seconds (interval); + else + source = g_timeout_source_new (interval); g_source_set_callback (source, function, data, NULL); g_source_attach (source, priv->ctx); @@ -482,8 +495,13 @@ NiceAddress *address = (NiceAddress *) iter->data; if (nice_address_equal (address, peer)) { + GList *prev = iter->prev; + nice_address_free (address); list = g_list_delete_link (list, iter); + iter = prev; + if (iter) + iter = list; } } @@ -626,7 +644,7 @@ buffer, sizeof(buffer), STUN_IND_SEND)) goto send; if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_PEER_ADDRESS, - &sa.addr, sizeof(sa)) != + &sa.storage, sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS) goto send; } else { @@ -687,7 +705,7 @@ req->priv = priv; stun_message_id (&msg, req->id); req->source = priv_timeout_add_with_context (priv, - STUN_END_TIMEOUT, priv_forget_send_request, req); + STUN_END_TIMEOUT, FALSE, priv_forget_send_request, req); g_queue_push_tail (priv->send_requests, req); } } @@ -822,7 +840,7 @@ /* find current binding and destroy it */ for (i = priv->channels ; i; i = i->next) { ChannelBinding *b = i->data; - if (b->timeout_source == g_source_get_id (source)) { + if (b->timeout_source == source) { priv->channels = g_list_remove (priv->channels, b); /* Make sure we don't free a currently being-refreshed binding */ if (priv->current_binding_msg && !priv->current_binding) { @@ -836,7 +854,7 @@ /* look up binding associated with peer */ stun_message_find_xor_addr ( &priv->current_binding_msg->message, - STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa.addr, &sa_len); + STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa.storage, &sa_len); nice_address_set_from_sockaddr (&to, &sa.addr); /* If the binding is being refreshed, then move it to @@ -882,11 +900,12 @@ /* find current binding and mark it for renewal */ for (i = priv->channels ; i; i = i->next) { ChannelBinding *b = i->data; - if (b->timeout_source == g_source_get_id (source)) { + if (b->timeout_source == source) { b->renew = TRUE; /* Install timer to expire the permission */ - b->timeout_source = g_timeout_add_seconds (STUN_EXPIRE_TIMEOUT, - priv_binding_expired_timeout, priv); + b->timeout_source = priv_timeout_add_with_context (priv, + STUN_EXPIRE_TIMEOUT, TRUE, priv_binding_expired_timeout, priv); + /* Send renewal */ if (!priv->current_binding_msg) priv_send_channel_bind (priv, NULL, b->channel, &b->peer); @@ -1054,7 +1073,7 @@ /* look up binding associated with peer */ stun_message_find_xor_addr ( &priv->current_binding_msg->message, - STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa.addr, &sa_len); + STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &sa.storage, &sa_len); nice_address_set_from_sockaddr (&to, &sa.addr); for (i = priv->channels; i; i = i->next) { @@ -1118,12 +1137,14 @@ binding->renew = FALSE; /* Remove any existing timer */ - if (binding->timeout_source) - g_source_remove (binding->timeout_source); + if (binding->timeout_source) { + g_source_destroy (binding->timeout_source); + g_source_unref (binding->timeout_source); + } /* Install timer to schedule refresh of the permission */ binding->timeout_source = - g_timeout_add_seconds (STUN_BINDING_TIMEOUT, - priv_binding_timeout, priv); + priv_timeout_add_with_context (priv, STUN_BINDING_TIMEOUT, + TRUE, priv_binding_timeout, priv); } priv_process_pending_bindings (priv); } @@ -1155,7 +1176,7 @@ nice_debug ("got response for CreatePermission"); stun_message_find_xor_addr ( ¤t_create_permission_msg->message, - STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &peer.addr, &peer_len); + STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &peer.storage, &peer_len); nice_address_set_from_sockaddr (&to, &peer.addr); /* unathorized => resend with realm and nonce */ @@ -1206,8 +1227,8 @@ if (stun_message_get_class (&msg) == STUN_RESPONSE && !priv->permission_timeout_source) { priv->permission_timeout_source = - g_timeout_add_seconds (STUN_PERMISSION_TIMEOUT, - priv_permission_timeout, priv); + priv_timeout_add_with_context (priv, STUN_PERMISSION_TIMEOUT, + TRUE, priv_permission_timeout, priv); } /* send enqued data */ @@ -1236,12 +1257,12 @@ if (priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9 || priv->compatibility == NICE_TURN_SOCKET_COMPATIBILITY_RFC5766) { if (stun_message_find_xor_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS, - &sa.addr, &from_len) != + &sa.storage, &from_len) != STUN_MESSAGE_RETURN_SUCCESS) goto recv; } else { if (stun_message_find_addr (&msg, STUN_ATTRIBUTE_REMOTE_ADDRESS, - &sa.addr, &from_len) != + &sa.storage, &from_len) != STUN_MESSAGE_RETURN_SUCCESS) goto recv; } @@ -1421,7 +1442,7 @@ stun_agent_forget_transaction (&priv->agent, id); stun_message_find_xor_addr ( ¤t_create_permission_msg->message, - STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &addr.addr, &addr_len); + STUN_ATTRIBUTE_XOR_PEER_ADDRESS, &addr.storage, &addr_len); nice_address_set_from_sockaddr (&to, &addr.addr); priv_remove_sent_permission_for_peer (priv, &to); @@ -1532,7 +1553,7 @@ guint timeout = stun_timer_remainder (&priv->current_binding_msg->timer); if (timeout > 0) { priv->tick_source_channel_bind = - priv_timeout_add_with_context (priv, timeout, + priv_timeout_add_with_context (priv, timeout, FALSE, priv_retransmissions_tick, priv); } else { priv_retransmissions_tick_unlocked (priv); @@ -1548,8 +1569,12 @@ timeout = stun_timer_remainder (¤t_create_permission_msg->timer); if (timeout > 0) { + if (priv->tick_source_create_permission) { + g_source_destroy (priv->tick_source_create_permission); + g_source_unref (priv->tick_source_create_permission); + } priv->tick_source_create_permission = - priv_timeout_add_with_context (priv, + priv_timeout_add_with_context (priv, FALSE, timeout, priv_retransmissions_create_permission_tick, priv); @@ -1624,7 +1649,7 @@ priv->password_len, realm, realm_len, nonce, nonce_len, - &addr.addr, + &addr.storage, STUN_USAGE_TURN_COMPATIBILITY_RFC5766); if (msg_buf_len > 0) { @@ -1676,7 +1701,7 @@ } if (stun_message_append_xor_addr (&msg->message, STUN_ATTRIBUTE_PEER_ADDRESS, - &sa.addr, + &sa.storage, sizeof(sa)) != STUN_MESSAGE_RETURN_SUCCESS) { g_free (msg); diff -Nru libnice-0.1.5/stun/stunagent.c libnice-0.1.7/stun/stunagent.c --- libnice-0.1.5/stun/stunagent.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/stunagent.c 2014-04-25 01:46:20.000000000 +0000 @@ -554,9 +554,9 @@ stun_hash_creds (realm, realm_len, username, username_len, key, key_len, md5); + memcpy (msg->long_term_key, md5, sizeof(msg->long_term_key)); + msg->long_term_valid = TRUE; } - memcpy (msg->long_term_key, md5, sizeof(msg->long_term_key)); - msg->long_term_valid = TRUE; } /* If no realm/username and long term credentials, diff -Nru libnice-0.1.5/stun/stunmessage.c libnice-0.1.7/stun/stunmessage.c --- libnice-0.1.5/stun/stunmessage.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/stun/stunmessage.c 2014-05-02 21:45:09.000000000 +0000 @@ -223,7 +223,7 @@ StunMessageReturn stun_message_find_addr (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, socklen_t *addrlen) + struct sockaddr_storage *addr, socklen_t *addrlen) { const uint8_t *ptr; uint16_t len = 0; @@ -284,8 +284,7 @@ StunMessageReturn stun_message_find_xor_addr (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, - socklen_t *addrlen) + struct sockaddr_storage *addr, socklen_t *addrlen) { StunMessageReturn val = stun_message_find_addr (msg, type, addr, addrlen); if (val) @@ -296,8 +295,7 @@ StunMessageReturn stun_message_find_xor_addr_full (const StunMessage *msg, StunAttribute type, - struct sockaddr *addr, socklen_t *addrlen, - uint32_t magic_cookie) + struct sockaddr_storage *addr, socklen_t *addrlen, uint32_t magic_cookie) { StunMessageReturn val = stun_message_find_addr (msg, type, addr, addrlen); if (val) @@ -475,48 +473,44 @@ StunMessageReturn stun_message_append_xor_addr (StunMessage *msg, StunAttribute type, - const struct sockaddr *addr, socklen_t addrlen) + const struct sockaddr_storage *addr, socklen_t addrlen) { StunMessageReturn val; /* Must be big enough to hold any supported address: */ - union { - struct sockaddr_storage storage; - struct sockaddr addr; - } xor; - - if ((size_t) addrlen > sizeof (xor)) - addrlen = sizeof (xor); - memcpy (&xor.storage, addr, addrlen); + struct sockaddr_storage tmpaddr; - val = stun_xor_address (msg, &xor.addr, addrlen, + if ((size_t) addrlen > sizeof (tmpaddr)) + addrlen = sizeof (tmpaddr); + memcpy (&tmpaddr, addr, addrlen); + + val = stun_xor_address (msg, &tmpaddr, addrlen, STUN_MAGIC_COOKIE); if (val) return val; - return stun_message_append_addr (msg, type, &xor.addr, addrlen); + return stun_message_append_addr (msg, type, (struct sockaddr *) &tmpaddr, + addrlen); } StunMessageReturn stun_message_append_xor_addr_full (StunMessage *msg, StunAttribute type, - const struct sockaddr *addr, socklen_t addrlen, + const struct sockaddr_storage *addr, socklen_t addrlen, uint32_t magic_cookie) { StunMessageReturn val; /* Must be big enough to hold any supported address: */ - union { - struct sockaddr_storage storage; - struct sockaddr addr; - } xor; - - if ((size_t) addrlen > sizeof (xor)) - addrlen = sizeof (xor); - memcpy (&xor.storage, addr, addrlen); + struct sockaddr_storage tmpaddr; + + if ((size_t) addrlen > sizeof (tmpaddr)) + addrlen = sizeof (tmpaddr); + memcpy (&tmpaddr, addr, addrlen); - val = stun_xor_address (msg, &xor.addr, addrlen, magic_cookie); + val = stun_xor_address (msg, &tmpaddr, addrlen, magic_cookie); if (val) return val; - return stun_message_append_addr (msg, type, &xor.addr, addrlen); + return stun_message_append_addr (msg, type, (struct sockaddr *) &tmpaddr, + addrlen); } @@ -631,7 +625,16 @@ /* from then on, we know we have the entire packet in buffer */ while (len > 0) { - size_t alen = stun_getw (msg + STUN_ATTRIBUTE_TYPE_LEN); + size_t alen; + + if (len < 4) + { + stun_debug ("STUN error: Incomplete STUN attribute header of length " + "%u bytes!\n", (unsigned)len); + return STUN_MESSAGE_BUFFER_INVALID; + } + + alen = stun_getw (msg + STUN_ATTRIBUTE_TYPE_LEN); if (has_padding) alen = stun_align (alen); diff -Nru libnice-0.1.5/stun/stunmessage.h libnice-0.1.7/stun/stunmessage.h --- libnice-0.1.5/stun/stunmessage.h 2014-03-07 02:14:00.000000000 +0000 +++ libnice-0.1.7/stun/stunmessage.h 2014-05-02 21:43:26.000000000 +0000 @@ -645,7 +645,7 @@ * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown. */ StunMessageReturn stun_message_find_addr (const StunMessage *msg, - StunAttribute type, struct sockaddr *addr, socklen_t *addrlen); + StunAttribute type, struct sockaddr_storage *addr, socklen_t *addrlen); /** * stun_message_find_xor_addr: @@ -664,7 +664,7 @@ * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown. */ StunMessageReturn stun_message_find_xor_addr (const StunMessage *msg, - StunAttribute type, struct sockaddr *addr, socklen_t *addrlen); + StunAttribute type, struct sockaddr_storage *addr, socklen_t *addrlen); /** * stun_message_find_xor_addr_full: @@ -684,7 +684,7 @@ * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown. */ StunMessageReturn stun_message_find_xor_addr_full (const StunMessage *msg, - StunAttribute type, struct sockaddr *addr, + StunAttribute type, struct sockaddr_storage *addr, socklen_t *addrlen, uint32_t magic_cookie); @@ -811,7 +811,7 @@ * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown. */ StunMessageReturn stun_message_append_xor_addr (StunMessage * msg, - StunAttribute type, const struct sockaddr *addr, socklen_t addrlen); + StunAttribute type, const struct sockaddr_storage *addr, socklen_t addrlen); /** * stun_message_append_xor_addr_full: @@ -828,7 +828,7 @@ * %STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS if the address family is unknown. */ StunMessageReturn stun_message_append_xor_addr_full (StunMessage * msg, - StunAttribute type, const struct sockaddr *addr, socklen_t addrlen, + StunAttribute type, const struct sockaddr_storage *addr, socklen_t addrlen, uint32_t magic_cookie); /** diff -Nru libnice-0.1.5/stun/tests/test-bind.c libnice-0.1.7/stun/tests/test-bind.c --- libnice-0.1.5/stun/tests/test-bind.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/tests/test-bind.c 2014-03-31 23:18:16.000000000 +0000 @@ -102,7 +102,8 @@ /** Incorrect socket family test */ static void bad_family (void) { - struct sockaddr addr, dummy; + struct sockaddr addr; + struct sockaddr_storage dummy; int val; socklen_t dummylen = sizeof(dummy); @@ -121,7 +122,8 @@ /** Too small socket address test */ static void small_srv_addr (void) { - struct sockaddr addr, dummy; + struct sockaddr addr; + struct sockaddr_storage dummy; int val; socklen_t dummylen = sizeof(dummy); @@ -141,7 +143,7 @@ static void big_srv_addr (void) { uint8_t buf[sizeof (struct sockaddr_storage) + 16]; - struct sockaddr dummy; + struct sockaddr_storage dummy; int val; socklen_t dummylen = sizeof(dummy); @@ -156,8 +158,7 @@ /** Timeout test */ static void timeout (void) { - struct sockaddr_storage srv; - struct sockaddr dummy; + struct sockaddr_storage srv, dummy; socklen_t srvlen = sizeof (srv); socklen_t dummylen = sizeof(dummy); int val; @@ -231,8 +232,7 @@ assert (stun_agent_validate (&agent, &msg, buf, len, NULL, NULL) == STUN_VALIDATION_SUCCESS); - val = stun_usage_bind_process (&msg, - (struct sockaddr *)&addr, &addrlen, (struct sockaddr *)&addr, &addrlen); + val = stun_usage_bind_process (&msg, &addr, &addrlen, &addr, &addrlen); assert (val == STUN_USAGE_BIND_RETURN_INVALID); /* Send response with wrong request type */ @@ -241,8 +241,7 @@ /* Send error response without ERROR-CODE */ buf[1] |= 0x10; - val = stun_usage_bind_process (&msg, - (struct sockaddr *)&addr, &addrlen, (struct sockaddr *)&addr, &addrlen); + val = stun_usage_bind_process (&msg, &addr, &addrlen, &addr, &addrlen); assert (val == STUN_USAGE_BIND_RETURN_INVALID); close (fd); @@ -311,8 +310,7 @@ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); assert (val == 0); - val = stun_usage_bind_process (&msg, - (struct sockaddr *)&addr, &addrlen, (struct sockaddr *)&addr, &addrlen); + val = stun_usage_bind_process (&msg, &addr, &addrlen, &addr, &addrlen); assert (val == STUN_USAGE_BIND_RETURN_ERROR); /* Send response with a no mapped address at all */ @@ -342,8 +340,7 @@ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); assert (val == 0); - val = stun_usage_bind_process (&msg, - (struct sockaddr *)&addr, &addrlen, (struct sockaddr *)&addr, &addrlen); + val = stun_usage_bind_process (&msg, &addr, &addrlen, &addr, &addrlen); assert (val == STUN_USAGE_BIND_RETURN_ERROR); /* Send old-style response */ @@ -365,7 +362,7 @@ stun_agent_init_response (&agent, &msg, buf, sizeof (buf), &msg); assert (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen) == STUN_MESSAGE_RETURN_SUCCESS); + &addr, addrlen) == STUN_MESSAGE_RETURN_SUCCESS); len = stun_agent_finish_message (&agent, &msg, NULL, 0); assert (len > 0); @@ -375,8 +372,7 @@ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); assert (val == 0); - val = stun_usage_bind_process (&msg, - (struct sockaddr *)&addr, &addrlen, (struct sockaddr *)&addr, &addrlen); + val = stun_usage_bind_process (&msg, &addr, &addrlen, &addr, &addrlen); assert (val == STUN_USAGE_BIND_RETURN_SUCCESS); /* End */ diff -Nru libnice-0.1.5/stun/tests/test-conncheck.c libnice-0.1.7/stun/tests/test-conncheck.c --- libnice-0.1.5/stun/tests/test-conncheck.c 2011-02-02 04:49:42.000000000 +0000 +++ libnice-0.1.7/stun/tests/test-conncheck.c 2014-03-31 22:41:13.000000000 +0000 @@ -67,24 +67,30 @@ int main (void) { - struct sockaddr_in ip4; + union { + struct sockaddr sa; + struct sockaddr_storage storage; + struct sockaddr_in ip4; + } addr; uint8_t req_buf[STUN_MAX_MESSAGE_SIZE]; uint8_t resp_buf[STUN_MAX_MESSAGE_SIZE]; - const uint64_t tie = 0x8000000000000000LL; + const const uint64_t tie = 0x8000000000000000LL; StunMessageReturn val; StunUsageIceReturn val2; size_t len; size_t rlen; - static char username[] = "L:R", ufrag[] = "L", pass[] = "secret"; + static char username[] = "L:R"; + static uint8_t ufrag[] = "L", pass[] = "secret"; + size_t ufrag_len = strlen ((char*) ufrag); + size_t pass_len = strlen ((char*) pass); int code; - uint16_t alen; bool control = false; StunAgent agent; StunMessage req; StunMessage resp; StunDefaultValidaterData validater_data[] = { - {ufrag, strlen (ufrag), pass, strlen (pass)}, - {username, strlen (username), pass, strlen (pass)}, + {ufrag, ufrag_len, pass, pass_len}, + {(uint8_t *) username, strlen (username), pass, pass_len}, {NULL, 0, NULL, 0}}; StunValidationStatus valid; @@ -93,13 +99,13 @@ STUN_AGENT_USAGE_USE_FINGERPRINT | STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS); - memset (&ip4, 0, sizeof (ip4)); - ip4.sin_family = AF_INET; + memset (&addr, 0, sizeof (addr)); + addr.ip4.sin_family = AF_INET; #ifdef HAVE_SA_LEN - ip4.sin_len = sizeof (addr); + addr.ip4.sin_len = sizeof (addr); #endif - ip4.sin_port = htons (12345); - ip4.sin_addr.s_addr = htonl (0x7f000001); + addr.ip4.sin_port = htons (12345); + addr.ip4.sin_addr.s_addr = htonl (0x7f000001); /* Incorrect message class */ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); @@ -110,8 +116,8 @@ len = sizeof (resp_buf); val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); assert (val2 == STUN_USAGE_ICE_RETURN_INVALID_REQUEST); assert (len == 0); @@ -119,13 +125,13 @@ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), 0x666)); val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, username); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); len = sizeof (resp_buf); val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); assert (val2 == STUN_USAGE_ICE_RETURN_INVALID_METHOD); assert (len > 0); @@ -135,7 +141,7 @@ assert (val == STUN_MESSAGE_RETURN_SUCCESS); val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, username); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); valid = stun_agent_validate (&agent, &req, req_buf, rlen, @@ -155,7 +161,7 @@ /* No username */ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); valid = stun_agent_validate (&agent, &req, req_buf, rlen, @@ -171,16 +177,17 @@ assert (val == STUN_MESSAGE_RETURN_SUCCESS); val = stun_message_append_flag (&req, STUN_ATTRIBUTE_USE_CANDIDATE); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); + val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, + (char*) ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); len = sizeof (resp_buf); val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); - assert (val == STUN_USAGE_ICE_RETURN_SUCCESS); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + assert (val2 == STUN_USAGE_ICE_RETURN_SUCCESS); assert (len > 0); assert (stun_agent_validate (&agent, &resp, resp_buf, len, stun_agent_default_validater, validater_data) == STUN_VALIDATION_SUCCESS); @@ -192,18 +199,18 @@ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); - ip4.sin_family = AF_UNSPEC; + addr.ip4.sin_family = AF_UNSPEC; len = sizeof (resp_buf); val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); assert (val2 == STUN_USAGE_ICE_RETURN_INVALID_ADDRESS); assert (len == 0); - ip4.sin_family = AF_INET; + addr.ip4.sin_family = AF_INET; /* Lost role conflict */ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); @@ -211,15 +218,15 @@ assert (val == STUN_MESSAGE_RETURN_SUCCESS); val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); len = sizeof (resp_buf); control = true; val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); assert (val2 == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT); assert (len > 0); assert (control == false); @@ -233,14 +240,14 @@ assert (val == STUN_MESSAGE_RETURN_SUCCESS); val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - rlen = stun_agent_finish_message (&agent, &req, pass, strlen (pass)); + rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); len = sizeof (resp_buf); control = false; val2 = stun_usage_ice_conncheck_create_reply (&agent, &req, - &resp, resp_buf, &len, (struct sockaddr *)&ip4, - sizeof (ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); + &resp, resp_buf, &len, &addr.storage, + sizeof (addr.ip4), &control, tie, STUN_USAGE_ICE_COMPATIBILITY_RFC5245); assert (val2 == STUN_USAGE_ICE_RETURN_SUCCESS); assert (len > 0); assert (control == false); diff -Nru libnice-0.1.5/stun/tests/test-format.c libnice-0.1.7/stun/tests/test-format.c --- libnice-0.1.5/stun/tests/test-format.c 2011-02-02 04:49:42.000000000 +0000 +++ libnice-0.1.7/stun/tests/test-format.c 2014-05-02 21:48:08.000000000 +0000 @@ -66,20 +66,20 @@ exit (1); } -static const char usr[] = "admin"; -static const char pwd[] = "s3kr3t"; +static const uint8_t usr[] = "admin"; +static const uint8_t pwd[] = "s3kr3t"; -bool dynamic_check_validater (StunAgent *agent, +static bool dynamic_check_validater (StunAgent *agent, StunMessage *message, uint8_t *username, uint16_t username_len, uint8_t **password, size_t *password_len, void *user_data) { - if (username_len != strlen (usr) || - memcmp (username, usr, strlen (usr)) != 0) + if (username_len != strlen ((char *) usr) || + memcmp (username, usr, strlen ((char *) usr)) != 0) fatal ("vector test : Validater received wrong username!"); *password = (uint8_t *) pwd; - *password_len = strlen (pwd); + *password_len = strlen ((char *) pwd); return true; @@ -117,9 +117,9 @@ if (stun_message_find (&msg2, STUN_ATTRIBUTE_MESSAGE_INTEGRITY, &plen) != NULL) fatal ("Missing HMAC test failed"); - stun_message_append_string (&msg2, STUN_ATTRIBUTE_USERNAME, usr); + stun_message_append_string (&msg2, STUN_ATTRIBUTE_USERNAME, (char *) usr); - len = stun_agent_finish_message (agent, &msg2, pwd, strlen (pwd)); + len = stun_agent_finish_message (agent, &msg2, pwd, strlen ((char *) pwd)); if (len <= 0) fatal ("Cannot finish message with short-term creds"); @@ -146,29 +146,30 @@ stun_agent_init_request (&agent, &msg, buf, sizeof(buf), STUN_BINDING); if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen) != + (struct sockaddr *) &addr, addrlen) != STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS) fatal ("Unknown address family test failed"); if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen) != + &addr, addrlen) != STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS) fatal ("Unknown address family xor test failed"); addr.ss_family = family; if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen - 1) != STUN_MESSAGE_RETURN_INVALID) + (struct sockaddr *) &addr, addrlen - 1) != + STUN_MESSAGE_RETURN_INVALID) fatal ("Too small %s sockaddr test failed", name); if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen - 1) != STUN_MESSAGE_RETURN_INVALID) + &addr, addrlen - 1) != STUN_MESSAGE_RETURN_INVALID) fatal ("Too small %s sockaddr xor test failed", name); if (stun_message_append_addr (&msg, STUN_ATTRIBUTE_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS) + (struct sockaddr *) &addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS) fatal ("%s sockaddr test failed", name); if (stun_message_append_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - (struct sockaddr *)&addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS) + &addr, addrlen) != STUN_MESSAGE_RETURN_SUCCESS) fatal ("%s sockaddr xor test failed", name); } @@ -176,7 +177,10 @@ { uint8_t buf[100]; size_t len; - struct sockaddr addr; + union { + struct sockaddr_storage storage; + struct sockaddr addr; + } addr; StunAgent agent; StunMessage msg; @@ -240,17 +244,17 @@ fatal ("String overflow test failed"); memset (&addr, 0, sizeof (addr)); - addr.sa_family = AF_INET; -#ifdef HAVE_SA_LEN - addr.sa_len = sizeof (addr); + addr.addr.sa_family = AF_INET; +#ifdef HAVE_SS_LEN + addr.addr.ss_len = sizeof (addr); #endif - if (stun_message_append_xor_addr (&msg, 0xffff, &addr, + if (stun_message_append_xor_addr (&msg, 0xffff, &addr.storage, sizeof (addr)) != STUN_MESSAGE_RETURN_NOT_ENOUGH_SPACE) fatal ("Address overflow test failed"); len = sizeof (msg); if (stun_agent_finish_message (&agent, &msg, NULL, 0) != 0) fatal ("Fingerprint overflow test failed"); - if (stun_agent_finish_message (&agent, &msg, pwd, strlen (pwd)) != 0) + if (stun_agent_finish_message (&agent, &msg, pwd, strlen ((char *) pwd)) != 0) fatal ("Message integrity overflow test failed"); /* Address attributes tests */ diff -Nru libnice-0.1.5/stun/tests/test-hmac.c libnice-0.1.7/stun/tests/test-hmac.c --- libnice-0.1.5/stun/tests/test-hmac.c 2009-08-14 22:46:12.000000000 +0000 +++ libnice-0.1.7/stun/tests/test-hmac.c 2014-03-31 21:39:58.000000000 +0000 @@ -45,7 +45,7 @@ #include #include -void print_bytes (uint8_t *bytes, int len) +static void print_bytes (const uint8_t *bytes, int len) { int i; @@ -55,12 +55,12 @@ printf ("\n"); } -void test_sha1 (uint8_t *str, uint8_t *expected) { +static void test_sha1 (const uint8_t *str, const uint8_t *expected) { SHA1_CTX ctx; uint8_t sha1[20]; SHA1Init(&ctx); - SHA1Update(&ctx, str, strlen (str)); + SHA1Update(&ctx, str, strlen ((char *) str)); SHA1Final(sha1, &ctx); printf ("SHA1 of '%s' : ", str); @@ -73,10 +73,11 @@ } -void test_hmac (uint8_t *key, uint8_t *str, uint8_t *expected) { +static void test_hmac (const uint8_t *key, const uint8_t *str, + const uint8_t *expected) { uint8_t hmac[20]; - hmac_sha1(key, strlen (key), str, strlen (str), hmac); + hmac_sha1(key, strlen ((char *) key), str, strlen ((char *) str), hmac); printf ("HMAC of '%s' with key '%s' is : ", str, key); print_bytes (hmac, SHA1_MAC_LEN); printf ("Expected : "); @@ -86,13 +87,12 @@ exit (1); } -void test_md5 (uint8_t *str, uint8_t *expected) { +static void test_md5 (const uint8_t *str, const uint8_t *expected) { MD5_CTX ctx; uint8_t md5[20]; - int i; MD5Init(&ctx); - MD5Update(&ctx, str, strlen (str)); + MD5Update(&ctx, str, strlen ((char *) str)); MD5Final(md5, &ctx); printf ("MD5 of '%s' : 0x", str); @@ -128,15 +128,16 @@ 0xaa, 0xe1, 0x16, 0xd3, 0x87, 0x6c, 0x66, 0x4a}; - test_hmac ("hello", "world", hello_world_hmac); + test_hmac ((const uint8_t *) "hello", (const uint8_t*) "world", + hello_world_hmac); - test_sha1 ("abc", abc_sha1); - test_md5 ("abc", abc_md5); + test_sha1 ((const uint8_t *) "abc", abc_sha1); + test_md5 ((const uint8_t *) "abc", abc_md5); - test_sha1 ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", - abcd_etc_sha1); - test_md5 ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", - abcd_etc_md5); + test_sha1 ((const uint8_t *) + "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", abcd_etc_sha1); + test_md5 ((const uint8_t *) + "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", abcd_etc_md5); return 0; } diff -Nru libnice-0.1.5/stun/tests/test-parse.c libnice-0.1.7/stun/tests/test-parse.c --- libnice-0.1.5/stun/tests/test-parse.c 2014-03-06 22:24:22.000000000 +0000 +++ libnice-0.1.7/stun/tests/test-parse.c 2014-03-31 22:41:13.000000000 +0000 @@ -285,18 +285,18 @@ } -bool test_attribute_validater (StunAgent *agent, +static bool test_attribute_validater (StunAgent *agent, StunMessage *message, uint8_t *username, uint16_t username_len, uint8_t **password, size_t *password_len, void *user_data) { - char *pwd = (char *) user_data; + uint8_t *pwd = user_data; if (username_len != 4 || memcmp (username, "ABCD", 4) != 0) return false; *password = pwd; - *password_len = strlen (pwd); + *password_len = strlen ((char *) pwd); return true; } @@ -356,7 +356,7 @@ union { - struct sockaddr sa; + struct sockaddr_storage st; struct sockaddr_in6 s6; } addr; socklen_t addrlen; @@ -368,7 +368,7 @@ StunMessage msg; uint16_t known_attributes[] = {STUN_ATTRIBUTE_MESSAGE_INTEGRITY, STUN_ATTRIBUTE_USERNAME, 0}; - printf ("Attribute test message length: %lu\n", sizeof (acme)); + printf ("Attribute test message length: %zd\n", sizeof (acme)); stun_agent_init (&agent, known_attributes, STUN_COMPATIBILITY_RFC5389, STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS); @@ -378,11 +378,11 @@ fatal ("Unauthorized validation failed"); if (stun_agent_validate (&agent, &msg, acme, sizeof(acme), - test_attribute_validater, "bad__guy") != STUN_VALIDATION_UNAUTHORIZED) + test_attribute_validater, (void *) "bad__guy") != STUN_VALIDATION_UNAUTHORIZED) fatal ("invalid password validation failed"); if (stun_agent_validate (&agent, &msg, acme, sizeof(acme), - test_attribute_validater, "good_guy") != STUN_VALIDATION_SUCCESS) + test_attribute_validater, (void *) "good_guy") != STUN_VALIDATION_SUCCESS) fatal ("good password validation failed"); if (stun_message_has_attribute (&msg, 0xff00)) @@ -422,27 +422,27 @@ fatal ("String test failed"); addrlen = sizeof (addr); - if (stun_message_find_addr (&msg, 0xff01, &addr.sa, &addrlen) != + if (stun_message_find_addr (&msg, 0xff01, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_INVALID) fatal ("Too short addres test failed"); addrlen = sizeof (addr); - if (stun_message_find_addr (&msg, 0xff02, &addr.sa, &addrlen) != + if (stun_message_find_addr (&msg, 0xff02, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_UNSUPPORTED_ADDRESS) fatal ("Unknown address family test failed"); addrlen = sizeof (addr); - if (stun_message_find_addr (&msg, 0xff03, &addr.sa, &addrlen) != + if (stun_message_find_addr (&msg, 0xff03, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_INVALID) fatal ("Too short IPv6 address test failed"); addrlen = sizeof (addr); - if (stun_message_find_addr (&msg, 0xff04, &addr.sa, &addrlen) != + if (stun_message_find_addr (&msg, 0xff04, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS) fatal ("IPv4 address test failed"); addrlen = sizeof (addr); - if (stun_message_find_addr (&msg, 0xff05, &addr.sa, &addrlen) != + if (stun_message_find_addr (&msg, 0xff05, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_INVALID) fatal ("Too big IPv4 address test failed"); addrlen = sizeof (addr); - if (stun_message_find_xor_addr (&msg, 0xff06, &addr.sa, &addrlen) != + if (stun_message_find_xor_addr (&msg, 0xff06, &addr.st, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS || memcmp (&addr.s6.sin6_addr, "\x20\x01\x0d\xb8""\xde\xad\xbe\xef" "\xde\xfa\xce\xd0""\xfa\xce\xde\xed", 16)) @@ -451,9 +451,9 @@ } static const char vector_username[] = "evtj:h6vY"; -static const char vector_password[] = "VOkJxbRl1RmTxUk/WvJxBt"; +static uint8_t vector_password[] = "VOkJxbRl1RmTxUk/WvJxBt"; -bool test_vector_validater (StunAgent *agent, +static bool test_vector_validater (StunAgent *agent, StunMessage *message, uint8_t *username, uint16_t username_len, uint8_t **password, size_t *password_len, void *user_data) { @@ -466,8 +466,8 @@ memcmp (username, vector_username, strlen (vector_username)) != 0) fatal ("vector test : Validater received wrong username!"); - *password = (uint8_t *) vector_password; - *password_len = strlen (vector_password); + *password = vector_password; + *password_len = strlen ((char *) vector_password); return true; @@ -598,8 +598,11 @@ 0x80, 0x28, 0x00, 0x04, // FINGERPRINT 0xec, 0x27, 0xae, 0xb7}; - struct sockaddr_in ip4; - struct sockaddr_in6 ip6; + union { + struct sockaddr_storage st; + struct sockaddr_in ip4; + struct sockaddr_in6 ip6; + } addr; socklen_t addrlen; StunAgent agent; @@ -616,8 +619,7 @@ STUN_AGENT_USAGE_SHORT_TERM_CREDENTIALS | STUN_AGENT_USAGE_USE_FINGERPRINT); - memset (&ip4, 0, sizeof (ip4)); - memset (&ip6, 0, sizeof (ip6)); + memset (&addr, 0, sizeof (addr)); puts ("Checking test vectors..."); @@ -635,7 +637,8 @@ if (stun_message_length (&msg) != sizeof(req) - 32) fatal ("vector test: removing attributes failed"); - stun_agent_finish_message (&agent, &msg, vector_password, strlen (vector_password)); + stun_agent_finish_message (&agent, &msg, vector_password, + strlen ((char *) vector_password)); if (stun_message_length (&msg) != stun_message_length (&msg2) || memcmp (req, req2, sizeof(req)) != 0) @@ -649,15 +652,15 @@ test_vector_validater, (void *) 0) != STUN_VALIDATION_UNMATCHED_RESPONSE) fatal ("Response ipv4 test vector authentication failed"); - addrlen = sizeof (ip4); + addrlen = sizeof (addr.ip4); if (stun_message_find_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - (struct sockaddr *)&ip4, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS) + &addr.st, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS) fatal ("Response test vector IPv4 extraction failed"); - if (ip4.sin_family != AF_INET) + if (addr.ip4.sin_family != AF_INET) fatal ("Response test vector IPv4 family failed"); - if (ntohl (ip4.sin_addr.s_addr) != 0xC0000201) + if (ntohl (addr.ip4.sin_addr.s_addr) != 0xC0000201) fatal ("Response test vector IPv4 address failed"); - if (ntohs (ip4.sin_port) != 32853) + if (ntohs (addr.ip4.sin_port) != 32853) fatal ("Response test vector IPv6 port failed"); if (stun_agent_validate (&agent, &msg, req, sizeof(req), @@ -682,16 +685,16 @@ test_vector_validater, (void *) 1) != STUN_VALIDATION_SUCCESS) fatal ("Response ipv6 test vector authentication failed"); - addrlen = sizeof (ip6); + addrlen = sizeof (addr.ip6); if (stun_message_find_xor_addr (&msg, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - (struct sockaddr *)&ip6, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS) + &addr.st, &addrlen) != STUN_MESSAGE_RETURN_SUCCESS) fatal ("Response test vector IPv6 extraction failed"); - if (ip6.sin6_family != AF_INET6) + if (addr.ip6.sin6_family != AF_INET6) fatal ("Response test vector IPv6 family failed"); - if (memcmp (ip6.sin6_addr.s6_addr, "\x20\x01\x0d\xb8\x12\x34\x56\x78" + if (memcmp (addr.ip6.sin6_addr.s6_addr, "\x20\x01\x0d\xb8\x12\x34\x56\x78" "\x00\x11\x22\x33\x44\x55\x66\x77", 16) != 0) fatal ("Response test vector IPv6 address failed"); - if (ntohs (ip6.sin6_port) != 32853) + if (ntohs (addr.ip6.sin6_port) != 32853) fatal ("Response test vector IPv6 port failed"); @@ -710,9 +713,9 @@ puts ("Testing long term credentials hash algorithm..."); - stun_hash_creds ("realm", strlen ("realm"), - "user", strlen ("user"), - "pass", strlen ("pass"), md5); + stun_hash_creds ((uint8_t *) "realm", strlen ("realm"), + (uint8_t *) "user", strlen ("user"), + (uint8_t *) "pass", strlen ("pass"), md5); stun_debug ("key for user:realm:pass is : "); stun_debug_bytes (md5, 16); diff -Nru libnice-0.1.5/stun/tools/stunbdc.c libnice-0.1.7/stun/tools/stunbdc.c --- libnice-0.1.5/stun/tools/stunbdc.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/tools/stunbdc.c 2014-03-31 22:41:13.000000000 +0000 @@ -108,8 +108,8 @@ printaddr ("Server address", ptr->ai_addr, ptr->ai_addrlen); - val = stun_usage_bind_run (ptr->ai_addr, ptr->ai_addrlen, - &addr.addr, &addrlen); + val = stun_usage_bind_run (ptr->ai_addr, ptr->ai_addrlen, &addr.storage, + &addrlen); if (val) fprintf (stderr, "%d\n", val); else diff -Nru libnice-0.1.5/stun/tools/stund.c libnice-0.1.7/stun/tools/stund.c --- libnice-0.1.5/stun/tools/stund.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/stun/tools/stund.c 2014-05-02 21:46:00.000000000 +0000 @@ -223,7 +223,7 @@ stun_agent_init_response (agent, &response, buf, sizeof (buf), &request); if (stun_message_has_cookie (&request)) stun_message_append_xor_addr (&response, - STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, &addr.addr, addr_len); + STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, &addr.storage, addr_len); else stun_message_append_addr (&response, STUN_ATTRIBUTE_MAPPED_ADDRESS, &addr.addr, addr_len); diff -Nru libnice-0.1.5/stun/usages/bind.c libnice-0.1.7/stun/usages/bind.c --- libnice-0.1.5/stun/usages/bind.c 2014-01-19 21:46:57.000000000 +0000 +++ libnice-0.1.7/stun/usages/bind.c 2014-04-16 03:16:34.000000000 +0000 @@ -126,7 +126,7 @@ if ((code / 100) == 3) { if (alternate_server && alternate_server_len) { if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER, - alternate_server, + (struct sockaddr_storage *) alternate_server, alternate_server_len) != STUN_MESSAGE_RETURN_SUCCESS) { stun_debug (" Unexpectedly missing ALTERNATE-SERVER attribute\n"); return STUN_USAGE_BIND_RETURN_ERROR; @@ -152,12 +152,14 @@ stun_debug ("Received %u-bytes STUN message\n", stun_message_length (msg)); val = stun_message_find_xor_addr (msg, - STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, addr, addrlen); + STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, (struct sockaddr_storage *)addr, + addrlen); if (val != STUN_MESSAGE_RETURN_SUCCESS) { stun_debug (" No XOR-MAPPED-ADDRESS: %d\n", val); val = stun_message_find_addr (msg, - STUN_ATTRIBUTE_MAPPED_ADDRESS, addr, addrlen); + STUN_ATTRIBUTE_MAPPED_ADDRESS, (struct sockaddr_storage *)addr, + addrlen); if (val != STUN_MESSAGE_RETURN_SUCCESS) { stun_debug (" No MAPPED-ADDRESS: %d\n", val); @@ -355,7 +357,7 @@ static ssize_t stun_trans_sendto (StunTransport *tr, const uint8_t *buf, size_t len, - const struct sockaddr *dst, socklen_t dstlen) + const struct sockaddr *dst, socklen_t dstlen) { static const int flags = MSG_DONTWAIT | MSG_NOSIGNAL; ssize_t val; @@ -375,14 +377,15 @@ static ssize_t stun_trans_recvfrom (StunTransport *tr, uint8_t *buf, size_t maxlen, - struct sockaddr * dst, + struct sockaddr_storage * dst, socklen_t * dstlen) { static const int flags = MSG_DONTWAIT | MSG_NOSIGNAL; ssize_t val; if (dstlen != NULL) - val = recvfrom (tr->fd, (void *)buf, maxlen, flags, dst, dstlen); + val = recvfrom (tr->fd, (void *)buf, maxlen, flags, (struct sockaddr *) dst, + dstlen); else val = recv (tr->fd, (void *)buf, maxlen, flags); @@ -396,14 +399,11 @@ static ssize_t stun_trans_send (StunTransport *tr, const uint8_t *buf, size_t len) { - union { - struct sockaddr_storage *storage; - struct sockaddr *addr; - } conv; + struct sockaddr *conv; - conv.storage = &tr->dst; + conv = (struct sockaddr *) &tr->dst; - return stun_trans_sendto (tr, buf, len, conv.addr, tr->dstlen); + return stun_trans_sendto (tr, buf, len, conv, tr->dstlen); } static ssize_t @@ -454,7 +454,7 @@ /** Blocking mode STUN binding discovery */ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv, - socklen_t srvlen, struct sockaddr *addr, socklen_t *addrlen) + socklen_t srvlen, struct sockaddr_storage *addr, socklen_t *addrlen) { StunTimer timer; StunTransport trans; @@ -467,10 +467,7 @@ size_t len; StunUsageTransReturn ret; int val; - union { - struct sockaddr_storage storage; - struct sockaddr addr; - } alternate_server; + struct sockaddr_storage alternate_server; socklen_t alternate_server_len = sizeof (alternate_server); StunUsageBindReturn bind_ret; @@ -534,13 +531,13 @@ if (valid != STUN_VALIDATION_SUCCESS) { ret = STUN_USAGE_TRANS_RETURN_RETRY; } else { - bind_ret = stun_usage_bind_process (&msg, addr, addrlen, - &alternate_server.addr, &alternate_server_len); + bind_ret = stun_usage_bind_process (&msg, (struct sockaddr *) addr, + addrlen, (struct sockaddr *) &alternate_server, &alternate_server_len); if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) { stun_trans_deinit (&trans); ret = stun_trans_create (&trans, SOCK_DGRAM, 0, - &alternate_server.addr, alternate_server_len); + (struct sockaddr *) &alternate_server, alternate_server_len); if (ret != STUN_USAGE_TRANS_RETURN_SUCCESS) { return STUN_USAGE_BIND_RETURN_ERROR; diff -Nru libnice-0.1.5/stun/usages/bind.h libnice-0.1.7/stun/usages/bind.h --- libnice-0.1.5/stun/usages/bind.h 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/usages/bind.h 2014-04-16 03:14:38.000000000 +0000 @@ -156,7 +156,7 @@ * #STUN_USAGE_BIND_RETURN_ERROR and #STUN_USAGE_BIND_RETURN_TIMEOUT */ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv, - socklen_t srvlen, struct sockaddr *addr, socklen_t *addrlen); + socklen_t srvlen, struct sockaddr_storage *addr, socklen_t *addrlen); # ifdef __cplusplus } diff -Nru libnice-0.1.5/stun/usages/ice.c libnice-0.1.7/stun/usages/ice.c --- libnice-0.1.5/stun/usages/ice.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/stun/usages/ice.c 2014-05-02 21:45:34.000000000 +0000 @@ -130,7 +130,7 @@ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg, - struct sockaddr *addr, socklen_t *addrlen, + struct sockaddr_storage *addr, socklen_t *addrlen, StunUsageIceCompatibility compatibility) { int code = -1; @@ -226,7 +226,7 @@ StunUsageIceReturn stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req, StunMessage *msg, uint8_t *buf, size_t *plen, - const struct sockaddr *src, socklen_t srclen, + const struct sockaddr_storage *src, socklen_t srclen, bool *control, uint64_t tie, StunUsageIceCompatibility compatibility) { @@ -305,7 +305,7 @@ src, srclen); } else { val = stun_message_append_addr (msg, STUN_ATTRIBUTE_MAPPED_ADDRESS, - src, srclen); + (struct sockaddr *) src, srclen); } if (val != STUN_MESSAGE_RETURN_SUCCESS) { diff -Nru libnice-0.1.5/stun/usages/ice.h libnice-0.1.7/stun/usages/ice.h --- libnice-0.1.5/stun/usages/ice.h 2011-02-02 04:50:08.000000000 +0000 +++ libnice-0.1.7/stun/usages/ice.h 2014-03-31 22:41:13.000000000 +0000 @@ -171,7 +171,7 @@ * Returns: A #StunUsageIceReturn value */ StunUsageIceReturn stun_usage_ice_conncheck_process (StunMessage *msg, - struct sockaddr *addr, socklen_t *addrlen, + struct sockaddr_storage *addr, socklen_t *addrlen, StunUsageIceCompatibility compatibility); /** @@ -207,7 +207,7 @@ StunUsageIceReturn stun_usage_ice_conncheck_create_reply (StunAgent *agent, StunMessage *req, StunMessage *msg, uint8_t *buf, size_t *plen, - const struct sockaddr *src, socklen_t srclen, + const struct sockaddr_storage *src, socklen_t srclen, bool *control, uint64_t tie, StunUsageIceCompatibility compatibility); diff -Nru libnice-0.1.5/stun/usages/turn.c libnice-0.1.7/stun/usages/turn.c --- libnice-0.1.5/stun/usages/turn.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/usages/turn.c 2014-03-31 22:41:13.000000000 +0000 @@ -221,7 +221,7 @@ uint8_t *password, size_t password_len, uint8_t *realm, size_t realm_len, uint8_t *nonce, size_t nonce_len, - struct sockaddr *peer, + struct sockaddr_storage *peer, StunUsageTurnCompatibility compatibility) { if (!peer) @@ -262,9 +262,9 @@ StunUsageTurnReturn stun_usage_turn_process (StunMessage *msg, - struct sockaddr *relay_addr, socklen_t *relay_addrlen, - struct sockaddr *addr, socklen_t *addrlen, - struct sockaddr *alternate_server, socklen_t *alternate_server_len, + struct sockaddr_storage *relay_addr, socklen_t *relay_addrlen, + struct sockaddr_storage *addr, socklen_t *addrlen, + struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len, uint32_t *bandwidth, uint32_t *lifetime, StunUsageTurnCompatibility compatibility) { diff -Nru libnice-0.1.5/stun/usages/turn.h libnice-0.1.7/stun/usages/turn.h --- libnice-0.1.5/stun/usages/turn.h 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/usages/turn.h 2014-03-31 22:41:13.000000000 +0000 @@ -212,7 +212,7 @@ uint8_t *password, size_t password_len, uint8_t *realm, size_t realm_len, uint8_t *nonce, size_t nonce_len, - struct sockaddr *peer, + struct sockaddr_storage *peer, StunUsageTurnCompatibility compatibility); /** @@ -242,9 +242,9 @@ * Returns: A #StunUsageTurnReturn value */ StunUsageTurnReturn stun_usage_turn_process (StunMessage *msg, - struct sockaddr *relay_addr, socklen_t *relay_addrlen, - struct sockaddr *addr, socklen_t *addrlen, - struct sockaddr *alternate_server, socklen_t *alternate_server_len, + struct sockaddr_storage *relay_addr, socklen_t *relay_addrlen, + struct sockaddr_storage *addr, socklen_t *addrlen, + struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len, uint32_t *bandwidth, uint32_t *lifetime, StunUsageTurnCompatibility compatibility); diff -Nru libnice-0.1.5/stun/utils.c libnice-0.1.7/stun/utils.c --- libnice-0.1.5/stun/utils.c 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/utils.c 2014-03-31 22:41:13.000000000 +0000 @@ -88,18 +88,18 @@ StunMessageReturn stun_xor_address (const StunMessage *msg, - struct sockaddr *addr, socklen_t addrlen, + struct sockaddr_storage *addr, socklen_t addrlen, uint32_t magic_cookie) { union { - struct sockaddr *addr; + struct sockaddr_storage *addr; struct sockaddr_in *in; struct sockaddr_in6 *in6; } addr_ptr; addr_ptr.addr = addr; - switch (addr->sa_family) + switch (addr->ss_family) { case AF_INET: { diff -Nru libnice-0.1.5/stun/utils.h libnice-0.1.7/stun/utils.h --- libnice-0.1.5/stun/utils.h 2011-02-02 04:49:42.000000000 +0000 +++ libnice-0.1.7/stun/utils.h 2014-03-31 22:41:13.000000000 +0000 @@ -68,7 +68,7 @@ void stun_set_type (uint8_t *h, StunClass c, StunMethod m); StunMessageReturn stun_xor_address (const StunMessage *msg, - struct sockaddr *addr, socklen_t addrlen, + struct sockaddr_storage *addr, socklen_t addrlen, uint32_t magic_cookie); diff -Nru libnice-0.1.5/stun/win32_common.h libnice-0.1.7/stun/win32_common.h --- libnice-0.1.5/stun/win32_common.h 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/stun/win32_common.h 2014-04-04 03:53:01.000000000 +0000 @@ -57,6 +57,7 @@ #ifndef _WIN32_COMMON_H #define _WIN32_COMMON_H +#include "config.h" #include /* 7.18.1.1 Exact-width integer types */ @@ -69,8 +70,10 @@ typedef long long int64_t; typedef unsigned long long uint64_t; -#ifndef _SSIZE_T_ +#ifndef HAVE_SIZE_T typedef unsigned int size_t; +#endif +#ifndef HAVE_SSIZE_T typedef unsigned long ssize_t; #endif diff -Nru libnice-0.1.5/tests/Makefile.am libnice-0.1.7/tests/Makefile.am --- libnice-0.1.5/tests/Makefile.am 2014-03-07 02:14:00.000000000 +0000 +++ libnice-0.1.7/tests/Makefile.am 2014-04-17 22:14:51.000000000 +0000 @@ -22,6 +22,7 @@ check_PROGRAMS = \ test-pseudotcp \ + test-pseudotcp-fuzzy \ test-bsd \ test \ test-address \ @@ -52,6 +53,8 @@ test_pseudotcp_LDADD = $(COMMON_LDADD) +test_pseudotcp_fuzzy_LDADD = $(COMMON_LDADD) -lm + test_bsd_LDADD = $(COMMON_LDADD) test_LDADD = $(COMMON_LDADD) diff -Nru libnice-0.1.5/tests/Makefile.in libnice-0.1.7/tests/Makefile.in --- libnice-0.1.5/tests/Makefile.in 2014-03-07 02:21:10.000000000 +0000 +++ libnice-0.1.7/tests/Makefile.in 2014-05-05 18:58:20.000000000 +0000 @@ -90,8 +90,8 @@ $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \ $(top_srcdir)/depcomp $(noinst_HEADERS) \ $(top_srcdir)/test-driver -check_PROGRAMS = test-pseudotcp$(EXEEXT) test-bsd$(EXEEXT) \ - test$(EXEEXT) test-address$(EXEEXT) \ +check_PROGRAMS = test-pseudotcp$(EXEEXT) test-pseudotcp-fuzzy$(EXEEXT) \ + test-bsd$(EXEEXT) test$(EXEEXT) test-address$(EXEEXT) \ test-add-remove-stream$(EXEEXT) test-build-io-stream$(EXEEXT) \ test-io-stream-thread$(EXEEXT) \ test-io-stream-closing-write$(EXEEXT) \ @@ -184,6 +184,9 @@ test_pseudotcp_SOURCES = test-pseudotcp.c test_pseudotcp_OBJECTS = test-pseudotcp.$(OBJEXT) test_pseudotcp_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_pseudotcp_fuzzy_SOURCES = test-pseudotcp-fuzzy.c +test_pseudotcp_fuzzy_OBJECTS = test-pseudotcp-fuzzy.$(OBJEXT) +test_pseudotcp_fuzzy_DEPENDENCIES = $(am__DEPENDENCIES_2) test_restart_SOURCES = test-restart.c test_restart_OBJECTS = test-restart.$(OBJEXT) test_restart_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -236,7 +239,8 @@ $(test_io_stream_pollable_SOURCES) \ $(test_io_stream_thread_SOURCES) test-mainloop.c \ test-new-dribble.c test-priority.c test-pseudotcp.c \ - test-restart.c $(test_send_recv_SOURCES) test-thread.c + test-pseudotcp-fuzzy.c test-restart.c \ + $(test_send_recv_SOURCES) test-thread.c DIST_SOURCES = test.c test-add-remove-stream.c test-address.c \ test-bsd.c test-build-io-stream.c test-dribble.c \ test-fallback.c test-fullmode.c \ @@ -246,7 +250,8 @@ $(test_io_stream_pollable_SOURCES) \ $(test_io_stream_thread_SOURCES) test-mainloop.c \ test-new-dribble.c test-priority.c test-pseudotcp.c \ - test-restart.c $(test_send_recv_SOURCES) test-thread.c + test-pseudotcp-fuzzy.c test-restart.c \ + $(test_send_recv_SOURCES) test-thread.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -639,6 +644,7 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS) noinst_HEADERS = test-io-stream-common.h test_pseudotcp_LDADD = $(COMMON_LDADD) +test_pseudotcp_fuzzy_LDADD = $(COMMON_LDADD) -lm test_bsd_LDADD = $(COMMON_LDADD) test_LDADD = $(COMMON_LDADD) test_thread_LDADD = $(COMMON_LDADD) @@ -777,6 +783,10 @@ @rm -f test-pseudotcp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_pseudotcp_OBJECTS) $(test_pseudotcp_LDADD) $(LIBS) +test-pseudotcp-fuzzy$(EXEEXT): $(test_pseudotcp_fuzzy_OBJECTS) $(test_pseudotcp_fuzzy_DEPENDENCIES) $(EXTRA_test_pseudotcp_fuzzy_DEPENDENCIES) + @rm -f test-pseudotcp-fuzzy$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_pseudotcp_fuzzy_OBJECTS) $(test_pseudotcp_fuzzy_LDADD) $(LIBS) + test-restart$(EXEEXT): $(test_restart_OBJECTS) $(test_restart_DEPENDENCIES) $(EXTRA_test_restart_DEPENDENCIES) @rm -f test-restart$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_restart_OBJECTS) $(test_restart_LDADD) $(LIBS) @@ -811,6 +821,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mainloop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-new-dribble.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-priority.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pseudotcp-fuzzy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pseudotcp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-restart.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-send-recv.Po@am__quote@ @@ -1043,6 +1054,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-pseudotcp-fuzzy.log: test-pseudotcp-fuzzy$(EXEEXT) + @p='test-pseudotcp-fuzzy$(EXEEXT)'; \ + b='test-pseudotcp-fuzzy'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) test-bsd.log: test-bsd$(EXEEXT) @p='test-bsd$(EXEEXT)'; \ diff -Nru libnice-0.1.5/tests/test-dribble.c libnice-0.1.7/tests/test-dribble.c --- libnice-0.1.5/tests/test-dribble.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/tests/test-dribble.c 2014-04-24 00:30:32.000000000 +0000 @@ -128,15 +128,25 @@ static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data) { + gboolean ready_to_connected = FALSE; g_debug ("test-dribble:%s: %p", G_STRFUNC, data); - if (GPOINTER_TO_UINT (data) == 1) + if (GPOINTER_TO_UINT (data) == 1) { + if (global_lagent_state == NICE_COMPONENT_STATE_READY && + state == NICE_COMPONENT_STATE_CONNECTED) + ready_to_connected = TRUE; global_lagent_state = state; - else if (GPOINTER_TO_UINT (data) == 2) + } else if (GPOINTER_TO_UINT (data) == 2) { + if (global_ragent_state == NICE_COMPONENT_STATE_READY && + state == NICE_COMPONENT_STATE_CONNECTED) + ready_to_connected = TRUE; global_ragent_state = state; - + } + if (state == NICE_COMPONENT_STATE_READY) global_components_ready++; + else if (state == NICE_COMPONENT_STATE_CONNECTED && ready_to_connected) + global_components_ready--; if (state == NICE_COMPONENT_STATE_FAILED) global_components_failed++; @@ -339,7 +349,7 @@ g_timeout_add (500, quit_loop_cb, NULL); g_main_loop_run (global_mainloop); - global_components_ready--; + //global_components_ready--; cands = nice_agent_get_local_candidates (ragent, rs_id, NICE_COMPONENT_TYPE_RTP); nice_address_set_port(&((NiceCandidate *) cands->data)->addr, 80); diff -Nru libnice-0.1.5/tests/test-fullmode.c libnice-0.1.7/tests/test-fullmode.c --- libnice-0.1.5/tests/test-fullmode.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/tests/test-fullmode.c 2014-03-31 23:20:03.000000000 +0000 @@ -155,10 +155,15 @@ return FALSE; } -static void cb_writable (NiceAgent*agent, guint stream_id, guint component_id) +static void cb_writable (NiceAgent*agent, guint stream_id, guint component_id, + gpointer user_data) { + guint *ls_id = user_data; + + if (stream_id == *ls_id && component_id == 1) { g_debug ("Transport is now writable, stopping mainloop"); - g_main_loop_quit (global_mainloop); + *ls_id = 0; + } } static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data) @@ -176,6 +181,9 @@ if (strncmp ("12345678", buf, 8)) return; + if (component_id == 2) + return; + if (GPOINTER_TO_UINT (user_data) == 2) { g_debug ("right agent received %d bytes, stopping mainloop", len); global_ragent_read = len; @@ -370,7 +378,7 @@ nice_agent_set_port_range (ragent, rs_id, 2, 10000, 10002); g_assert (nice_agent_gather_candidates (ragent, rs_id) == TRUE); -#ifdef USE_LOOPBACK +#if USE_LOOPBACK { GSList *cands = NULL, *i; NiceCandidate *cand = NULL; @@ -466,10 +474,13 @@ g_debug ("Sending data returned -1 in %s mode", reliable?"Reliable":"Non-reliable"); if (reliable) { gulong signal_handler; + guint ls_id_copy = ls_id; + signal_handler = g_signal_connect (G_OBJECT (lagent), - "reliable-transport-writable", G_CALLBACK (cb_writable), NULL); + "reliable-transport-writable", G_CALLBACK (cb_writable), &ls_id_copy); g_debug ("Running mainloop until transport is writable"); - g_main_loop_run (global_mainloop); + while (ls_id_copy == ls_id) + g_main_context_iteration (NULL, TRUE); g_signal_handler_disconnect(G_OBJECT (lagent), signal_handler); ret = nice_agent_send (lagent, ls_id, 1, 16, "1234567812345678"); @@ -477,7 +488,8 @@ } g_debug ("Sent %d bytes", ret); g_assert (ret == 16); - g_main_loop_run (global_mainloop); + while (global_ragent_read != 16) + g_main_context_iteration (NULL, TRUE); g_assert (global_ragent_read == 16); g_debug ("test-fullmode: Ran mainloop, removing streams..."); @@ -589,14 +601,18 @@ /* note: test payload send and receive */ global_ragent_read = 0; ret = nice_agent_send (lagent, ls_id, 1, 16, "1234567812345678"); - { + if (ret == -1) { gboolean reliable = FALSE; g_object_get (G_OBJECT (lagent), "reliable", &reliable, NULL); if (reliable) { gulong signal_handler; + guint ls_id_copy = ls_id; + signal_handler = g_signal_connect (G_OBJECT (lagent), - "reliable-transport-writable", G_CALLBACK (cb_writable), NULL); - g_main_loop_run (global_mainloop); + "reliable-transport-writable", G_CALLBACK (cb_writable), &ls_id_copy); + g_debug ("Running mainloop until transport is writable"); + while (ls_id_copy == ls_id) + g_main_context_iteration (NULL, TRUE); g_signal_handler_disconnect(G_OBJECT (lagent), signal_handler); ret = nice_agent_send (lagent, ls_id, 1, 16, "1234567812345678"); diff -Nru libnice-0.1.5/tests/test-new-dribble.c libnice-0.1.7/tests/test-new-dribble.c --- libnice-0.1.5/tests/test-new-dribble.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/tests/test-new-dribble.c 2014-05-02 21:49:50.000000000 +0000 @@ -192,7 +192,7 @@ if (stun_message_has_cookie (&request)) stun_message_append_xor_addr (&response, STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, - &addr.addr, addr_len); + &addr.storage, addr_len); else stun_message_append_addr (&response, STUN_ATTRIBUTE_MAPPED_ADDRESS, &addr.addr, addr_len); diff -Nru libnice-0.1.5/tests/test-pseudotcp.c libnice-0.1.7/tests/test-pseudotcp.c --- libnice-0.1.5/tests/test-pseudotcp.c 2014-03-07 01:21:05.000000000 +0000 +++ libnice-0.1.7/tests/test-pseudotcp.c 2014-03-31 23:20:03.000000000 +0000 @@ -220,7 +220,8 @@ static void adjust_clock (PseudoTcpSocket *sock) { - long timeout = 0; + guint64 timeout = 0; + if (pseudo_tcp_socket_get_next_clock (sock, &timeout)) { timeout -= g_get_monotonic_time () / 1000; g_debug ("Socket %p: Adjuting clock to %ld ms", sock, timeout); diff -Nru libnice-0.1.5/tests/test-pseudotcp-fuzzy.c libnice-0.1.7/tests/test-pseudotcp-fuzzy.c --- libnice-0.1.5/tests/test-pseudotcp-fuzzy.c 1970-01-01 00:00:00.000000000 +0000 +++ libnice-0.1.7/tests/test-pseudotcp-fuzzy.c 2014-04-17 22:14:51.000000000 +0000 @@ -0,0 +1,467 @@ +/* vim: et ts=2 sw=2 tw=80: */ +/* + * This file is part of the Nice GLib ICE library. + * + * (C) 2010, 2014 Collabora Ltd. + * Contact: Philip Withnall + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Nice GLib ICE library. + * + * The Initial Developers of the Original Code are Collabora Ltd and Nokia + * Corporation. All Rights Reserved. + * + * Contributors: + * Philip Withnall, Collabora Ltd. + * Youness Alaoui, Collabora Ltd. + * + * 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 + * case the provisions of LGPL are applicable instead of those above. If you + * wish to allow use of your version of this file only under the terms of the + * LGPL and not to allow others to use your version of this file under the + * MPL, indicate your decision by deleting the provisions above and replace + * them with the notice and other provisions required by the LGPL. If you do + * not delete the provisions above, a recipient may use your version of this + * file under either the MPL or the LGPL. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include + +#include "pseudotcp.h" + + +/** + * A fuzzing test for the pseudotcp socket. This connects two sockets in a + * loopback arrangement, with the packet output from one being fed to the other, + * and vice-versa. Fuzzing happens on the packet interface between the two, + * mutating the packets slightly and seeing what happens. + * + * The input data to the left-most socket is read from a file. The output data + * from the loopback is written to another file, although this probably isn’t + * very useful. If no files are provided, a small amount of dummy data is sent + * through the sockets instead. This almost certainly won’t catch any bugs, and + * is just present to allow this test to be run as part of `make check` so it + * doesn’t bit rot. + * + * A good command to generate an input file is: + * dd if=/dev/urandom of=rand count=10000 ibs=1024 + * + * None of the data is validated, and the test results are effectively the 1-bit + * value of ‘did it crash?’. In particular, the output file is not validated, + * and the TCP packets emitted by both sockets are not checked for validity. + * + * It is suggested that this test is run under GDB and Valgrind. Any crashes or + * errors which are detected can be reproduced by providing the same input file + * and seed (using the --seed option). The seed is printed out at the beginning + * of each test run. + */ + + +PseudoTcpSocket *left; +PseudoTcpSocket *right; +GMainLoop *main_loop = NULL; +GRand *prng = NULL; +gint retval = 0; +FILE *in = NULL; +FILE *out = NULL; +int total_read = 0; +int total_wrote = 0; +guint left_clock = 0; +guint right_clock = 0; +gboolean left_closed = FALSE; +gboolean right_closed = FALSE; +gboolean reading_done = FALSE; + +/* Number of bytes of payload each socket has received so far. */ +guint32 left_stream_pos = 0; +guint32 right_stream_pos = 0; + +/* Configuration options. */ +gint64 seed = 0; +guint32 fuzz_start_pos = 1; /* bytes into stream payload; after the SYN-ACKs */ +guint n_changes_lambda = 2; /* lambda parameter for a Poisson distribution + * controlling the number of mutations made to each + * packet */ + + +static void +adjust_clock (PseudoTcpSocket *sock); + + +static void +write_to_sock (PseudoTcpSocket *sock) +{ + gchar buf[1024]; + gsize len; + gint wlen; + guint total = 0; + + while (TRUE) { + len = fread (buf, 1, sizeof(buf), in); + if (len == 0) { + g_debug ("Done reading data from file"); + g_assert (feof (in)); + reading_done = TRUE; + pseudo_tcp_socket_close (sock, FALSE); + break; + } else { + wlen = pseudo_tcp_socket_send (sock, buf, len); + g_debug ("Sending %" G_GSIZE_FORMAT " bytes : %d", len, wlen); + total += wlen; + total_read += wlen; + if (wlen < (gint) len) { + g_debug ("seeking %ld from %lu", wlen - len, ftell (in)); + fseek (in, wlen - len, SEEK_CUR); + g_assert (!feof (in)); + g_debug ("Socket queue full after %d bytes written", total); + break; + } + } + } + adjust_clock (sock); +} + +static void +opened (PseudoTcpSocket *sock, gpointer data) +{ + g_debug ("Socket %p Opened", sock); + if (sock == left) { + if (in) + write_to_sock (sock); + else { + pseudo_tcp_socket_send (sock, "abcdefghijklmnopqrstuvwxyz", 26); + reading_done = TRUE; + pseudo_tcp_socket_close (sock, FALSE); + } + } +} + +static void +readable (PseudoTcpSocket *sock, gpointer data) +{ + gchar buf[1024]; + gint len; + g_debug ("Socket %p Readable", sock); + + do { + len = pseudo_tcp_socket_recv (sock, buf, sizeof(buf)); + + if (len > 0) { + g_debug ("Read %d bytes", len); + if (out) { + if (fwrite (buf, len, 1, out) == 0) + g_debug ("Error writing to output file"); + else { + total_wrote += len; + + g_assert (total_wrote <= total_read); + g_debug ("Written %d bytes, need %d bytes", total_wrote, total_read); + if (total_wrote == total_read && feof (in)) { + g_assert (reading_done); + pseudo_tcp_socket_close (sock, FALSE); + } + } + } else { + pseudo_tcp_socket_close (sock, FALSE); + } + } + } while (len > 0); + + if (len == -1 && + pseudo_tcp_socket_get_error (sock) != EWOULDBLOCK) { + g_printerr ("Error reading from socket: error code %d.\n", + pseudo_tcp_socket_get_error (sock)); + + retval = -1; + g_main_loop_quit (main_loop); + return; + } +} + +static void +writable (PseudoTcpSocket *sock, gpointer data) +{ + g_debug ("Socket %p Writable", sock); + if (in && sock == left) + write_to_sock (sock); +} + +static void +closed (PseudoTcpSocket *sock, guint32 err, gpointer data) +{ + /* Don’t treat this as an error, since we’re throwing rubbish into the + * socket and can hardly expect it to complete successfully. */ + g_debug ("Socket %p Closed : %d", sock, err); + retval = 0; + g_main_loop_quit (main_loop); +} + +struct notify_data { + PseudoTcpSocket *sock; + guint32 len; + guint32 stream_pos; + guint8 buffer[]; +}; + +/** + * random_int_poisson: + * @lambda: Lambda parameter for the distribution function, which must be + * non-zero + * + * Generate a random variable from a Poisson distribution with parameter + * @lambda. This consumes one %gdouble’s worth of randomness from the global + * @prng. + * + * This is implemented using the inverse transform of the Poisson CDF, and is + * guaranteed to return in time linearly proportional to @lambda. + * + * Returns: Poisson-distributed pseudo-random variable + */ +static guint32 +random_int_poisson (guint lambda) +{ + gdouble U; + guint32 i; + gdouble p, F; + + g_return_val_if_fail (lambda > 0, 0); + + /* + * Reference: http://www.cs.bgu.ac.il/~mps042/invtransnote.htm, + * §Simulating a Poisson random variable. + */ + U = g_rand_double (prng); /* step 1 */ + i = 0; + p = exp (0.0 - (gdouble) lambda); + F = p; /* step 2 */ + + while (U >= F) { /* step 3 */ + p = (lambda * p) / (i + 1); + F += p; + i += 1; /* step 4 and 5 */ + } + + return i; +} + +static guint32 +fuzz_packet (guint8 *buf, guint32 len, guint32 stream_pos) +{ + guint32 i; + guint n_changes; +#define TCP_HEADER_LENGTH 32 /* bytes; or thereabouts (include some options) */ + + /* Do we want to fuzz this packet? */ + if (stream_pos < fuzz_start_pos) { + return len; + } + + /* Get fuzzing. Only bother fuzzing the header; fuzzing the payload is + * pointless. Weight the number of changes towards having only a few changes, + * since that makes them less likely to be summarily rejected. */ + n_changes = random_int_poisson (n_changes_lambda); + g_debug ("Making %u changes for bytes at stream position %u:", + n_changes, stream_pos); + + for (i = 0; i < n_changes; i++) { + guint32 pos = g_rand_int_range (prng, 0, MIN (len, TCP_HEADER_LENGTH)); + g_debug (" • Changing byte %u.", stream_pos + pos); + buf[pos] = g_rand_int_range (prng, 0, G_MAXUINT8 + 1); + } + + return len; +} + +static gboolean +notify_packet (gpointer user_data) +{ + struct notify_data *data = (struct notify_data*) user_data; + + /* Fuzz the packet. */ + data->len = fuzz_packet (data->buffer, data->len, data->stream_pos); + + pseudo_tcp_socket_notify_packet (data->sock, + (gchar *) data->buffer, data->len); + adjust_clock (data->sock); + + g_free (data); + return FALSE; +} + +static PseudoTcpWriteResult +write_packet (PseudoTcpSocket *sock, const gchar *buffer, guint32 len, + gpointer user_data) +{ + struct notify_data *data; + PseudoTcpState state; + g_object_get (sock, "state", &state, NULL); + + data = g_malloc (sizeof(struct notify_data) + len); + + g_debug ("Socket %p(%d) Writing : %d bytes", sock, state, len); + + memcpy (data->buffer, buffer, len); + data->len = len; + + if (sock == left) { + data->stream_pos = left_stream_pos; + left_stream_pos += len; + data->sock = right; + } else { + data->stream_pos = right_stream_pos; + right_stream_pos += len; + data->sock = left; + } + + g_idle_add (notify_packet, data); + + return WR_SUCCESS; +} + + +static gboolean notify_clock (gpointer data) +{ + PseudoTcpSocket *sock = (PseudoTcpSocket *)data; + //g_debug ("Socket %p: Notifying clock", sock); + pseudo_tcp_socket_notify_clock (sock); + adjust_clock (sock); + return FALSE; +} + +static void adjust_clock (PseudoTcpSocket *sock) +{ + guint64 timeout = 0; + + if (pseudo_tcp_socket_get_next_clock (sock, &timeout)) { + timeout -= g_get_monotonic_time () / 1000; + g_debug ("Socket %p: Adjusting clock to %ld ms", sock, timeout); + if (sock == left) { + if (left_clock != 0) + g_source_remove (left_clock); + left_clock = g_timeout_add (timeout, notify_clock, sock); + } else { + if (right_clock != 0) + g_source_remove (right_clock); + right_clock = g_timeout_add (timeout, notify_clock, sock); + } + } else { + g_debug ("Socket %p should be destroyed, it's done", sock); + if (sock == left) + left_closed = TRUE; + else + right_closed = TRUE; + if (left_closed && right_closed) + g_main_loop_quit (main_loop); + } +} + +static GOptionEntry entries[] = { + { "seed", 's', 0, G_OPTION_ARG_INT64, &seed, "PRNG seed", "N" }, + { "fuzz-start-position", 'p', 0, G_OPTION_ARG_INT, &fuzz_start_pos, + "Number of bytes into the stream to start fuzzing after", "B" }, + { "fuzz-n-changes-lambda", 'l', 0, G_OPTION_ARG_INT, &n_changes_lambda, + "Lambda value for the Poisson distribution controlling the number of " + "changes made to each packet", "λ" }, + { NULL } +}; + +int main (int argc, char *argv[]) +{ + PseudoTcpCallbacks cbs = { + NULL, opened, readable, writable, closed, write_packet + }; + GOptionContext *context; + GError *error = NULL; + + setlocale (LC_ALL, ""); + g_type_init (); + + /* Configuration. */ + context = g_option_context_new ("— fuzz-test the pseudotcp socket"); + g_option_context_add_main_entries (context, entries, NULL); + + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_printerr ("Option parsing failed: %s\n", error->message); + goto context_error; + } + + if (n_changes_lambda == 0) { + g_printerr ("Option parsing failed: %s\n", + "Lambda values must be positive."); + goto context_error; + } + + g_option_context_free (context); + + /* Tweak the configuration. */ + if (seed == 0) { + seed = g_get_real_time (); + } + + /* Open the input and output files */ + if (argc >= 3) { + in = fopen (argv[1], "r"); + out = fopen (argv[2], "w"); + } + + /* Set up the main loop and sockets. */ + main_loop = g_main_loop_new (NULL, FALSE); + + g_print ("Using seed: %" G_GINT64_FORMAT ", start position: %u, λ: %u\n", + seed, fuzz_start_pos, n_changes_lambda); + prng = g_rand_new_with_seed (seed); + + pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_VERBOSE); + + left = pseudo_tcp_socket_new (0, &cbs); + right = pseudo_tcp_socket_new (0, &cbs); + g_debug ("Left: %p. Right: %p", left, right); + + pseudo_tcp_socket_notify_mtu (left, 1496); + pseudo_tcp_socket_notify_mtu (right, 1496); + + pseudo_tcp_socket_connect (left); + adjust_clock (left); + adjust_clock (right); + + /* Run the main loop. */ + g_main_loop_run (main_loop); + g_main_loop_unref (main_loop); + + g_object_unref (left); + g_object_unref (right); + + g_rand_free (prng); + + if (in != NULL) + fclose (in); + if (out != NULL) + fclose (out); + + return retval; + +context_error: + g_printerr ("\n%s\n", g_option_context_get_help (context, TRUE, NULL)); + g_option_context_free (context); + + return 1; +} diff -Nru libnice-0.1.5/tests/test-send-recv.c libnice-0.1.7/tests/test-send-recv.c --- libnice-0.1.5/tests/test-send-recv.c 2014-03-07 02:14:00.000000000 +0000 +++ libnice-0.1.7/tests/test-send-recv.c 2014-03-31 23:18:17.000000000 +0000 @@ -186,7 +186,7 @@ * Guaranteed to be in the interval [1, 1 << 16). ((1 << 16) is the maximum * message size.) */ static gsize -generate_buffer_size (BufferSizeStrategy strategy, GRand *rand, +generate_buffer_size (BufferSizeStrategy strategy, GRand *grand, gsize buffer_offset) { switch (strategy) { @@ -203,7 +203,7 @@ return CLAMP (1L << buffer_offset, 1, (1 << 16) - 1); case BUFFER_SIZE_RANDOM: - return g_rand_int_range (rand, 1, 1 << 16); + return g_rand_int_range (grand, 1, 1 << 16); default: g_assert_not_reached (); @@ -214,7 +214,7 @@ * byte. Guaranteed to be in the interval [1, 100], where 100 was chosen * arbitrarily.*/ static guint -generate_buffer_count (BufferCountStrategy strategy, GRand *rand, +generate_buffer_count (BufferCountStrategy strategy, GRand *grand, gsize buffer_offset) { switch (strategy) { @@ -225,7 +225,7 @@ return 2; case BUFFER_COUNT_RANDOM: - return g_rand_int_range (rand, 1, 100 + 1); + return g_rand_int_range (grand, 1, 100 + 1); default: g_assert_not_reached (); @@ -236,7 +236,7 @@ * @buffer_offset-th byte. Guaranteed to be in the interval [1, 100], where 100 * was chosen arbitrarily.*/ static guint -generate_message_count (MessageCountStrategy strategy, GRand *rand, +generate_message_count (MessageCountStrategy strategy, GRand *grand, guint buffer_index) { switch (strategy) { @@ -247,7 +247,7 @@ return 2; case MESSAGE_COUNT_RANDOM: - return g_rand_int_range (rand, 1, 100 + 1); + return g_rand_int_range (grand, 1, 100 + 1); default: g_assert_not_reached (); diff -Nru libnice-0.1.5/win32/dogenmarshal.cmd libnice-0.1.7/win32/dogenmarshal.cmd --- libnice-0.1.5/win32/dogenmarshal.cmd 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/win32/dogenmarshal.cmd 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -..\glib\bin\glib-genmarshal.exe --header --prefix=agent_marshal ..\agent\agent-signals-marshal.list > ..\agent\agent-signals-marshal.h -echo #include "agent-signals-marshal.h" > ..\agent\agent-signals-marshal.c -..\glib\bin\glib-genmarshal.exe --body --prefix=agent_marshal ..\agent\agent-signals-marshal.list >> ..\agent\agent-signals-marshal.c diff -Nru libnice-0.1.5/win32/vs9/libnice.def libnice-0.1.7/win32/vs9/libnice.def --- libnice-0.1.5/win32/vs9/libnice.def 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/win32/vs9/libnice.def 2014-04-25 01:09:45.000000000 +0000 @@ -21,6 +21,7 @@ nice_agent_add_local_address nice_agent_add_stream nice_agent_attach_recv +nice_agent_forget_relays nice_agent_gather_candidates nice_agent_generate_local_candidate_sdp nice_agent_generate_local_sdp @@ -53,6 +54,7 @@ nice_candidate_copy nice_candidate_free nice_candidate_new +nice_component_state_to_string nice_debug_disable nice_debug_enable nice_interfaces_get_ip_for_interface diff -Nru libnice-0.1.5/win32/vs9/libnice.vcproj libnice-0.1.7/win32/vs9/libnice.vcproj --- libnice-0.1.5/win32/vs9/libnice.vcproj 2014-01-06 23:05:13.000000000 +0000 +++ libnice-0.1.7/win32/vs9/libnice.vcproj 2014-04-04 03:52:17.000000000 +0000 @@ -191,14 +191,6 @@ > - - - -

`agent` :	The NiceAgent Object
`stream_id` :	The ID of the stream
`component_id` :	The ID of the component
Returns :	+`FALSE` if the component could not be found, `TRUE` otherwise

`agent` :	The NiceAgent Object
`stream_id` :	The ID of the stream
Returns :	+`TRUE` on success `FALSE` on error

`state` :	a NiceComponentState +
Returns :	a string representation of `state`. [transfer none] +

pseudo_tcp_socket_get_next_clock ()

stun_message_find_addr ()

stun_message_find_xor_addr ()

stun_message_find_xor_addr_full ()

stun_message_append_xor_addr ()

stun_message_append_xor_addr_full ()

stun_usage_turn_process ()

nice_agent_forget_relays ()