Skip to content

libnice: Migrate to Pexip's libnice fork #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
superdump wants to merge 3 commits into
base: master
Choose a base branch
from
Open

libnice: Migrate to Pexip's libnice fork #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b468b9
libnice: Migrate to Pexip's libnice fork
superdump Jul 15, 2015
e96e3bd
openwebrtc: Apply patch to pick up Pexip libnice
superdump Jul 16, 2015
c6e1993
openwebrtc: Add patches necessary to get Pexip libnice working
superdump Jul 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions recipes/libnice.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
class Recipe(recipe.Recipe):
name = 'libnice'
version = '0.1.13'
stype = SourceType.TARBALL
url = 'http://nice.freedesktop.org/releases/%(name)s-%(version)s.tar.gz'
stype = SourceType.GIT
remotes = {'origin': 'https://github.com/pexip/libnice.git'}
commit = '1a0796dfb9dc9769ef7b15fceefd5cebd1d3152b'
licenses = [License.LGPLv2_1Plus, License.MPLv1_1]
config_sh = 'sh ./autogen.sh --no-configure && ./configure'
configure_options = ' --enable-static --enable-shared --with-gstreamer \
--without-gstreamer-0.10 --enable-compile-warnings=maximum \
--disable-gtk-doc'
--disable-gtk-doc --disable-python '
deps = ['glib', 'gtk-doc-lite', 'gstreamer-1.0']
autoreconf = True
patches = [
"libnice/0001-agent-Remove-unnecessary-NULL-check.patch",
"libnice/0002-Do-not-update-a-remote-candidate-s-type.patch",
"libnice/0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch",
"libnice/0004-Removing-no-op-assignment.patch"
"libnice/0001-agent-Add-API-to-set-local-credentials.patch"
# "libnice/0001-agent-Remove-unnecessary-NULL-check.patch",
# "libnice/0002-Do-not-update-a-remote-candidate-s-type.patch",
# "libnice/0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch",
# "libnice/0004-Removing-no-op-assignment.patch"
]

files_bins = ['stunbdc', 'stund']
Expand Down
355 changes: 355 additions & 0 deletions recipes/libnice/0001-agent-Add-API-to-set-local-credentials.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
From b304c2972a1e3a9dc51b7f0d85bf1b1ae35903a0 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Wed, 8 Apr 2015 23:10:14 +0200
Subject: [PATCH] agent: Add API to set local credentials

Adds new API: nice_agent_set_local_credentials().
---
agent/agent.c | 31 +++++
agent/agent.h | 27 ++++
docs/reference/libnice/libnice-sections.txt | 1 +
nice/libnice.sym | 1 +
tests/Makefile.am | 5 +-
tests/test-credentials.c | 204 ++++++++++++++++++++++++++++
6 files changed, 268 insertions(+), 1 deletion(-)
create mode 100644 tests/test-credentials.c

diff --git a/agent/agent.c b/agent/agent.c
index a134f79..e0f2d88 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -2014,6 +2014,37 @@ nice_agent_set_remote_credentials (
return ret;
}

+NICEAPI_EXPORT gboolean
+nice_agent_set_local_credentials (
+ NiceAgent *agent,
+ guint stream_id,
+ const gchar *ufrag,
+ const gchar *pwd)
+{
+ Stream *stream;
+ gboolean ret = FALSE;
+
+ g_return_val_if_fail (NICE_IS_AGENT (agent), FALSE);
+ g_return_val_if_fail (stream_id >= 1, FALSE);
+
+ agent_lock ();
+
+ stream = agent_find_stream (agent, stream_id);
+
+ /* note: oddly enough, ufrag and pwd can be empty strings */
+ if (stream && ufrag && pwd) {
+ g_strlcpy (stream->local_ufrag, ufrag, NICE_STREAM_MAX_UFRAG);
+ g_strlcpy (stream->local_password, pwd, NICE_STREAM_MAX_PWD);
+
+ ret = TRUE;
+ goto done;
+ }
+
+ done:
+ agent_unlock ();
+ return ret;
+}
+

