From da8e11efb0472f8d21cd4afff152036701e531a9 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 11 Dec 2008 16:56:43 +0100 Subject: [PATCH] Add devname attribute for device filtering --- include/element.h | 1 + src/element.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/element.h b/include/element.h index aaf389d..e56f669 100644 --- a/include/element.h +++ b/include/element.h @@ -95,6 +95,7 @@ struct connman_element { gboolean available; gboolean remember; guint16 priority; + gchar *devname; struct connman_element *parent; diff --git a/src/element.c b/src/element.c index a8eee21..7361eb2 100644 --- a/src/element.c +++ b/src/element.c @@ -1154,6 +1154,7 @@ void connman_element_unref(struct connman_element *element) g_free(element->ipv4.network); g_free(element->ipv4.broadcast); g_free(element->ipv4.nameserver); + g_free(element->devname); g_free(element->path); g_free(element->name); g_free(element); @@ -1846,10 +1847,14 @@ int connman_element_register(struct connman_element *element, { DBG("element %p name %s parent %p", element, element->name, parent); + if (element->devname == NULL) + element->devname = g_strdup(element->name); + if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) { if (g_pattern_match_simple(device_filter, - element->name) == FALSE) { - DBG("ignoring %s device", element->name); + element->devname) == FALSE) { + DBG("ignoring %s [%s] device", element->name, + element->devname); return -EPERM; } } -- 2.7.4