Commit 38268e53 authored by Jakub Adam's avatar Jakub Adam Committed by Philip Withnall

socket: fix wrong function called in nice_socket_is_base_of()

We have to call is_base_of "virtual function pointer" of 'other'
object, not 'sock', since 'other' is the structure whose base
NiceSocket we need to get from its private data.

For instance calling nice_socket_is_base_of() with 'sock' and 'other'
being respectively pseudo-SSL and UDP-TURN-over-TCP invoked is_base_of
variant for pseudo-SSL, casting other->priv into PseudoSSLPriv *, but
other->priv is actually TurnTcpPriv *. It must be called the other way
around.

https://phabricator.freedesktop.org/T7335
https://phabricator.freedesktop.org/T7336Reviewed-by: Philip Withnall's avatarPhilip Withnall <philip.withnall@collabora.co.uk>
Reviewed-by: Jose Antonio Santos Cadenas's avatarJosé Antonio Santos Cadenas <santoscadenas@gmail.com>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <philip@tecnocode.co.uk>
Reviewed-by: Jose Antonio Santos Cadenas's avatarJosé Antonio Santos Cadenas <santoscadenas@gmail.com>
Differential Revision: https://phabricator.freedesktop.org/D785
parent 7037ab4c
......@@ -268,8 +268,8 @@ nice_socket_set_writable_callback (NiceSocket *sock,
gboolean
nice_socket_is_base_of (NiceSocket *sock, NiceSocket *other)
{
if (sock->is_base_of)
return sock->is_base_of (sock, other);
if (other->is_base_of)
return other->is_base_of (sock, other);
return (sock == other);
}
......
......@@ -43,6 +43,7 @@ check_PROGRAMS = \
test-io-stream-cancelling \
test-io-stream-pollable \
test-send-recv \
test-socket-is-base-of \
test-priority \
test-mainloop \
test-fullmode \
......@@ -103,6 +104,8 @@ test_io_stream_pollable_LDADD = $(COMMON_LDADD)
test_send_recv_SOURCES = test-send-recv.c test-io-stream-common.c
test_send_recv_LDADD = $(COMMON_LDADD)
test_socket_is_base_of_LDADD = $(COMMON_LDADD)
test_priority_LDADD = $(COMMON_LDADD)
test_mainloop_LDADD = $(COMMON_LDADD)
......
/*
* This file is part of the Nice GLib ICE library.
*
* (C) 2016 Jakub Adam <jakub.adam@ktknet.cz>
*
* 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.
*
* 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 <locale.h>
#include "socket.h"
static NiceSocket *udp_bsd;
static NiceSocket *tcp_active;
static NiceSocket *pseudossl;
static NiceSocket *udp_turn_over_tcp;
static void
socket_base_udp_bsd (void)
{
g_assert (nice_socket_is_base_of (udp_bsd, udp_bsd));
g_assert (!nice_socket_is_base_of (udp_bsd, tcp_active));
g_assert (!nice_socket_is_base_of (udp_bsd, pseudossl));
g_assert (!nice_socket_is_base_of (udp_bsd, udp_turn_over_tcp));
}
static void
socket_base_tcp_active (void)
{
g_assert (!nice_socket_is_base_of (tcp_active, udp_bsd));
g_assert (nice_socket_is_base_of (tcp_active, tcp_active));
g_assert (nice_socket_is_base_of (tcp_active, pseudossl));
g_assert (nice_socket_is_base_of (tcp_active, udp_turn_over_tcp));
}
static void
socket_base_pseudossl (void)
{
g_assert (!nice_socket_is_base_of (pseudossl, udp_bsd));
g_assert (!nice_socket_is_base_of (pseudossl, tcp_active));
g_assert (nice_socket_is_base_of (pseudossl, pseudossl));
g_assert (nice_socket_is_base_of (pseudossl, udp_turn_over_tcp));
}
static void
socket_base_udp_turn_over_tcp (void)
{
g_assert (!nice_socket_is_base_of (udp_turn_over_tcp, udp_bsd));
g_assert (!nice_socket_is_base_of (udp_turn_over_tcp, tcp_active));
g_assert (!nice_socket_is_base_of (udp_turn_over_tcp, pseudossl));
g_assert (nice_socket_is_base_of (udp_turn_over_tcp, udp_turn_over_tcp));
}
int
main (int argc, char *argv[])
{
GMainLoop *mainloop = NULL;
NiceAddress addr;
setlocale (LC_ALL, "");
g_test_init (&argc, &argv, NULL);
mainloop = g_main_loop_new (NULL, TRUE);
nice_address_set_from_string (&addr, "127.0.0.1");
/* Standalone socket */
udp_bsd = nice_udp_bsd_socket_new (&addr);
/* tcp_passive -> pseudossl -> udp_turn_over_tcp */
tcp_active = nice_tcp_active_socket_new (g_main_loop_get_context (mainloop),
&addr);
pseudossl = nice_pseudossl_socket_new (tcp_active,
NICE_PSEUDOSSL_SOCKET_COMPATIBILITY_GOOGLE);
udp_turn_over_tcp = nice_udp_turn_over_tcp_socket_new (pseudossl,
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE);
g_test_add_func ("/socket/is-base-of/udp-bsd",
socket_base_udp_bsd);
g_test_add_func ("/socket/is-base-of/tcp-active",
socket_base_tcp_active);
g_test_add_func ("/socket/is-base-of/pseudossl",
socket_base_pseudossl);
g_test_add_func ("/socket/is-base-of/udp-turn-over-tcp",
socket_base_udp_turn_over_tcp);
g_test_run ();
nice_socket_free (udp_bsd);
nice_socket_free (udp_turn_over_tcp);
g_main_loop_unref (mainloop);
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment