Merge branch 'LA.BF64.1.2.2_rb4.1' of git://codeaurora.org/platform/system/qcom into caf-merge

This commit provides read/write access on accept/deny files
to hostapd similar to hostapd.conf.

Change-Id: I1c3cda056a4067d48484cb336e748f04804b68e3
CRs-fixed: 910398

softap/jni/Android.mk

@@ -11,10 +11,10 @@ LOCAL_MODULE := libQWiFiSoftApCfg
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) \
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
                     $(JNI_H_INCLUDE)
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SHARED_LIBRARIES := libsysutils libcutils libnetutils libcrypto
 
 include $(BUILD_SHARED_LIBRARY)
-

softap/jni/QWiFiSoftApCfg.c

@@ -319,7 +319,7 @@ JNIEXPORT jstring JNICALL
     char       code[32] = {0};
     int        connect_retry;
 
-    strncpy(cmd, "softap qccmd ", sizeof(cmd));
+    strlcpy(cmd, "softap qccmd ", sizeof(cmd));
 
     pcmd = (char *) ((*env)->GetStringUTFChars(env, jcmd, NULL));
 
@@ -330,12 +330,12 @@ JNIEXPORT jstring JNICALL
 
     ALOGD("Received Command: %s\n", pcmd);
 
-    if ((strlen(cmd) + strlen(pcmd)) > sizeof(cmd)) {
+    if ((strlen(cmd) + strlen(pcmd)) >= sizeof(cmd)) {
         UPDATE_ERROR_CODE("Command length is larger than MAX_CMD_SIZE", "");
         goto end;
     }
 
-    strcat(cmd, pcmd);
+    strlcat(cmd, pcmd, sizeof(cmd));
 
     connect_retry = 0;
 

softap/sdk/Android.mk

@@ -12,6 +12,10 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
+LOCAL_COPY_HEADERS_TO := sdk/softap/include
+LOCAL_COPY_HEADERS := qsap_api.h
+LOCAL_COPY_HEADERS += qsap.h
+
 ifdef WIFI_DRIVER_MODULE_PATH
 LOCAL_CFLAGS += -DWIFI_DRIVER_MODULE_PATH=\"$(WIFI_DRIVER_MODULE_PATH)\"
 endif

softap/sdk/qsap.c

@@ -54,7 +54,6 @@
 
 #include "qsap_api.h"
 #include "qsap.h"
-#include "libwpa_client/wpa_ctrl.h"
 
 #include <sys/system_properties.h>
 
@@ -585,3 +584,45 @@ s32 wifi_qsap_reload_softap()
 
     return eSUCCESS;
 }
+
+s32 wifi_qsap_set_tx_power(s32 tx_power)
+{
+#define QCSAP_IOCTL_SET_MAX_TX_POWER   (SIOCIWFIRSTPRIV + 22)
+    s32 sock;
+    s32 ret = eERR_SET_TX_POWER;
+    s8  interface[128];
+    s8  *iface;
+    s32 len = 128;
+    struct iwreq wrq;
+
+    if(NULL == (iface = qsap_get_config_value(CONFIG_FILE, &qsap_str[STR_INTERFACE], interface, (u32*)&len))) {
+        ALOGE("%s :interface error \n", __func__);
+        return ret;
+    }
+
+    /* Issue QCSAP_IOCTL_SET_MAX_TX_POWER ioctl */
+    sock = socket(AF_INET, SOCK_DGRAM, 0);
+
+    if (sock < 0) {
+        ALOGE("%s :socket error \n", __func__);
+        return eERR_SET_TX_POWER;
+    }
+
+    strlcpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
+    wrq.u.data.length = sizeof(s32);
+    wrq.u.data.pointer = &tx_power;
+    wrq.u.data.flags = 0;
+
+    ret = ioctl(sock, QCSAP_IOCTL_SET_MAX_TX_POWER, &wrq);
+    close(sock);
+
+    if (ret) {
+        ALOGE("%s :IOCTL set tx power failed: %ld\n", __func__, ret);
+        ret = eERR_SET_TX_POWER;
+    } else {
+        ALOGD("%s :IOCTL set tx power issued\n", __func__);
+        ret = eSUCCESS;
+    }
+
+    return ret;
+}

