diff options
Diffstat (limited to 'socket')
-rw-r--r-- | socket/tcp-active.c | 7 | ||||
-rw-r--r-- | socket/tcp-active.h | 3 | ||||
-rw-r--r-- | socket/tcp-passive.c | 10 | ||||
-rw-r--r-- | socket/tcp-passive.h | 3 |
4 files changed, 6 insertions, 17 deletions
diff --git a/socket/tcp-active.c b/socket/tcp-active.c index e26e70d..5144678 100644 --- a/socket/tcp-active.c +++ b/socket/tcp-active.c @@ -51,7 +51,6 @@ #endif typedef struct { - gboolean reliable; GSocketAddress *local_addr; GMainContext *context; } TcpActivePriv; @@ -71,8 +70,7 @@ static void socket_set_writable_callback (NiceSocket *sock, NiceSocket * -nice_tcp_active_socket_new (GMainContext *ctx, NiceAddress *addr, - gboolean reliable) +nice_tcp_active_socket_new (GMainContext *ctx, NiceAddress *addr) { union { struct sockaddr_storage storage; @@ -109,7 +107,6 @@ nice_tcp_active_socket_new (GMainContext *ctx, NiceAddress *addr, sock->priv = priv = g_slice_new0 (TcpActivePriv); - priv->reliable = reliable; priv->context = g_main_context_ref (ctx); priv->local_addr = gaddr; @@ -256,7 +253,7 @@ nice_tcp_active_socket_connect (NiceSocket *sock, NiceAddress *addr) nice_address_set_from_sockaddr (&local_addr, &name.addr); new_socket = nice_tcp_bsd_socket_new_from_gsock (priv->context, gsock, - &local_addr, addr, priv->reliable); + &local_addr, addr, TRUE); g_object_unref (gsock); return new_socket; diff --git a/socket/tcp-active.h b/socket/tcp-active.h index beba033..cf4a0d9 100644 --- a/socket/tcp-active.h +++ b/socket/tcp-active.h @@ -41,8 +41,7 @@ G_BEGIN_DECLS -NiceSocket * nice_tcp_active_socket_new (GMainContext *ctx, NiceAddress *addr, - gboolean reliable); +NiceSocket * nice_tcp_active_socket_new (GMainContext *ctx, NiceAddress *addr); NiceSocket * nice_tcp_active_socket_connect (NiceSocket *socket, NiceAddress *addr); 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 diff --git a/socket/tcp-passive.h b/socket/tcp-passive.h index 9be521d..37e780b 100644 --- a/socket/tcp-passive.h +++ b/socket/tcp-passive.h @@ -43,8 +43,7 @@ G_BEGIN_DECLS -NiceSocket * nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr, - gboolean reliable); +NiceSocket * nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr); NiceSocket * nice_tcp_passive_socket_accept (NiceSocket *socket); |