[capi-network-wifi-direct]Sync with Tizen 2.4

Change-Id: I3284cbb37b2958446894fb1a135799b7a71e3aa7
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/doc/wifi_direct_doc.h b/doc/wifi_direct_doc.h
index 7c944e3..1daa4b4 100755 (executable)
--- a/doc/wifi_direct_doc.h
+++ b/doc/wifi_direct_doc.h
@@ -43,7 +43,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="../org.tizen.gettingstarted/html/native/details/app_filtering_n.htm"><b>Feature List</b>.</a>
  *
  */
 

diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec
index 8e79360..129aeab 100644 (file)
--- a/packaging/capi-network-wifi-direct.spec
+++ b/packaging/capi-network-wifi-direct.spec
@@ -1,6 +1,6 @@
 Name:       capi-network-wifi-direct
 Summary:    Network WiFi-Direct library in Tizen CAPI
-Version:    1.2.37
+Version:    1.2.38
 Release:    1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -93,6 +93,7 @@ cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{na
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/capi-network-wifi-direct.pc
 %{_includedir}/wifi-direct/wifi-direct.h
+%{_includedir}/wifi-direct/wifi-direct-internal.h
 %{_libdir}/libwifi-direct.so
 
 #%files -n test-wifi-direct

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c47ba5f..4725de1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -124,5 +124,6 @@ CONFIGURE_FILE(capi-network-wifi-direct.pc.in capi-network-wifi-direct.pc @ONLY)
 # Install
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT Runtime)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wifi-direct.h DESTINATION include/wifi-direct)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wifi-direct-internal.h DESTINATION include/wifi-direct)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/capi-network-wifi-direct.pc DESTINATION ${LIBDIR}/pkgconfig)
 

diff --git a/src/include/wifi-direct-ipc.h b/src/include/wifi-direct-ipc.h
index 7107288..c530eb0 100755 (executable)
--- a/src/include/wifi-direct-ipc.h
+++ b/src/include/wifi-direct-ipc.h
@@ -125,7 +125,7 @@ typedef enum
        WIFI_DIRECT_CMD_GET_OPERATING_CHANNEL,
        WIFI_DIRECT_CMD_ACTIVATE_PERSISTENT_GROUP,
        WIFI_DIRECT_CMD_DEACTIVATE_PERSISTENT_GROUP,
-       WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP,
+       WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP_ACTIVATED,
        WIFI_DIRECT_CMD_GET_PERSISTENT_GROUP_INFO,      // 50
        WIFI_DIRECT_CMD_REMOVE_PERSISTENT_GROUP,
        WIFI_DIRECT_CMD_GET_DEVICE_NAME,

diff --git a/src/wifi-direct-client-proxy.c b/src/wifi-direct-client-proxy.c
index 9f359a2..6d9d293 100755 (executable)
--- a/src/wifi-direct-client-proxy.c
+++ b/src/wifi-direct-client-proxy.c
@@ -449,8 +449,8 @@ char *__wfd_client_print_cmd(wifi_direct_cmd_e cmd)
                return "WIFI_DIRECT_CMD_ACTIVATE_PERSISTENT_GROUP";
        case WIFI_DIRECT_CMD_DEACTIVATE_PERSISTENT_GROUP:
                return "WIFI_DIRECT_CMD_DEACTIVATE_PERSISTENT_GROUP";
-       case WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP:
-               return "WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP";
+       case WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP_ACTIVATED:
+               return "WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP_ACTIVATED";
        case WIFI_DIRECT_CMD_GET_PERSISTENT_GROUP_INFO:
                return "WIFI_DIRECT_CMD_GET_PERSISTENT_GROUP_INFO";
        case WIFI_DIRECT_CMD_REMOVE_PERSISTENT_GROUP:
@@ -3433,8 +3433,13 @@ int wifi_direct_get_primary_device_type(wifi_direct_primary_device_type_e* type)
                return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
        }
 
