revise cumbersome structure that is a opaque type
[platform/core/connectivity/nfc-manager-neard.git] / tests / net_nfc_test_llcp.c
old mode 100644 (file)
new mode 100755 (executable)
index e77eeb2..3318e5f
 static net_nfc_llcp_socket_t server_test_socket;
 static net_nfc_llcp_socket_t client_test_socket;
 
-static net_nfc_llcp_config_info_llcp_config = NULL;
-static net_nfc_llcp_config_info_llcp_config_sync = NULL;
-static net_nfc_llcp_config_info_llcp_config_default = NULL;
-static net_nfc_llcp_config_info_llcp_config_default_sync = NULL;
+static net_nfc_llcp_config_info_s *llcp_config = NULL;
+static net_nfc_llcp_config_info_s *llcp_config_sync = NULL;
+static net_nfc_llcp_config_info_s *llcp_config_default = NULL;
+static net_nfc_llcp_config_info_s *llcp_config_default_sync = NULL;
 
 
 /*********************************** utility Calls *************************************/
 
-static void run_next_callback(gpointer user_data);
-
 static void run_next_callback(gpointer user_data)
 {
        if (user_data)
@@ -48,16 +46,14 @@ static void run_next_callback(gpointer user_data)
 
 /*********************************** Callbacks *************************************/
 
-static void llcp_default_config_cb(net_nfc_error_e result,
-               void *user_data)
+static void llcp_default_config_cb(net_nfc_error_e result, void *user_data)
 {
        g_print(" llcp_default_config_cb Completed %d\n", result);
 
        run_next_callback(user_data);
 }
 
-static void llcp_custom_config_cb(net_nfc_error_e result,
-               void *user_data)
+static void llcp_custom_config_cb(net_nfc_error_e result, void *user_data)
 {
        g_print("llcp_custom_config_cb Completed %d\n", result);
 
@@ -65,8 +61,7 @@ static void llcp_custom_config_cb(net_nfc_error_e result,
 }
 
 static void llcp_listen_socket_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+               net_nfc_llcp_socket_t client_socket, void *user_data)
 {
 
        g_print("llcp_listen_socket_cb  Completed %d\n", client_socket);
@@ -75,11 +70,10 @@ static void llcp_listen_socket_cb(net_nfc_error_e result,
        run_next_callback(user_data);
 }
 
-static void llcp_receive_socket_cb(net_nfc_error_e result,
-                               data_h data,
-                               void *user_data)
+static void llcp_receive_socket_cb(net_nfc_error_e result, data_s *data,
+               void *user_data)
 {
-       data_received_data = data;
+       data_s *received_data = data;
 
        print_received_data(received_data);
 
@@ -89,11 +83,11 @@ static void llcp_receive_socket_cb(net_nfc_error_e result,
 }
 
 static void llcp_receive_from_socket_cb(net_nfc_error_e result,
-                                               sap_t sap,
-                                               data_h data,
-                                               void *user_data)
+               sap_t sap,
+               data_s *data,
+               void *user_data)
 {
-       data_received_data = data;
+       data_s *received_data = data;
 
        print_received_data(received_data);
 
@@ -106,8 +100,7 @@ static void llcp_receive_from_socket_cb(net_nfc_error_e result,
 
 
 static void llcp_connect_socket_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+               net_nfc_llcp_socket_t client_socket, void *user_data)
 {
        g_print("llcp_connect_socket_cb Completed %d\n", client_socket);
        g_print("llcp_connect_socket_cb Completed %d\n", result);
@@ -117,8 +110,8 @@ static void llcp_connect_socket_cb(net_nfc_error_e result,
 
 
 static void llcp_connect_sap_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+               net_nfc_llcp_socket_t client_socket,
+               void *user_data)
 {
        g_print("llcp_connect_socket_cb Completed %d\n", client_socket);
        g_print("llcp_connect_socket_cb Completed %d\n", result);
@@ -127,44 +120,30 @@ static void llcp_connect_sap_cb(net_nfc_error_e result,
 }
 
 
-static void llcp_send_socket_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+static void llcp_send_socket_cb(net_nfc_error_e result, void *user_data)
 {
-       g_print("llcp_send_socket_cb    Completed %d\n", client_socket);
        g_print("llcp_send_socket_cb    Completed %d\n", result);
 
        run_next_callback(user_data);
-
 }
 
-static void llcp_send_to_socket_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+static void llcp_send_to_socket_cb(net_nfc_error_e result, void *user_data)
 {
-       g_print("llcp_send_to_socket_cb Completed %d\n", client_socket);
        g_print("llcp_send_to_socket_cb Completed %d\n", result);
 
        run_next_callback(user_data);
-
 }
 
-static void llcp_disconnect_socket_cb(net_nfc_error_e result,
-                               net_nfc_llcp_socket_t client_socket,
-                               void *user_data)
+static void llcp_disconnect_socket_cb(net_nfc_error_e result, void *user_data)
 {
-       g_print("llcp_send_to_socket_cb Completed %d\n", client_socket);
        g_print("llcp_send_to_socket_cb Completed %d\n", result);
 
        run_next_callback(user_data);
-
 }
 
-
 /*********************************** Function Calls *************************************/
 
-void net_nfc_test_llcp_default_config(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_default_config(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
 
@@ -178,13 +157,12 @@ void net_nfc_test_llcp_default_config(gpointer data,
 
        }
        result = net_nfc_client_llcp_config(llcp_config_default,
-                                       llcp_default_config_cb,
-                                       user_data);
+                       llcp_default_config_cb,
+                       user_data);
 
 }
 
-void net_nfc_test_llcp_default_config_sync(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_default_config_sync(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
 
@@ -195,7 +173,6 @@ void net_nfc_test_llcp_default_config_sync(gpointer data,
                g_print(" llcp create default config failed: %d\n", result);
                run_next_callback(user_data);
                return;
-
        }
 
        result = net_nfc_client_llcp_config_sync(llcp_config_default_sync);
@@ -203,14 +180,11 @@ void net_nfc_test_llcp_default_config_sync(gpointer data,
        {
                g_print(" llcp create default config (sync) success: %d\n", result);
        }
-
 }
 
 
-void net_nfc_test_llcp_custom_config(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_custom_config(gpointer data, gpointer user_data)
 {
-
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_create_config(&llcp_config,128, 1, 10, 0);
@@ -220,18 +194,13 @@ void net_nfc_test_llcp_custom_config(gpointer data,
                g_print(" llcp create custom config failed: %d\n", result);
                run_next_callback(user_data);
                return;
-
        }
-       result = net_nfc_client_llcp_config(llcp_config,
-                                       llcp_custom_config_cb,
-                                       user_data);
-
+       result = net_nfc_client_llcp_config(llcp_config, llcp_custom_config_cb, user_data);
 }
 
 
 
-void net_nfc_test_llcp_custom_config_sync(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_custom_config_sync(gpointer data, gpointer user_data)
 {
 
        net_nfc_error_e result;
@@ -243,7 +212,6 @@ void net_nfc_test_llcp_custom_config_sync(gpointer data,
                g_print(" net_nfc_test_llcp_custom_config_sync failed: %d\n", result);
                run_next_callback(user_data);
                return;
-
        }
        result = net_nfc_client_llcp_config_sync(llcp_config_sync);
 
@@ -254,10 +222,9 @@ void net_nfc_test_llcp_custom_config_sync(gpointer data,
 
 }
 
-void net_nfc_test_llcp_get_local_config(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_get_local_config(gpointer data, gpointer user_data)
 {
-       net_nfc_llcp_config_info_local_config;
+       net_nfc_llcp_config_info_s *local_config;
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_get_local_config(&local_config);
@@ -267,23 +234,21 @@ void net_nfc_test_llcp_get_local_config(gpointer data,
                g_print(" llcp create custom config failed: %d\n", result);
                run_next_callback(user_data);
                return;
-
        }
 
        g_print(" net_nfc_test_llcp_get_local_config: %d\n", local_config->miu);
        g_print("net_nfc_test_llcp_get_local_config: %d\n", local_config->wks);
        g_print(" net_nfc_test_llcp_get_local_config: %d\n", local_config->lto);
        g_print("net_nfc_test_llcp_get_local_config: %d\n", local_config->option);
-
 }
 
 
 /*commented because remote config API is not available*/
-/*
+#if 0
 void net_nfc_test_llcp_get_remote_config(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
-       net_nfc_llcp_config_info_local_config;
+       net_nfc_llcp_config_info_s *local_config;
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_get_local_config(&local_config);
@@ -302,10 +267,10 @@ void net_nfc_test_llcp_get_remote_config(gpointer data,
        g_print("net_nfc_test_llcp_get_local_config: %d\n", local_config->option);
 
 }
-*/
+#endif
 
 void net_nfc_test_llcp_get_config_miu(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
 
        net_nfc_error_e result;
@@ -331,7 +296,7 @@ void net_nfc_test_llcp_get_config_miu(gpointer data,
 
 
 void net_nfc_test_llcp_get_config_wks(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint16_t wks;
@@ -354,7 +319,7 @@ void net_nfc_test_llcp_get_config_wks(gpointer data,
 }
 
 void net_nfc_test_llcp_get_config_lto(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint8_t lto;
@@ -379,7 +344,7 @@ void net_nfc_test_llcp_get_config_lto(gpointer data,
 
 
 void net_nfc_test_llcp_get_config_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint8_t option;
@@ -404,7 +369,7 @@ void net_nfc_test_llcp_get_config_option(gpointer data,
 
 
 void net_nfc_test_llcp_set_config_miu(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint16_t miu = 128;
@@ -429,7 +394,7 @@ void net_nfc_test_llcp_set_config_miu(gpointer data,
 
 
 void net_nfc_test_llcp_set_config_wks(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint16_t wks = 1;
@@ -454,7 +419,7 @@ void net_nfc_test_llcp_set_config_wks(gpointer data,
 
 
 void net_nfc_test_llcp_set_config_lto(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        uint16_t lto = 10;
@@ -478,7 +443,7 @@ void net_nfc_test_llcp_set_config_lto(gpointer data,
 
 
 void net_nfc_test_llcp_set_config_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
 
        net_nfc_error_e result;
@@ -502,7 +467,7 @@ void net_nfc_test_llcp_set_config_option(gpointer data,
 
 
 void net_nfc_test_llcp_free_config(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
 
@@ -524,15 +489,15 @@ void net_nfc_test_llcp_free_config(gpointer data,
 
 
 void net_nfc_test_llcp_create_custom_socket_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
-       net_nfc_llcp_socket_option_option;
+       net_nfc_llcp_socket_option_s *option;
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_create_socket_option(&option,
-                                               128,
-                                               1,
-                                               NET_NFC_LLCP_SOCKET_TYPE_CONNECTIONORIENTED);
+                       128,
+                       1,
+                       NET_NFC_LLCP_SOCKET_TYPE_CONNECTIONORIENTED);
 
        if(result != NET_NFC_OK)
        {
@@ -548,9 +513,9 @@ void net_nfc_test_llcp_create_custom_socket_option(gpointer data,
 }
 
 void net_nfc_test_llcp_create_default_socket_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
-       net_nfc_llcp_socket_option_option;
+       net_nfc_llcp_socket_option_s *option;
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_create_socket_option_default(&option);
@@ -568,31 +533,29 @@ void net_nfc_test_llcp_create_default_socket_option(gpointer data,
 }
 
 void net_nfc_test_llcp_get_local_socket_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
-       net_nfc_llcp_socket_option_option;
+       net_nfc_llcp_socket_option_s *option;
 
        result = net_nfc_client_llcp_get_local_socket_option(client_test_socket,&option);
 
-if(result != NET_NFC_OK)
-{
-       g_print(" net_nfc_test_llcp_get_local_socket_option failed: %d\n", result);
-       run_next_callback(user_data);
-       return;
-}
-
-g_print(" net_nfc_test_llcp_get_local_socket_option: %d\n", option->miu);
-g_print("net_nfc_test_llcp_get_local_socket_option: %d\n", option->rw);
-g_print(" net_nfc_test_llcp_get_local_socket_option: %d\n", option->type);
-
-run_next_callback(user_data);
+       if(result != NET_NFC_OK)
+       {
+               g_print(" net_nfc_test_llcp_get_local_socket_option failed: %d\n", result);
+               run_next_callback(user_data);
+               return;
+       }
 
+       g_print(" net_nfc_test_llcp_get_local_socket_option: %d\n", option->miu);
+       g_print("net_nfc_test_llcp_get_local_socket_option: %d\n", option->rw);
+       g_print(" net_nfc_test_llcp_get_local_socket_option: %d\n", option->type);
 
+       run_next_callback(user_data);
 }
 
 void net_nfc_test_llcp_get_socket_option_miu(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -614,7 +577,7 @@ void net_nfc_test_llcp_get_socket_option_miu(gpointer data,
 
 
 void net_nfc_test_llcp_set_socket_option_miu(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -634,7 +597,7 @@ void net_nfc_test_llcp_set_socket_option_miu(gpointer data,
 }
 
 void net_nfc_test_llcp_get_socket_option_rw(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -655,7 +618,7 @@ void net_nfc_test_llcp_get_socket_option_rw(gpointer data,
 
 
 void net_nfc_test_llcp_set_socket_option_rw(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -675,7 +638,7 @@ void net_nfc_test_llcp_set_socket_option_rw(gpointer data,
 }
 
 void net_nfc_test_llcp_get_socket_option_type(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -696,7 +659,7 @@ void net_nfc_test_llcp_get_socket_option_type(gpointer data,
 
 
 void net_nfc_test_llcp_set_socket_option_type(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -716,7 +679,7 @@ void net_nfc_test_llcp_set_socket_option_type(gpointer data,
 }
 
 void net_nfc_test_llcp_free_socket_option(gpointer data,
-                       gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_llcp_socket_option_s option;
        net_nfc_error_e result;
@@ -736,17 +699,17 @@ void net_nfc_test_llcp_free_socket_option(gpointer data,
 
 
 void net_nfc_test_llcp_listen(gpointer data,
-                               gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
 
        net_nfc_client_llcp_create_socket(&server_test_socket,NULL);
 
        result = net_nfc_client_llcp_listen(server_test_socket,
-                               "urn:nfc:xsn:samsung.com:testllcp" ,
-                               16 ,
-                               llcp_listen_socket_cb,
-                               NULL);
+                       "urn:nfc:xsn:samsung.com:testllcp" ,
+                       16 ,
+                       llcp_listen_socket_cb,
+                       NULL);
 
        if(result != NET_NFC_OK)
        {
@@ -756,7 +719,7 @@ void net_nfc_test_llcp_listen(gpointer data,
 }
 
 void net_nfc_test_llcp_listen_sync(gpointer data,
-                               gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
        net_nfc_llcp_socket_t out_socket;
@@ -764,9 +727,9 @@ void net_nfc_test_llcp_listen_sync(gpointer data,
        net_nfc_client_llcp_create_socket(&server_test_socket,NULL);
 
        result = net_nfc_client_llcp_listen_sync(server_test_socket,
-                               "urn:nfc:xsn:samsung.com:testllcp" ,
-                               16 ,
-                               &out_socket);
+                       "urn:nfc:xsn:samsung.com:testllcp" ,
+                       16 ,
+                       &out_socket);
 
        if(result != NET_NFC_OK)
        {
@@ -782,16 +745,16 @@ void net_nfc_test_llcp_listen_sync(gpointer data,
 
 
 void net_nfc_test_llcp_receive(gpointer data,
-                               gpointer user_data)
+               gpointer user_data)
 {
 
        net_nfc_error_e result;
 
 
        result = net_nfc_client_llcp_receive(server_test_socket,
-                               512,
-                               llcp_receive_socket_cb,
-                               NULL);
+                       512,
+                       llcp_receive_socket_cb,
+                       NULL);
 
        if(result != NET_NFC_OK)
        {
@@ -802,15 +765,15 @@ void net_nfc_test_llcp_receive(gpointer data,
 
 
 void net_nfc_test_llcp_receive_sync(gpointer data,
-                               gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
-       data_out_data;
+       data_s *out_data;
 
 
        result = net_nfc_client_llcp_receive_sync(server_test_socket,
-                               512,
-                               &out_data);
+                       512,
+                       &out_data);
 
        if(result != NET_NFC_OK)
        {
@@ -826,15 +789,15 @@ void net_nfc_test_llcp_receive_sync(gpointer data,
 
 
 void net_nfc_test_llcp_receive_from(gpointer data,
-                               gpointer user_data)
+               gpointer user_data)
 {
        net_nfc_error_e result;
 
 
        result = net_nfc_client_llcp_receive_from(server_test_socket,
-                               512,
-                               llcp_receive_from_socket_cb,
-                               NULL);
+                       512,
+                       llcp_receive_from_socket_cb,
+                       NULL);
 
        if(result != NET_NFC_OK)
        {
@@ -843,17 +806,16 @@ void net_nfc_test_llcp_receive_from(gpointer data,
        }
 }
 
-void net_nfc_test_llcp_receive_from_sync(gpointer data,
-                               gpointer user_data)
+void net_nfc_test_llcp_receive_from_sync(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
-       data_h out_data;
-       sap_t sap_data;
+       data_s *out_data = NULL;
+       sap_t sap_data = 0;
 
        result = net_nfc_client_llcp_receive_from_sync(server_test_socket,
-                               512,
-                               &sap_data,
-                               &out_data);
+                       512,
+                       &sap_data,
+                       &out_data);
 
        if(result != NET_NFC_OK)
        {
@@ -867,19 +829,16 @@ void net_nfc_test_llcp_receive_from_sync(gpointer data,
        run_next_callback(user_data);
 }
 
-
-
-void net_nfc_test_llcp_connect(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_connect(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
 
        net_nfc_client_llcp_create_socket(&client_test_socket, NULL);
 
        result = net_nfc_client_llcp_connect(client_test_socket,
-                               "urn:nfc:xsn:samsung.com:testllcp",
-                               llcp_connect_socket_cb,
-                               user_data);
+                       "urn:nfc:xsn:samsung.com:testllcp",
+                       llcp_connect_socket_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
@@ -889,8 +848,7 @@ void net_nfc_test_llcp_connect(gpointer data,
 
 }
 
-void net_nfc_test_llcp_connect_sync(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_connect_sync(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
        net_nfc_llcp_socket_t out_socket;
@@ -898,8 +856,8 @@ void net_nfc_test_llcp_connect_sync(gpointer data,
        net_nfc_client_llcp_create_socket(&client_test_socket, NULL);
 
        result = net_nfc_client_llcp_connect_sync(client_test_socket,
-                               "urn:nfc:xsn:samsung.com:testllcp",
-                               &out_socket);
+                       "urn:nfc:xsn:samsung.com:testllcp",
+                       &out_socket);
 
        if(result != NET_NFC_OK)
        {
@@ -912,17 +870,16 @@ void net_nfc_test_llcp_connect_sync(gpointer data,
        run_next_callback(user_data);
 }
 
-void net_nfc_test_llcp_connect_sap(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_connect_sap(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
 
        net_nfc_client_llcp_create_socket(&client_test_socket, NULL);
 
        result = net_nfc_client_llcp_connect_sap(client_test_socket,
-                               16,
-                               llcp_connect_sap_cb,
-                               user_data);
+                       16,
+                       llcp_connect_sap_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
@@ -932,17 +889,14 @@ void net_nfc_test_llcp_connect_sap(gpointer data,
 
 }
 
-void net_nfc_test_llcp_connect_sap_sync(gpointer data,
-                       gpointer user_data)
+void net_nfc_test_llcp_connect_sap_sync(gpointer data, gpointer user_data)
 {
        net_nfc_error_e result;
        net_nfc_llcp_socket_t out_socket;
 
        net_nfc_client_llcp_create_socket(&client_test_socket, NULL);
 
-       result = net_nfc_client_llcp_connect_sap_sync(client_test_socket,
-                               16,
-                               &out_socket);
+       result = net_nfc_client_llcp_connect_sap_sync(client_test_socket, 16, &out_socket);
 
        if(result != NET_NFC_OK)
        {
@@ -955,21 +909,18 @@ void net_nfc_test_llcp_connect_sap_sync(gpointer data,
        run_next_callback(user_data);
 }
 
-
-
-void net_nfc_test_llcp_send(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_send(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
-       data_data;
+       data_s *data;
        char * str = "Client message: Hello, server!";
 
        net_nfc_create_data (&data, (const uint8_t*)str ,strlen (str) + 1);
 
        result = net_nfc_client_llcp_send(client_test_socket,
-                               data,
-                               llcp_send_socket_cb,
-                               user_data);
+                       data,
+                       llcp_send_socket_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
@@ -979,20 +930,15 @@ void net_nfc_test_llcp_send(gpointer func_data,
 
 }
 
-
-void net_nfc_test_llcp_send_sync(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_send_sync(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
-       data_data;
+       data_s *data;
        char * str = "Client message: Hello, server!";
-       net_nfc_llcp_socket_t out_socket;
 
        net_nfc_create_data (&data, (const uint8_t*)str ,strlen (str) + 1);
 
-       result = net_nfc_client_llcp_send_sync(client_test_socket,
-                               data,
-                               &out_socket);
+       result = net_nfc_client_llcp_send_sync(client_test_socket, data);
 
        if(result != NET_NFC_OK)
        {
@@ -1001,26 +947,25 @@ void net_nfc_test_llcp_send_sync(gpointer func_data,
                return;
        }
 
-       g_print(" net_nfc_test_llcp_send_sync out_socket: %d\n", out_socket);
+       g_print(" net_nfc_test_llcp_send_sync success\n");
        run_next_callback(user_data);
 
 }
 
 
-void net_nfc_test_llcp_send_to(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_send_to(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
-       data_data;
+       data_s *data;
        char * str = "Client message: Hello, server!";
 
        net_nfc_create_data (&data, (const uint8_t*)str ,strlen (str) + 1);
 
        result = net_nfc_client_llcp_send_to(client_test_socket,
-                               16,
-                               data,
-                               llcp_send_to_socket_cb,
-                               user_data);
+                       16,
+                       data,
+                       llcp_send_to_socket_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
@@ -1031,20 +976,17 @@ void net_nfc_test_llcp_send_to(gpointer func_data,
 }
 
 
-void net_nfc_test_llcp_send_to_sync(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_send_to_sync(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
-       data_data;
+       data_s *data;
        char * str = "Client message: Hello, server!";
-       net_nfc_llcp_socket_t out_socket;
 
        net_nfc_create_data (&data, (const uint8_t*)str ,strlen (str) + 1);
 
        result = net_nfc_client_llcp_send_to_sync(client_test_socket,
-                               16,
-                               data,
-                               &out_socket);
+                       16,
+                       data);
 
        if(result != NET_NFC_OK)
        {
@@ -1053,20 +995,19 @@ void net_nfc_test_llcp_send_to_sync(gpointer func_data,
                return;
        }
 
-       g_print(" net_nfc_test_llcp_send_to_sync out_socket: %d\n", out_socket);
+       g_print(" net_nfc_test_llcp_send_to_sync success\n");
        run_next_callback(user_data);
 
 }
 
 
-void net_nfc_test_llcp_disconnect(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_disconnect(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_disconnect(client_test_socket,
-                               llcp_disconnect_socket_cb,
-                               user_data);
+                       llcp_disconnect_socket_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
@@ -1076,32 +1017,26 @@ void net_nfc_test_llcp_disconnect(gpointer func_data,
 
 }
 
-void net_nfc_test_llcp_disconnect_server(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_disconnect_server(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
 
        result = net_nfc_client_llcp_disconnect(server_test_socket,
-                               llcp_disconnect_socket_cb,
-                               user_data);
+                       llcp_disconnect_socket_cb,
+                       user_data);
 
        if(result != NET_NFC_OK)
        {
                g_print(" net_nfc_test_llcp_disconnect accepted_socket failed: %d\n", result);
                return;
        }
-
 }
 
-
-void net_nfc_test_llcp_disconnect_sync(gpointer func_data,
-                       gpointer user_data)
+void net_nfc_test_llcp_disconnect_sync(gpointer func_data, gpointer user_data)
 {
        net_nfc_error_e result;
-       net_nfc_llcp_socket_t out_socket;
 
-       result = net_nfc_client_llcp_disconnect_sync(client_test_socket,
-                       &out_socket);
+       result = net_nfc_client_llcp_disconnect_sync(client_test_socket);
 
        if(result != NET_NFC_OK)
        {
@@ -1110,10 +1045,6 @@ void net_nfc_test_llcp_disconnect_sync(gpointer func_data,
                return;
        }
 
-       g_print(" net_nfc_test_llcp_disconnect_sync out_socket: %d\n", out_socket);
+       g_print(" net_nfc_test_llcp_disconnect_sync success\n");
        run_next_callback(user_data);
-
 }
-
-
-