diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2014-07-09 17:57:33 -0400 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2014-07-25 13:56:39 -0400 |
| commit | 7cb326cfb8470030bd95842ffdf35e895f462fd8 (patch) | |
| tree | ac4e24e958cdb1c5a452d204280cdd04fcc075ad /socket/tcp-passive.c | |
| parent | 5f031cc8f10087de7b51a9a76e16518d9bc5f223 (diff) | |
| download | libnice-7cb326cfb8470030bd95842ffdf35e895f462fd8.tar.gz | |
Revert "agent: Separate reliability from ice-tcp vs ice-udp"
This reverts commit 18e5dff4f25b12522e857c13d3ef3bdb40212246.
Diffstat (limited to 'socket/tcp-passive.c')
| -rw-r--r-- | socket/tcp-passive.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/socket/tcp-passive.c b/socket/tcp-passive.c index 844012a..30bfba8 100644 --- a/socket/tcp-passive.c +++ b/socket/tcp-passive.c @@ -51,8 +51,6 @@ #endif typedef struct { - gboolean reliable; - GMainContext *context; GHashTable *connections; NiceSocketWritableCb writable_cb; @@ -75,8 +73,7 @@ static void socket_set_writable_callback (NiceSocket *sock, static guint nice_address_hash (const NiceAddress * key); NiceSocket * -nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr, - gboolean reliable) +nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr) { union { struct sockaddr_storage storage; @@ -154,7 +151,6 @@ nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr, nice_address_set_from_sockaddr (&sock->addr, &name.addr); sock->priv = priv = g_slice_new0 (TcpPassivePriv); - priv->reliable = reliable; priv->context = g_main_context_ref (ctx); priv->connections = g_hash_table_new_full ((GHashFunc) nice_address_hash, (GEqualFunc) nice_address_equal, ( @@ -223,9 +219,7 @@ static gint socket_send_messages_reliable (NiceSocket *sock, static gboolean socket_is_reliable (NiceSocket *sock) { - TcpPassivePriv *priv = sock->priv; - - return priv->reliable; + return TRUE; } static gboolean |