qsap: Kill more logspam

Change-Id: I0a32abbf783ffb1534051fd89708d2a49014c6c3

softap/jni/Android.mk

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

softap/sdk/Android.mk

@@ -12,10 +12,6 @@ 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,6 +54,7 @@
 
 #include "qsap_api.h"
 #include "qsap.h"
+#include "libwpa_client/wpa_ctrl.h"
 
 #include <sys/system_properties.h>
 
@@ -584,45 +585,3 @@ 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,8 +52,6 @@ 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,7 +152,6 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "setchannelrange",       NULL             },
     { "autochannel",           NULL             },
     { "ieee80211w",            NULL             },
-    { "wpa_key_mgmt",          NULL             },
 };
 
 struct Command qsap_str[eSTR_LAST] = {
@@ -1464,7 +1463,6 @@ 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;
 
@@ -1484,9 +1482,7 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
         goto error;
     }
 
-    /* response has length field + 6 bytes per STA */
+    pbuf = (s8 *)malloc((MAX_STA_ALLOWED * 6) + 8);
-    buflen = sizeof(u32) + (MAX_STA_ALLOWED * 6);
-    pbuf = (s8 *)malloc(buflen);
     if(NULL == pbuf) {
         ALOGE("%s :No memory \n", __func__);
         close(sock);
@@ -1496,7 +1492,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 = buflen;
+    wrq.u.data.length = SIZE_OF_MAC_INT * 8 + 8; /** 8 supported MAC and 7 SPACE separators and a '\0' */
     wrq.u.data.pointer = (void *)pbuf;
     wrq.u.data.flags = 0;
 
@@ -1508,14 +1504,13 @@ void qsap_get_associated_sta_mac(s8 *presp, u32 *plen)
         goto error;
     }
 
-    recvLen = *(u32 *)(wrq.u.data.pointer);
+    recvLen = *(unsigned long int *)(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(u32), recvLen, pout, &tlen);
+    qsap_mac_to_macstr(pbuf+sizeof(unsigned long int), recvLen, pout, &tlen);
 
     *plen = len + tlen;
 
@@ -1717,7 +1712,7 @@ static void qsap_get_from_config(esap_cmd_t cNum, s8 *presp, u32 *plen)
                 break;
 
         case eCMD_REGULATORY_DOMAIN:
-                qsap_read_cfg(pconffile, &cmd_list[cNum], presp, plen, NULL, GET_ENABLED_ONLY);
+                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:
@@ -2306,7 +2301,7 @@ void qsap_disassociate_sta(s8 *pVal, s8 *presp, u32 *plen)
         goto end;
     }
 
-    strlcpy(wrq.ifr_name, pif, sizeof(wrq.ifr_name));
+    strncpy(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__);
@@ -3070,7 +3065,7 @@ int qsapsetSoftap(int argc, char *argv[])
 {
     char cmdbuf[CMD_BUF_LEN];
     char respbuf[RECV_BUF_LEN];
-    u32 rlen = RECV_BUF_LEN;
+    unsigned long int rlen = RECV_BUF_LEN;
     int i;
     int hidden = 0;
     int sec = SEC_MODE_NONE;
@@ -3182,20 +3177,6 @@ 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;
@@ -3208,11 +3189,6 @@ void check_for_configuration_files(void)
         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);
     }
 
@@ -3221,11 +3197,6 @@ 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);
     }
 
@@ -3234,11 +3205,6 @@ void check_for_configuration_files(void)
         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);
     }
 

softap/sdk/qsap_api.h

@@ -77,8 +77,7 @@ 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
@@ -324,7 +323,6 @@ typedef enum esap_cmd {
     eCMD_SET_CHANNEL_RANGE   = 62,
     eCMD_GET_AUTO_CHANNEL    = 63,
     eCMD_IEEE80211W          = 64,
-    eCMD_WPA_KEY_MGMT        = 65,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;