From c6cc55565a767e9bc63896aaa355ef8c79fb3f88 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 1 Nov 2013 11:02:44 +0200 Subject: upnp: use port setting when creating GUPnPContextManager Bumps dleyna-core dependency to 0.5. Fixes #141. Signed-off-by: Jussi Kukkonen --- libdleyna/renderer/dleyna-renderer-service.conf.in | 3 +++ libdleyna/renderer/server.c | 1 + libdleyna/renderer/upnp.c | 3 ++- libdleyna/renderer/upnp.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libdleyna') diff --git a/libdleyna/renderer/dleyna-renderer-service.conf.in b/libdleyna/renderer/dleyna-renderer-service.conf.in index 3d045df..3a6fceb 100644 --- a/libdleyna/renderer/dleyna-renderer-service.conf.in +++ b/libdleyna/renderer/dleyna-renderer-service.conf.in @@ -12,6 +12,9 @@ never-quit=@never_quit@ # IPC connector name connector-name=@with_connector_name@ +# Source port for SSDP messages +#port=4321 + # Log configuration options [log] diff --git a/libdleyna/renderer/server.c b/libdleyna/renderer/server.c index b241a4f..a0e52e4 100644 --- a/libdleyna/renderer/server.c +++ b/libdleyna/renderer/server.c @@ -1126,6 +1126,7 @@ static gboolean prv_control_point_start_service( if (g_context.dlr_id[DLR_MANAGER_INTERFACE_MANAGER]) { g_context.upnp = dlr_upnp_new(connection, + dleyna_settings_port(g_context.settings), g_server_vtables, prv_found_media_server, prv_lost_media_server); diff --git a/libdleyna/renderer/upnp.c b/libdleyna/renderer/upnp.c index fefc340..fb12b1e 100644 --- a/libdleyna/renderer/upnp.c +++ b/libdleyna/renderer/upnp.c @@ -361,6 +361,7 @@ static void prv_on_context_available(GUPnPContextManager *context_manager, } dlr_upnp_t *dlr_upnp_new(dleyna_connector_id_t connection, + guint port, const dleyna_connector_dispatch_cb_t *dispatch_table, dlr_upnp_callback_t found_server, dlr_upnp_callback_t lost_server) @@ -379,7 +380,7 @@ dlr_upnp_t *dlr_upnp_new(dleyna_connector_id_t connection, upnp->server_uc_map = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - upnp->context_manager = gupnp_context_manager_create(0); + upnp->context_manager = gupnp_context_manager_create(port); g_signal_connect(upnp->context_manager, "context-available", G_CALLBACK(prv_on_context_available), diff --git a/libdleyna/renderer/upnp.h b/libdleyna/renderer/upnp.h index 9a42e60..f888821 100644 --- a/libdleyna/renderer/upnp.h +++ b/libdleyna/renderer/upnp.h @@ -42,6 +42,7 @@ typedef void (*dlr_upnp_callback_t)(const gchar *path); typedef void (*dlr_upnp_task_complete_t)(dlr_task_t *task, GError *error); dlr_upnp_t *dlr_upnp_new(dleyna_connector_id_t connection, + uint port, const dleyna_connector_dispatch_cb_t *dispatch_table, dlr_upnp_callback_t found_server, dlr_upnp_callback_t lost_server); -- cgit v1.2.1