This email list is read-only. Emails sent to this list will be discarded
----------------------------------
connman.pc.in | 1 +
include/element.h | 11 ++++---
plugins/Makefile.am | 11 ++++--
plugins/ethernet.c | 28 ++++++------------
plugins/hal.c | 22 +++++++++++++-
plugins/netdev.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/element.c | 6 +++-
7 files changed, 130 insertions(+), 30 deletions(-)
New commits:
commit 103706c4f4da0c89f8b6f33cccdc3149f4ecc09a
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 19:58:41 2008 +0200
Add support for detecting WiMAX devices properly
commit ad94c021ad5df8b199f1d74510ed19e61ca2899a
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 19:58:14 2008 +0200
Add debug message when device is ignored
commit 5ac584540591580d393ba5a136e949860ae86e75
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 15:03:31 2008 +0200
Let the Ethernet plugin create network devices
commit 99b5476272ab042a002ca6e636439e92a06f87e7
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 15:01:19 2008 +0200
Add string conversion for network device subtype
commit 8393bbf9b8c2704b68df7db9b326d7230b663476
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 14:53:52 2008 +0200
Add simple network device plugin
commit ce727c1bf6c7580104d4241b1b1ec0d53b2465f6
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 14:44:21 2008 +0200
Add element subtype for generic network devices
commit 3ffbebd7928775c18ff83c629e266d431d8e489d
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Sep 16 14:39:19 2008 +0200
Mention the GLib requirement
Diff in this email is a maximum of 400 lines.
diff --git a/connman.pc.in b/connman.pc.in
index fd86152..cb38b92 100644
--- a/connman.pc.in
+++ b/connman.pc.in
@@ -8,6 +8,7 @@ scriptdir=${libdir}/connman/scripts
Name: connman
Description: Connection Manager
+Requires: glib-2.0
Version: @VERSION@
Libs: -module -avoid-version -export-symbols-regex connman_plugin_desc
Cflags: -I${includedir}
diff --git a/include/element.h b/include/element.h
index 57103d3..a7ddb7d 100644
--- a/include/element.h
+++ b/include/element.h
@@ -61,11 +61,12 @@ enum connman_element_type {
enum connman_element_subtype {
CONNMAN_ELEMENT_SUBTYPE_UNKNOWN = 0,
- CONNMAN_ELEMENT_SUBTYPE_ETHERNET = 1,
- CONNMAN_ELEMENT_SUBTYPE_WIFI = 2,
- CONNMAN_ELEMENT_SUBTYPE_WIMAX = 3,
- CONNMAN_ELEMENT_SUBTYPE_MODEM = 4,
- CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 5,
+ CONNMAN_ELEMENT_SUBTYPE_NETWORK = 1,
+ CONNMAN_ELEMENT_SUBTYPE_ETHERNET = 2,
+ CONNMAN_ELEMENT_SUBTYPE_WIFI = 3,
+ CONNMAN_ELEMENT_SUBTYPE_WIMAX = 4,
+ CONNMAN_ELEMENT_SUBTYPE_MODEM = 5,
+ CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 6,
};
struct connman_driver;
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b4e9805..e91bf05 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,10 +1,9 @@
plugindir = $(libdir)/connman/plugins
-plugin_LTLIBRARIES = rtnllink.la ethernet.la wifi.la bluetooth.la \
- dhclient.la ipv4.la resolvconf.la resolvfile.la
-
-rtnllink_la_SOURCES = rtnllink.c
+plugin_LTLIBRARIES = ethernet.la wifi.la bluetooth.la \
+ netdev.la dhclient.la ipv4.la \
+ resolvconf.la resolvfile.la rtnllink.la
ethernet_la_SOURCES = ethernet.c
@@ -13,6 +12,8 @@ wifi_la_SOURCES = wifi.c inet.h inet.c supplicant.h
supplicant.c
bluetooth_la_SOURCES = bluetooth.c
bluetooth_la_LIBADD = @GDBUS_LIBS@
+netdev_la_SOURCES = netdev.c
+
dhclient_la_SOURCES = dhclient.c
dhclient_la_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DDHCLIENT=\"@[EMAIL
PROTECTED]" \
-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
@@ -23,6 +24,8 @@ resolvconf_la_SOURCES = resolvconf.c inet.h inet.c
resolvfile_la_SOURCES = resolvfile.c
+rtnllink_la_SOURCES = rtnllink.c
+
if HAL
plugin_LTLIBRARIES += hal.la
diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index 697149b..b05c78b 100644
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -43,23 +43,6 @@ struct ethernet_data {
static GStaticMutex ethernet_mutex = G_STATIC_MUTEX_INIT;
static GSList *ethernet_list = NULL;
-static void create_element(struct connman_element *parent,
- enum connman_element_type type)
-{
- struct connman_element *element;
-
- DBG("parent %p name %s", parent, parent->name);
-
- element = connman_element_create(NULL);
- if (element == NULL)
- return;
-
- element->type = type;
- element->index = parent->index;
-
- connman_element_register(element, parent);
-}
-
static void rtnl_link(struct nlmsghdr *hdr, const char *type)
{
GSList *list;
@@ -76,6 +59,7 @@ static void rtnl_link(struct nlmsghdr *hdr, const char *type)
for (list = ethernet_list; list; list = list->next) {
struct connman_element *element = list->data;
+ struct connman_element *netdev;
struct ethernet_data *ethernet;
ethernet = connman_element_get_data(element);
@@ -94,8 +78,14 @@ static void rtnl_link(struct nlmsghdr *hdr, const char *type)
if (ethernet->flags & IFF_RUNNING) {
DBG("carrier on");
- create_element(element, CONNMAN_ELEMENT_TYPE_DHCP);
- create_element(element, CONNMAN_ELEMENT_TYPE_ZEROCONF);
+ netdev = connman_element_create(NULL);
+ if (netdev != NULL) {
+ netdev->type = CONNMAN_ELEMENT_TYPE_DEVICE;
+ netdev->subtype =
CONNMAN_ELEMENT_SUBTYPE_NETWORK;
+ netdev->index = element->index;
+
+ connman_element_register(netdev, element);
+ }
} else {
DBG("carrier off");
diff --git a/plugins/hal.c b/plugins/hal.c
index 942faaf..bda2f8c 100644
--- a/plugins/hal.c
+++ b/plugins/hal.c
@@ -23,6 +23,9 @@
#include <config.h>
#endif
+#include <stdio.h>
+#include <sys/stat.h>
+
#include <dbus/dbus.h>
#include <hal/libhal.h>
@@ -36,6 +39,7 @@ static struct {
} capabilities[] = {
{ "net.80203", CONNMAN_ELEMENT_SUBTYPE_ETHERNET },
{ "net.80211", CONNMAN_ELEMENT_SUBTYPE_WIFI },
+ { "net.wimax", CONNMAN_ELEMENT_SUBTYPE_WIMAX },
{ "modem", CONNMAN_ELEMENT_SUBTYPE_MODEM },
{ }
};
@@ -84,7 +88,8 @@ static void device_netdev(LibHalContext *ctx, const char *udi,
struct connman_element *element)
{
if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_ETHERNET ||
- element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI) {
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX) {
element->index = libhal_device_get_property_int(ctx,
udi, "net.linux.ifindex", NULL);
@@ -108,6 +113,21 @@ static void create_element(LibHalContext *ctx, const char
*udi,
DBG("ctx %p udi %s", ctx, udi);
+ if (subtype == CONNMAN_ELEMENT_SUBTYPE_ETHERNET) {
+ char *sysfs_path, wimax_path[PATH_MAX];
+ struct stat st;
+
+ sysfs_path = libhal_device_get_property_string(ctx, udi,
+ "linux.sysfs_path", NULL);
+ if (sysfs_path != NULL) {
+ snprintf(wimax_path, PATH_MAX, "%s/wimax", sysfs_path);
+
+ if (stat(wimax_path, &st) == 0 &&
+ (st.st_mode & S_IFDIR))
+ subtype = CONNMAN_ELEMENT_SUBTYPE_WIMAX;
+ }
+ }
+
element = connman_element_create(NULL);
element->type = CONNMAN_ELEMENT_TYPE_DEVICE;
diff --git a/plugins/netdev.c b/plugins/netdev.c
new file mode 100644
index 0000000..d8733b7
--- /dev/null
+++ b/plugins/netdev.c
@@ -0,0 +1,81 @@
+/*
+ *
+ * Connection Manager
+ *
+ * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <connman/plugin.h>
+#include <connman/driver.h>
+#include <connman/log.h>
+
+static void create_element(struct connman_element *parent,
+ enum connman_element_type type)
+{
+ struct connman_element *element;
+
+ DBG("parent %p name %s", parent, parent->name);
+
+ element = connman_element_create(NULL);
+ if (element == NULL)
+ return;
+
+ element->type = type;
+ element->index = parent->index;
+
+ connman_element_register(element, parent);
+}
+
+static int netdev_probe(struct connman_element *element)
+{
+ DBG("element %p name %s", element, element->name);
+
+ create_element(element, CONNMAN_ELEMENT_TYPE_DHCP);
+ create_element(element, CONNMAN_ELEMENT_TYPE_ZEROCONF);
+
+ return 0;
+}
+
+static void netdev_remove(struct connman_element *element)
+{
+ DBG("element %p name %s", element, element->name);
+}
+
+static struct connman_driver netdev_driver = {
+ .name = "netdev",
+ .type = CONNMAN_ELEMENT_TYPE_DEVICE,
+ .subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK,
+ .probe = netdev_probe,
+ .remove = netdev_remove,
+};
+
+static int netdev_init(void)
+{
+ return connman_driver_register(&netdev_driver);
+}
+
+static void netdev_exit(void)
+{
+ connman_driver_unregister(&netdev_driver);
+}
+
+CONNMAN_PLUGIN_DEFINE("netdev", "Network device plugin", VERSION,
+ netdev_init, netdev_exit)
diff --git a/src/element.c b/src/element.c
index a9012b2..4238bdf 100644
--- a/src/element.c
+++ b/src/element.c
@@ -122,6 +122,8 @@ static const char *subtype2string(enum
connman_element_subtype type)
switch (type) {
case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
return "unknown";
+ case CONNMAN_ELEMENT_SUBTYPE_NETWORK:
+ return "network";
case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
return "ethernet";
case CONNMAN_ELEMENT_SUBTYPE_WIFI:
@@ -955,8 +957,10 @@ int connman_element_register(struct connman_element
*element,
DBG("element %p name %s parent %p", element, element->name, parent);
if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) {
- if (g_str_equal(device_filter, element->name) == FALSE)
+ if (g_str_equal(device_filter, element->name) == FALSE) {
+ DBG("ignoring %s device", element->name);
return -EPERM;
+ }
}
if (connman_element_ref(element) == NULL)
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
