From 35802b975925fb8f92d10e3ad5f0bca74091e3e9 Mon Sep 17 00:00:00 2001 From: Rick Bell Date: Fri, 1 May 2015 15:43:27 -0700 Subject: Added new core.c and core.h to Makefile.am. Updated Copyright from 2013 to 2015 --- libdleyna/server/async.c | 2 +- libdleyna/server/async.h | 2 +- libdleyna/server/client.h | 2 +- libdleyna/server/device.c | 11 ++++++++--- libdleyna/server/device.h | 4 ++-- libdleyna/server/interface.h | 2 +- libdleyna/server/path.c | 2 +- libdleyna/server/path.h | 2 +- libdleyna/server/props.c | 2 +- libdleyna/server/props.h | 2 +- libdleyna/server/search.c | 2 +- libdleyna/server/search.h | 2 +- libdleyna/server/sort.c | 2 +- libdleyna/server/sort.h | 2 +- libdleyna/server/task.c | 2 +- libdleyna/server/task.h | 2 +- libdleyna/server/upnp.c | 8 +++----- libdleyna/server/upnp.h | 2 +- libdleyna/server/xml-util.c | 2 +- libdleyna/server/xml-util.h | 2 +- m4/compiler-flags.m4 | 2 +- m4/log.m4 | 2 +- test/dbus/dms-info.c | 2 +- test/dbus/download_sync_controller.py | 2 +- 24 files changed, 34 insertions(+), 31 deletions(-) mode change 100644 => 100755 libdleyna/server/async.c mode change 100644 => 100755 libdleyna/server/async.h mode change 100644 => 100755 libdleyna/server/client.h mode change 100644 => 100755 libdleyna/server/device.h mode change 100644 => 100755 libdleyna/server/interface.h mode change 100644 => 100755 libdleyna/server/path.c mode change 100644 => 100755 libdleyna/server/path.h mode change 100644 => 100755 libdleyna/server/props.c mode change 100644 => 100755 libdleyna/server/props.h mode change 100644 => 100755 libdleyna/server/search.c mode change 100644 => 100755 libdleyna/server/search.h mode change 100644 => 100755 libdleyna/server/sort.c mode change 100644 => 100755 libdleyna/server/sort.h mode change 100644 => 100755 libdleyna/server/task.c mode change 100644 => 100755 libdleyna/server/task.h mode change 100644 => 100755 libdleyna/server/upnp.c mode change 100644 => 100755 libdleyna/server/upnp.h mode change 100644 => 100755 libdleyna/server/xml-util.c mode change 100644 => 100755 libdleyna/server/xml-util.h mode change 100644 => 100755 m4/compiler-flags.m4 mode change 100644 => 100755 m4/log.m4 mode change 100644 => 100755 test/dbus/dms-info.c mode change 100644 => 100755 test/dbus/download_sync_controller.py diff --git a/libdleyna/server/async.c b/libdleyna/server/async.c old mode 100644 new mode 100755 index c073841..07ec200 --- a/libdleyna/server/async.c +++ b/libdleyna/server/async.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/async.h b/libdleyna/server/async.h old mode 100644 new mode 100755 index 2408b4b..9c3d838 --- a/libdleyna/server/async.h +++ b/libdleyna/server/async.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/client.h b/libdleyna/server/client.h old mode 100644 new mode 100755 index 6d499dd..3b79c92 --- a/libdleyna/server/client.h +++ b/libdleyna/server/client.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/device.c b/libdleyna/server/device.c index b09814a..431334e 100644 --- a/libdleyna/server/device.c +++ b/libdleyna/server/device.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -1650,16 +1651,20 @@ dls_device_t *dls_device_new( const gchar *ip_address, const dleyna_connector_dispatch_cb_t *dispatch_table, GHashTable *property_map, - guint counter, + const char *udn, const dleyna_task_queue_key_t *queue_id) { dls_device_t *dev; gchar *new_path; + gchar *uuid; dls_device_context_t *context; DLEYNA_LOG_DEBUG("New Device on %s", ip_address); - new_path = g_strdup_printf("%s/%u", DLEYNA_SERVER_PATH, counter); + uuid = dleyna_core_prv_convert_udn_to_path(udn); + new_path = g_strdup_printf("%s/%s", DLEYNA_SERVER_PATH, uuid); + g_free(uuid); + DLEYNA_LOG_DEBUG("Server Path %s", new_path); dev = g_new0(dls_device_t, 1); diff --git a/libdleyna/server/device.h b/libdleyna/server/device.h old mode 100644 new mode 100755 index ef728ed..9d0501e --- a/libdleyna/server/device.h +++ b/libdleyna/server/device.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, @@ -116,7 +116,7 @@ dls_device_t *dls_device_new( const gchar *ip_address, const dleyna_connector_dispatch_cb_t *dispatch_table, GHashTable *filter_map, - guint counter, + const char *udn, const dleyna_task_queue_key_t *queue_id); dls_device_t *dls_device_from_path(const gchar *path, GHashTable *device_list); diff --git a/libdleyna/server/interface.h b/libdleyna/server/interface.h old mode 100644 new mode 100755 index f955db2..563acb6 --- a/libdleyna/server/interface.h +++ b/libdleyna/server/interface.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/path.c b/libdleyna/server/path.c old mode 100644 new mode 100755 index 345cba4..012a967 --- a/libdleyna/server/path.c +++ b/libdleyna/server/path.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/path.h b/libdleyna/server/path.h old mode 100644 new mode 100755 index 1ccd12d..a78795f --- a/libdleyna/server/path.h +++ b/libdleyna/server/path.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/props.c b/libdleyna/server/props.c old mode 100644 new mode 100755 index 13e76b5..eea50ea --- a/libdleyna/server/props.c +++ b/libdleyna/server/props.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/props.h b/libdleyna/server/props.h old mode 100644 new mode 100755 index 8d78817..79f0e43 --- a/libdleyna/server/props.h +++ b/libdleyna/server/props.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/search.c b/libdleyna/server/search.c old mode 100644 new mode 100755 index c331ceb..be9850b --- a/libdleyna/server/search.c +++ b/libdleyna/server/search.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/search.h b/libdleyna/server/search.h old mode 100644 new mode 100755 index 150a764..7c1c672 --- a/libdleyna/server/search.h +++ b/libdleyna/server/search.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/sort.c b/libdleyna/server/sort.c old mode 100644 new mode 100755 index d1f3c4d..ea7578d --- a/libdleyna/server/sort.c +++ b/libdleyna/server/sort.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/sort.h b/libdleyna/server/sort.h old mode 100644 new mode 100755 index 378d163..fd32295 --- a/libdleyna/server/sort.h +++ b/libdleyna/server/sort.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/task.c b/libdleyna/server/task.c old mode 100644 new mode 100755 index ec63d8e..3a4618b --- a/libdleyna/server/task.c +++ b/libdleyna/server/task.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/task.h b/libdleyna/server/task.h old mode 100644 new mode 100755 index 6642e8d..5fd97cf --- a/libdleyna/server/task.h +++ b/libdleyna/server/task.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c old mode 100644 new mode 100755 index 618300e..6d6c696 --- a/libdleyna/server/upnp.c +++ b/libdleyna/server/upnp.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, @@ -52,7 +52,6 @@ struct dls_upnp_t_ { GHashTable *device_udn_map; GHashTable *sleeping_device_udn_map; GHashTable *device_uc_map; - guint counter; }; /* Private structure used in service task */ @@ -286,13 +285,12 @@ static void prv_device_available_cb(GUPnPControlPoint *cp, device_info, ip_address, upnp->interface_info, - upnp->property_map, upnp->counter, + upnp->property_map, + udn, queue_id); prv_update_device_context(priv_t, upnp, udn, device, ip_address, queue_id); - - upnp->counter++; } else { DLEYNA_LOG_DEBUG("Device Found"); diff --git a/libdleyna/server/upnp.h b/libdleyna/server/upnp.h old mode 100644 new mode 100755 index df7310d..6e1aa55 --- a/libdleyna/server/upnp.h +++ b/libdleyna/server/upnp.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/xml-util.c b/libdleyna/server/xml-util.c old mode 100644 new mode 100755 index f6ddf6a..f7d740c --- a/libdleyna/server/xml-util.c +++ b/libdleyna/server/xml-util.c @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/libdleyna/server/xml-util.h b/libdleyna/server/xml-util.h old mode 100644 new mode 100755 index d5c72f4..a89c303 --- a/libdleyna/server/xml-util.h +++ b/libdleyna/server/xml-util.h @@ -1,7 +1,7 @@ /* * dLeyna * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4 old mode 100644 new mode 100755 index 7a1853d..408df48 --- a/m4/compiler-flags.m4 +++ b/m4/compiler-flags.m4 @@ -1,7 +1,7 @@ dnl dnl dLeyna dnl -dnl Copyright (C) 2012-2013 Intel Corporation. All rights reserved. +dnl Copyright (C) 2012-2015 Intel Corporation. All rights reserved. dnl dnl This program is free software; you can redistribute it and/or modify it dnl under the terms and conditions of the GNU Lesser General Public License, diff --git a/m4/log.m4 b/m4/log.m4 old mode 100644 new mode 100755 index 56ddfc4..b3e007d --- a/m4/log.m4 +++ b/m4/log.m4 @@ -1,7 +1,7 @@ dnl dnl dLeyna dnl -dnl Copyright (C) 2012-2013 Intel Corporation. All rights reserved. +dnl Copyright (C) 2012-2015 Intel Corporation. All rights reserved. dnl dnl This program is free software; you can redistribute it and/or modify it dnl under the terms and conditions of the GNU Lesser General Public License, diff --git a/test/dbus/dms-info.c b/test/dbus/dms-info.c old mode 100644 new mode 100755 index 8b9b075..a189b9f --- a/test/dbus/dms-info.c +++ b/test/dbus/dms-info.c @@ -14,7 +14,7 @@ * along with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2015 Intel Corporation. All rights reserved. * * Mark Ryan * diff --git a/test/dbus/download_sync_controller.py b/test/dbus/download_sync_controller.py old mode 100644 new mode 100755 index e45b869..b6c0476 --- a/test/dbus/download_sync_controller.py +++ b/test/dbus/download_sync_controller.py @@ -1,6 +1,6 @@ # download_sync_controller # -# Copyright (C) 2012-2013 Intel Corporation. All rights reserved. +# Copyright (C) 2012-2015 Intel Corporation. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU Lesser General Public License, -- cgit v1.2.1