projects / connman / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add support for reading config directory from dbus-1.pc
[connman] / src / element.c
diff --git a/src/element.c b/src/element.c
index eb26ae6..fb11f79 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -58,12 +58,6 @@ static struct {
                DBUS_TYPE_STRING, "IPv4.Broadcast" },
        { CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
                DBUS_TYPE_STRING, "IPv4.Nameserver" },
-
-       { CONNMAN_PROPERTY_ID_WIFI_SECURITY,
-               DBUS_TYPE_STRING, "WiFi.Security" },
-       { CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE,
-               DBUS_TYPE_STRING, "WiFi.Passphrase" },
-
        { }
 };
 
@@ -127,58 +121,6 @@ static const char *type2string(enum connman_element_type type)
        return NULL;
 }
 
-#if 0
-static const char *subtype2string(enum connman_element_subtype type)
-{
-       switch (type) {
-       case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
-               return "unknown";
-       case CONNMAN_ELEMENT_SUBTYPE_FAKE:
-               return "fake";
-       case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
-               return "ethernet";
-       case CONNMAN_ELEMENT_SUBTYPE_WIFI:
-               return "wifi";
-       case CONNMAN_ELEMENT_SUBTYPE_WIMAX:
-               return "wimax";
-       case CONNMAN_ELEMENT_SUBTYPE_CELLULAR:
-               return "cellular";
-       case CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH:
-               return "bluetooth";
-       }
-
-       return NULL;
-}
-#endif
-
-const char *__connman_element_policy2string(enum connman_element_policy policy)
-{
-       switch (policy) {
-       case CONNMAN_ELEMENT_POLICY_UNKNOWN:
-               return "unknown";
-       case CONNMAN_ELEMENT_POLICY_IGNORE:
-               return "ignore";
-       case CONNMAN_ELEMENT_POLICY_AUTO:
-               return "auto";
-       case CONNMAN_ELEMENT_POLICY_ASK:
-               return "ask";
-       }
-
-       return NULL;
-}
-
-enum connman_element_policy __connman_element_string2policy(const char *policy)
-{
-       if (strcasecmp(policy, "ignore") == 0)
-               return CONNMAN_ELEMENT_POLICY_IGNORE;
-       else if (strcasecmp(policy, "auto") == 0)
-               return CONNMAN_ELEMENT_POLICY_AUTO;
-       else if (strcasecmp(policy, "ask") == 0)
-               return CONNMAN_ELEMENT_POLICY_ASK;
-       else
-               return CONNMAN_ELEMENT_POLICY_UNKNOWN;
-}
-
 const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
 {
        switch (method) {
@@ -499,12 +441,8 @@ static gboolean match_driver(struct connman_element *element,
        if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
                return FALSE;
 
-       if (element->type != driver->type &&
-                       driver->type != CONNMAN_ELEMENT_TYPE_UNKNOWN)
-               return FALSE;
-
-       if (element->subtype == driver->subtype ||
-                       driver->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
+       if (element->type == driver->type ||
+                       driver->type == CONNMAN_ELEMENT_TYPE_UNKNOWN)
                return TRUE;
 
        return FALSE;
@@ -631,9 +569,6 @@ struct connman_element *connman_element_create(const char *name)
 
        element->name    = g_strdup(name);
        element->type    = CONNMAN_ELEMENT_TYPE_UNKNOWN;
-       element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
-       element->state   = CONNMAN_ELEMENT_STATE_CLOSED;
-       element->policy  = CONNMAN_ELEMENT_POLICY_AUTO;
        element->index   = -1;
        element->enabled = FALSE;
 
@@ -691,7 +626,6 @@ void connman_element_unref(struct connman_element *element)
                g_free(element->ipv4.broadcast);
                g_free(element->ipv4.nameserver);
                g_free(element->devname);
-               g_free(element->devpath);
                g_free(element->path);
                g_free(element->name);
                g_free(element);
@@ -1008,18 +942,6 @@ int connman_element_set_property(struct connman_element *element,
                element->ipv4.nameserver = g_strdup(*((const char **) value));
                __connman_element_unlock(element);
                break;
-       case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
-               __connman_element_lock(element);
-               g_free(element->wifi.security);
-               element->wifi.security = g_strdup(*((const char **) value));
-               __connman_element_unlock(element);
-               break;
-       case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
-               __connman_element_lock(element);
-               g_free(element->wifi.passphrase);
-               element->wifi.passphrase = g_strdup(*((const char **) value));
-               __connman_element_unlock(element);
-               break;
        default:
                return -EINVAL;
        }
@@ -1034,6 +956,14 @@ int connman_element_get_value(struct connman_element *element,
                return -EINVAL;
 
        switch (id) {
+       case CONNMAN_PROPERTY_ID_IPV4_METHOD:
+               if (element->ipv4.method == CONNMAN_IPV4_METHOD_UNKNOWN)
+                       return connman_element_get_value(element->parent,
+                                                               id, value);
+               __connman_element_lock(element);
+               *((const char **) value) = __connman_ipv4_method2string(element->ipv4.method);
+               __connman_element_unlock(element);
+               break;
        case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
                if (element->ipv4.address == NULL)
                        return connman_element_get_value(element->parent,
@@ -1074,22 +1004,6 @@ int connman_element_get_value(struct connman_element *element,
                *((char **) value) = element->ipv4.nameserver;
                __connman_element_unlock(element);
                break;
-       case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
-               if (element->wifi.security == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               __connman_element_lock(element);
-               *((char **) value) = element->wifi.security;
-               __connman_element_unlock(element);
-               break;
-       case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
-               if (element->wifi.passphrase == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               __connman_element_lock(element);
-               *((char **) value) = element->wifi.passphrase;
-               __connman_element_unlock(element);
-               break;
        default:
                return -EINVAL;
        }
@@ -1119,6 +1033,10 @@ gboolean connman_element_get_static_property(struct connman_element *element,
                                *((char **) value) = property->value;
                                found = TRUE;
                                break;
+                       case DBUS_TYPE_BYTE:
+                               memcpy(value, property->value, 1);
+                               found = TRUE;
+                               break;
                        }
                        break;
                }
@@ -1126,6 +1044,10 @@ gboolean connman_element_get_static_property(struct connman_element *element,
 
        __connman_element_unlock(element);
 
+       if (found == FALSE && element->parent != NULL)
+               return connman_element_get_static_property(element->parent,
+                                                               name, value);
+
        return found;
 }
 
@@ -1260,20 +1182,6 @@ static void emit_state_change(DBusConnection *conn, const char *state)
        g_dbus_send_message(conn, signal);
 }
 
-static void set_signal_strength(struct connman_element *connection)
-{
-       struct connman_element *element = connection;
-
-       while (element != NULL) {
-               if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
-                       connection->strength = element->strength;
-                       break;
-               }
-
-               element = element->parent;
-       }
-}
-
 static void probe_element(struct connman_element *element)
 {
        GSList *list;
@@ -1309,9 +1217,6 @@ static void register_element(gpointer data, gpointer user_data)
                node = g_node_find(element_root, G_PRE_ORDER,
                                        G_TRAVERSE_ALL, element->parent);
                basepath = element->parent->path;
-
-               if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
-                       element->subtype = element->parent->subtype;
        } else {
                element->parent = element_root->data;
 
@@ -1330,7 +1235,6 @@ static void register_element(gpointer data, gpointer user_data)
        g_node_append_data(node, element);
 
        if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
-               set_signal_strength(element);
                emit_connections_signal(connection);
                emit_state_change(connection, "online");
        }
@@ -1383,6 +1287,9 @@ int connman_element_register(struct connman_element *element,
                }
        }
 
+       if (element->type == CONNMAN_ELEMENT_TYPE_DHCP)
+               element->ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+
        element->parent = parent;
 
        __connman_element_unlock(element);
@@ -1460,19 +1367,12 @@ void connman_element_unregister_children(struct connman_element *element)
 static gboolean update_element(GNode *node, gpointer user_data)
 {
        struct connman_element *element = node->data;
-       struct connman_element *root = user_data;
 
        DBG("element %p name %s", element, element->name);
 
        if (element->driver && element->driver->update)
                element->driver->update(element);
 
-       if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION &&
-                               root->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
-               if (element->strength != root->strength)
-                       element->strength = root->strength;
-       }
-
        emit_element_signal(connection, "ElementUpdated", element);
 
        return FALSE;
@@ -1555,6 +1455,8 @@ void __connman_element_start(void)
 
        started = TRUE;
 
+       __connman_storage_init_device();
+
        __connman_connection_init();
        __connman_ipv4_init();
        __connman_detect_init();
Unnamed repository; edit this file to name it for gitweb.