Rename IP configuration methods to match specification

diff --git a/include/ipconfig.h b/include/ipconfig.h
index 608e727..7266ea2 100644 (file)
--- a/include/ipconfig.h
+++ b/include/ipconfig.h
@@ -53,8 +53,8 @@ enum connman_ipconfig_type {
 
 enum connman_ipconfig_method {
        CONNMAN_IPCONFIG_METHOD_UNKNOWN = 0,
-       CONNMAN_IPCONFIG_METHOD_IGNORE  = 1,
-       CONNMAN_IPCONFIG_METHOD_STATIC  = 2,
+       CONNMAN_IPCONFIG_METHOD_OFF     = 1,
+       CONNMAN_IPCONFIG_METHOD_MANUAL  = 2,
        CONNMAN_IPCONFIG_METHOD_DHCP    = 3,
 };
 

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 4a2b4d2..9aa71f0 100644 (file)
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -1224,7 +1224,7 @@ static void update_settings(DBusMessageIter *array,
                        if (g_strcmp0(method, "static") == 0) {
 
                                parent->ipv4.method =
-                                       CONNMAN_IPCONFIG_METHOD_STATIC;
+                                       CONNMAN_IPCONFIG_METHOD_MANUAL;
                        } else if (g_strcmp0(method, "dhcp") == 0) {
 
                                parent->ipv4.method =
@@ -1366,9 +1366,9 @@ static void pri_context_changed(DBusConnection *connection,
 
                switch (parent->ipv4.method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_IGNORE:
+               case CONNMAN_IPCONFIG_METHOD_OFF:
                        break;
-               case CONNMAN_IPCONFIG_METHOD_STATIC:
+               case CONNMAN_IPCONFIG_METHOD_MANUAL:
                        if (static_network_set_connected(
                                        pending_network, parent, active) < 0)
                                set_network_active(pending_network, FALSE);

diff --git a/src/ipconfig.c b/src/ipconfig.c
index 3a73ecc..7d2ae9d 100644 (file)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -256,8 +256,8 @@ static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
 
        switch (ipdevice->config->method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_IGNORE:
-       case CONNMAN_IPCONFIG_METHOD_STATIC:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
                return;
        case CONNMAN_IPCONFIG_METHOD_DHCP:
                break;
@@ -896,10 +896,10 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method
        switch (method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
                break;
-       case CONNMAN_IPCONFIG_METHOD_IGNORE:
-               return "ignore";
-       case CONNMAN_IPCONFIG_METHOD_STATIC:
-               return "static";
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+               return "off";
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               return "manual";
        case CONNMAN_IPCONFIG_METHOD_DHCP:
                return "dhcp";
        }
@@ -909,10 +909,10 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method
 
 enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method)
 {
-       if (g_strcmp0(method, "ignore") == 0)
-               return CONNMAN_IPCONFIG_METHOD_IGNORE;
-       else if (g_strcmp0(method, "static") == 0)
-               return CONNMAN_IPCONFIG_METHOD_STATIC;
+       if (g_strcmp0(method, "off") == 0)
+               return CONNMAN_IPCONFIG_METHOD_OFF;
+       else if (g_strcmp0(method, "manual") == 0)
+               return CONNMAN_IPCONFIG_METHOD_MANUAL;
        else if (g_strcmp0(method, "dhcp") == 0)
                return CONNMAN_IPCONFIG_METHOD_DHCP;
        else

diff --git a/src/network.c b/src/network.c
index 6c1a359..dcd64f1 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -681,8 +681,7 @@ static gboolean set_connected(gpointer user_data)
                connman_device_set_disconnected(network->device, FALSE);
 
                if (network->element.ipv4.method ==
-                                       CONNMAN_IPCONFIG_METHOD_STATIC) {
-
+                                       CONNMAN_IPCONFIG_METHOD_MANUAL) {
                        network->connecting = FALSE;
 
                        connman_network_set_associating(network, FALSE);