+#ifdef TIZEN_TV
+       WDC_LOGD("Current primary_dev_type [%d]", WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY);
+       *type = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY;
+#else /* TIZEN_TV */
        WDC_LOGD("Current primary_dev_type [%d]", WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE);
        *type = WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE;
+#endif /* TIZEN_TV */
 
        __WDC_LOG_FUNC_END__;
        return WIFI_DIRECT_ERROR_NONE;
@@ -3459,8 +3464,13 @@ int wifi_direct_get_secondary_device_type(wifi_direct_secondary_device_type_e* t
                return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
        }
 
+#ifdef TIZEN_TV
+       WDC_LOGD("Current second_dev_type [%d]", WIFI_DIRECT_SECONDARY_DEVICE_TYPE_DISPLAY_TV);
+       *type = WIFI_DIRECT_SECONDARY_DEVICE_TYPE_DISPLAY_TV;
+#else /* TIZEN_TV */
        WDC_LOGD("Current second_dev_type [%d]", WIFI_DIRECT_SECONDARY_DEVICE_TYPE_TELEPHONE_SMARTPHONE_DUAL);
        *type = WIFI_DIRECT_SECONDARY_DEVICE_TYPE_TELEPHONE_SMARTPHONE_DUAL;    // smart phone dual mode (wifi and cellular)
+#endif /* TIZEN_TV */
 
        __WDC_LOG_FUNC_END__;
        return WIFI_DIRECT_ERROR_NONE;
@@ -3607,7 +3617,7 @@ int wifi_direct_is_persistent_group_enabled(bool *enabled)
        memset(&req, 0, sizeof(wifi_direct_client_request_s));
        memset(&rsp, 0, sizeof(wifi_direct_client_response_s));
 
-       req.cmd = WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP;
+       req.cmd = WIFI_DIRECT_CMD_IS_PERSISTENT_GROUP_ACTIVATED;
        req.client_id = g_client_info.client_id;
 
        res = __wfd_client_send_request(g_client_info.sync_sockfd, &req, &rsp);
@@ -4588,12 +4598,6 @@ int wifi_direct_set_display_availability(bool availability)
                return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
        }
 
-       if (availability < 0) {
-               WDC_LOGE("Invalid parameter");
-               __WDC_LOG_FUNC_END__;
-               return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
-       }
-
        memset(&req, 0, sizeof(wifi_direct_client_request_s));
        memset(&rsp, 0, sizeof(wifi_direct_client_response_s));
 

diff --git a/test/test-wifi-direct.c b/test/test-wifi-direct.c
index c428c65..93a4a98 100644 (file)
--- a/test/test-wifi-direct.c
+++ b/test/test-wifi-direct.c
@@ -73,13 +73,14 @@ enum
        CMD_DEACTIVATE_WIFI_DIRECT,
        CMD_START_DISCOVER,
        CMD_START_DISCOVER_WITH_LISTEN_ONLY,
-       CMD_START_DISCOVER_SPECIFIC_CHANNEL,    
+       CMD_START_DISCOVER_SPECIFIC_CHANNEL,
        CMD_CANCEL_DISCOVER,
        CMD_GET_DISVOCERY_RESULT,
        //CMD_SEND_PROVISION_DISCOVER_REQ,
        CMD_SEND_CONNECTION_REQ,
        CMD_GET_LINK_STATUS,
        CMD_CONNECT_PEER,
+       CMD_CANCEL_CONNECTION,
        CMD_DISCONNECT_ALL,
        CMD_DISCONNECT,
 
@@ -127,23 +128,23 @@ enum
        CMD_UNSET_ACTIVATION_CB,
        CMD_UNSET_DISCOVER_CB,
        CMD_UNSET_SERVICE_CB,
-       CMD_UNSET_CONNECTION_CB,        
+       CMD_UNSET_CONNECTION_CB,
        CMD_UNSET_PEER_FOUND_CB,
        CMD_UNSET_DEVICE_NAME_CB,
        CMD_GET_NETWORK_IF_NAME,
        CMD_GET_SUBNET_MASK,
