enum connman_device_type type;
enum connman_device_mode mode;
enum connman_device_policy policy;
+ connman_bool_t secondary;
connman_bool_t powered;
connman_bool_t carrier;
connman_bool_t scanning;
char *node;
char *address;
char *interface;
+ char *ident;
unsigned int connections;
guint scan_timeout;
static int set_carrier(struct connman_device *device, connman_bool_t carrier)
{
+ struct connman_service *service;
+
+ service = __connman_service_lookup_from_device(device);
+ __connman_service_set_carrier(service, carrier);
+
if (carrier == TRUE) {
enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
struct connman_element *element;
+ device->disconnected = TRUE;
+
+ switch (device->policy) {
+ case CONNMAN_DEVICE_POLICY_UNKNOWN:
+ case CONNMAN_DEVICE_POLICY_IGNORE:
+ case CONNMAN_DEVICE_POLICY_OFF:
+ case CONNMAN_DEVICE_POLICY_MANUAL:
+ return 0;
+ case CONNMAN_DEVICE_POLICY_AUTO:
+ break;
+ }
+
switch (device->element.ipv4.method) {
case CONNMAN_IPV4_METHOD_UNKNOWN:
case CONNMAN_IPV4_METHOD_OFF:
if (connman_element_register(element,
&device->element) < 0)
connman_element_unref(element);
+
+ device->disconnected = FALSE;
+
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_CONFIGURATION);
}
} else
connman_element_unregister_children(&device->element);
err = set_powered(device, powered);
if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else if (g_str_equal(name, "Policy") == TRUE) {
enum connman_device_policy policy;
const char *str;
err = set_policy(conn, device, policy);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else if (g_str_equal(name, "Priority") == TRUE) {
connman_uint8_t priority;
network = connman_network_create("00_00_00_00_00_00", type);
if (network == NULL)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, ENOMEM);
while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter entry, value;
connman_network_unref(network);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return __connman_error_not_supported(msg);
if (device->powered == FALSE)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, EINVAL);
err = device->driver->scan(device);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- __connman_profile_add_device(device);
+ if (device->secondary == FALSE)
+ __connman_profile_add_device(device);
break;
}
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- __connman_profile_remove_device(device);
+ if (device->secondary == FALSE)
+ __connman_profile_remove_device(device);
break;
}
DBG("element %p name %s", element, element->name);
+ g_free(device->ident);
g_free(device->node);
g_free(device->name);
g_free(device->address);
device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
- device->type = type;
- device->name = g_strdup(type2description(device->type));
- device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
- device->policy = CONNMAN_DEVICE_POLICY_AUTO;
+ device->type = type;
+ device->name = g_strdup(type2description(device->type));
+ device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
+ device->policy = CONNMAN_DEVICE_POLICY_AUTO;
+ device->secondary = FALSE;
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
}
/**
+ * connman_device_set_ident:
+ * @device: device structure
+ * @ident: unique identifier
+ *
+ * Set unique identifier of device
+ */
+void connman_device_set_ident(struct connman_device *device,
+ const char *ident)
+{
+ g_free(device->ident);
+ device->ident = g_strdup(ident);
+}
+
+const char *__connman_device_get_ident(struct connman_device *device)
+{
+ return device->ident;
+}
+
+/**
* connman_device_set_policy:
* @device: device structure
* @policy: power and connection policy
}
/**
+ * connman_device_set_secondary:
+ * @device: device structure
+ * @secondary: secondary value
+ *
+ * Change secondary value of device
+ */
+void connman_device_set_secondary(struct connman_device *device,
+ connman_bool_t secondary)
+{
+ device->secondary = secondary;
+}
+
+/**
+ * connman_device_get_secondary:
+ * @device: device structure
+ *
+ * Get secondary value of device
+ */
+connman_bool_t connman_device_get_secondary(struct connman_device *device)
+{
+ return device->secondary;
+}
+
+/**
* connman_device_set_powered:
* @device: device structure
* @powered: powered state
device->carrier = carrier;
- switch (device->policy) {
- case CONNMAN_DEVICE_POLICY_UNKNOWN:
- case CONNMAN_DEVICE_POLICY_IGNORE:
- case CONNMAN_DEVICE_POLICY_OFF:
- return 0;
- case CONNMAN_DEVICE_POLICY_AUTO:
- case CONNMAN_DEVICE_POLICY_MANUAL:
- break;
- }
-
return set_carrier(device, device->carrier);
}
-void __connman_device_disconnect(struct connman_device *device)
+int __connman_device_connect(struct connman_device *device)
+{
+ DBG("device %p", device);
+
+ if (device->disconnected == FALSE)
+ return -EINVAL;
+
+ return 0;
+}
+
+int __connman_device_disconnect(struct connman_device *device)
{
GHashTableIter iter;
gpointer key, value;
if (connman_network_get_connected(network) == TRUE)
__connman_network_disconnect(network);
}
+
+ return 0;
}
static void connect_known_network(struct connman_device *device)
data = g_key_file_to_data(keyfile, &length, NULL);
- g_file_set_contents(pathname, data, length, NULL);
+ if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
+ connman_error("Failed to store device information");
done:
g_free(data);