char **nameservers_config;
char **domains;
char *domainname;
+ char **timeservers;
/* 802.1x settings from the config files */
char *eap;
char *identity;
case CONNMAN_SERVICE_STATE_IDLE:
case CONNMAN_SERVICE_STATE_FAILURE:
if (service->network != NULL)
- return __connman_network_get_connecting(
- service->network);
+ return connman_network_get_connecting(service->network);
case CONNMAN_SERVICE_STATE_DISCONNECT:
case CONNMAN_SERVICE_STATE_READY:
case CONNMAN_SERVICE_STATE_ONLINE:
return -EINVAL;
if (service->nameservers != NULL) {
+ int i;
+
+ for (i = 0; service->nameservers[i] != NULL; i++)
+ if (g_strcmp0(service->nameservers[i], nameserver) == 0)
+ return -EEXIST;
+
len = g_strv_length(service->nameservers);
service->nameservers = g_try_renew(char *, service->nameservers,
len + 2);
return 0;
}
+void __connman_service_nameserver_clear(struct connman_service *service)
+{
+ g_strfreev(service->nameservers);
+ service->nameservers = NULL;
+
+ update_nameservers(service);
+}
+
static void nameserver_add_routes(int index, char **nameservers,
const char *gw)
{
return;
if (service->ipconfig_ipv6 != NULL)
- __connman_ipconfig_append_ipv6(service->ipconfig_ipv6, iter);
+ __connman_ipconfig_append_ipv6(service->ipconfig_ipv6, iter,
+ service->ipconfig_ipv4);
}
static void append_ipv4config(DBusMessageIter *iter, void *user_data)
return NULL;
}
+static void update_timeservers(struct connman_service *service)
+{
+ int i;
+
+ if (service->timeservers == NULL)
+ return;
+
+ switch (combine_state(service->state_ipv4, service->state_ipv6)) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ return;
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ for (i = 0; service->timeservers[i] != NULL; i++)
+ connman_timeserver_remove(service->timeservers[i]);
+ return;
+ case CONNMAN_SERVICE_STATE_READY:
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ break;
+ }
+
+ for (i = 0; service->timeservers[i] != NULL; i++)
+ connman_timeserver_append(service->timeservers[i]);
+}
+
+int __connman_service_timeserver_append(struct connman_service *service,
+ const char *timeserver)
+{
+ int len;
+
+ DBG("service %p timeserver %s", service, timeserver);
+
+ if (timeserver == NULL)
+ return -EINVAL;
+
+ if (service->timeservers != NULL) {
+ int i;
+
+ for (i = 0; service->timeservers[i] != NULL; i++)
+ if (g_strcmp0(service->timeservers[i], timeserver) == 0)
+ return -EEXIST;
+
+ len = g_strv_length(service->timeservers);
+ service->timeservers = g_try_renew(char *, service->timeservers,
+ len + 2);
+ } else {
+ len = 0;
+ service->timeservers = g_try_new0(char *, len + 2);
+ }
+
+ if (service->timeservers == NULL)
+ return -ENOMEM;
+
+ service->timeservers[len] = g_strdup(timeserver);
+ service->timeservers[len + 1] = NULL;
+
+ update_timeservers(service);
+
+ return 0;
+}
+
+int __connman_service_timeserver_remove(struct connman_service *service,
+ const char *timeserver)
+{
+ char **servers;
+ int len, i, j;
+
+ DBG("service %p timeserver %s", service, timeserver);
+
+ if (timeserver == NULL)
+ return -EINVAL;
+
+ if (service->timeservers == NULL)
+ return 0;
+
+ len = g_strv_length(service->timeservers);
+ if (len == 1) {
+ if (g_strcmp0(service->timeservers[0], timeserver) != 0)
+ return 0;
+
+ g_strfreev(service->timeservers);
+ service->timeservers = NULL;
+
+ return 0;
+ }
+
+ servers = g_try_new0(char *, len - 1);
+ if (servers == NULL)
+ return -ENOMEM;
+
+ for (i = 0, j = 0; i < len; i++) {
+ if (g_strcmp0(service->timeservers[i], timeserver) != 0) {
+ servers[j] = g_strdup(service->timeservers[i]);
+ j++;
+ }
+ }
+ servers[len - 2] = NULL;
+
+ g_strfreev(service->timeservers);
+ service->timeservers = servers;
+
+ update_timeservers(service);
+
+ return 0;
+}
+
+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);
+}
+
void __connman_service_set_passphrase(struct connman_service *service,
const char* passphrase)
{
error);
if (reply != NULL)
g_dbus_send_message(connection, reply);
- } else
- g_dbus_send_reply(connection, service->pending,
+ } else {
+ const char *sender;
+
+ sender = dbus_message_get_interface(service->pending);
+
+ DBG("sender %s", sender);
+
+ if (g_strcmp0(sender, CONNMAN_MANAGER_INTERFACE) == 0)
+ g_dbus_send_reply(connection, service->pending,
+ DBUS_TYPE_OBJECT_PATH, &service->path,
DBUS_TYPE_INVALID);
+ else
+ g_dbus_send_reply(connection, service->pending,
+ DBUS_TYPE_INVALID);
+ }
dbus_message_unref(service->pending);
service->pending = NULL;
__connman_network_disconnect(service->network);
}
- g_hash_table_destroy(service->counter_table);
-
g_free(service->passphrase);
service->passphrase = NULL;
g_free(path);
}
+ g_hash_table_destroy(service->counter_table);
+
if (service->network != NULL)
connman_network_unref(service->network);
return service->ipconfig_ipv6;
}
+struct connman_ipconfig *
+__connman_service_get_ipconfig(struct connman_service *service, int family)
+{
+ if (family == AF_INET)
+ return __connman_service_get_ip4config(service);
+ else if (family == AF_INET6)
+ return __connman_service_get_ip6config(service);
+ else
+ return NULL;
+
+}
+
enum connman_service_security __connman_service_get_security(struct connman_service *service)
{
if (service == NULL)
__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV6);
+ /*
+ * Toggling the IPv6 state to IDLE could trigger the auto connect
+ * machinery and consequently the IPv4 state.
+ */
+ if (service->state_ipv4 != CONNMAN_SERVICE_STATE_UNKNOWN &&
+ service->state_ipv4 != CONNMAN_SERVICE_STATE_FAILURE)
+ return 0;
+
return __connman_service_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV4);
if (err < 0 && err != -EINPROGRESS)
return err;
+ __connman_6to4_remove(service->ipconfig_ipv4);
+
if (service->ipconfig_ipv4)
__connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv4,
NULL);
__connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv6,
NULL);
- __connman_ipconfig_clear_address(service->ipconfig_ipv4);
- __connman_ipconfig_clear_address(service->ipconfig_ipv6);
+ __connman_ipconfig_address_remove(service->ipconfig_ipv4);
+ __connman_ipconfig_address_remove(service->ipconfig_ipv6);
__connman_ipconfig_disable(service->ipconfig_ipv4);
__connman_ipconfig_disable(service->ipconfig_ipv6);
if (err < 0 && err != -EINPROGRESS)
goto failed;
- g_dbus_send_reply(connection, msg,
- DBUS_TYPE_OBJECT_PATH, &service->path,
- DBUS_TYPE_INVALID);
+ service->pending = dbus_message_ref(msg);
return 0;
projects / platform / upstream / connman.git / blobdiff