softap/sdk/qsap.h

@@ -52,6 +52,8 @@ s32 wifi_qsap_start_softap_in_concurrency(void);
 s32 wifi_qsap_stop_softap_in_concurrency(void);
 #endif
 
+s32 wifi_qsap_set_tx_power(s32);
+
 #if __cplusplus
 };  // extern "C"
 #endif

softap/sdk/qsap_api.c

@@ -152,6 +152,12 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "setchannelrange",       NULL             },
     { "autochannel",           NULL             },
     { "ieee80211w",            NULL             },
+    { "wpa_key_mgmt",          NULL             },
+    { "max_num_sta",           "8"              },
+    { "ieee80211ac",           NULL             },
+    { "vht_oper_chwidth",      NULL             },
+    { "chanlist",              NULL             },
+    { "ht_capab",              NULL             },
 };
 
 struct Command qsap_str[eSTR_LAST] = {
@@ -704,6 +710,40 @@ static s8 *qsap_get_allow_deny_file_name(s8 *pcfgfile, struct Command * pcmd, s8
     return NULL;
 }
 
+int qsap_hostd_exec(int argc, char ** argv)  {
+
+#define MAX_CMD_SIZE 256
+    char qcCmdBuf[MAX_CMD_SIZE], *pCmdBuf;
+    u32 len = MAX_CMD_SIZE;
+    int i = 2, ret;
+
+    if ( argc < 4 ) {
+        ALOGD("failure: invalid arguments");
+        return -1;
+    }
+
+    argc -= 2;
+    pCmdBuf = qcCmdBuf;
+
+    while (argc--) {
+        ret = snprintf(pCmdBuf, len, " %s", argv[i]);
+        if ((ret < 0) || (ret >= (int)len)) {
+            /* Error case */
+            /* TODO: Command too long send the error message */
+            *pCmdBuf = '\0';
+             break;
+        }
+        ALOGD("argv[%d] (%s)",i, argv[i]);
+        pCmdBuf += ret;
+        len -= ret;
+        i++;
+    }
+
+    ALOGD("QCCMD data (%s)", pCmdBuf);
+    len = MAX_CMD_SIZE;
+    qsap_hostd_exec_cmd(qcCmdBuf, qcCmdBuf, (u32*)&len);
+    return 0;
+}
 /** Function to identify a valid MAC address */
 static int isValid_MAC_address(char *pMac)
 {
@@ -1463,6 +1503,7 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
     u32 len = MAX_CONF_LINE_LEN;
     s8 *pif;
     s8 *pbuf, *pout;
+    u32 buflen;
     u32 recvLen;
     u32 tlen;
 
@@ -1482,7 +1523,9 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
         goto error;
     }
 
-    pbuf = (s8 *)malloc((MAX_STA_ALLOWED * 6) + 8);
+    /* response has length field + 6 bytes per STA */
+    buflen = sizeof(u32) + (MAX_STA_ALLOWED * 6);
+    pbuf = (s8 *)malloc(buflen);
     if(NULL == pbuf) {
         ALOGE("%s :No memory \n", __func__);
         close(sock);
@@ -1492,7 +1535,7 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
 
 #define SIZE_OF_MAC_INT   (6)
     strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
-    wrq.u.data.length = SIZE_OF_MAC_INT * 8 + 8; /** 8 supported MAC and 7 SPACE separators and a '\0' */
+    wrq.u.data.length = buflen;
     wrq.u.data.pointer = (void *)pbuf;
     wrq.u.data.flags = 0;
 
@@ -1504,13 +1547,14 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
         goto error;
     }
 
-    recvLen = *(unsigned long int *)(wrq.u.data.pointer);
+    recvLen = *(u32 *)(wrq.u.data.pointer);
+    recvLen -= sizeof(u32);
 
     len = qsap_scnprintf(presp, *plen, "%s %s=", SUCCESS, cmd_list[eCMD_ASSOC_STA_MACS].name);
     pout = presp + len;
     tlen = *plen - len;
 
-    qsap_mac_to_macstr(pbuf+sizeof(unsigned long int), recvLen, pout, &tlen);
+    qsap_mac_to_macstr(pbuf+sizeof(u32), recvLen, pout, &tlen);
 
     *plen = len + tlen;
 
@@ -1708,15 +1752,9 @@ static void qsap_get_from_config(esap_cmd_t cNum, s8 *presp, u32 *plen)
                 break;
 
         case eCMD_FRAG_THRESHOLD:
-                qsap_read_cfg(fIni, &qsap_str[STR_FRAG_THRESHOLD_IN_INI], presp, plen, cmd_list[eCMD_FRAG_THRESHOLD].name, GET_ENABLED_ONLY);
-                break;
-
         case eCMD_REGULATORY_DOMAIN:
-                qsap_read_cfg(fIni, &qsap_str[STR_802DOT11D_IN_INI], presp, plen, cmd_list[eCMD_REGULATORY_DOMAIN].name, GET_ENABLED_ONLY);
-                break;
-
         case eCMD_RTS_THRESHOLD:
-                qsap_read_cfg(fIni, &qsap_str[STR_RTS_THRESHOLD_IN_INI], presp, plen, cmd_list[eCMD_RTS_THRESHOLD].name, GET_ENABLED_ONLY);
+                qsap_read_cfg(pconffile, &cmd_list[cNum], presp, plen, NULL, GET_ENABLED_ONLY);
                 break;
 
         case eCMD_ALLOW_LIST: /* fall through */
@@ -1735,7 +1773,7 @@ static void qsap_get_from_config(esap_cmd_t cNum, s8 *presp, u32 *plen)
                 break;
 
         case eCMD_WMM_STATE:
-                qsap_read_cfg(fIni, &qsap_str[STR_WMM_IN_INI], presp, plen, cmd_list[eCMD_WMM_STATE].name, GET_ENABLED_ONLY);
+                qsap_read_cfg(pconffile, &cmd_list[cNum], presp, plen, NULL, GET_ENABLED_ONLY);
                 break;
 
         case eCMD_WPS_STATE:
@@ -2301,7 +2339,7 @@ void qsap_disassociate_sta(s8 *pVal, s8 *presp, u32 *plen)
         goto end;
     }
 