-       CMD_GET_GATEWAY_ADDR,   
+       CMD_GET_GATEWAY_ADDR,
        CMD_IS_DISCOVERABLE,
        CMD_IS_LISTEN_ONLY,
        CMD_GET_PRIMARY_DEVICE_TYPE,
-       CMD_GET_SECONDARY_DEVICE_TYPE,  
+       CMD_GET_SECONDARY_DEVICE_TYPE,
        CMD_GET_OPERATING_CHANNEL,
        CMD_GET_IP_ADDR,
        CMD_REGISTER_SERVICE,
        CMD_DEREGISTER_SERVICE,
        CMD_START_SERVICE_DISCOVERY,
        CMD_CANCEL_SERVICE_DISCOVERY,
-       
+
        CMD_INCREASE_OEM_LOGLEVEL,
        CMD_DECREASE_OEM_LOGLEVEL,
        CMD_DEINITIALIZE,
@@ -189,6 +190,7 @@ menu_str_t g_menu_str[] =
 
                { CMD_GET_LINK_STATUS, "CMD_GET_LINK_STATUS" },
                { CMD_CONNECT_PEER, "CMD_CONNECT_PEER" },
+               { CMD_CANCEL_CONNECTION, "CMD_CANCEL_CONNECTION" },
                { CMD_DISCONNECT_ALL, "CMD_DISCONNECT_ALL" },
                { CMD_DISCONNECT, "CMD_DISCONNECT" },
 
@@ -210,13 +212,13 @@ menu_str_t g_menu_str[] =
                { CMD_GET_MAX_CLIENT, "CMD_GET_MAX_CLIENT" },
                { CMD_SET_HIDE_SSID, "CMD_SET_HIDE_SSID" },
                { CMD_ACTIVATE_PERSISTENT_GROUP, "CMD_ACTIVATE_PERSISTENT_GROUP" },
-               { CMD_DEACTIVATE_PERSISTENT_GROUP, "CMD_DEACTIVATE_PERSISTENT_GROUP" },         
+               { CMD_DEACTIVATE_PERSISTENT_GROUP, "CMD_DEACTIVATE_PERSISTENT_GROUP" },
                { CMD_IS_PERSISTENT_GROUP_ACTIVATED, "CMD_IS_PERSISTENT_GROUP_ACTIVATED" },
                { CMD_GET_PERSISTENT_GROUP_LIST, "CMD_GET_PERSISTENT_GROUP_LIST" },
                { CMD_REMOVE_PERSISTENT_GROUP, "CMD_REMOVE_PERSISTENT_GROUP" },
                //{ CMD_SET_GROUP_OWNER, "CMD_SET_GROUP_OWNER" },
                { CMD_SET_AUTO_CONNECTION, "CMD_SET_AUTO_CONNECTION" },
-               { CMD_IS_AUTO_CONNECTION, "CMD_IS_AUTO_CONNECTION" },           
+               { CMD_IS_AUTO_CONNECTION, "CMD_IS_AUTO_CONNECTION" },
                //{ CMD_SET_LISTEN_ONLY, "CMD_SET_LISTEN_ONLY" },
                { CMD_SET_WPS_PIN, "CMD_SET_WPS_PIN" },
                { CMD_GET_WPS_PIN, "CMD_GET_WPS_PIN" },
@@ -243,7 +245,7 @@ menu_str_t g_menu_str[] =
                { CMD_IS_DISCOVERABLE, "CMD_IS_DISCOVERABLE" },
                { CMD_IS_LISTEN_ONLY, "CMD_IS_LISTEN_ONLY" },
                { CMD_GET_PRIMARY_DEVICE_TYPE, "CMD_GET_PRIMARY_DEVICE_TYPE" },
-               { CMD_GET_SECONDARY_DEVICE_TYPE, "CMD_GET_SECONDARY_DEVICE_TYPE" },             
+               { CMD_GET_SECONDARY_DEVICE_TYPE, "CMD_GET_SECONDARY_DEVICE_TYPE" },
                { CMD_GET_OPERATING_CHANNEL, "CMD_GET_OPERATING_CHANNEL" },
                { CMD_GET_IP_ADDR, "CMD_GET_IP_ADDR" },
                { CMD_REGISTER_SERVICE, "CMD_REGISTER_SERVICE" },
