#include <config.h>
#endif
+#include <errno.h>
#include <string.h>
#include <gdbus.h>
struct connman_element element;
enum connman_network_type type;
enum connman_network_protocol protocol;
- connman_bool_t associating;
connman_bool_t secondary;
connman_bool_t available;
connman_bool_t connected;
- connman_bool_t remember;
+ connman_bool_t hidden;
connman_uint8_t strength;
+ connman_uint16_t frequency;
char *identifier;
char *address;
char *name;
char *node;
char *group;
+ struct connman_ipconfig *ipconfig;
struct connman_network_driver *driver;
void *driver_data;
connman_bool_t registered;
+ connman_bool_t connecting;
+ connman_bool_t associating;
struct connman_device *device;
void *ssid;
int ssid_len;
char *mode;
+ unsigned short channel;
char *security;
char *passphrase;
} wifi;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return "bluetooth";
+ case CONNMAN_NETWORK_TYPE_MBM:
case CONNMAN_NETWORK_TYPE_HSO:
return "cellular";
}
connman_dbus_dict_append_variant(&dict, "Strength",
DBUS_TYPE_BYTE, &network->strength);
+ if (network->frequency > 0)
+ connman_dbus_dict_append_variant(&dict, "Frequency",
+ DBUS_TYPE_UINT16, &network->frequency);
+
if (network->wifi.ssid != NULL && network->wifi.ssid_len > 0)
connman_dbus_dict_append_array(&dict, "WiFi.SSID",
DBUS_TYPE_BYTE, &network->wifi.ssid,
connman_dbus_dict_append_variant(&dict, "WiFi.Mode",
DBUS_TYPE_STRING, &network->wifi.mode);
+ if (network->wifi.channel > 0)
+ connman_dbus_dict_append_variant(&dict, "WiFi.Channel",
+ DBUS_TYPE_UINT16, &network->wifi.channel);
+
if (network->wifi.security != NULL)
connman_dbus_dict_append_variant(&dict, "WiFi.Security",
DBUS_TYPE_STRING, &network->wifi.security);
g_free(network->wifi.passphrase);
network->wifi.passphrase = g_strdup(passphrase);
- }
-
- __connman_storage_save_network(network);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *do_connect(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_network *network = data;
- int err;
-
- DBG("conn %p", conn);
-
- if (__connman_security_check_privilege(msg,
- CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
- return __connman_error_permission_denied(msg);
-
- if (network->connected == TRUE)
- return __connman_error_failed(msg, EALREADY);
+ } else if (g_str_has_prefix(name, "IPv4.") == TRUE) {
+ int err;
- if (network->driver && network->driver->connect) {
- enum connman_device_mode mode;
-
- mode = connman_device_get_mode(network->device);
- if (mode == CONNMAN_DEVICE_MODE_NETWORK_SINGLE)
- __connman_device_disconnect(network->device);
-
- err = network->driver->connect(network);
- if (err < 0 && err != -EINPROGRESS)
+ err = __connman_ipconfig_set_ipv4(network->ipconfig,
+ name + 5, &value);
+ if (err < 0)
return __connman_error_failed(msg, -err);
} else
- network->connected = TRUE;
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *do_disconnect(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_network *network = data;
- int err;
-
- DBG("conn %p", conn);
-
- if (__connman_security_check_privilege(msg,
- CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
- return __connman_error_permission_denied(msg);
-
- if (network->connected == FALSE)
- return __connman_error_failed(msg, EINVAL);
-
- connman_element_unregister_children(&network->element);
-
- connman_device_set_disconnected(network->device, TRUE);
-
- if (network->driver && network->driver->disconnect) {
- err = network->driver->disconnect(network);
- if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg, -err);
- } else
- network->connected = FALSE;
+ return __connman_error_invalid_property(msg);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static GDBusMethodTable network_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
{ "SetProperty", "sv", "", set_property },
- { "Connect", "", "", do_connect },
- { "Disconnect", "", "", do_disconnect },
{ },
};
g_free(network->name);
g_free(network->address);
g_free(network->identifier);
+
+ connman_ipconfig_unref(network->ipconfig);
}
/**
__connman_element_initialize(&network->element);
//temp = connman_dbus_encode_string(identifier);
- temp = g_strdup(identifier);
+ if (identifier == NULL) {
+ temp = g_strdup("hidden");
+ network->hidden = TRUE;
+ } else
+ temp = g_strdup(identifier);
+
if (temp == NULL) {
g_free(network);
return NULL;
network->type = type;
network->secondary = FALSE;
- network->identifier = g_strdup(identifier);
+ network->identifier = g_strdup(temp);
+
+ network->ipconfig = connman_ipconfig_create();
+ if (network->ipconfig == NULL) {
+ connman_network_unref(network);
+ return NULL;
+ }
return network;
}
void connman_network_set_group(struct connman_network *network,
const char *group)
{
- g_free(network->group);
+ if (network->secondary == TRUE)
+ return;
+
+ if (g_strcmp0(network->group, group) == 0)
+ return;
+
+ switch (network->type) {
+ case CONNMAN_NETWORK_TYPE_UNKNOWN:
+ case CONNMAN_NETWORK_TYPE_VENDOR:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ return;
+ case CONNMAN_NETWORK_TYPE_MBM:
+ case CONNMAN_NETWORK_TYPE_HSO:
+ case CONNMAN_NETWORK_TYPE_WIFI:
+ case CONNMAN_NETWORK_TYPE_WIMAX:
+ break;
+ }
+
+ if (network->group != NULL) {
+ __connman_profile_remove_network(network);
+
+ g_free(network->group);
+ }
+
network->group = g_strdup(group);
+
+ if (network->group != NULL)
+ __connman_profile_add_network(network);
}
-const char *__connman_network_get_group(struct connman_network *network)
+/**
+ * connman_network_get_group:
+ * @network: network structure
+ *
+ * Get group name for automatic clustering
+ */
+const char *connman_network_get_group(struct connman_network *network)
{
return network->group;
}
return __connman_device_get_ident(network->device);
}
+connman_bool_t __connman_network_get_weakness(struct connman_network *network)
+{
+ if (network->secondary == TRUE)
+ return FALSE;
+
+ switch (network->type) {
+ case CONNMAN_NETWORK_TYPE_UNKNOWN:
+ case CONNMAN_NETWORK_TYPE_VENDOR:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_MBM:
+ case CONNMAN_NETWORK_TYPE_HSO:
+ case CONNMAN_NETWORK_TYPE_WIMAX:
+ break;
+ case CONNMAN_NETWORK_TYPE_WIFI:
+ if (network->strength > 0 && network->strength < 20)
+ return TRUE;
+ break;
+ }
+
+ return FALSE;
+}
+
/**
* connman_network_set_available:
* @network: network structure
*/
connman_bool_t connman_network_get_available(struct connman_network *network)
{
+ if (network->hidden == TRUE)
+ return TRUE;
+
return network->available;
}
+/**
+ * connman_network_set_associating:
+ * @network: network structure
+ * @associating: associating state
+ *
+ * Change associating state of network
+ */
+int connman_network_set_associating(struct connman_network *network,
+ connman_bool_t associating)
+{
+ DBG("network %p associating %d", network, associating);
+
+ if (network->associating == associating)
+ return -EALREADY;
+
+ network->associating = associating;
+
+ if (associating == TRUE) {
+ struct connman_service *service;
+
+ service = __connman_service_lookup_from_network(network);
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_ASSOCIATION);
+ }
+
+ return 0;
+}
+
static gboolean set_connected(gpointer user_data)
{
struct connman_network *network = user_data;
CONNMAN_SERVICE_STATE_CONFIGURATION);
}
} else {
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE);
-
connman_element_unregister_children(&network->element);
__connman_device_set_network(network->device, NULL);
+ network->hidden = FALSE;
__connman_device_decrease_connections(network->device);
- }
- return FALSE;
-}
-
-/**
- * connman_network_set_associating:
- * @network: network structure
- * @associating: associating state
- *
- * Change associating state of network
- */
-int connman_network_set_associating(struct connman_network *network,
- connman_bool_t associating)
-{
- DBG("network %p associating %d", network, associating);
-
- if (network->associating == associating)
- return -EALREADY;
-
- network->associating = associating;
-
- if (associating == TRUE) {
- struct connman_service *service;
-
- service = __connman_service_lookup_from_network(network);
__connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_ASSOCIATION);
+ CONNMAN_SERVICE_STATE_IDLE);
}
- return 0;
+ network->connecting = FALSE;
+
+ connman_network_set_associating(network, FALSE);
+
+ return FALSE;
}
/**
DBG("network %p connected %d", network, connected);
+ if ((network->connecting == TRUE || network->associating == TRUE) &&
+ connected == FALSE) {
+ connman_element_set_error(&network->element,
+ CONNMAN_ELEMENT_ERROR_CONNECT_FAILED);
+ __connman_network_disconnect(network);
+ }
+
if (network->connected == connected)
return -EALREADY;
network->connected = connected;
- if (connected == TRUE)
- network->associating = FALSE;
-
if (network->registered == FALSE) {
g_idle_add(set_connected, network);
return 0;
}
/**
- * connman_network_set_remember:
+ * connman_network_get_associating:
+ * @network: network structure
+ *
+ * Get network associating status
+ */
+connman_bool_t connman_network_get_associating(struct connman_network *network)
+{
+ return network->associating;
+}
+
+/**
+ * __connman_network_connect:
* @network: network structure
- * @remember: remember state
*
- * Change remember state of network (known networks)
+ * Connect network
*/
-int connman_network_set_remember(struct connman_network *network,
- connman_bool_t remember)
+int __connman_network_connect(struct connman_network *network)
{
- DBG("network %p remember %d", network, remember);
+ int err;
+
+ DBG("network %p", network);
- if (network->remember == remember)
+ if (network->connected == TRUE)
+ return -EISCONN;
+
+ if (network->connecting == TRUE || network->associating == TRUE)
return -EALREADY;
- network->remember = remember;
+ if (network->driver == NULL)
+ return -EUNATCH;
- return 0;
+ if (network->driver->connect == NULL)
+ return -ENOSYS;
+
+ __connman_device_disconnect(network->device);
+
+ network->connecting = TRUE;
+
+ err = network->driver->connect(network);
+ if (err < 0) {
+ if (err == -EINPROGRESS)
+ connman_network_set_associating(network, TRUE);
+ else
+ network->hidden = FALSE;
+
+ return err;
+ }
+
+ network->connected = TRUE;
+ set_connected(network);
+
+ return err;
}
/**
- * connman_network_get_remember:
+ * __connman_network_disconnect:
* @network: network structure
*
- * Get network remember setting
+ * Disconnect network
*/
-connman_bool_t connman_network_get_remember(struct connman_network *network)
+int __connman_network_disconnect(struct connman_network *network)
{
- return network->remember;
+ int err;
+
+ DBG("network %p", network);
+
+ if (network->connected == FALSE && network->connecting == FALSE &&
+ network->associating == FALSE)
+ return -ENOTCONN;
+
+ if (network->driver == NULL)
+ return -EUNATCH;
+
+ if (network->driver->disconnect == NULL)
+ return -ENOSYS;
+
+ network->connecting = FALSE;
+
+ err = network->driver->disconnect(network);
+ if (err == 0) {
+ network->connected = FALSE;
+ set_connected(network);
+ }
+
+ return err;
}
/**
- * connman_network_connect:
+ * connman_network_set_address:
* @network: network structure
+ * @address: binary address value
+ * @size: binary address length
*
- * Connect network
+ * Set unique address value for network
*/
-int connman_network_connect(struct connman_network *network)
+int connman_network_set_address(struct connman_network *network,
+ const void *address, unsigned int size)
{
- if (network->connected == TRUE)
- return -EALREADY;
+ const unsigned char *addr_octet = address;
+ char *str;
- if (network->driver && network->driver->connect)
- return network->driver->connect(network);
+ DBG("network %p size %d", network, size);
- network->connected = TRUE;
+ if (size != 6)
+ return -EINVAL;
- return 0;
+ 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;
+
+ g_free(network->address);
+ network->address = str;
+
+ return connman_element_set_string(&network->element,
+ "Address", network->address);
}
-int __connman_network_disconnect(struct connman_network *network)
+/**
+ * connman_network_set_name:
+ * @network: network structure
+ * @name: name value
+ *
+ * Set display name value for network
+ */
+int connman_network_set_name(struct connman_network *network,
+ const char *name)
{
- if (network->connected == FALSE)
- return -ENOTCONN;
+ DBG("network %p name %s", network, name);
- connman_element_unregister_children(&network->element);
+ g_free(network->name);
+ network->name = g_strdup(name);
- if (network->driver && network->driver->disconnect)
- return network->driver->disconnect(network);
+ return connman_element_set_string(&network->element, "Name", name);
+}
- network->connected = FALSE;
+/**
+ * connman_network_set_strength:
+ * @network: network structure
+ * @strength: strength value
+ *
+ * Set signal strength value for network
+ */
+int connman_network_set_strength(struct connman_network *network,
+ connman_uint8_t strength)
+{
+ DBG("network %p strengh %d", network, strength);
- return 0;
+ network->strength = strength;
+
+ return connman_element_set_uint8(&network->element,
+ "Strength", strength);
}
/**
{
DBG("network %p key %s value %s", network, key, value);
+ 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, "Name") == TRUE) {
- g_free(network->name);
- network->name = g_strdup(value);
} else if (g_str_equal(key, "Node") == TRUE) {
g_free(network->node);
network->node = g_strdup(value);
{
DBG("network %p key %s value %d", network, key, value);
- if (g_str_equal(key, "Strength") == TRUE)
- network->strength = value;
+ if (g_strcmp0(key, "Strength") == 0)
+ return connman_network_set_strength(network, value);
return connman_element_set_uint8(&network->element, key, value);
}
}
/**
+ * connman_network_set_uint16:
+ * @network: network structure
+ * @key: unique identifier
+ * @value: integer value
+ *
+ * Set integer value for specific key
+ */
+int connman_network_set_uint16(struct connman_network *network,
+ const char *key, connman_uint16_t value)
+{
+ DBG("network %p key %s value %d", network, key, value);
+
+ if (g_str_equal(key, "Frequency") == TRUE)
+ network->frequency = value;
+ else if (g_str_equal(key, "WiFi.Channel") == TRUE)
+ network->wifi.channel = value;
+
+ return -EINVAL;
+}
+
+/**
+ * connman_network_get_uint16:
+ * @network: network structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint16_t connman_network_get_uint16(struct connman_network *network,
+ const char *key)
+{
+ DBG("network %p key %s", network, key);
+
+ if (g_str_equal(key, "Frequency") == TRUE)
+ return network->frequency;
+ else if (g_str_equal(key, "WiFi.Channel") == TRUE)
+ return network->wifi.channel;
+
+ return 0;
+}
+
+/**
* connman_network_set_blob:
* @network: network structure
* @key: unique identifier
{
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);
case CONNMAN_NETWORK_TYPE_VENDOR:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
- case CONNMAN_NETWORK_TYPE_HSO:
break;
+ case CONNMAN_NETWORK_TYPE_MBM:
+ case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIFI:
case CONNMAN_NETWORK_TYPE_WIMAX:
- if (network->secondary == FALSE)
+ if (network->group != NULL && network->secondary == FALSE)
__connman_profile_add_network(network);
break;
}
case CONNMAN_NETWORK_TYPE_VENDOR:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
- case CONNMAN_NETWORK_TYPE_HSO:
break;
+ case CONNMAN_NETWORK_TYPE_MBM:
+ case CONNMAN_NETWORK_TYPE_HSO:
case CONNMAN_NETWORK_TYPE_WIFI:
case CONNMAN_NETWORK_TYPE_WIMAX:
- if (network->secondary == FALSE)
+ if (network->group != NULL && network->secondary == FALSE) {
__connman_profile_remove_network(network);
+
+ g_free(network->group);
+ network->group = NULL;
+ }
break;
}
projects / platform / upstream / connman.git / blobdiff