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,
};
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 =
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);
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;
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";
}
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
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);