@@ -572,17 +574,17 @@ void _cb_activation(int error_code, wifi_direct_device_state_e device_state, voi
 bool _cb_discovered_peers_impl(wifi_direct_discovered_peer_info_s* peer, void* user_data)
 {
        __FUNC_ENTER__;
-       
+
        struct appdata* ad = (struct appdata*) user_data;
 
        if(NULL != peer)
        {
                if ( ad->peer_count >= MAX_PEER_NUM )
                        return false;   // break out of the loop
-               
+
                memcpy(&ad->peer_list[ad->peer_count], peer, sizeof(wifi_direct_discovered_peer_info_s));
                ad->peer_count++;
-               
+
        }
 
        return true;    // continue with the next iteration of the loop
@@ -591,17 +593,17 @@ bool _cb_discovered_peers_impl(wifi_direct_discovered_peer_info_s* peer, void* u
 bool _cb_connected_peers_impl(wifi_direct_connected_peer_info_s* peer, void* user_data)
 {
        __FUNC_ENTER__;
-       
+
        struct appdata* ad = (struct appdata*) user_data;
 
        if(NULL != peer)
        {
                if ( ad->connected_peer_count >= MAX_PEER_NUM )
                        return false;   // break out of the loop
-               
+
                memcpy(&ad->connected_peer_list[ad->connected_peer_count], peer, sizeof(wifi_direct_connected_peer_info_s));
                ad->connected_peer_count++;
-               
+
        }
 
        return true;    // continue with the next iteration of the loop
@@ -610,7 +612,7 @@ bool _cb_connected_peers_impl(wifi_direct_connected_peer_info_s* peer, void* use
 bool _cb_persistent_groups_impl(const char* mac_address, const char* ssid, void* user_data)
 {
        __FUNC_ENTER__;
-       
+
        struct appdata* ad = (struct appdata*) user_data;
 
        if(NULL != mac_address)
@@ -651,7 +653,7 @@ void _cb_discover(int error_code, wifi_direct_discovery_state_e discovery_state,
                        memset(ad->peer_list, 0x00, sizeof(wifi_direct_discovered_peer_info_s)*MAX_PEER_NUM);
                        ad->peer_count = 0;
                        ad ->selected_peer_index = 0;
-                       
+
                        ret = wifi_direct_foreach_discovered_peers(_cb_discovered_peers_impl, (void*)ad);
                        printf("wifi_direct_foreach_discovered_peers() ret=[%d]\n", ret);
                }
@@ -778,9 +780,9 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                        if(NULL != mac_address)
                                strncpy(_peer_mac, mac_address, strlen(mac_address));
 
-                       
+
                        printf ("Connection start with [%s] \n", _peer_mac);
-               
+
                        event_printf("Error None\n");
 
                }
@@ -846,7 +848,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                event_printf("event - WIFI_DIRECT_CONNECTION_WPS_REQ\n");
 
                wifi_direct_wps_type_e wps_mode;
-               
+
                int result;
 
                result = wifi_direct_get_local_wps_type(&wps_mode);
@@ -925,7 +927,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                int result;
 
                memset(incomming_peer_mac, 0, sizeof(incomming_peer_mac));
-               
+
                if(NULL != mac_address)
                        strncpy(incomming_peer_mac, mac_address, strlen(mac_address));
 
@@ -939,13 +941,11 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
 
                if(auto_connection_mode == TRUE)
                {
-               
                        result = wifi_direct_accept_connection(incomming_peer_mac);
                        printf("wifi_direct_accept_connection() result=[%d]\n", result);
                }
                else
                {
-               
                        if ( wps_mode == WIFI_DIRECT_WPS_TYPE_PBC)
                        {
                                char pushbutton;
@@ -953,7 +953,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                                printf("************\n");
                                printf("Connect? (Y/N)\n");
                                printf("*************\n");
-                               
+
                                scanf("%c", &pushbutton);
 
                                if( (pushbutton == 'Y') || (pushbutton == 'y') )
@@ -961,6 +961,11 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                                        result = wifi_direct_accept_connection(incomming_peer_mac);
                                        printf("wifi_direct_accept_connection() result=[%d]\n", result);
                                }
+                               else
+                               {
+                                       result = wifi_direct_reject_connection(incomming_peer_mac);
+                                       printf("wifi_direct_reject_connection() result=[%d]\n", result);
+                               }
                        }
                        else if ( wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD )
                        {
@@ -987,19 +992,16 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                                }
                                else
                                        printf("wifi_direct_set_wps_pin Error [%d]\n", result);
-                               
+
                        }
                        else
                        {
                                printf("wps_config is unkown!\n");
                        }
                }
-               
-
-                               
        }
        break;
-       
+
        case WIFI_DIRECT_DISCONNECTION_IND:
        {
                event_printf("event - WIFI_DIRECT_DISCONNECTION_IND\n");
@@ -1012,13 +1014,13 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                                strncpy(incomming_peer_mac, mac_address, strlen(mac_address));
 
                        printf ("Disconnection IND from [%s] \n", incomming_peer_mac);
-               
+
                        event_printf("Error None\n");
-               }       
-               
+               }
+
        }
        break;
