Register default device and network storage drivers

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index a54049b..e5353f5 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -30,6 +30,7 @@
 struct connman_network {
        struct connman_element element;
        enum connman_network_type type;
+       enum connman_network_protocol protocol;
        gboolean connected;
        char *identifier;
        char *path;
@@ -257,6 +258,13 @@ struct connman_network *connman_network_create(const char *identifier,
        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;
@@ -264,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;
-       default:
-               network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
-               break;
        }
 
        network->element.network = network;
@@ -365,6 +370,19 @@ int connman_network_get_index(struct connman_network *network)
 }
 
 /**
+ * connman_network_set_protocol:
+ * @network: network structure
+ * @protocol: network protocol
+ *
+ * Change protocol of network
+ */
+void connman_network_set_protocol(struct connman_network *network,
+                                       enum connman_network_protocol protocol)
+{
+       network->protocol = protocol;
+}
+
+/**
  * connman_network_set_connected:
  * @network: network structure
  * @connected: connected state
@@ -383,11 +401,23 @@ int connman_network_set_connected(struct connman_network *network,
 
        if (connected == TRUE) {
                struct connman_element *element;
+               enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
+
+               switch (network->protocol) {
+               case CONNMAN_NETWORK_PROTOCOL_UNKNOWN:
+                       return 0;
+               case CONNMAN_NETWORK_PROTOCOL_IP:
+                       type = CONNMAN_ELEMENT_TYPE_DHCP;
+                       break;
+               case CONNMAN_NETWORK_PROTOCOL_PPP:
+                       type = CONNMAN_ELEMENT_TYPE_PPP;
+                       break;
+               }
 
                element = connman_element_create(NULL);
                if (element != NULL) {
-                       element->type    = CONNMAN_ELEMENT_TYPE_DEVICE;
-                       element->subtype = CONNMAN_ELEMENT_SUBTYPE_NETWORK;
+                       element->type    = type;
+                       element->subtype = network->element.subtype;
                        element->index   = network->element.index;
 
                        if (connman_element_register(element,
@@ -514,12 +544,20 @@ static struct connman_driver network_driver = {
        .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();
 
+       if (connman_storage_register(&network_storage) < 0)
+               connman_error("Failed to register network storage");
+
        return connman_driver_register(&network_driver);
 }
 
@@ -529,5 +567,7 @@ void __connman_network_cleanup(void)
 
        connman_driver_unregister(&network_driver);
 
+       connman_storage_unregister(&network_storage);
+
        dbus_connection_unref(connection);
 }