new_gateway->ipv4_gateway != NULL) {
__connman_service_nameserver_add_routes(service,
new_gateway->ipv4_gateway->gateway);
- __connman_service_set_ipconfig_ready(service,
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
new_gateway->ipv6_gateway != NULL) {
__connman_service_nameserver_add_routes(service,
new_gateway->ipv6_gateway->gateway);
- __connman_service_set_ipconfig_ready(service,
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
CONNMAN_IPCONFIG_TYPE_IPV6);
}
void __connman_service_set_string(struct connman_service *service,
const char *key, const char *value);
-int __connman_service_set_ipconfig_ready(struct connman_service *service,
- enum connman_ipconfig_type type);
int __connman_service_ipconfig_indicate_state(struct connman_service *service,
enum connman_service_state state,
enum connman_ipconfig_type type);
__connman_service_request_login(location->service);
break;
case CONNMAN_LOCATION_RESULT_ONLINE:
- __connman_service_indicate_state(location->service,
+ __connman_service_ipconfig_indicate_state(location->service,
CONNMAN_SERVICE_STATE_ONLINE,
CONNMAN_IPCONFIG_TYPE_IPV4);
break;
struct connman_service *service;
service = __connman_service_lookup_from_network(network);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_ASSOCIATION,
CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_ASSOCIATION,
CONNMAN_IPCONFIG_TYPE_IPV6);
}
service = __connman_service_lookup_from_network(network);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
service = __connman_service_lookup_from_network(network);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
connman_device_set_disconnected(network->device, FALSE);
service = __connman_service_lookup_from_network(network);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
if (err < 0)
goto err;
- __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
return;
if (service == NULL)
return;
- __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
- CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_IDLE,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
}
static void dhcp_callback(struct connman_network *network,
if (err < 0)
goto err;
- __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
return 0;
connman_network_set_associating(network, FALSE);
- __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
return;
network->connecting = FALSE;
- __connman_service_set_ipconfig_ready(service,
- CONNMAN_IPCONFIG_TYPE_IPV6);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
return 0;
}
network->connecting = FALSE;
- __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV6);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
}
static gboolean set_connected(gpointer user_data)
service = __connman_service_lookup_from_network(network);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_DISCONNECT,
CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_DISCONNECT,
CONNMAN_IPCONFIG_TYPE_IPV6);
__connman_ipconfig_enable_ipv6(ipconfig_ipv6);
}
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV6);
}
__connman_ipconfig_gateway_add(ipconfig);
- __connman_service_set_ipconfig_ready(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
return 0;
}
}
if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
CONNMAN_IPCONFIG_TYPE_IPV6);
else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
CONNMAN_IPCONFIG_TYPE_IPV4);
{
DBG("state %d", state);
- __connman_service_indicate_state(provider->vpn_service, state,
+ __connman_service_ipconfig_indicate_state(provider->vpn_service, state,
CONNMAN_IPCONFIG_TYPE_IPV4);
- return __connman_service_indicate_state(provider->vpn_service, state,
- CONNMAN_IPCONFIG_TYPE_IPV6);
+ return __connman_service_ipconfig_indicate_state(provider->vpn_service,
+ state, CONNMAN_IPCONFIG_TYPE_IPV6);
}
int __connman_provider_disconnect(struct connman_provider *provider)
} else
autoconnect = TRUE;
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV6);
}
}
-int __connman_service_set_ipconfig_ready(struct connman_service *service,
- enum connman_ipconfig_type type)
-{
- enum connman_service_state state;
- int err = 0;
-
- DBG("service %p (%s) type %d (%s)",
- service, service ? service->identifier : NULL,
- type, __connman_ipconfig_type2string(type));
-
- if (service == NULL)
- return -EINVAL;
-
- state = combine_state(service->state_ipv4, service->state_ipv6);
-
- if (state == CONNMAN_SERVICE_STATE_READY ||
- state == CONNMAN_SERVICE_STATE_ONLINE) {
- err = -EALREADY;
- } else {
- err = __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_READY, type);
- }
-
- return err;
-}
-
int __connman_service_indicate_state(struct connman_service *service,
enum connman_service_state new_state,
enum connman_ipconfig_type type)
if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
__connman_service_set_passphrase(service, NULL);
- return __connman_service_indicate_state(service,
+ return __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
if (service->favorite == TRUE)
set_reconnect_state(service, TRUE);
- __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV6);
/*
service->state_ipv4 != CONNMAN_SERVICE_STATE_FAILURE)
return 0;
- return __connman_service_indicate_state(service,
+ return __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV4);
}
if (service->userconnect == TRUE)
reply_pending(service, err);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV6);
if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
method == CONNMAN_IPCONFIG_METHOD_AUTO)
- __connman_service_set_ipconfig_ready(service,
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
CONNMAN_IPCONFIG_TYPE_IPV6);
settings_changed(service, ipconfig);
if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
method == CONNMAN_IPCONFIG_METHOD_OFF)
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_DISCONNECT,
CONNMAN_IPCONFIG_TYPE_IPV6);
if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
method == CONNMAN_IPCONFIG_METHOD_OFF)
- __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_DISCONNECT,
CONNMAN_IPCONFIG_TYPE_IPV4);