-    strncpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
+    strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
 
     if (TRUE != qsap_get_mac_in_bytes(pVal, (char *) &wrq.u)) {
         ALOGE("%s: Invalid input \n", __func__);
@@ -2605,6 +2643,9 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
                 goto error;
             break;
 
+        case eCMD_SET_MAX_CLIENTS:
+            value = strlen(pVal);
+            break;
         case eCMD_BSSID:
             value = atoi(pVal);
             if(FALSE == IS_VALID_BSSID(value))
@@ -2867,8 +2908,6 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
                 goto error;
 
             qsap_scnprintf(pVal, strlen(pVal)+1, "%ld", value);
-            cNum = STR_WMM_IN_INI;
-            ini = INI_CONF_FILE;
             break;
         case eCMD_WPS_STATE:
             value = atoi(pVal);
@@ -2899,9 +2938,6 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
             if(TRUE != IS_VALID_FRAG_THRESHOLD(value))
                 goto error;
             qsap_scnprintf(pVal, strlen(pVal)+1, "%ld", value);
-
-            cNum = STR_FRAG_THRESHOLD_IN_INI;
-            ini = INI_CONF_FILE;
             break;
 
         case eCMD_REGULATORY_DOMAIN:
@@ -2918,8 +2954,6 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
             if(TRUE != IS_VALID_RTS_THRESHOLD(value))
                 goto error;
             qsap_scnprintf(pVal, strlen(pVal)+1, "%ld", value);
-            cNum = STR_RTS_THRESHOLD_IN_INI;
-            ini = INI_CONF_FILE;
             break;
 
         case eCMD_GTK_TIMEOUT:
@@ -2933,7 +2967,6 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
             value = atoi(pVal);
             if(TRUE != IS_VALID_TX_POWER(value))
                 goto error;
-            qsap_set_ini_filename();
             qsap_scnprintf(pVal, strlen(pVal)+1, "%ld", value);
             cNum = STR_TX_POWER_IN_INI;
             ini = INI_CONF_FILE;
@@ -3028,6 +3061,8 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
     SKIP_BLANK_SPACE(pcmd);
 
     check_for_configuration_files();
+    if(fIni == NULL)
+        qsap_set_ini_filename();
 
     if(!strncmp(pcmd, Cmd_req[eCMD_GET], strlen(Cmd_req[eCMD_GET])) && isblank(pcmd[strlen(Cmd_req[eCMD_GET])])) {
         qsap_handle_get_request(pcmd, presp, plen);
@@ -3065,7 +3100,7 @@ int qsapsetSoftap(int argc, char *argv[])
 {
     char cmdbuf[CMD_BUF_LEN];
     char respbuf[RECV_BUF_LEN];
-    unsigned long int rlen = RECV_BUF_LEN;
+    u32 rlen = RECV_BUF_LEN;
     int i;
     int hidden = 0;
     int sec = SEC_MODE_NONE;
@@ -3163,6 +3198,16 @@ int qsapsetSoftap(int argc, char *argv[])
         return -1;
     }
 
+    rlen = RECV_BUF_LEN;
+    if(argc > 8) {
+        qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set max_num_sta=%d",atoi(argv[8]));
+    }
+    (void) qsap_hostd_exec_cmd(cmdbuf, respbuf, &rlen);
+
+    if(strncmp("success", respbuf, rlen) != 0) {
+        ALOGE("Failed to set maximun client connections number \n");
+        return -1;
+    }
     rlen = RECV_BUF_LEN;
 
     qsap_scnprintf(cmdbuf, sizeof(cmdbuf), "set commit");
@@ -3177,18 +3222,37 @@ int qsapsetSoftap(int argc, char *argv[])
     return 0;
 }
 
+
+static int check_for_config_file_size(FILE *fp)
+{
+   int length = 0;
+
+   if( NULL != fp )
+   {
+      fseek(fp, 0L, SEEK_END);
+      length = ftell(fp);
+   }
+
+   return length;
+}
+
 void check_for_configuration_files(void)
 {
     FILE * fp;
+    char *pfile;
 
     /* Check if configuration files are present, if not create the default files */
-    mkdir("/data/hostapd", 0771);
 
     /* If configuration file does not exist copy the default file */
     if ( NULL == (fp = fopen(CONFIG_FILE, "r")) ) {
         wifi_qsap_reset_to_default(CONFIG_FILE, DEFAULT_CONFIG_FILE_PATH);
     }
     else {
+
+        /* The configuration file could be of 0 byte size, replace with default */
+        if (check_for_config_file_size(fp) <= 0)
+            wifi_qsap_reset_to_default(CONFIG_FILE, DEFAULT_CONFIG_FILE_PATH);
+
         fclose(fp);
     }
 
@@ -3197,17 +3261,51 @@ void check_for_configuration_files(void)
         wifi_qsap_reset_to_default(ACCEPT_LIST_FILE, DEFAULT_ACCEPT_LIST_FILE_PATH);
     }
     else {
+
+        /* The configuration file could be of 0 byte size, replace with default */
+        if (check_for_config_file_size(fp) <= 0)
+            wifi_qsap_reset_to_default(ACCEPT_LIST_FILE, DEFAULT_ACCEPT_LIST_FILE_PATH);
+
         fclose(fp);
     }
 
+    /* Provide read and write permissions to the owner */
+    pfile = ACCEPT_LIST_FILE;
+    if (chmod(pfile, 0660) < 0) {
+        ALOGE("Error changing permissions of %s to 0660: %s",
+                pfile, strerror(errno));
+    }
+
+    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
+        ALOGE("Error changing group ownership of %s to %d: %s",
+                pfile, AID_WIFI, strerror(errno));
+    }
+
     /* If deny MAC list file does not exist, copy the default file */
     if ( NULL == (fp = fopen(DENY_LIST_FILE, "r")) ) {
         wifi_qsap_reset_to_default(DENY_LIST_FILE, DEFAULT_DENY_LIST_FILE_PATH);
     }
     else {
+
+        /* The configuration file could be of 0 byte size, replace with default */
+        if (check_for_config_file_size(fp) <= 0)
+            wifi_qsap_reset_to_default(DENY_LIST_FILE, DEFAULT_DENY_LIST_FILE_PATH);
+
         fclose(fp);
     }
 
