Imported Upstream version 1.24

[platform/upstream/connman.git] / include / network.h

diff --git a/include/network.h b/include/network.h
index 1ed6f6a..fcb6905 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -1,9 +1,8 @@
-
 /*
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2013  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
@@ -23,7 +22,9 @@
 #ifndef __CONNMAN_NETWORK_H
 #define __CONNMAN_NETWORK_H
 
-#include <connman/types.h>
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <connman/device.h>
 #include <connman/ipconfig.h>
 
@@ -41,10 +42,10 @@ enum connman_network_type {
        CONNMAN_NETWORK_TYPE_UNKNOWN       = 0,
        CONNMAN_NETWORK_TYPE_ETHERNET      = 1,
        CONNMAN_NETWORK_TYPE_WIFI          = 2,
-       CONNMAN_NETWORK_TYPE_WIMAX         = 3,
        CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8,
        CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9,
        CONNMAN_NETWORK_TYPE_CELLULAR      = 10,
+       CONNMAN_NETWORK_TYPE_GADGET        = 11,
        CONNMAN_NETWORK_TYPE_VENDOR        = 10000,
 };
 
@@ -64,14 +65,22 @@ struct connman_network;
 
 struct connman_network *connman_network_create(const char *identifier,
                                        enum connman_network_type type);
-struct connman_network *connman_network_ref(struct connman_network *network);
-void connman_network_unref(struct connman_network *network);
+
+#define connman_network_ref(network) \
+       connman_network_ref_debug(network, __FILE__, __LINE__, __func__)
+
+#define connman_network_unref(network) \
+       connman_network_unref_debug(network, __FILE__, __LINE__, __func__)
+
+struct connman_network *
+connman_network_ref_debug(struct connman_network *network,
+                       const char *file, int line, const char *caller);
+void connman_network_unref_debug(struct connman_network *network,
+                       const char *file, int line, const char *caller);
 
 enum connman_network_type connman_network_get_type(struct connman_network *network);
 const char *connman_network_get_identifier(struct connman_network *network);
 
-struct connman_element *connman_network_get_element(
-                               struct connman_network *network);
 void connman_network_set_index(struct connman_network *network, int index);
 int connman_network_get_index(struct connman_network *network);
 
@@ -79,20 +88,24 @@ void connman_network_set_group(struct connman_network *network,
                                                const char *group);
 const char *connman_network_get_group(struct connman_network *network);
 
-connman_bool_t connman_network_get_connecting(struct connman_network *network);
+bool connman_network_get_connecting(struct connman_network *network);
 int connman_network_set_available(struct connman_network *network,
-                                               connman_bool_t available);
-connman_bool_t connman_network_get_available(struct connman_network *network);
+                                               bool available);
+bool connman_network_get_available(struct connman_network *network);
 int connman_network_set_associating(struct connman_network *network,
-                                               connman_bool_t associating);
+                                               bool associating);
 void connman_network_set_error(struct connman_network *network,
                                        enum connman_network_error error);
 void connman_network_clear_error(struct connman_network *network);
 int connman_network_set_connected(struct connman_network *network,
-                                               connman_bool_t connected);
-connman_bool_t connman_network_get_connected(struct connman_network *network);
+                                               bool connected);
+bool connman_network_get_connected(struct connman_network *network);
+
+bool connman_network_get_associating(struct connman_network *network);
 
-connman_bool_t connman_network_get_associating(struct connman_network *network);
+void connman_network_clear_hidden(void *user_data);
+int connman_network_connect_hidden(struct connman_network *network,
+                       char *identity, char* passphrase, void *user_data);
 
 void connman_network_set_ipv4_method(struct connman_network *network,
                                        enum connman_ipconfig_method method);
@@ -104,30 +117,25 @@ int connman_network_set_nameservers(struct connman_network *network,
                                const char *nameservers);
 int connman_network_set_domain(struct connman_network *network,
                                     const char *domain);
-int connman_network_set_pac(struct connman_network *network,
-                               const char *pac);
 int connman_network_set_name(struct connman_network *network,
                                                        const char *name);
 int connman_network_set_strength(struct connman_network *network,
-                                               connman_uint8_t strength);
-int connman_network_set_roaming(struct connman_network *network,
-                                               connman_bool_t roaming);
+                                               uint8_t strength);
+uint8_t connman_network_get_strength(struct connman_network *network);
+int connman_network_set_frequency(struct connman_network *network,
+                                       uint16_t frequency);
+uint16_t connman_network_get_frequency(struct connman_network *network);
+int connman_network_set_wifi_channel(struct connman_network *network,
+                                       uint16_t channel);
+uint16_t connman_network_get_wifi_channel(struct connman_network *network);
 
 int connman_network_set_string(struct connman_network *network,
                                        const char *key, const char *value);
 const char *connman_network_get_string(struct connman_network *network,
                                                        const char *key);
 int connman_network_set_bool(struct connman_network *network,
-                                       const char *key, connman_bool_t value);
-connman_bool_t connman_network_get_bool(struct connman_network *network,
-                                                       const char *key);
-int connman_network_set_uint8(struct connman_network *network,
-                                       const char *key, connman_uint8_t value);
-connman_uint8_t connman_network_get_uint8(struct connman_network *network,
-                                                       const char *key);
-int connman_network_set_uint16(struct connman_network *network,
-                                       const char *key, connman_uint16_t value);
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
+                                       const char *key, bool value);
+bool connman_network_get_bool(struct connman_network *network,
                                                        const char *key);
 int connman_network_set_blob(struct connman_network *network,
                        const char *key, const void *data, unsigned int size);