From 0dad1866712f9ae13209c950a534691eabccdf6a Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Tue, 16 Feb 2016 17:16:52 +0900 Subject: [PATCH] Fix wearable profile build error Change-Id: Ic67443dbbd10732327e279543e736906e4775c29 Signed-off-by: Yu jiung --- .../include/wfd-plugin-wpasupplicant.h | 1 + .../ctrl_iface_sock/wfd-plugin-wpasupplicant.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h index 2437be7..ab01996 100755 --- a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h +++ b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h @@ -170,6 +170,7 @@ #define WS_STR_JOIN " join" #define WS_STR_AUTH " auth" #define WS_STR_PERSISTENT " persistent" +#define WS_STR_PASSPHRASE " passphrase=" #define WS_STR_FREQ " freq=" #define WS_STR_FREQ_2G " freq=2" diff --git a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c index 0b7860e..0de9878 100755 --- a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c +++ b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c @@ -3491,6 +3491,7 @@ int ws_create_group(wfd_oem_group_param_s *param) ws_sock_data_s *sock = g_pd->common; char cmd[44] = {0, }; char freq_str[11] = {0, }; + char passphrase[21] = {0, }; char reply[1024]={0,}; int res = 0; @@ -3501,25 +3502,24 @@ int ws_create_group(wfd_oem_group_param_s *param) if (param->persistent) { if(param->persistent == 2) - sprintf(cmd, sizeof(cmd), WS_CMD_P2P_GROUP_ADD WS_STR_PERSISTENT "=%d", + snprintf(cmd, sizeof(cmd), WS_CMD_P2P_GROUP_ADD WS_STR_PERSISTENT "=%d", param->persistent_group_id); else snprintf(cmd, sizeof(cmd), WS_CMD_P2P_GROUP_ADD WS_STR_PERSISTENT); - } else { - if (passphrase[0] != '\0') { - - g_snprintf(cmd, sizeof(cmd), WS_CMD_P2P_GROUP_ADD " passphrase=%s", param->passphrase); - - }else{ - g_snprintf(cmd, sizeof(cmd), WS_CMD_P2P_GROUP_ADD); - } } - if (freq > 0) { + if (param->freq > 0) { g_snprintf(freq_str, sizeof(freq_str), WS_STR_FREQ "%d", param->freq); strncat(cmd, freq_str, sizeof(freq_str)); } else { +#ifndef TIZEN_WLAN_BOARD_SPRD strncat(cmd, WS_STR_FREQ_2G, 8); +#endif /* TIZEN_WLAN_BOARD_SPRD */ + } + + if (param->passphrase[0] != '\0') { + g_snprintf(passphrase, sizeof(passphrase), WS_STR_PASSPHRASE "%s", param->passphrase); + strncat(cmd, passphrase, sizeof(passphrase)); } res = _ws_send_cmd(sock->ctrl_sock, cmd, reply, sizeof(reply)); -- 2.7.4