Fix position of builtin include

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index fefc369..f2b9da2 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -33,6 +33,7 @@ struct connman_network {
        struct connman_element element;
        enum connman_network_type type;
        enum connman_network_protocol protocol;
+       connman_bool_t secondary;
        connman_bool_t available;
        connman_bool_t connected;
        connman_bool_t remember;
@@ -42,6 +43,7 @@ struct connman_network {
        char *address;
        char *name;
        char *node;
+       char *group;
 
        struct connman_network_driver *driver;
        void *driver_data;
@@ -433,6 +435,7 @@ static void network_destruct(struct connman_element *element)
        g_free(network->wifi.security);
        g_free(network->wifi.passphrase);
 
+       g_free(network->group);
        g_free(network->node);
        g_free(network->name);
        g_free(network->address);
@@ -454,7 +457,6 @@ struct connman_network *connman_network_create(const char *identifier,
        connman_uint8_t strength = 0;
        const char *str;
        char *temp;
-       unsigned int i;
 
        DBG("identifier %s type %d", identifier, type);
 
@@ -466,19 +468,13 @@ struct connman_network *connman_network_create(const char *identifier,
 
        __connman_element_initialize(&network->element);
 
+       //temp = connman_dbus_encode_string(identifier);
        temp = g_strdup(identifier);
        if (temp == NULL) {
                g_free(network);
                return NULL;
        }
 
-       for (i = 0; i < strlen(temp); i++) {
-               char tmp = temp[i];
-               if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') &&
-                                               (tmp < 'a' || tmp > 'z'))
-                       temp[i] = '_';
-       }
-
        network->element.name = temp;
        network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
 
@@ -491,7 +487,8 @@ struct connman_network *connman_network_create(const char *identifier,
 
        connman_element_set_uint8(&network->element, "Strength", strength);
 
-       network->type = type;
+       network->type       = type;
+       network->secondary  = FALSE;
        network->identifier = g_strdup(identifier);
 
        return network;
@@ -522,6 +519,22 @@ void connman_network_unref(struct connman_network *network)
        connman_element_unref(&network->element);
 }
 
+const char *__connman_network_get_type(struct connman_network *network)
+{
+       return type2string(network->type);
+}
+
+/**
+ * connman_network_get_type:
+ * @network: network structure
+ *
+ * Get type of network
+ */
+enum connman_network_type connman_network_get_type(struct connman_network *network)
+{
+       return network->type;
+}
+
 /**
  * connman_network_get_identifier:
  * @network: network structure
@@ -581,6 +594,33 @@ void connman_network_set_protocol(struct connman_network *network,
 }
 
 /**
+ * connman_network_set_group:
+ * @network: network structure
+ * @group: group name
+ *
+ * Set group name for automatic clustering
+ */
+void connman_network_set_group(struct connman_network *network,
+                                                       const char *group)
+{
+       g_free(network->group);
+       network->group = g_strdup(group);
+}
+
+const char *__connman_network_get_group(struct connman_network *network)
+{
+       return network->group;
+}
+
+const char *__connman_network_get_ident(struct connman_network *network)
+{
+       if (network->device == NULL)
+               return NULL;
+
+       return __connman_device_get_ident(network->device);
+}
+
+/**
  * connman_network_set_available:
  * @network: network structure
  * @available: availability state
@@ -821,6 +861,8 @@ int __connman_network_disconnect(struct connman_network *network)
        if (network->connected == FALSE)
                return -ENOTCONN;
 
+       connman_element_unregister_children(&network->element);
+
        if (network->driver && network->driver->disconnect)
                return network->driver->disconnect(network);
 
@@ -1068,7 +1110,21 @@ static int network_probe(struct connman_element *element)
                return err;
        }
 
-       __connman_profile_add_network(network);
+       network->secondary = connman_device_get_secondary(network->device);
+
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_HSO:
+               break;
+       case CONNMAN_NETWORK_TYPE_WIFI:
+       case CONNMAN_NETWORK_TYPE_WIMAX:
+               if (network->secondary == FALSE)
+                       __connman_profile_add_network(network);
+               break;
+       }
 
        return 0;
 }
@@ -1085,7 +1141,19 @@ static void network_remove(struct connman_element *element)
        if (network->driver == NULL)
                return;
 
-       __connman_profile_remove_network(network);
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_HSO:
+               break;
+       case CONNMAN_NETWORK_TYPE_WIFI:
+       case CONNMAN_NETWORK_TYPE_WIMAX:
+               if (network->secondary == FALSE)
+                       __connman_profile_remove_network(network);
+               break;
+       }
 
        unregister_interface(element);
 
@@ -1142,6 +1210,7 @@ static int network_load(struct connman_network *network)
        gchar *pathname, *data = NULL;
        gsize length;
        const char *name;
+       char *str;
        int val;
 
        DBG("network %p", network);
@@ -1179,13 +1248,19 @@ static int network_load(struct connman_network *network)
        if (val > 0)
                network->priority = val;
 
-       g_free(network->wifi.security);
-       network->wifi.security = g_key_file_get_string(keyfile,
+       str = g_key_file_get_string(keyfile,
                                network->identifier, "WiFi.Security", NULL);
+       if (str != NULL) {
+               g_free(network->wifi.security);
+               network->wifi.security = str;
+       }
 
-       g_free(network->wifi.passphrase);
-       network->wifi.passphrase = g_key_file_get_string(keyfile,
+       str = g_key_file_get_string(keyfile,
                                network->identifier, "WiFi.Passphrase", NULL);
+       if (str != NULL) {
+               g_free(network->wifi.passphrase);
+               network->wifi.passphrase = str;
+       }
 
        g_key_file_free(keyfile);
 
@@ -1242,7 +1317,8 @@ update:
 
        data = g_key_file_to_data(keyfile, &length, NULL);
 
-       g_file_set_contents(pathname, data, length, NULL);
+       if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
+               connman_error("Failed to store network information");
 
 done:
        g_free(data);