-       
+
        case WIFI_DIRECT_DISCONNECTION_RSP:
        {
                event_printf("event - WIFI_DIRECT_DISCONNECTION_RSP\n");
@@ -1029,18 +1031,17 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
 
                        if(NULL != mac_address)
                                strncpy(incomming_peer_mac, mac_address, strlen(mac_address));
-                       
+
                        printf ("Disconnection RSP with [%s] \n", incomming_peer_mac);
-               
+
                        event_printf("Error None\n");
-               }       
-               
+               }
+
        }
        break;
 
        case WIFI_DIRECT_DISASSOCIATION_IND:
        {
-
                event_printf("event - WIFI_DIRECT_DISASSOCIATION_IND\n");
        
                if ( error_code == WIFI_DIRECT_ERROR_NONE )
@@ -1459,7 +1460,21 @@ void process_input(const char *input, gpointer user_data)
                                                                list[i].device_name);
 
                                printf("wifi_direct_connect() result=[%d]\n", result);
-                               
+
+                       }
+               }
+               break;
+
+       case CMD_CANCEL_CONNECTION:
+               if (ad != NULL)
+               {
+                       if (select_peer(ad))
+                       {
+                               int i = ad->selected_peer_index;
+                               wifi_direct_discovered_peer_info_s* list = ad->peer_list;
+
+                               result = wifi_direct_cancel_connection(list[i].mac_address);
+                               printf("wifi_direct_cancel_connection() result=[%d]\n", result);
                        }
                }
                break;
@@ -2430,23 +2445,17 @@ void process_input(const char *input, gpointer user_data)
        {
                if (ad != NULL)
                {
-                       char passphrase[64 + 1];
+                       char passphrase[64] = {0, };
 
-                       memset(passphrase, 0, sizeof(passphrase));
                        printf("Input passphrase :\n");
-                       scanf("%s",passphrase);
+                       scanf(" %64[^\n]s", passphrase);
 
-                       if (strlen(passphrase) <= 0)
-                               printf("invalid passphrase !!\n");
-                       else
+                       if (strlen(passphrase) > 0) {
                                printf("passphrase: [%s]\n", passphrase);
-
-
-                       if ((strlen(passphrase) > 0))
-                       {
                                result = wifi_direct_set_passphrase(passphrase);
                                printf("wifi_direct_set_passphrase() ret=[%d]\n", result);
-                       }
+                       } else
+                               printf("invalid passphrase !!\n");
                }
        }
        break;
@@ -2730,7 +2739,7 @@ int main(int argc, char **argv)
        ad->main_loop = main_loop;
 #if 0
        ad->peer_list = NULL;
-#endif 
+#endif
        ad->peer_count = 0;
 
        set_appdata(ad);