projects
/
connman
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Register default device and network storage drivers
[connman]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
977a48e
..
e5353f5
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-258,6
+258,13
@@
struct connman_network *connman_network_create(const char *identifier,
network->element.index = -1;
switch (type) {
network->element.index = -1;
switch (type) {
+ case CONNMAN_NETWORK_TYPE_UNKNOWN:
+ case CONNMAN_NETWORK_TYPE_VENDOR:
+ network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
+ break;
+ case CONNMAN_NETWORK_TYPE_WIFI:
+ network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI;
+ break;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH;
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH;
@@
-265,9
+272,6
@@
struct connman_network *connman_network_create(const char *identifier,
case CONNMAN_NETWORK_TYPE_HSO:
network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_CELLULAR;
break;
case CONNMAN_NETWORK_TYPE_HSO:
network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_CELLULAR;
break;
- default:
- network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
- break;
}
network->element.network = network;
}
network->element.network = network;
@@
-397,7
+401,7
@@
int connman_network_set_connected(struct connman_network *network,
if (connected == TRUE) {
struct connman_element *element;
if (connected == TRUE) {
struct connman_element *element;
- enum connman_element_type type;
+ enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
switch (network->protocol) {
case CONNMAN_NETWORK_PROTOCOL_UNKNOWN:
switch (network->protocol) {
case CONNMAN_NETWORK_PROTOCOL_UNKNOWN:
@@
-540,12
+544,20
@@
static struct connman_driver network_driver = {
.remove = network_remove,
};
.remove = network_remove,
};
+static struct connman_storage network_storage = {
+ .name = "network",
+ .priority = CONNMAN_STORAGE_PRIORITY_LOW,
+};
+
int __connman_network_init(void)
{
DBG("");
connection = connman_dbus_get_connection();
int __connman_network_init(void)
{
DBG("");
connection = connman_dbus_get_connection();
+ if (connman_storage_register(&network_storage) < 0)
+ connman_error("Failed to register network storage");
+
return connman_driver_register(&network_driver);
}
return connman_driver_register(&network_driver);
}
@@
-555,5
+567,7
@@
void __connman_network_cleanup(void)
connman_driver_unregister(&network_driver);
connman_driver_unregister(&network_driver);
+ connman_storage_unregister(&network_storage);
+
dbus_connection_unref(connection);
}
dbus_connection_unref(connection);
}