[PATCH v2 3/6] network: Factor out ipconfig connecting

[Patrik Flykt]

Factor out ipconfig connecting so that the functionality will be in
one place only and one ipconfig can be connected independent of the
other one in a service.
---
 src/network.c |  113 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 68 insertions(+), 45 deletions(-)

diff --git a/src/network.c b/src/network.c
index 3fd34c7..9fb9b55 100644
--- a/src/network.c
+++ b/src/network.c
@@ -567,12 +567,73 @@ static void autoconf_ipv6_set(struct connman_network 
*network)
        __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
 }
 
+static int set_ipconfig_connected(struct connman_network *network,
+               struct connman_ipconfig *ipconfig)
+{
+       enum connman_ipconfig_method method;
+       enum connman_ipconfig_type type;
+       int err;
+
+       method = __connman_ipconfig_get_method(ipconfig);
+       type = __connman_ipconfig_get_config_type(ipconfig);
+
+       DBG("network %p ipconfig %p method %d", network, ipconfig, method);
+
+       switch (method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+               if (type != CONNMAN_IPCONFIG_TYPE_IPV4)
+                       return -EINVAL;
+
+               err = set_connected_dhcp(network);
+               if (err < 0)
+                       return err;
+
+               break;
+
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               if (type != CONNMAN_IPCONFIG_TYPE_IPV6)
+                       return -EINVAL;
+
+               autoconf_ipv6_set(network);
+               break;
+
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+               if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+
+                       err = set_connected_fixed(network);
+                       if (err < 0)
+                               return err;
+
+                       break;
+               }
+               /* IPv6 fall through */
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+                       set_connected_manual(network);
+
+               } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+
+                       err = manual_ipv6_set(network, ipconfig);
+                       if (err < 0)
+                               return err;
+
+               } else
+                       return -EINVAL;
+
+               break;
+       }
+
+       return 0;
+}
+
 static void set_connected(struct connman_network *network)
 {
        struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
-       enum connman_ipconfig_method ipv4_method, ipv6_method;
        struct connman_service *service;
-       int ret;
+       int err_ipv4, err_ipv6;
 
        if (network->connected == TRUE)
                return;
@@ -587,51 +648,13 @@ static void set_connected(struct connman_network *network)
        DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
                ipconfig_ipv6);
 
-       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+       err_ipv4 = set_ipconfig_connected(network, ipconfig_ipv4);
+       err_ipv6 = set_ipconfig_connected(network, ipconfig_ipv6);
 
-       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
-
-       switch (ipv6_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-               break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               autoconf_ipv6_set(network);
-               break;
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               ret = manual_ipv6_set(network, ipconfig_ipv6);
-               if (ret != 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
-               break;
-       }
-
-       switch (ipv4_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               return;
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-               if (set_connected_fixed(network) < 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
-               return;
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               set_connected_manual(network);
+       if (err_ipv4 < 0 && err_ipv6 < 0) {
+               connman_network_set_error(network,
+                               CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
                return;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               if (set_connected_dhcp(network) < 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
        }
 
        network->connecting = FALSE;
-- 
1.7.10.4

_______________________________________________
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman