From 79bbbdfe4455cb7acae5c8d65f39c5f3ccc46031 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Fri, 5 Jun 2015 13:55:23 +0200 Subject: [PATCH 1/2] socket: add nice_socket_get_base() --- socket/http.c | 10 ++++++++++ socket/pseudossl.c | 10 ++++++++++ socket/socket.c | 8 ++++++++ socket/socket.h | 4 ++++ socket/socks5.c | 10 ++++++++++ socket/udp-turn-over-tcp.c | 10 ++++++++++ socket/udp-turn.c | 10 ++++++++++ 7 files changed, 62 insertions(+) diff --git a/socket/http.c b/socket/http.c index 404d378..86f8d43 100644 --- a/socket/http.c +++ b/socket/http.c @@ -95,6 +95,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_can_send (NiceSocket *sock, NiceAddress *addr); static void socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +static gpointer socket_get_base (NiceSocket *sock); NiceSocket * nice_http_socket_new (NiceSocket *base_socket, @@ -126,6 +127,7 @@ nice_http_socket_new (NiceSocket *base_socket, sock->is_reliable = socket_is_reliable; sock->can_send = socket_can_send; sock->set_writable_callback = socket_set_writable_callback; + sock->get_base_callback = socket_get_base; sock->close = socket_close; /* Send HTTP CONNECT */ @@ -642,3 +644,11 @@ socket_set_writable_callback (NiceSocket *sock, nice_socket_set_writable_callback (priv->base_socket, callback, user_data); } + +static gpointer +socket_get_base (NiceSocket *sock) +{ + HttpPriv *priv = sock->priv; + + return nice_socket_get_base(priv->base_socket); +} diff --git a/socket/pseudossl.c b/socket/pseudossl.c index 5ad4f97..e451365 100644 --- a/socket/pseudossl.c +++ b/socket/pseudossl.c @@ -116,6 +116,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_can_send (NiceSocket *sock, NiceAddress *addr); static void socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +static gpointer socket_get_base (NiceSocket *sock); NiceSocket * nice_pseudossl_socket_new (NiceSocket *base_socket, @@ -152,6 +153,7 @@ nice_pseudossl_socket_new (NiceSocket *base_socket, sock->is_reliable = socket_is_reliable; sock->can_send = socket_can_send; sock->set_writable_callback = socket_set_writable_callback; + sock->get_base_callback = socket_get_base; sock->close = socket_close; /* We send 'to' NULL because it will always be to an already connected @@ -319,3 +321,11 @@ socket_set_writable_callback (NiceSocket *sock, nice_socket_set_writable_callback (priv->base_socket, callback, user_data); } + +static gpointer +socket_get_base (NiceSocket *sock) +{ + PseudoSSLPriv *priv = sock->priv; + + return nice_socket_get_base(priv->base_socket); +} diff --git a/socket/socket.c b/socket/socket.c index 9c0d978..86041cc 100644 --- a/socket/socket.c +++ b/socket/socket.c @@ -265,6 +265,14 @@ nice_socket_set_writable_callback (NiceSocket *sock, sock->set_writable_callback (sock, callback, user_data); } +gpointer +nice_socket_get_base(NiceSocket *sock) +{ + if (sock->get_base_callback) + return sock->get_base_callback (sock); + return sock; +} + void nice_socket_free (NiceSocket *sock) { diff --git a/socket/socket.h b/socket/socket.h index 41ea07b..8c7bc82 100644 --- a/socket/socket.h +++ b/socket/socket.h @@ -88,6 +88,7 @@ struct _NiceSocket gboolean (*can_send) (NiceSocket *sock, NiceAddress *addr); void (*set_writable_callback) (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); + gpointer (*get_base_callback) (NiceSocket *sock); void (*close) (NiceSocket *sock); void *priv; }; @@ -124,6 +125,9 @@ void nice_socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +gpointer +nice_socket_get_base(NiceSocket *sock); + void nice_socket_free (NiceSocket *sock); diff --git a/socket/socks5.c b/socket/socks5.c index 46d17fb..4a1f33c 100644 --- a/socket/socks5.c +++ b/socket/socks5.c @@ -81,6 +81,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_can_send (NiceSocket *sock, NiceAddress *addr); static void socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +static gpointer socket_get_base (NiceSocket *sock); NiceSocket * @@ -108,6 +109,7 @@ nice_socks5_socket_new (NiceSocket *base_socket, sock->is_reliable = socket_is_reliable; sock->can_send = socket_can_send; sock->set_writable_callback = socket_set_writable_callback; + sock->get_base_callback = socket_get_base; sock->close = socket_close; /* Send SOCKS5 handshake */ @@ -488,3 +490,11 @@ socket_set_writable_callback (NiceSocket *sock, nice_socket_set_writable_callback (priv->base_socket, callback, user_data); } + +static gpointer +socket_get_base (NiceSocket *sock) +{ + Socks5Priv *priv = sock->priv; + + return nice_socket_get_base(priv->base_socket); +} diff --git a/socket/udp-turn-over-tcp.c b/socket/udp-turn-over-tcp.c index d97fa04..3757da4 100644 --- a/socket/udp-turn-over-tcp.c +++ b/socket/udp-turn-over-tcp.c @@ -86,6 +86,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_can_send (NiceSocket *sock, NiceAddress *addr); static void socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +static gpointer socket_get_base (NiceSocket *sock); NiceSocket * nice_udp_turn_over_tcp_socket_new (NiceSocket *base_socket, @@ -107,6 +108,7 @@ nice_udp_turn_over_tcp_socket_new (NiceSocket *base_socket, sock->is_reliable = socket_is_reliable; sock->can_send = socket_can_send; sock->set_writable_callback = socket_set_writable_callback; + sock->get_base_callback = socket_get_base; sock->close = socket_close; return sock; @@ -458,3 +460,11 @@ socket_set_writable_callback (NiceSocket *sock, nice_socket_set_writable_callback (priv->base_socket, callback, user_data); } + +static gpointer +socket_get_base (NiceSocket *sock) +{ + TurnTcpPriv *priv = sock->priv; + + return nice_socket_get_base(priv->base_socket); +} diff --git a/socket/udp-turn.c b/socket/udp-turn.c index e640363..5b89616 100644 --- a/socket/udp-turn.c +++ b/socket/udp-turn.c @@ -125,6 +125,7 @@ static gboolean socket_is_reliable (NiceSocket *sock); static gboolean socket_can_send (NiceSocket *sock, NiceAddress *addr); static void socket_set_writable_callback (NiceSocket *sock, NiceSocketWritableCb callback, gpointer user_data); +static gpointer socket_get_base (NiceSocket *sock); static void priv_process_pending_bindings (UdpTurnPriv *priv); static gboolean priv_retransmissions_tick_unlocked (UdpTurnPriv *priv); @@ -243,6 +244,7 @@ nice_udp_turn_socket_new (GMainContext *ctx, NiceAddress *addr, sock->is_reliable = socket_is_reliable; sock->can_send = socket_can_send; sock->set_writable_callback = socket_set_writable_callback; + sock->get_base_callback = socket_get_base; sock->close = socket_close; sock->priv = (void *) priv; @@ -950,6 +952,14 @@ socket_set_writable_callback (NiceSocket *sock, nice_socket_set_writable_callback (priv->base_socket, callback, user_data); } +static gpointer +socket_get_base (NiceSocket *sock) +{ + UdpTurnPriv *priv = sock->priv; + + return nice_socket_get_base(priv->base_socket); +} + static gboolean priv_forget_send_request (gpointer pointer) { -- 2.1.4