diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-01-01 19:07:00 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-01-01 19:07:00 +0100 |
| commit | bffaaf7bd6f31a0c873d358bc0119e2de9f55a9c (patch) | |
| tree | bf40d04cc0ec16da809dbb6911e192807fa1526f /src | |
| parent | 3909f166fb41fba2521bf84ed5fc87d367c163b8 (diff) | |
| download | connman-bffaaf7bd6f31a0c873d358bc0119e2de9f55a9c.tar.gz connman-bffaaf7bd6f31a0c873d358bc0119e2de9f55a9c.tar.bz2 connman-bffaaf7bd6f31a0c873d358bc0119e2de9f55a9c.zip | |
Remove deprecated network subtype
Diffstat (limited to 'src')
| -rw-r--r-- | src/device.c | 4 | ||||
| -rw-r--r-- | src/element.c | 9 | ||||
| -rw-r--r-- | src/network.c | 16 | ||||
| -rw-r--r-- | src/storage.c | 3 |
4 files changed, 18 insertions, 14 deletions
diff --git a/src/device.c b/src/device.c index d5e836b7..3a1ae260 100644 --- a/src/device.c +++ b/src/device.c @@ -785,8 +785,8 @@ int connman_device_set_carrier(struct connman_device *device, element = connman_element_create(NULL); if (element != NULL) { - element->type = CONNMAN_ELEMENT_TYPE_DEVICE; - element->subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK; + element->type = CONNMAN_ELEMENT_TYPE_DHCP; + element->subtype = device->element.subtype; element->index = device->element.index; if (connman_element_register(element, diff --git a/src/element.c b/src/element.c index a3bfa028..85d92fda 100644 --- a/src/element.c +++ b/src/element.c @@ -132,8 +132,6 @@ static const char *subtype2string(enum connman_element_subtype type) return "unknown"; case CONNMAN_ELEMENT_SUBTYPE_FAKE: return "fake"; - case CONNMAN_ELEMENT_SUBTYPE_NETWORK: - return "network"; case CONNMAN_ELEMENT_SUBTYPE_ETHERNET: return "ethernet"; case CONNMAN_ELEMENT_SUBTYPE_WIFI: @@ -631,10 +629,6 @@ static gboolean append_path(GNode *node, gpointer user_data) filter->type != element->type) return FALSE; - if (filter->type == CONNMAN_ELEMENT_TYPE_DEVICE && - element->subtype == CONNMAN_ELEMENT_SUBTYPE_NETWORK) - return FALSE; - dbus_message_iter_append_basic(filter->iter, DBUS_TYPE_OBJECT_PATH, &element->path); @@ -1741,8 +1735,7 @@ int connman_element_register(struct connman_element *element, if (element->devname == NULL) element->devname = g_strdup(element->name); - if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE && - element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) { + if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) { if (g_pattern_match_simple(device_filter, element->devname) == FALSE) { DBG("ignoring %s [%s] device", element->name, diff --git a/src/network.c b/src/network.c index 69b61909..6e966e34 100644 --- a/src/network.c +++ b/src/network.c @@ -397,11 +397,23 @@ int connman_network_set_connected(struct connman_network *network, if (connected == TRUE) { struct connman_element *element; + enum connman_element_type type; + + switch (network->protocol) { + case CONNMAN_NETWORK_PROTOCOL_UNKNOWN: + return 0; + case CONNMAN_NETWORK_PROTOCOL_IP: + type = CONNMAN_ELEMENT_TYPE_DHCP; + break; + case CONNMAN_NETWORK_PROTOCOL_PPP: + type = CONNMAN_ELEMENT_TYPE_PPP; + break; + } element = connman_element_create(NULL); if (element != NULL) { - element->type = CONNMAN_ELEMENT_TYPE_DEVICE; - element->subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK; + element->type = type; + element->subtype = network->element.subtype; element->index = network->element.index; if (connman_element_register(element, diff --git a/src/storage.c b/src/storage.c index e0e3dc55..3ed0fc17 100644 --- a/src/storage.c +++ b/src/storage.c @@ -165,8 +165,7 @@ int __connman_element_store(struct connman_element *element) element->type != CONNMAN_ELEMENT_TYPE_NETWORK) return -EINVAL; - if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_FAKE || - element->subtype == CONNMAN_ELEMENT_SUBTYPE_NETWORK) + if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_FAKE) return -EINVAL; pathname = g_strdup_printf("%s/elements.conf", STORAGEDIR); |