Make network connect function private for now

diff --git a/include/network.h b/include/network.h
index 49a2072..0e827c5 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -80,8 +80,6 @@ extern int connman_network_set_connected(struct connman_network *network,
                                                connman_bool_t connected);
 extern connman_bool_t connman_network_get_connected(struct connman_network *network);
 
-extern int connman_network_connect(struct connman_network *network);
-
 extern int connman_network_set_string(struct connman_network *network,
                                        const char *key, const char *value);
 extern const char *connman_network_get_string(struct connman_network *network,

diff --git a/src/connman.h b/src/connman.h
index 3078631..5f1b1bd 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -212,6 +212,7 @@ void __connman_network_cleanup(void);
 void __connman_network_set_device(struct connman_network *network,
                                        struct connman_device *device);
 
+int __connman_network_connect(struct connman_network *network);
 int __connman_network_disconnect(struct connman_network *network);
 
 connman_bool_t __connman_network_has_driver(struct connman_network *network);

diff --git a/src/device.c b/src/device.c
index 4525e30..cd9105d 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -1405,7 +1405,7 @@ static void connect_known_network(struct connman_device *device)
                name = connman_network_get_string(value,
                                                CONNMAN_PROPERTY_ID_NAME);
                if (name != NULL) {
-                       err = connman_network_connect(network);
+                       err = __connman_network_connect(network);
                        if (err == 0 || err == -EINPROGRESS)
                                return;
                }

diff --git a/src/network.c b/src/network.c
index 11b550b..3f9b6f9 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -799,12 +799,12 @@ connman_bool_t connman_network_get_connected(struct connman_network *network)
 }
 
 /**
- * connman_network_connect:
+ * __connman_network_connect:
  * @network: network structure
  *
  * Connect network
  */
-int connman_network_connect(struct connman_network *network)
+int __connman_network_connect(struct connman_network *network)
 {
        if (network->connected == TRUE)
                return -EALREADY;

diff --git a/src/service.c b/src/service.c
index 54ccce9..5f424e8 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -364,7 +364,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
                connman_network_set_string(service->network,
                                "WiFi.Passphrase", service->passphrase);
 
-               err = connman_network_connect(service->network);
+               err = __connman_network_connect(service->network);
                if (err < 0 && err != -EINPROGRESS)
                        return __connman_error_failed(msg, -err);