From 69e26303c4a1a98f85e63afde3b75989b9d103b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Cervi=C3=B1o?= Date: Tue, 18 Apr 2017 14:20:02 +0200 Subject: [PATCH] Revert libnice to version 0.1.4 temporarily (#855) --- erizo/src/erizo/lib/LibNiceInterfaceImpl.cpp | 8 +------- scripts/installUbuntuDeps.sh | 9 +++++---- scripts/libnice-014.patch0 | 10 ++++++++++ 3 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 scripts/libnice-014.patch0 diff --git a/erizo/src/erizo/lib/LibNiceInterfaceImpl.cpp b/erizo/src/erizo/lib/LibNiceInterfaceImpl.cpp index 03a875f0cb..8c6d630a1e 100644 --- a/erizo/src/erizo/lib/LibNiceInterfaceImpl.cpp +++ b/erizo/src/erizo/lib/LibNiceInterfaceImpl.cpp @@ -63,13 +63,7 @@ namespace erizo { } int LibNiceInterfaceImpl::NiceAgentSend(NiceAgent* agent, unsigned int stream_id, unsigned int component_id, unsigned int len, const char* buf) { - GError *error = NULL; - GOutputVector vec[1] = { - { buf, len } - }; - NiceOutputMessage message = {vec, G_N_ELEMENTS(vec)}; - - return nice_agent_send_messages_nonblocking(agent, stream_id, component_id, &message, 1, NULL, &error); + return nice_agent_send(agent, stream_id, component_id, len, buf); } } // namespace erizo diff --git a/scripts/installUbuntuDeps.sh b/scripts/installUbuntuDeps.sh index d3cdfdd430..e7b2d3b80d 100755 --- a/scripts/installUbuntuDeps.sh +++ b/scripts/installUbuntuDeps.sh @@ -112,10 +112,11 @@ install_openssl(){ install_libnice(){ if [ -d $LIB_DIR ]; then cd $LIB_DIR - if [ ! -f ./libnice-0.1.7.tar.gz ]; then - curl -O https://nice.freedesktop.org/releases/libnice-0.1.7.tar.gz - tar -zxvf libnice-0.1.7.tar.gz - cd libnice-0.1.7 + if [ ! -f ./libnice-0.1.4.tar.gz ]; then + curl -O https://nice.freedesktop.org/releases/libnice-0.1.4.tar.gz + tar -zxvf libnice-0.1.4.tar.gz + cd libnice-0.1.4 + patch -R ./agent/conncheck.c < $PATHNAME/libnice-014.patch0 ./configure --prefix=$PREFIX_DIR make -s V=0 make install diff --git a/scripts/libnice-014.patch0 b/scripts/libnice-014.patch0 new file mode 100644 index 0000000000..6858ef82d1 --- /dev/null +++ b/scripts/libnice-014.patch0 @@ -0,0 +1,10 @@ +--- conncheck.c 2014-01-20 08:51:48.535625502 +0100 ++++ agent/conncheck.c 2013-01-09 22:35:25.000000000 +0100 +@@ -2824,7 +2824,6 @@ + + if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE || + agent->compatibility == NICE_COMPATIBILITY_MSN || +- agent->compatibility == NICE_COMPATIBILITY_RFC5245 || + agent->compatibility == NICE_COMPATIBILITY_OC2007) { + /* We need to find which local candidate was used */ + for (i = component->remote_candidates;