#include <config.h>
#endif
+#include <errno.h>
#include <stdio.h>
#include <string.h>
+#include <netdb.h>
#include <gdbus.h>
#include "connman.h"
char *path;
enum connman_service_type type;
enum connman_service_security security;
+ enum connman_service_state state;
enum connman_service_state state_ipv4;
enum connman_service_state state_ipv6;
enum connman_service_error error;
unsigned int order;
char *name;
char *passphrase;
+ char *agent_passphrase;
char *profile;
connman_bool_t roaming;
connman_bool_t login_required;
/* 802.1x settings from the config files */
char *eap;
char *identity;
+ char *agent_identity;
char *ca_cert_file;
char *client_cert_file;
char *private_key_file;
void __connman_service_list(DBusMessageIter *iter, void *user_data)
{
+ if (service_list == NULL)
+ return;
+
g_sequence_foreach(service_list, append_path, iter);
}
}
if (state_a == CONNMAN_SERVICE_STATE_READY) {
- if (state_b == CONNMAN_SERVICE_STATE_ONLINE)
+ if (state_b == CONNMAN_SERVICE_STATE_ONLINE ||
+ state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
result = state_b;
else
result = state_a;
}
if (state_b == CONNMAN_SERVICE_STATE_READY) {
- if (state_a == CONNMAN_SERVICE_STATE_ONLINE)
+ if (state_a == CONNMAN_SERVICE_STATE_ONLINE ||
+ state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
result = state_a;
else
result = state_b;
}
if (state_a == CONNMAN_SERVICE_STATE_ONLINE) {
- result = state_a;
+ if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
+ result = state_b;
+ else
+ result = state_a;
goto done;
}
if (state_b == CONNMAN_SERVICE_STATE_ONLINE) {
- result = state_b;
+ if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
+ result = state_a;
+ else
+ result = state_b;
goto done;
}
if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT) {
- result = state_b;
+ result = state_a;
goto done;
}
if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT) {
- result = state_a;
+ result = state_b;
goto done;
}
static connman_bool_t is_connecting(struct connman_service *service)
{
- enum connman_service_state state;
-
- state = combine_state(service->state_ipv4, service->state_ipv6);
-
- return is_connecting_state(service, state);
+ return is_connecting_state(service, service->state);
}
static connman_bool_t is_connected(struct connman_service *service)
{
- enum connman_service_state state;
-
- state = combine_state(service->state_ipv4, service->state_ipv6);
-
- return is_connected_state(service, state);
+ return is_connected_state(service, service->state);
}
static void update_nameservers(struct connman_service *service)
return 0;
}
- servers = g_try_new0(char *, len - 1);
+ servers = g_try_new0(char *, len);
if (servers == NULL)
return -ENOMEM;
j++;
}
}
- servers[len - 2] = NULL;
+ servers[len - 1] = NULL;
g_strfreev(service->nameservers);
service->nameservers = servers;
static void nameserver_add_routes(int index, char **nameservers,
const char *gw)
{
- int i;
+ int i, ret, family;
+ struct addrinfo hints;
+ struct addrinfo *addr;
for (i = 0; nameservers[i] != NULL; i++) {
- if (connman_inet_compare_subnet(index, nameservers[i]))
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_flags = AI_NUMERICHOST;
+ addr = NULL;
+
+ ret = getaddrinfo(nameservers[i], NULL, &hints, &addr);
+ if (ret == EAI_NONAME)
+ family = AF_INET; /* use the IPv4 as a default */
+ else if (ret != 0)
continue;
+ else
+ family = addr->ai_family;
- connman_inet_add_host_route(index, nameservers[i], gw);
+ if (family == AF_INET) {
+ if (connman_inet_compare_subnet(index,
+ nameservers[i]) != TRUE)
+ connman_inet_add_host_route(index,
+ nameservers[i], gw);
+ } else if (family == AF_INET6)
+ connman_inet_add_ipv6_host_route(index,
+ nameservers[i], gw);
+
+ freeaddrinfo(addr);
}
}
static void nameserver_del_routes(int index, char **nameservers)
{
- int i;
+ int i, ret, family;
+ struct addrinfo hints;
+ struct addrinfo *addr;
+
+ for (i = 0; nameservers[i] != NULL; i++) {
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_flags = AI_NUMERICHOST;
+ addr = NULL;
+
+ ret = getaddrinfo(nameservers[i], NULL, &hints, &addr);
+ if (ret == EAI_NONAME)
+ family = AF_INET; /* use the IPv4 as a default */
+ else if (ret != 0)
+ continue;
+ else
+ family = addr->ai_family;
- for (i = 0; nameservers[i] != NULL; i++)
- connman_inet_del_host_route(index, nameservers[i]);
+ if (family == AF_INET)
+ connman_inet_del_host_route(index, nameservers[i]);
+ else if (family == AF_INET6)
+ connman_inet_del_ipv6_host_route(index,
+ nameservers[i]);
+
+ freeaddrinfo(addr);
+ }
}
void __connman_service_nameserver_add_routes(struct connman_service *service,
static void state_changed(struct connman_service *service)
{
- enum connman_service_state state;
const char *str;
- state = combine_state(service->state_ipv4, service->state_ipv6);
+ __connman_notifier_service_state_changed(service, service->state);
- __connman_notifier_service_state_changed(service, state);
-
- str = state2string(state);
+ str = state2string(service->state);
if (str == NULL)
return;
stats->data.time = stats->data_last.time + seconds;
}
+static char *wifi_build_group_name(const unsigned char *ssid,
+ unsigned int ssid_len,
+ const char *mode,
+ const char *security)
+{
+ GString *str;
+ unsigned int i;
+
+ /* the last 3 is for the 2 '_' and '\0' */
+ str = g_string_sized_new((ssid_len * 2) + strlen(mode)
+ + strlen(security) + 3);
+ if (str == NULL)
+ return NULL;
+
+ for (i = 0; i < ssid_len; i++)
+ g_string_append_printf(str, "%02x", ssid[i]);
+
+ g_string_append_printf(str, "_%s_%s", mode, security);
+
+ return g_string_free(str, FALSE);
+}
+
void __connman_service_notify(struct connman_service *service,
unsigned int rx_packets, unsigned int tx_packets,
unsigned int rx_bytes, unsigned int tx_bytes,
GSequence *list;
GSequenceIter *iter;
struct connman_service *service;
- enum connman_service_state state;
struct service_entry *entry;
list = g_sequence_new(destroy_service_entry);
service = g_sequence_get(iter);
if (service_match(session, service) == TRUE) {
- state = combine_state(service->state_ipv4,
- service->state_ipv6);
entry = create_service_entry(service, service->name,
- state);
+ service->state);
if (entry == NULL)
return list;
void __connman_service_session_inc(struct connman_service *service)
{
- DBG("service %p", service);
+ DBG("service %p ref count %d", service,
+ g_atomic_int_get(&service->session_usage_count) + 1);
g_atomic_int_inc(&service->session_usage_count);
}
connman_bool_t __connman_service_session_dec(struct connman_service *service)
{
- connman_bool_t in_use;
-
- if (g_atomic_int_dec_and_test(&service->session_usage_count) == TRUE)
- in_use = FALSE;
- else
- in_use = TRUE;
+ DBG("service %p ref count %d", service,
+ g_atomic_int_get(&service->session_usage_count) - 1);
- DBG("service %p last %d", service, in_use);
+ if (g_atomic_int_dec_and_test(&service->session_usage_count) == FALSE)
+ return FALSE;
- return in_use;
+ return TRUE;
}
static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
connman_dbus_dict_append_array(dict, "Security",
DBUS_TYPE_STRING, append_security, service);
- str = state2string(combine_state(service->state_ipv4,
- service->state_ipv6));
+ str = state2string(service->state);
if (str != NULL)
connman_dbus_dict_append_basic(dict, "State",
DBUS_TYPE_STRING, &str);
if (service->timeservers == NULL)
return;
- switch (combine_state(service->state_ipv4, service->state_ipv6)) {
+ switch (service->state) {
case CONNMAN_SERVICE_STATE_UNKNOWN:
case CONNMAN_SERVICE_STATE_IDLE:
case CONNMAN_SERVICE_STATE_ASSOCIATION:
void __connman_service_set_pac(struct connman_service *service,
const char *pac)
{
- if (pac == NULL)
- return;
-
g_free(service->pac);
service->pac = g_strdup(pac);
+
+ proxy_changed(service);
}
void __connman_service_set_identity(struct connman_service *service,
service->identity);
}
+void __connman_service_set_agent_identity(struct connman_service *service,
+ const char *agent_identity)
+{
+ g_free(service->agent_identity);
+ service->agent_identity = g_strdup(agent_identity);
+
+ if (service->network != NULL)
+ connman_network_set_string(service->network,
+ "WiFi.AgentIdentity",
+ service->agent_identity);
+}
+
void __connman_service_set_passphrase(struct connman_service *service,
const char* passphrase)
{
__connman_storage_save_service(service);
}
+void __connman_service_set_agent_passphrase(struct connman_service *service,
+ const char *agent_passphrase)
+{
+ g_free(service->agent_passphrase);
+ service->agent_passphrase = g_strdup(agent_passphrase);
+
+ if (service->network != NULL)
+ connman_network_set_string(service->network,
+ "WiFi.AgentPassphrase",
+ service->agent_passphrase);
+}
+
static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
proxy_configuration_changed(service);
+ __connman_notifier_proxy_changed(service);
+
__connman_storage_save_service(service);
} else if (g_str_equal(name, "IPv4.Configuration") == TRUE ||
g_str_equal(name, "IPv6.Configuration")) {
static void set_idle(struct connman_service *service)
{
- service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE;
+ service->state = service->state_ipv4 = service->state_ipv6 =
+ CONNMAN_SERVICE_STATE_IDLE;
service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
state_changed(service);
}
if (service->ignore == TRUE)
return TRUE;
- if (combine_state(service->state_ipv4, service->state_ipv6) ==
- CONNMAN_SERVICE_STATE_FAILURE)
+ if (service->state == CONNMAN_SERVICE_STATE_FAILURE)
return TRUE;
return FALSE;
if (is_connected(service) == TRUE)
return;
- if (is_ignore(service) == FALSE &&
- combine_state(service->state_ipv4,
- service->state_ipv6) ==
+ if (is_ignore(service) == FALSE && service->state ==
CONNMAN_SERVICE_STATE_IDLE)
break;
} 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);
return;
if (identity != NULL)
- __connman_service_set_identity(service, identity);
+ __connman_service_set_agent_identity(service, identity);
- if (passphrase != NULL)
- __connman_service_set_passphrase(service, passphrase);
+ if (passphrase != NULL) {
+ switch (service->security) {
+ case CONNMAN_SERVICE_SECURITY_WEP:
+ case CONNMAN_SERVICE_SECURITY_PSK:
+ __connman_service_set_passphrase(service, passphrase);
+ break;
+ case CONNMAN_SERVICE_SECURITY_8021X:
+ __connman_service_set_agent_passphrase(service,
+ passphrase);
+ break;
+ case CONNMAN_SERVICE_SECURITY_UNKNOWN:
+ case CONNMAN_SERVICE_SECURITY_NONE:
+ case CONNMAN_SERVICE_SECURITY_WPA:
+ case CONNMAN_SERVICE_SECURITY_RSN:
+ DBG("service security '%s' not handled",
+ security2string(service->security));
+ break;
+ }
+ }
__connman_service_connect(service);
+
+ /* Never cache agent provided credentials */
+ __connman_service_set_agent_identity(service, NULL);
+ __connman_service_set_agent_passphrase(service, NULL);
}
static DBusMessage *connect_service(DBusConnection *conn,
err = __connman_service_connect(service);
if (err < 0) {
- if (err == -ENOKEY) {
- if (__connman_agent_request_input(service,
- request_input_cb,
- NULL) == 0)
- return NULL;
- }
-
if (service->pending == NULL)
return NULL;
if (service->immutable == TRUE)
return __connman_error_not_supported(msg);
- if (service->favorite == FALSE &&
- combine_state(service->state_ipv4, service->state_ipv6) !=
+ if (service->favorite == FALSE && service->state !=
CONNMAN_SERVICE_STATE_FAILURE)
return __connman_error_not_supported(msg);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+static gboolean check_suitable_state(enum connman_service_state a,
+ enum connman_service_state b)
+{
+ /*
+ * Special check so that "ready" service can be moved before
+ * "online" one.
+ */
+ if ((a == CONNMAN_SERVICE_STATE_ONLINE &&
+ b == CONNMAN_SERVICE_STATE_READY) ||
+ (b == CONNMAN_SERVICE_STATE_ONLINE &&
+ a == CONNMAN_SERVICE_STATE_READY))
+ return TRUE;
+
+ return a == b;
+}
+
static DBusMessage *move_service(DBusConnection *conn,
DBusMessage *msg, void *user_data,
gboolean before)
struct connman_service *target;
const char *path;
GSequenceIter *src, *dst;
+ enum connman_ipconfig_method target4, target6;
+ enum connman_ipconfig_method service4, service6;
DBG("service %p", service);
if (target == NULL || target->favorite == FALSE || target == service)
return __connman_error_invalid_service(msg);
- DBG("target %s", target->identifier);
+ target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4);
+ target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6);
+ service4 = __connman_ipconfig_get_method(service->ipconfig_ipv4);
+ service6 = __connman_ipconfig_get_method(service->ipconfig_ipv6);
- if (target->state_ipv4 != service->state_ipv4 &&
- target->state_ipv6 != service->state_ipv6)
- return __connman_error_invalid_service(msg);
+ DBG("target %s method %d/%d state %d/%d", target->identifier,
+ target4, target6,
+ target->state_ipv4, target->state_ipv6);
+
+ DBG("service %s method %d/%d state %d/%d", service->identifier,
+ service4, service6,
+ service->state_ipv4, service->state_ipv6);
+
+ /*
+ * If method is OFF, then we do not need to check the corresponding
+ * ipconfig state.
+ */
+ if (target4 == CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (service6 != CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (check_suitable_state(target->state_ipv6,
+ service->state_ipv6) == FALSE)
+ return __connman_error_invalid_service(msg);
+ }
+ }
+
+ if (target6 == CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (service4 != CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (check_suitable_state(target->state_ipv4,
+ service->state_ipv4) == FALSE)
+ return __connman_error_invalid_service(msg);
+ }
+ }
+
+ if (service4 == CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (target6 != CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (check_suitable_state(target->state_ipv6,
+ service->state_ipv6) == FALSE)
+ return __connman_error_invalid_service(msg);
+ }
+ }
+
+ if (service6 == CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (target4 != CONNMAN_IPCONFIG_METHOD_OFF) {
+ if (check_suitable_state(target->state_ipv4,
+ service->state_ipv4) == FALSE)
+ return __connman_error_invalid_service(msg);
+ }
+ }
g_get_current_time(&service->modified);
__connman_storage_save_service(service);
if (service->network != NULL) {
if (service->network_created == TRUE)
- connman_network_unregister(service->network);
- connman_network_unref(service->network);
+ connman_network_unref(service->network);
}
if (service->provider != NULL)
connman_provider_unref(service->provider);
if (service->ipconfig_ipv4 != NULL) {
+ connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL);
+ connman_ipconfig_set_data(service->ipconfig_ipv4, NULL);
connman_ipconfig_unref(service->ipconfig_ipv4);
service->ipconfig_ipv4 = NULL;
}
if (service->ipconfig_ipv6 != NULL) {
+ connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL);
+ connman_ipconfig_set_data(service->ipconfig_ipv6, NULL);
connman_ipconfig_unref(service->ipconfig_ipv6);
service->ipconfig_ipv6 = NULL;
}
g_free(service->profile);
g_free(service->name);
g_free(service->passphrase);
+ g_free(service->agent_passphrase);
g_free(service->identifier);
g_free(service->eap);
g_free(service->identity);
+ g_free(service->agent_identity);
g_free(service->ca_cert_file);
g_free(service->client_cert_file);
g_free(service->private_key_file);
service->type = CONNMAN_SERVICE_TYPE_UNKNOWN;
service->security = CONNMAN_SERVICE_SECURITY_UNKNOWN;
+ service->state = CONNMAN_SERVICE_STATE_UNKNOWN;
service->state_ipv4 = CONNMAN_SERVICE_STATE_UNKNOWN;
service->state_ipv6 = CONNMAN_SERVICE_STATE_UNKNOWN;
struct connman_service *service_b = (void *) b;
enum connman_service_state state_a, state_b;
- state_a = combine_state(service_a->state_ipv4, service_a->state_ipv6);
- state_b = combine_state(service_b->state_ipv4, service_b->state_ipv6);
+ state_a = service_a->state;
+ state_b = service_b->state;
if (state_a != state_b) {
if (is_connected(service_a) == TRUE)
return 0;
}
-connman_bool_t __connman_service_get_immutable(struct connman_service *service)
-{
- if (service == NULL)
- return FALSE;
-
- return service->immutable;
-}
-
int __connman_service_set_immutable(struct connman_service *service,
connman_bool_t immutable)
{
}
}
-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)
+static int __connman_service_indicate_state(struct connman_service *service)
{
- enum connman_service_state service_state,
- state = CONNMAN_SERVICE_STATE_IDLE;
+ enum connman_service_state old_state, new_state;
GSequenceIter *iter;
if (service == NULL)
return -EINVAL;
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
- if (service->state_ipv4 == new_state)
- return -EALREADY;
- state = combine_state(new_state, service->state_ipv6);
- } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
- if (service->state_ipv6 == new_state)
- return -EALREADY;
- state = combine_state(new_state, service->state_ipv4);
- } else
- return -EINVAL;
+ old_state = service->state;
+ new_state = combine_state(service->state_ipv4, service->state_ipv6);
- service_state = combine_state(service->state_ipv4,
- service->state_ipv6);
+ if (old_state == new_state)
+ return -EALREADY;
- DBG("service %p state %s/%s => %s new %s/%d => %s",
+ DBG("service %p old %s - new %s/%s => %s",
service,
+ state2string(old_state),
state2string(service->state_ipv4),
state2string(service->state_ipv6),
- state2string(service_state),
- state2string(new_state),
- type,
- state2string(state));
-
- if (service_state == CONNMAN_SERVICE_STATE_FAILURE &&
- state == CONNMAN_SERVICE_STATE_IDLE)
- return -EINVAL;
+ state2string(new_state));
- if (service_state == CONNMAN_SERVICE_STATE_IDLE &&
- state == CONNMAN_SERVICE_STATE_DISCONNECT)
- return -EINVAL;
-
- if (state == CONNMAN_SERVICE_STATE_IDLE &&
- service_state != CONNMAN_SERVICE_STATE_DISCONNECT) {
- state_changed(service);
+ service->state = new_state;
+ state_changed(service);
+ if (new_state == CONNMAN_SERVICE_STATE_IDLE &&
+ old_state != CONNMAN_SERVICE_STATE_DISCONNECT) {
reply_pending(service, ECONNABORTED);
__connman_service_disconnect(service);
__connman_stats_get(service, TRUE,
&service->stats_roaming.data);
}
-
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
- new_state == CONNMAN_SERVICE_STATE_CONFIGURATION)
- __connman_ipconfig_enable(service->ipconfig_ipv4);
- else if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
- new_state == CONNMAN_SERVICE_STATE_CONFIGURATION)
- __connman_ipconfig_enable(service->ipconfig_ipv6);
}
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
- service->state_ipv4 = new_state;
- else if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
- service->state_ipv6 = new_state;
-
- if (state == service_state)
- return -EALREADY;
-
- state_changed(service);
-
- if (state == CONNMAN_SERVICE_STATE_ONLINE) {
+ if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
if (service->login_required == TRUE) {
service->login_required = FALSE;
login_changed(service);
connman_timeserver_sync();
}
- if (state == CONNMAN_SERVICE_STATE_IDLE) {
+ if (new_state == CONNMAN_SERVICE_STATE_IDLE) {
connman_bool_t reconnect;
reconnect = get_reconnect_state(service);
if (reconnect == TRUE)
__connman_service_auto_connect();
+
+ __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
}
- if (state == CONNMAN_SERVICE_STATE_READY) {
- enum connman_service_proxy_method proxy_config;
+ if (new_state == CONNMAN_SERVICE_STATE_READY) {
enum connman_ipconfig_method method;
set_reconnect_state(service, TRUE);
dns_changed(service);
domain_changed(service);
- proxy_config = service->proxy_config;
-
- /*
- * We start WPAD if we haven't got a PAC URL from DHCP and
- * if our proxy manual configuration is either empty or set
- * to AUTO with an empty URL.
- */
- if (service->proxy == CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN &&
- (proxy_config == CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN ||
- (proxy_config ==
- CONNMAN_SERVICE_PROXY_METHOD_AUTO &&
- service->pac == NULL)))
- if (__connman_wpad_start(service) < 0) {
- service->proxy =
- CONNMAN_SERVICE_PROXY_METHOD_DIRECT;
-
- __connman_notifier_proxy_changed(service);
- }
-
__connman_notifier_connect(service->type);
if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
__connman_ipconfig_disable_ipv6(
service->ipconfig_ipv6);
- } else if (state == CONNMAN_SERVICE_STATE_DISCONNECT) {
+ } else if (new_state == CONNMAN_SERVICE_STATE_DISCONNECT) {
+ struct connman_service *def_service = get_default();
+
+ if (__connman_notifier_count_connected() == 0 &&
+ def_service != NULL &&
+ def_service->provider != NULL)
+ __connman_provider_disconnect(def_service->provider);
+
__connman_location_finish(service);
default_changed();
__connman_notifier_disconnect(service->type);
}
- if (state == CONNMAN_SERVICE_STATE_FAILURE) {
+ if (new_state == CONNMAN_SERVICE_STATE_FAILURE) {
if (service->userconnect == TRUE &&
__connman_agent_report_error(service,
error2string(service->error),
report_error_cb, NULL) == -EIO)
return 0;
service_complete(service);
+
+ __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
} else
service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
__connman_profile_changed(FALSE);
- service_state = combine_state(service->state_ipv4,
- service->state_ipv6);
- if (service_state == CONNMAN_SERVICE_STATE_ONLINE)
+ if (new_state == CONNMAN_SERVICE_STATE_ONLINE)
default_changed();
- if (service_state == CONNMAN_SERVICE_STATE_DISCONNECT) {
- struct connman_service *def_service = get_default();
-
- if (__connman_notifier_count_connected() == 0 &&
- def_service != NULL &&
- def_service->provider != NULL)
- __connman_provider_disconnect(def_service->provider);
- }
-
- if (service_state == CONNMAN_SERVICE_STATE_IDLE ||
- service_state == CONNMAN_SERVICE_STATE_FAILURE)
- __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
-
return 0;
}
if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
__connman_service_set_passphrase(service, NULL);
- return __connman_service_indicate_state(service,
+ __connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE,
CONNMAN_IPCONFIG_TYPE_IPV4);
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_FAILURE,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
+ return 0;
}
int __connman_service_clear_error(struct connman_service *service)
{
- enum connman_service_state state;
-
DBG("service %p", service);
if (service == NULL)
return -EINVAL;
- state = combine_state(service->state_ipv4, service->state_ipv6);
-
- if (state != CONNMAN_SERVICE_STATE_FAILURE)
+ if (service->state != CONNMAN_SERVICE_STATE_FAILURE)
return -EINVAL;
service->state_ipv4 = service->state_ipv6 =
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);
}
return 0;
}
+static void check_proxy_setup(struct connman_service *service)
+{
+ /*
+ * We start WPAD if we haven't got a PAC URL from DHCP and
+ * if our proxy manual configuration is either empty or set
+ * to AUTO with an empty URL.
+ */
+
+ if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN)
+ return;
+
+ if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN &&
+ (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO ||
+ service->pac != NULL))
+ return;
+
+ if (__connman_wpad_start(service) < 0) {
+ service->proxy = CONNMAN_SERVICE_PROXY_METHOD_DIRECT;
+ __connman_notifier_proxy_changed(service);
+ }
+}
+
+int __connman_service_ipconfig_indicate_state(struct connman_service *service,
+ enum connman_service_state new_state,
+ enum connman_ipconfig_type type)
+{
+ struct connman_ipconfig *ipconfig = NULL;
+ enum connman_service_state old_state;
+
+ if (service == NULL)
+ return -EINVAL;
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+ old_state = service->state_ipv4;
+ ipconfig = service->ipconfig_ipv4;
+ } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ old_state = service->state_ipv6;
+ ipconfig = service->ipconfig_ipv6;
+ }
+
+ if (ipconfig == NULL)
+ return -EINVAL;
+
+ /* Any change? */
+ if (old_state == new_state)
+ return -EALREADY;
+
+ DBG("service %p (%s) state %d (%s) type %d (%s)",
+ service, service ? service->identifier : NULL,
+ new_state, state2string(new_state),
+ type, __connman_ipconfig_type2string(type));
+
+ switch (new_state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ if (service->state == CONNMAN_SERVICE_STATE_FAILURE)
+ return -EINVAL;
+ break;
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ break;
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ __connman_ipconfig_enable(ipconfig);
+ break;
+ case CONNMAN_SERVICE_STATE_READY:
+ update_nameservers(service);
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ check_proxy_setup(service);
+ break;
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ break;
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ if (service->state == CONNMAN_SERVICE_STATE_IDLE)
+ return -EINVAL;
+ break;
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ break;
+ }
+
+ /* We keep that state */
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ service->state_ipv4 = new_state;
+ else if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ service->state_ipv6 = new_state;
+
+ return __connman_service_indicate_state(service);
+}
+
int __connman_service_request_login(struct connman_service *service)
{
DBG("service %p", service);
if (g_str_equal(service->eap, "tls") == TRUE)
break;
- if (service->immutable != TRUE)
+ /*
+ * Return -ENOKEY if either identity or passphrase is
+ * missing. Agent provided credentials can be used as
+ * fallback if needed.
+ */
+ if ((service->identity == NULL &&
+ service->agent_identity == NULL) ||
+ (service->passphrase == NULL &&
+ service->agent_passphrase == NULL))
return -ENOKEY;
break;
int __connman_service_connect(struct connman_service *service)
{
- enum connman_service_state state;
int err;
- state = combine_state(service->state_ipv4, service->state_ipv6);
-
- DBG("service %p state %s", service, state2string(state));
+ DBG("service %p state %s", service, state2string(service->state));
if (is_connected(service) == TRUE)
return -EISCONN;
return -EINPROGRESS;
}
- if (err == -ENOKEY)
- return -ENOKEY;
-
- 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 (service->network != NULL)
+ __connman_network_disconnect(service->network);
+ else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
+ service->provider != NULL)
+ __connman_provider_disconnect(service->provider);
+
+ if (service->userconnect == TRUE) {
+ if (err == -ENOKEY) {
+ if (__connman_agent_request_input(service,
+ request_input_cb,
+ NULL) == -EIO)
+ return -EINPROGRESS;
+ }
+ reply_pending(service, err);
+ }
+
return err;
}
}
static struct connman_network *create_hidden_wifi(struct connman_device *device,
- const char *ssid, const char *mode, const char *security)
+ const char *ssid, const char *mode, const char *security,
+ const char *group)
{
struct connman_network *network;
char *name;
if (ssid_len < 1)
return NULL;
- network = connman_network_create(NULL, CONNMAN_NETWORK_TYPE_WIFI);
+ network = connman_network_create(group, CONNMAN_NETWORK_TYPE_WIFI);
if (network == NULL)
return NULL;
- connman_network_register(network);
-
connman_network_set_blob(network, "WiFi.SSID",
(unsigned char *) ssid, ssid_len);
name = g_try_malloc0(ssid_len + 1);
if (name == NULL) {
- connman_network_unregister(network);
connman_network_unref(network);
return NULL;
}
connman_network_set_index(network, index);
if (connman_device_add_network(device, network) < 0) {
- connman_network_unregister(network);
connman_network_unref(network);
return NULL;
}
else
group_security = security;
- group = connman_wifi_build_group_name((unsigned char *) ssid,
+ group = wifi_build_group_name((unsigned char *) ssid,
ssid_len, mode, group_security);
if (group == NULL)
return -EINVAL;
if (service != NULL)
goto done;
- network = create_hidden_wifi(device, ssid, mode, security);
- if (network != NULL) {
+ network = create_hidden_wifi(device, ssid, mode, security, group);
+ if (network != NULL)
connman_network_set_group(network, group);
- service->network_created = TRUE;
- }
service = lookup_by_identifier(name);
goto failed;
}
+ service->network_created = TRUE;
+
if (is_connected(service) == TRUE) {
err = -EISCONN;
goto failed;
return err;
}
+static void provision_changed(gpointer value, gpointer user_data)
+{
+ struct connman_service *service = value;
+ char *path = user_data;
+
+ __connman_config_provision_service_ident(service, path);
+}
+
+void __connman_service_provision_changed(const char *ident)
+{
+ g_sequence_foreach(service_list, provision_changed, (void *)ident);
+}
+
int __connman_service_provision(DBusMessage *msg)
{
GKeyFile *keyfile = NULL;
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);
.ip_release = service_ip_release,
};
-static void setup_ip4config(struct connman_service *service, int index)
+static void setup_ip4config(struct connman_service *service, int index,
+ enum connman_ipconfig_method method)
{
if (index < 0)
return;
if (service->ipconfig_ipv4 == NULL)
return;
- connman_ipconfig_set_method(service->ipconfig_ipv4,
- CONNMAN_IPCONFIG_METHOD_DHCP);
+ connman_ipconfig_set_method(service->ipconfig_ipv4, method);
connman_ipconfig_set_data(service->ipconfig_ipv4, service);
connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops);
}
-void __connman_service_create_ip4config(struct connman_service *service,
- int index)
+void __connman_service_read_ip4config(struct connman_service *service)
{
const char *ident = service->profile;
GKeyFile *keyfile;
- DBG("ipv4 %p", service->ipconfig_ipv4);
-
- if (service->ipconfig_ipv4 != NULL)
+ if (ident == NULL)
return;
- setup_ip4config(service, index);
-
- if (ident == NULL)
+ if (service->ipconfig_ipv4 == NULL)
return;
keyfile = __connman_storage_open_profile(ident);
if (keyfile == NULL)
return;
- if (service->ipconfig_ipv4)
- __connman_ipconfig_load(service->ipconfig_ipv4, keyfile,
- service->identifier, "IPv4.");
+ __connman_ipconfig_load(service->ipconfig_ipv4, keyfile,
+ service->identifier, "IPv4.");
+
g_key_file_free(keyfile);
}
-void __connman_service_create_ip6config(struct connman_service *service,
- int index)
+void __connman_service_create_ip4config(struct connman_service *service,
+ int index)
{
- const char *ident = service->profile;
- GKeyFile *keyfile;
-
- DBG("ipv6 %p", service->ipconfig_ipv6);
+ DBG("ipv4 %p", service->ipconfig_ipv4);
- if (service->ipconfig_ipv6 != NULL)
+ if (service->ipconfig_ipv4 != NULL)
return;
- setup_ip6config(service, index);
+ setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP);
+ __connman_service_read_ip4config(service);
+}
+
+void __connman_service_read_ip6config(struct connman_service *service)
+{
+ const char *ident = service->profile;
+ GKeyFile *keyfile;
if (ident == NULL)
return;
+ if (service->ipconfig_ipv6 == NULL)
+ return;
keyfile = __connman_storage_open_profile(ident);
+
if (keyfile == NULL)
return;
- if (service->ipconfig_ipv6 != NULL)
- __connman_ipconfig_load(service->ipconfig_ipv6, keyfile,
- service->identifier, "IPv6.");
+ __connman_ipconfig_load(service->ipconfig_ipv6, keyfile,
+ service->identifier, "IPv6.");
g_key_file_free(keyfile);
}
+void __connman_service_create_ip6config(struct connman_service *service,
+ int index)
+{
+ DBG("ipv6 %p", service->ipconfig_ipv6);
+
+ if (service->ipconfig_ipv6 != NULL)
+ return;
+
+ setup_ip6config(service, index);
+ __connman_service_read_ip6config(service);
+}
+
/**
* __connman_service_lookup_from_network:
* @network: network structure
service->wps = connman_network_get_bool(network, "WiFi.WPS");
if (service->strength > strength && service->network != NULL) {
- connman_network_unref(service->network);
- service->network = connman_network_ref(network);
+ service->network = network;
strength_changed(service);
}
if (service->network == NULL)
- service->network = connman_network_ref(network);
+ service->network = network;
iter = g_hash_table_lookup(service_hash, service->identifier);
if (iter != NULL)
}
service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE;
+ service->state = combine_state(service->state_ipv4, service->state_ipv6);
update_from_network(service, network);
index = connman_network_get_index(network);
if (service->ipconfig_ipv4 == NULL)
- setup_ip4config(service, index);
+ setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP);
if (service->ipconfig_ipv6 == NULL)
setup_ip6config(service, index);
__connman_service_auto_connect();
}
- __connman_notifier_service_add(service);
+ __connman_notifier_service_add(service, service->name);
return service;
}
service->strength = 0;
if (service->ipconfig_ipv4 == NULL)
- service->ipconfig_ipv4 = connman_ipconfig_create(index,
- CONNMAN_IPCONFIG_TYPE_IPV4);
- if (service->ipconfig_ipv4 == NULL)
- return service;
-
- connman_ipconfig_set_method(service->ipconfig_ipv4,
- CONNMAN_IPCONFIG_METHOD_MANUAL);
- connman_ipconfig_set_data(service->ipconfig_ipv4, service);
- connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops);
+ setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_MANUAL);
if (service->ipconfig_ipv6 == NULL)
- service->ipconfig_ipv6 = connman_ipconfig_create(index,
- CONNMAN_IPCONFIG_TYPE_IPV6);
- if (service->ipconfig_ipv6 == NULL)
- return service;
-
- connman_ipconfig_set_method(service->ipconfig_ipv6,
- CONNMAN_IPCONFIG_METHOD_OFF);
- connman_ipconfig_set_data(service->ipconfig_ipv6, service);
- connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops);
+ setup_ip6config(service, index);
service_register(service);
- __connman_notifier_service_add(service);
+ __connman_notifier_service_add(service, service->name);
return service;
}
+void __connman_service_downgrade_state(struct connman_service *service)
+{
+ if (service == NULL)
+ return;
+
+ DBG("service %p state4 %d state6 %d", service, service->state_ipv4,
+ service->state_ipv6);
+
+ if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE)
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
+
+ if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE)
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
+}
+
static int service_load(struct connman_service *service)
{
const char *ident = service->profile;
g_key_file_remove_key(keyfile, service->identifier,
"Passphrase", NULL);
- if (service->ipconfig_ipv4 != NULL)
- __connman_ipconfig_save(service->ipconfig_ipv4, keyfile,
- service->identifier, "IPv4.");
+ switch (service->state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ break;
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ case CONNMAN_SERVICE_STATE_READY:
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ if (service->ipconfig_ipv4 != NULL)
+ __connman_ipconfig_save(service->ipconfig_ipv4,
+ keyfile, service->identifier,
+ "IPv4.");
- if (service->ipconfig_ipv6 != NULL)
- __connman_ipconfig_save(service->ipconfig_ipv6, keyfile,
- service->identifier, "IPv6.");
+ if (service->ipconfig_ipv6 != NULL)
+ __connman_ipconfig_save(service->ipconfig_ipv6,
+ keyfile, service->identifier,
+ "IPv6.");
+ }
if (service->nameservers_config != NULL) {
guint len = g_strv_length(service->nameservers_config);
void __connman_service_cleanup(void)
{
+ GSequence *list;
+
DBG("");
- g_sequence_free(service_list);
+ list = service_list;
service_list = NULL;
+ g_sequence_free(list);
g_hash_table_destroy(service_hash);
service_hash = NULL;
projects / platform / upstream / connman.git / blobdiff