connman_uint8_t strength;
connman_uint16_t frequency;
char *identifier;
- char *address;
char *name;
char *node;
char *group;
g_free(network->group);
g_free(network->node);
g_free(network->name);
- g_free(network->address);
g_free(network->identifier);
network->device = NULL;
struct connman_service *service;
struct connman_ipconfig *ipconfig;
const char *nameserver = NULL;
+ const char *gateway;
int err;
DBG("network %p", network);
connman_element_get_value(&network->element,
CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver);
if (nameserver != NULL)
- __connman_service_append_nameserver(service, nameserver);
+ __connman_service_nameserver_append(service, nameserver);
- __connman_ipconfig_set_gateway(ipconfig, &network->element);
+ connman_element_get_value(&network->element,
+ CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
+ if (gateway != NULL)
+ __connman_ipconfig_set_gateway(ipconfig, gateway);
network->connecting = FALSE;
return 0;
}
-static void autoconf_ipv6_set(struct connman_network *network,
- struct connman_ipconfig *ipconfig_ipv6)
+static void autoconf_ipv6_set(struct connman_network *network)
{
struct connman_service *service;
struct connman_ipconfig *ipconfig;
connman_element_get_value(&network->element,
CONNMAN_PROPERTY_ID_IPV6_NAMESERVER, &nameserver);
if (nameserver != NULL)
- __connman_service_append_nameserver(service, nameserver);
+ __connman_service_nameserver_append(service, nameserver);
network->connecting = FALSE;
case CONNMAN_IPCONFIG_METHOD_OFF:
break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
- autoconf_ipv6_set(network, ipconfig_ipv6);
+ autoconf_ipv6_set(network);
break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
service = __connman_service_lookup_from_network(network);
__connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_DISCONNECT,
+ CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV4);
+ /* TODO: eventually the IPv6 disconnect state should be handled
+ * in connection.c
+ */
__connman_service_indicate_state(service,
CONNMAN_SERVICE_STATE_DISCONNECT,
CONNMAN_IPCONFIG_TYPE_IPV6);
+
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_IDLE,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
}
network->connecting = FALSE;
static int dhcp_stop(struct connman_network *network)
{
connman_element_unregister_children_type(&network->element,
- CONNMAN_ELEMENT_TYPE_CONNECTION);
- connman_element_unregister_children_type(&network->element,
CONNMAN_ELEMENT_TYPE_IPV4);
connman_element_unregister_children_type(&network->element,
CONNMAN_ELEMENT_TYPE_DHCP);
struct connman_ipconfig *ipconfig)
{
struct connman_service *service;
+ const char *gateway;
int err;
service = __connman_service_lookup_from_network(network);
return err;
}
- __connman_ipconfig_set_gateway(ipconfig, &network->element);
+ connman_element_get_value(&network->element,
+ CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
+ if (gateway != NULL)
+ __connman_ipconfig_set_gateway(ipconfig, gateway);
__connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
CONNMAN_IPCONFIG_TYPE_IPV4);
{
struct connman_service *service;
enum connman_ipconfig_method method;
+ enum connman_ipconfig_type type;
service = __connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
method = __connman_ipconfig_get_method(ipconfig);
+ type = __connman_ipconfig_get_config_type(ipconfig);
switch (method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_AUTO:
return -EINVAL;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
- connman_element_unregister_children_type(&network->element,
- CONNMAN_ELEMENT_TYPE_CONNECTION);
__connman_ipconfig_clear_address(ipconfig);
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
break;
}
- __connman_service_indicate_state(service,
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ __connman_service_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_STATE_CONFIGURATION,
CONNMAN_IPCONFIG_TYPE_IPV4);
case CONNMAN_IPCONFIG_METHOD_OFF:
break;
case CONNMAN_IPCONFIG_METHOD_AUTO:
- autoconf_ipv6_set(network, ipconfig_ipv6);
+ autoconf_ipv6_set(network);
break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
return 0;
}
-/**
- * connman_network_set_address:
- * @network: network structure
- * @address: binary address value
- * @size: binary address length
- *
- * Set unique address value for network
- */
-int connman_network_set_address(struct connman_network *network,
- const void *address, unsigned int size)
+int connman_network_set_ipaddress(struct connman_network *network,
+ struct connman_ipaddress *ipaddress)
{
- const unsigned char *addr_octet = address;
- char *str;
+ struct connman_service *service;
+ struct connman_ipconfig *ipconfig = NULL;
- DBG("network %p size %d", network, size);
+ DBG("network %p", network);
- if (size != 6)
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
return -EINVAL;
- str = g_strdup_printf("%02X:%02X:%02X:%02X:%02X:%02X",
- addr_octet[0], addr_octet[1], addr_octet[2],
- addr_octet[3], addr_octet[4], addr_octet[5]);
- if (str == NULL)
- return -ENOMEM;
+ if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV4)
+ ipconfig = __connman_service_get_ip4config(service);
+ else if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV6)
+ ipconfig = __connman_service_get_ip6config(service);
+
+ if (ipconfig == NULL)
+ return -EINVAL;
- g_free(network->address);
- network->address = str;
+ __connman_ipconfig_set_local(ipconfig, ipaddress->local);
+ __connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
+ __connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
+ __connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
+ __connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
- return connman_element_set_string(&network->element,
- "Address", network->address);
+ return 0;
+}
+
+int connman_network_set_pac(struct connman_network *network,
+ const char *pac)
+{
+ struct connman_service *service;
+
+ DBG("network %p pac %s", network, pac);
+
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_service_set_pac(service, pac);
+
+ return 0;
+}
+
+int connman_network_set_nameservers(struct connman_network *network,
+ const char *nameservers)
+{
+ struct connman_service *service;
+ char **nameservers_array = NULL;
+ int i;
+
+ DBG("network %p nameservers %s", network, nameservers);
+
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_service_nameserver_clear(service);
+
+ if (nameservers != NULL)
+ nameservers_array = g_strsplit(nameservers, " ", 0);
+
+ for (i = 0; nameservers_array[i] == NULL; i++) {
+ __connman_service_nameserver_append(service,
+ nameservers_array[i]);
+ }
+
+ return 0;
+}
+
+int connman_network_set_domain(struct connman_network *network,
+ const char *domain)
+{
+ struct connman_service *service;
+
+ DBG("network %p domain %s", network, domain);
+
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_service_set_domainname(service, domain);
+
+ return 0;
}
/**
if (g_strcmp0(key, "Name") == 0)
return connman_network_set_name(network, value);
- if (g_str_equal(key, "Address") == TRUE) {
- g_free(network->address);
- network->address = g_strdup(value);
- } else if (g_str_equal(key, "Node") == TRUE) {
+ if (g_str_equal(key, "Node") == TRUE) {
g_free(network->node);
network->node = g_strdup(value);
} else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
{
DBG("network %p key %s", network, key);
- if (g_str_equal(key, "Address") == TRUE)
- return network->address;
- else if (g_str_equal(key, "Name") == TRUE)
+ if (g_str_equal(key, "Name") == TRUE)
return network->name;
else if (g_str_equal(key, "Node") == TRUE)
return network->node;
{
DBG("network %p key %s size %d", network, key, size);
- if (g_strcmp0(key, "Address") == 0)
- return connman_network_set_address(network, data, size);
-
if (g_str_equal(key, "WiFi.SSID") == TRUE) {
g_free(network->wifi.ssid);
network->wifi.ssid = g_try_malloc(size);