This email list is read-only. Emails sent to this list will be discarded
----------------------------------
include/driver.h | 4 ++--
include/element.h | 2 +-
plugins/wifi.c | 14 +++++++-------
src/element.c | 25 ++++++++++++-------------
test/disable-network | 6 +++---
test/list-devices | 11 +++++++----
test/list-networks | 2 +-
test/monitor-state | 2 +-
test/select-network | 6 +++---
9 files changed, 37 insertions(+), 35 deletions(-)
New commits:
commit 9e1af1dead7a965277a7e8b0dea90a3de5b47411
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Mon Aug 11 08:35:36 2008 +0200
Use Enabled property instead of Connected
commit bfff79aeb857855ef025efa294028e34f91d91f0
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Mon Aug 11 08:20:47 2008 +0200
Rename connect/disconnect to enable/disable for better semantics
commit 9b4c51a543c5dd205bf5134f02f446077c1168f0
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Mon Aug 11 06:43:56 2008 +0200
Use the element listing and filter by device type
Diff in this email is a maximum of 400 lines.
diff --git a/include/driver.h b/include/driver.h
index 3d0ad92..8076a0e 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -40,8 +40,8 @@ struct connman_driver {
int (*probe) (struct connman_element *element);
void (*remove) (struct connman_element *element);
int (*update) (struct connman_element *element);
- int (*connect) (struct connman_element *element);
- int (*disconnect) (struct connman_element *element);
+ int (*enable) (struct connman_element *element);
+ int (*disable) (struct connman_element *element);
};
extern int connman_driver_register(struct connman_driver *driver);
diff --git a/include/element.h b/include/element.h
index c0702ac..9b8beab 100644
--- a/include/element.h
+++ b/include/element.h
@@ -72,7 +72,7 @@ struct connman_element {
enum connman_element_type type;
enum connman_element_subtype subtype;
enum connman_element_state state;
- gboolean connected;
+ gboolean enabled;
guint16 priority;
struct connman_element *parent;
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 640b708..0561133 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -46,7 +46,7 @@ static void network_remove(struct connman_element *element)
DBG("element %p name %s", element, element->name);
}
-static int network_connect(struct connman_element *element)
+static int network_enable(struct connman_element *element)
{
DBG("element %p name %s", element, element->name);
@@ -57,7 +57,7 @@ static int network_connect(struct connman_element *element)
__supplicant_disconnect(element);
- element->connected = FALSE;
+ element->enabled = FALSE;
connman_element_update(element);
@@ -70,7 +70,7 @@ static int network_connect(struct connman_element *element)
return 0;
}
-static int network_disconnect(struct connman_element *element)
+static int network_disable(struct connman_element *element)
{
DBG("element %p name %s", element, element->name);
@@ -81,7 +81,7 @@ static int network_disconnect(struct connman_element *element)
__supplicant_disconnect(element);
- element->connected = FALSE;
+ element->enabled = FALSE;
connman_element_update(element);
@@ -94,8 +94,8 @@ static struct connman_driver network_driver = {
.subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI,
.probe = network_probe,
.remove = network_remove,
- .connect = network_connect,
- .disconnect = network_disconnect,
+ .enable = network_enable,
+ .disable = network_disable,
};
struct wifi_data {
@@ -148,7 +148,7 @@ static void state_change(struct connman_element *parent,
dhcp_element = dhcp;
- element->connected = TRUE;
+ element->enabled = TRUE;
connman_element_update(element);
diff --git a/src/element.c b/src/element.c
index d954b63..db7cb4e 100644
--- a/src/element.c
+++ b/src/element.c
@@ -176,8 +176,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
if (str != NULL)
append_entry(&dict, "Subtype", DBUS_TYPE_STRING, &str);
- append_entry(&dict, "Connected",
- DBUS_TYPE_BOOLEAN, &element->connected);
+ append_entry(&dict, "Enabled", DBUS_TYPE_BOOLEAN, &element->enabled);
if (element->priority > 0)
append_entry(&dict, "Priority",
@@ -232,7 +231,7 @@ static DBusMessage *do_update(DBusConnection *conn,
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *do_connect(DBusConnection *conn,
+static DBusMessage *do_enable(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
@@ -242,15 +241,15 @@ static DBusMessage *do_connect(DBusConnection *conn,
if (element->driver == NULL)
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- if (element->driver->connect) {
- DBG("Calling connect callback");
- element->driver->connect(element);
+ if (element->driver->enable) {
+ DBG("Calling enable callback");
+ element->driver->enable(element);
}
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *do_disconnect(DBusConnection *conn,
+static DBusMessage *do_disable(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
@@ -260,9 +259,9 @@ static DBusMessage *do_disconnect(DBusConnection *conn,
if (element->driver == NULL)
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- if (element->driver->disconnect) {
- DBG("Calling disconnect callback");
- element->driver->disconnect(element);
+ if (element->driver->disable) {
+ DBG("Calling disable callback");
+ element->driver->disable(element);
}
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
@@ -272,8 +271,8 @@ static GDBusMethodTable element_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
{ "SetProperty", "sv", "", set_property },
{ "Update", "", "", do_update },
- { "Connect", "", "", do_connect },
- { "Disconnect", "", "", do_disconnect },
+ { "Enable", "", "", do_enable },
+ { "Disable", "", "", do_disable },
{ },
};
@@ -438,7 +437,7 @@ struct connman_element *connman_element_create(void)
element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
element->state = CONNMAN_ELEMENT_STATE_CLOSED;
- element->connected = FALSE;
+ element->enabled = FALSE;
element->netdev.index = -1;
diff --git a/test/disable-network b/test/disable-network
index 12da1e8..eede449 100755
--- a/test/disable-network
+++ b/test/disable-network
@@ -18,8 +18,8 @@ for path in elements:
if (properties["Type"] != "network"):
continue
- if (properties["Connected"] == dbus.Boolean(1)):
- print "Disconnecting %s" % (path)
- element.Disconnect()
+ if (properties["Enabled"] == dbus.Boolean(1)):
+ print "Disabling %s" % (path)
+ element.Disable()
except:
pass
diff --git a/test/list-devices b/test/list-devices
index 9b9615b..3c1b82e 100755
--- a/test/list-devices
+++ b/test/list-devices
@@ -7,15 +7,18 @@ bus = dbus.SystemBus()
manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
"org.moblin.connman.Manager")
-devices = manager.ListDevices()
-
-for path in devices:
- print "[ %s ]" % (path)
+elements = manager.ListElements()
+for path in elements:
element = dbus.Interface(bus.get_object("org.moblin.connman", path),
"org.moblin.connman.Element")
properties = element.GetProperties()
+ if (properties["Type"] != "device"):
+ continue
+
+ print "[ %s ]" % (path)
+
for key in properties.keys():
print " %s = %s" % (key, properties[key])
diff --git a/test/list-networks b/test/list-networks
index d3fa34d..c799863 100755
--- a/test/list-networks
+++ b/test/list-networks
@@ -19,7 +19,7 @@ for path in elements:
print "[ %s ]" % (path)
if (properties["Type"] == "network"):
- if (properties["Connected"] == 1):
+ if (properties["Enabled"] == 1):
state = "*"
else:
state = " "
diff --git a/test/monitor-state b/test/monitor-state
index d17c0e5..b4bd1de 100755
--- a/test/monitor-state
+++ b/test/monitor-state
@@ -27,7 +27,7 @@ def element_added(path):
def element_updated(path):
properties = get_properties(path)
- if (properties["Type"] == "network" and properties["Connected"] == 1):
+ if (properties["Type"] == "network" and properties["Enabled"] == 1):
print "Associated with %s" % (properties["SSID"])
def element_removed(path):
diff --git a/test/select-network b/test/select-network
index 2d5b2b1..afa287c 100755
--- a/test/select-network
+++ b/test/select-network
@@ -22,9 +22,9 @@ for path in elements:
if (properties["Type"] != "network"):
continue
- if (properties["Connected"] == dbus.Boolean(1)):
+ if (properties["Enabled"] == dbus.Boolean(1)):
continue
if (properties["Identifier"] == sys.argv[1]):
- print "Connecting %s" % (path)
- element.Connect()
+ print "Enabling %s" % (path)
+ element.Enable()
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