NICEAPI_EXPORT gboolean
nice_agent_get_local_credentials (
diff --git a/agent/agent.h b/agent/agent.h
index 049f83a..2db6a4f 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -442,6 +442,33 @@ nice_agent_set_remote_credentials (
const gchar *ufrag, const gchar *pwd);


+/**
+ * nice_agent_set_local_credentials:
+ * @agent: The #NiceAgent Object
+ * @stream_id: The ID of the stream
+ * @ufrag: nul-terminated string containing an ICE username fragment
+ * (length must be between 22 and 256 chars)
+ * @pwd: nul-terminated string containing an ICE password
+ * (length must be between 4 and 256 chars)
+ *
+ * Sets the local credentials for stream @stream_id.
+ *
+ <note>
+ <para>
+ This is only effective before ICE negotiation has started.
+ </para>
+ </note>
+ *
+ * Since 0.1.11
+ * Returns: %TRUE on success, %FALSE on error.
+ */
+gboolean
+nice_agent_set_local_credentials (
+ NiceAgent *agent,
+ guint stream_id,
+ const gchar *ufrag,
+ const gchar *pwd);
+

/**
* nice_agent_get_local_credentials:
diff --git a/docs/reference/libnice/libnice-sections.txt b/docs/reference/libnice/libnice-sections.txt
index d5a659f..48bf5cc 100644
--- a/docs/reference/libnice/libnice-sections.txt
+++ b/docs/reference/libnice/libnice-sections.txt
@@ -17,6 +17,7 @@ nice_agent_set_relay_info
nice_agent_gather_candidates
nice_agent_set_remote_credentials
nice_agent_get_local_credentials
+nice_agent_set_local_credentials
nice_agent_set_remote_candidates
nice_agent_get_remote_candidates
nice_agent_get_local_candidates
diff --git a/nice/libnice.sym b/nice/libnice.sym
index 8822f0c..5a10208 100644
--- a/nice/libnice.sym
+++ b/nice/libnice.sym
@@ -32,6 +32,7 @@ nice_agent_set_transport
nice_agent_set_relay_info
nice_agent_set_remote_candidates
nice_agent_set_remote_credentials
+nice_agent_set_local_credentials
nice_agent_set_selected_pair
nice_agent_set_selected_remote_candidate
nice_agent_set_software
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 967b4d7..262cfc3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,7 +33,8 @@ check_PROGRAMS = \
test-fallback \
test-thread \
test-dribble \
- test-new-dribble
+ test-new-dribble \
+ test-credentials

dist_check_SCRIPTS = \
check-test-fullmode-with-stun.sh
@@ -66,5 +67,7 @@ test_dribble_LDADD = $(COMMON_LDADD)

test_new_dribble_LDADD = $(COMMON_LDADD)

+test_credentials_LDADD = $(COMMON_LDADD)
+
all-local:
chmod a+x $(srcdir)/check-test-fullmode-with-stun.sh
diff --git a/tests/test-credentials.c b/tests/test-credentials.c
new file mode 100644
index 0000000..f678afa
--- /dev/null
+++ b/tests/test-credentials.c
@@ -0,0 +1,204 @@
+/*
+ * This file is part of the Nice GLib ICE library.
+ *
+ * (C) 2015 Rohan Garg <rohan@garg.io>
+ *
+ * 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.
+ *
+ * Contributors:
+ * Dafydd Harries, Collabora Ltd.
+ * Kai Vehmanen, Nokia
+ *
+ * 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 "agent.h"
+#include "agent-priv.h"
+#include <string.h>
+#include <stdio.h>
+
+#define LEFT_AGENT GINT_TO_POINTER(1)
+#define RIGHT_AGENT GINT_TO_POINTER(2)
+#define USE_UPNP 0
+
+static GMainLoop *loop = NULL;
+
+static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data)
+{
+ g_debug ("test-credentials:%s: %p", G_STRFUNC, user_data);
+}
+
+static void set_credentials(NiceAgent *lagent, NiceAgent *ragent)
+{
+ gchar *ufrag = NULL, *password = NULL;
+
+ g_debug ("test-credentials:%s", G_STRFUNC);
+
+ nice_agent_get_local_credentials (lagent, 1, &ufrag, &password);
+ nice_agent_set_remote_credentials (ragent, 1, ufrag, password);
+
+ g_free (ufrag);
+ g_free (password);
+
+ nice_agent_get_local_credentials (ragent, 1, &ufrag, &password);
+ nice_agent_set_remote_credentials (lagent, 1, ufrag, password);
+
+ g_free (ufrag);
+ g_free (password);
+}
+
+static void swap_candidates(NiceAgent *local, guint local_id, NiceAgent *remote, guint remote_id)
+{
+ GSList *cands = NULL;
+
+ g_debug ("test-credentials:%s", G_STRFUNC);
+ cands = nice_agent_get_local_candidates(local, local_id,
+ NICE_COMPONENT_TYPE_RTP);
+ g_assert(nice_agent_set_remote_candidates(remote, remote_id,
+ NICE_COMPONENT_TYPE_RTP, cands));
+
+ g_slist_free_full (cands, (GDestroyNotify) nice_candidate_free);
+}
+
+
+static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpointer data)
+{
+ static gboolean L_CAND_DONE = false, R_CAND_DONE = false;
+ static NiceAgent *lagent = NULL, *ragent = NULL;
+
+ g_debug ("test-credentials:%s: %p", G_STRFUNC, data);
+ if (GPOINTER_TO_UINT(data) == 1) {
+ g_debug ("lagent finished gathering candidates");
+ L_CAND_DONE = true;
+ lagent = agent;
+ } else if (GPOINTER_TO_UINT(data) == 2) {
+ g_debug ("ragent finished gathering candidates");
+ R_CAND_DONE = true;
+ ragent = agent;
+ }
+
+ if (L_CAND_DONE && R_CAND_DONE) {
+ set_credentials (lagent, ragent);
+ swap_candidates (lagent, 1, ragent, 1);
+ swap_candidates (ragent, 1, lagent, 1);
+ }
+}
+
+static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
+{
+ if (state == NICE_COMPONENT_STATE_READY) {
+ g_main_loop_quit(loop);
+ }
+}
+
+static void setup(NiceAgent *lagent, NiceAgent *ragent)
+{
+ NiceAddress addr;
+
+ g_assert (nice_agent_add_stream (lagent, 1) == 1);
+ g_assert (nice_agent_add_stream (ragent, 1) == 1);
+ g_assert (NULL != lagent->streams);
+ g_assert (NULL != ragent->streams);
+
+ nice_address_init (&addr);
+ g_assert (nice_address_set_from_string (&addr, "127.0.0.1"));
+ nice_agent_add_local_address (lagent, &addr);
+ nice_agent_add_local_address (ragent, &addr);
+
+ nice_agent_attach_recv (lagent, 1, NICE_COMPONENT_TYPE_RTP,
+ g_main_context_default (),
+ cb_nice_recv, LEFT_AGENT);
+ nice_agent_attach_recv (ragent, 1, NICE_COMPONENT_TYPE_RTP,
+ g_main_context_default (),
+ cb_nice_recv, RIGHT_AGENT);
+
+ g_signal_connect(G_OBJECT(lagent), "candidate-gathering-done",
+ G_CALLBACK(cb_candidate_gathering_done), LEFT_AGENT);
+ g_signal_connect(G_OBJECT(ragent), "candidate-gathering-done",
+ G_CALLBACK(cb_candidate_gathering_done), RIGHT_AGENT);
+
+ g_signal_connect(G_OBJECT(lagent), "component-state-changed",
+ G_CALLBACK(cb_component_state_changed), LEFT_AGENT);
+
+ g_object_set (G_OBJECT (lagent), "ice-tcp", FALSE, NULL);
+ g_object_set (G_OBJECT (ragent), "ice-tcp", FALSE, NULL);
+
+ g_object_set (G_OBJECT (lagent), "controlling-mode", TRUE, NULL);
+ g_object_set (G_OBJECT (ragent), "controlling-mode", FALSE, NULL);
+
+ g_object_set (G_OBJECT (lagent), "upnp", USE_UPNP, NULL);
+ g_object_set (G_OBJECT (ragent), "upnp", USE_UPNP, NULL);
+
+ g_object_set_data (G_OBJECT (lagent), "other-agent", ragent);
+ g_object_set_data (G_OBJECT (ragent), "other-agent", lagent);
+}
+
+static void teardown(NiceAgent *lagent, NiceAgent *ragent)
+{
+ nice_agent_remove_stream (lagent, 1);
+ nice_agent_remove_stream (ragent, 1);
+}
+
+int main (void)
+{
+ NiceAgent *lagent = NULL, *ragent = NULL;
+ gchar *ufrag = NULL, *password = NULL;
+
+#ifdef G_OS_WIN32
+ WSADATA w;
+ WSAStartup(0x0202, &w);
+#endif
+ g_type_init ();
+ g_thread_init (NULL);
+
+ loop = g_main_loop_new (NULL, FALSE);
+
+ lagent = nice_agent_new (NULL, NICE_COMPATIBILITY_RFC5245);
+ ragent = nice_agent_new (NULL, NICE_COMPATIBILITY_RFC5245);
+
+ setup (lagent, ragent);
+
+ nice_agent_set_local_credentials (lagent, 1, "unicorns", "awesome");
+ nice_agent_get_local_credentials (lagent, 1, &ufrag, &password);
+ g_assert (g_strcmp0("unicorns", ufrag) == 0);
+ g_assert (g_strcmp0("awesome", password) == 0);
+
+ nice_agent_gather_candidates (lagent, 1);
+ nice_agent_gather_candidates (ragent, 1);
+
+ g_main_loop_run (loop);
+
+ teardown (lagent, ragent);
+
+ g_object_unref (lagent);
+ g_object_unref (ragent);
+
+#ifdef G_OS_WIN32
+ WSACleanup();
+#endif
+ return 0;
+}
--
2.3.2 (Apple Git-55)

Loading