Add the connection structure

diff --git a/include/net_wifi_private.h b/include/net_wifi_private.h
index 50a85d36e6943a76e332e6e8b5f6b4f4939c1d1f..a4d52f777141b4fda4578902838bb52b701a9615 100644 (file)
--- a/include/net_wifi_private.h
+++ b/include/net_wifi_private.h
@@ -51,6 +51,33 @@
 extern "C" {
 #endif /* __cplusplus */
 
+/*****************************************************************************
+ *     Global Structures
+ *****************************************************************************/
+/**
+ * This is the structure to connect with WPS network.
+ */
+typedef struct {
+       /** PBC / PIN */
+       net_wifi_wps_type_t type;
+
+       /** Optional. This pin is needed when the user input PIN code */
+       char pin[NET_WLAN_MAX_WPSPIN_LEN + 1];
+} net_wifi_wps_info_t;
+
+/**
+ * This is the profile structure to connect hidden WiFi network.
+ */
+typedef struct {
+       /** Basic feature */
+       char essid[NET_WLAN_ESSID_LEN + 1];
+
+       /** Infrastructure / ad-hoc / auto mode */
+       wlan_connection_mode_type_t wlan_mode;
+
+       /** Security mode and authentication info */
+       wlan_security_info_t security_info;
+} net_wifi_connection_info_t;
 
 bool _wifi_libnet_init(void);
 bool _wifi_libnet_deinit(void);
@@ -89,6 +116,11 @@ wifi_connection_state_e _wifi_convert_to_ap_state(
                                        net_state_type_t state);
 
 net_state_type_t _get_service_state_type(const char *state);
+
+/*For connection which CAPI send some message to WiNet daemon*/
+void _set_wifi_conn_info(net_wifi_connection_info_t *wifi_conn_info);
+net_wifi_connection_info_t *_get_wifi_conn_info(void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/src/libnetwork.c b/src/libnetwork.c
index 50be350b383f96151d87a05a3a339a9cd2735f4d..cf926aa0ce92546b1f10f877c27fae704c854783 100755 (executable)
--- a/src/libnetwork.c
+++ b/src/libnetwork.c
@@ -24,6 +24,22 @@
 
 static GSList *ap_handle_list = NULL;
 
+typedef struct {
+       char *type;
+       char *mode;
+       char *ssid;
+       char *security;
+       char *passphrase;
+       char *eap_type;
+       char *eap_auth;
+       char *identity;
+       char *password;
+       char *ca_cert_file;
+       char *client_cert_file;
+       char *private_key_file;
+       char *private_key_password;
+} net_wifi_connect_service_info_t;
+
 struct _wifi_cb_s {
        wifi_device_state_changed_cb device_state_cb;
        void *device_state_user_data;
@@ -54,6 +70,26 @@ static struct _wifi_cb_s wifi_callbacks = {0,};
 static struct _profile_list_s profile_iterator = {0, NULL};
 static struct _profile_list_s hidden_profile_iterator = {0, NULL};
 
+/*For connection which CAPI send some message to WiNet daemon*/
+static net_wifi_connection_info_t net_wifi_conn_info;
+
+/*For connection which CAPI send some message to WiNet daemon*/
+void _set_wifi_conn_info(net_wifi_connection_info_t *wifi_conn_info)
+{
+       g_strlcpy(net_wifi_conn_info.essid, wifi_conn_info->essid,
+                                       NET_WLAN_ESSID_LEN+1);
+       net_wifi_conn_info.wlan_mode = wifi_conn_info->wlan_mode;
+       memcpy(&net_wifi_conn_info.security_info,
+                                       &wifi_conn_info->security_info,
+                                       sizeof(wlan_security_info_t));
+}
+
+/*For connection which CAPI send some message to WiNet daemon*/
+net_wifi_connection_info_t *_get_wifi_conn_info(void)
+{
+       return &net_wifi_conn_info;
+}
+
 net_state_type_t _get_service_state_type(const char *state)
 {
        if (!g_strcmp0(state, "idle"))
@@ -362,22 +398,6 @@ char* _net_print_error(net_err_t error)
        }
 }
 
-typedef struct {
-       char *type;
-       char *mode;
-       char *ssid;
-       char *security;
-       char *passphrase;
-       char *eap_type;
-       char *eap_auth;
-       char *identity;
-       char *password;
-       char *ca_cert_file;
-       char *client_cert_file;
-       char *private_key_file;
-       char *private_key_password;
-} net_wifi_connect_service_info_t;
-
 static void __libnet_set_connected_cb(wifi_connected_cb user_cb, void *user_data)
 {
        if (user_cb) {
@@ -607,12 +627,9 @@ static int __net_open_connection_with_wifi_info(wifi_ap_h ap_h, const net_wifi_c
 
 static int __libnet_connect_with_wifi_info(wifi_ap_h ap_h, wifi_connected_cb callback, void *user_data)
 {
-       struct connman_service* service = ap_h;
-
        net_wifi_connection_info_t *wifi_info;
-       /*memset(&wifi_info, 0, sizeof(net_wifi_connection_info_t));*/
 
-       wifi_info = connman_service_get_wifi_conn_info(service);
+       wifi_info = _get_wifi_conn_info();
 
        if (__net_open_connection_with_wifi_info(ap_h, wifi_info) != NET_ERR_NONE)
                return WIFI_ERROR_OPERATION_FAILED;

diff --git a/src/net_wifi_ap.c b/src/net_wifi_ap.c
index d83c6d79c2de1a1ef1b0cd4cf7fc25dd756cf19c..33340d8ff101fbd96f552b1c9d7e731f1e780c3b 100755 (executable)
--- a/src/net_wifi_ap.c
+++ b/src/net_wifi_ap.c
@@ -915,7 +915,7 @@ EXPORT_API int wifi_ap_set_passphrase(wifi_ap_h ap, const char* passphrase)
 
        wifi_conn_info.security_info.sec_mode = sec_info.sec_mode;
 
-       connman_service_set_wifi_conn_info(service, &wifi_conn_info);
+       _set_wifi_conn_info(&wifi_conn_info);
 
        return WIFI_ERROR_NONE;
 }