network: Add IP setters

[framework/connectivity/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index a8ebb47..a0867fc 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -40,7 +40,6 @@ struct connman_network {
        connman_uint8_t strength;
        connman_uint16_t frequency;
        char *identifier;
-       char *address;
        char *name;
        char *node;
        char *group;
@@ -176,7 +175,6 @@ static void network_destruct(struct connman_element *element)
        g_free(network->group);
        g_free(network->node);
        g_free(network->name);
-       g_free(network->address);
        g_free(network->identifier);
 
        network->device = NULL;
@@ -772,8 +770,7 @@ static int manual_ipv6_set(struct connman_network *network,
        return 0;
 }
 
-static void autoconf_ipv6_set(struct connman_network *network,
-                               struct connman_ipconfig *ipconfig_ipv6)
+static void autoconf_ipv6_set(struct connman_network *network)
 {
        struct connman_service *service;
        struct connman_ipconfig *ipconfig;
@@ -832,7 +829,7 @@ static gboolean set_connected(gpointer user_data)
                case CONNMAN_IPCONFIG_METHOD_OFF:
                        break;
                case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       autoconf_ipv6_set(network, ipconfig_ipv6);
+                       autoconf_ipv6_set(network);
                        break;
                case CONNMAN_IPCONFIG_METHOD_FIXED:
                case CONNMAN_IPCONFIG_METHOD_MANUAL:
@@ -1157,7 +1154,7 @@ int __connman_network_set_ipconfig(struct connman_network *network,
                case CONNMAN_IPCONFIG_METHOD_OFF:
                        break;
                case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       autoconf_ipv6_set(network, ipconfig_ipv6);
+                       autoconf_ipv6_set(network);
                        break;
                case CONNMAN_IPCONFIG_METHOD_FIXED:
                case CONNMAN_IPCONFIG_METHOD_MANUAL:
@@ -1192,36 +1189,91 @@ int __connman_network_set_ipconfig(struct connman_network *network,
        return 0;
 }
 
-/**
- * connman_network_set_address:
- * @network: network structure
- * @address: binary address value
- * @size: binary address length
- *
- * Set unique address value for network
- */
-int connman_network_set_address(struct connman_network *network,
-                               const void *address, unsigned int size)
+int connman_network_set_ipaddress(struct connman_network *network,
+                                       struct connman_ipaddress *ipaddress)
 {
-       const unsigned char *addr_octet = address;
-       char *str;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig = NULL;
 
-       DBG("network %p size %d", network, size);
+       DBG("network %p", network);
 
-       if (size != 6)
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
                return -EINVAL;
 
-       str = g_strdup_printf("%02X:%02X:%02X:%02X:%02X:%02X",
-                               addr_octet[0], addr_octet[1], addr_octet[2],
-                               addr_octet[3], addr_octet[4], addr_octet[5]);
-       if (str == NULL)
-               return -ENOMEM;
+       if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV4)
+               ipconfig = __connman_service_get_ip4config(service);
+       else if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV6)
+               ipconfig = __connman_service_get_ip6config(service);
+
+       if (ipconfig == NULL)
+               return -EINVAL;
 
-       g_free(network->address);
-       network->address = str;
+       __connman_ipconfig_set_local(ipconfig, ipaddress->local);
+       __connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
+       __connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
+       __connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
+       __connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
 
-       return connman_element_set_string(&network->element,
-                                               "Address", network->address);
+       return 0;
+}
+
+int connman_network_set_pac(struct connman_network *network,
+                               const char *pac)
+{
+       struct connman_service *service;
+
+       DBG("network %p pac %s", network, pac);
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
+
+       __connman_service_set_pac(service, pac);
+
+       return 0;
+}
+
+int connman_network_set_nameservers(struct connman_network *network,
+                               const char *nameservers)
+{
+       struct connman_service *service;
+       char **nameservers_array = NULL;
+       int i;
+
+       DBG("network %p nameservers %s", network, nameservers);
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
+
+       __connman_service_nameserver_clear(service);
+
+       if (nameservers != NULL)
+               nameservers_array = g_strsplit(nameservers, " ", 0);
+
+       for (i = 0; nameservers_array[i] == NULL; i++) {
+               __connman_service_nameserver_append(service,
+                                               nameservers_array[i]);
+       }
+
+       return 0;
+}
+
+int connman_network_set_domain(struct connman_network *network,
+                               const char *domain)
+{
+       struct connman_service *service;
+
+       DBG("network %p domain %s", network, domain);
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
+
+       __connman_service_set_domainname(service, domain);
+
+       return 0;
 }
 
 /**
@@ -1296,10 +1348,7 @@ int connman_network_set_string(struct connman_network *network,
        if (g_strcmp0(key, "Name") == 0)
                return connman_network_set_name(network, value);
 
-       if (g_str_equal(key, "Address") == TRUE) {
-               g_free(network->address);
-               network->address = g_strdup(value);
-       } else if (g_str_equal(key, "Node") == TRUE) {
+       if (g_str_equal(key, "Node") == TRUE) {
                g_free(network->node);
                network->node = g_strdup(value);
        } else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
@@ -1362,9 +1411,7 @@ const char *connman_network_get_string(struct connman_network *network,
 {
        DBG("network %p key %s", network, key);
 
-       if (g_str_equal(key, "Address") == TRUE)
-               return network->address;
-       else if (g_str_equal(key, "Name") == TRUE)
+       if (g_str_equal(key, "Name") == TRUE)
                return network->name;
        else if (g_str_equal(key, "Node") == TRUE)
                return network->node;
@@ -1531,9 +1578,6 @@ int connman_network_set_blob(struct connman_network *network,
 {
        DBG("network %p key %s size %d", network, key, size);
 
-       if (g_strcmp0(key, "Address") == 0)
-               return connman_network_set_address(network, data, size);
-
        if (g_str_equal(key, "WiFi.SSID") == TRUE) {
                g_free(network->wifi.ssid);
                network->wifi.ssid = g_try_malloc(size);