+    /* Provide read and write permissions to the owner */
+    pfile = DENY_LIST_FILE;
+    if (chmod(pfile, 0660) < 0) {
+        ALOGE("Error changing permissions of %s to 0660: %s",
+                pfile, strerror(errno));
+    }
+
+    if (chown(pfile, AID_SYSTEM, AID_WIFI) < 0) {
+        ALOGE("Error changing group ownership of %s to %d: %s",
+                pfile, AID_WIFI, strerror(errno));
+    }
+
     return;
 }
 

softap/sdk/qsap_api.h

@@ -39,8 +39,8 @@ typedef unsigned char      u8;
 typedef char               s8;
 typedef unsigned short int u16;
 typedef signed short int   s16;
-typedef unsigned long int  u32;
-typedef signed long int    s32;
+typedef unsigned int       u32;
+typedef signed int         s32;
 
 /** Success and error messages */
 #define SUCCESS                     "success"
@@ -77,7 +77,8 @@ enum error_val {
     eERR_LOAD_FAILED_SDIOIF,
     eERR_LOAD_FAILED_SOFTAP,
     eERR_SET_CHAN_RANGE,
-    eERR_GET_AUTO_CHAN
+    eERR_GET_AUTO_CHAN,
+    eERR_SET_TX_POWER
 };
 
 #ifndef WIFI_DRIVER_CONF_FILE
@@ -323,6 +324,12 @@ typedef enum esap_cmd {
     eCMD_SET_CHANNEL_RANGE   = 62,
     eCMD_GET_AUTO_CHANNEL    = 63,
     eCMD_IEEE80211W          = 64,
+    eCMD_WPA_KEY_MGMT        = 65,
+    eCMD_SET_MAX_CLIENTS     = 66,
+    eCMD_IEEE80211AC         = 67,
+    eCMD_VHT_OPER_CH_WIDTH   = 68,
+    eCMD_ACS_CHAN_LIST       = 69,
+    eCMD_HT_CAPAB            = 70,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;
@@ -575,6 +582,7 @@ typedef struct sap_auto_channel_info {
 #define IS_VALID_ENERGY_DETECT_TH(x) ((((x >= AP_ENERGY_DETECT_TH_MIN) && (x <= AP_ENERGY_DETECT_TH_MAX)) ||( x == 128)) ? TRUE : FALSE)
 
 /** Function declartion */
+int qsap_hostd_exec(int argc, char ** argv);
 void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen);
 s8 *qsap_get_config_value(s8 *pfile, struct Command *pcmd, s8 *pbuf, u32 *plen);
 int qsapsetSoftap(int argc, char *argv[]);