diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2013-11-01 11:25:12 +0200 |
|---|---|---|
| committer | Jussi Kukkonen <jku@goto.fi> | 2014-07-08 12:26:38 +0300 |
| commit | 4b908c91267cfa1125216d1ed892d24caa373cd6 (patch) | |
| tree | d753fe04d6c92af034b7a14fc35259b360f2ec3e | |
| parent | 676871f81ee51bc60de188220bb7569e2c5d6481 (diff) | |
| download | dleyna-server-4b908c91267cfa1125216d1ed892d24caa373cd6.tar.gz | |
[upnp] Use "port" setting when creating GUPnPContextManager
Fixes #140.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libdleyna/server/dleyna-server-service.conf.in | 2 | ||||
| -rw-r--r-- | libdleyna/server/server.c | 1 | ||||
| -rw-r--r-- | libdleyna/server/upnp.c | 3 | ||||
| -rw-r--r-- | libdleyna/server/upnp.h | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 539aa43..38e1353 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ AC_ARG_ENABLE(master-build,, [master_build=no]) AS_IF([test "x$master_build" = "xno"], - [PKG_CHECK_MODULES([DLEYNA_CORE], [dleyna-core-1.0 >= 0.4.0])], + [PKG_CHECK_MODULES([DLEYNA_CORE], [dleyna-core-1.0 >= 0.5.0])], [this_abs_top_srcdir=`cd "$srcdir" && pwd`; DLEYNA_CORE_CFLAGS="-I$this_abs_top_srcdir/../dleyna-core"; DLEYNA_CORE_LIBS="-L$this_abs_top_srcdir/../dleyna-core/.libs -ldleyna-core-1.0" diff --git a/libdleyna/server/dleyna-server-service.conf.in b/libdleyna/server/dleyna-server-service.conf.in index 5cec2b8..49c2110 100644 --- a/libdleyna/server/dleyna-server-service.conf.in +++ b/libdleyna/server/dleyna-server-service.conf.in @@ -12,6 +12,8 @@ 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/server/server.c b/libdleyna/server/server.c index b564348..425f764 100644 --- a/libdleyna/server/server.c +++ b/libdleyna/server/server.c @@ -1326,6 +1326,7 @@ static gboolean prv_control_point_start_service( if (g_context.dls_id[DLS_MANAGER_INTERFACE_MANAGER]) { g_context.upnp = dls_upnp_new(connection, + dleyna_settings_port(g_context.settings), g_server_vtables, prv_found_media_server, prv_lost_media_server, diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c index b34871e..618300e 100644 --- a/libdleyna/server/upnp.c +++ b/libdleyna/server/upnp.c @@ -509,6 +509,7 @@ static void prv_on_context_available(GUPnPContextManager *context_manager, } dls_upnp_t *dls_upnp_new(dleyna_connector_id_t connection, + guint port, const dleyna_connector_dispatch_cb_t *dispatch_table, dls_upnp_callback_t found_server, dls_upnp_callback_t lost_server, @@ -536,7 +537,7 @@ dls_upnp_t *dls_upnp_new(dleyna_connector_id_t connection, dls_prop_maps_new(&upnp->property_map, &upnp->filter_map); - 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/server/upnp.h b/libdleyna/server/upnp.h index 854083a..df7310d 100644 --- a/libdleyna/server/upnp.h +++ b/libdleyna/server/upnp.h @@ -32,6 +32,7 @@ typedef void (*dls_upnp_callback_t)(const gchar *path, void *user_data); typedef void (*dls_upnp_task_complete_t)(dls_task_t *task, GError *error); dls_upnp_t *dls_upnp_new(dleyna_connector_id_t connection, + guint port, const dleyna_connector_dispatch_cb_t *dispatch_table, dls_upnp_callback_t found_server, dls_upnp_callback_t lost_server, |