Implement wifi_qsap_set_tx_power

Used by radio proprietary binaries from Motorola.

Change-Id: I9fd49cbba6001a4c7ddadf5cb88df06d6146f01a

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/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>
 
@@ -266,12 +265,12 @@ void qsap_send_module_down_indication(void)
 
      /* Equivalent to: iwpriv wlan0 sendModuleInd */
      if ((s = socket(PF_INET, SOCK_DGRAM, 0)) >= 0) {
-        strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
+        strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
         wrq.u.data.length = 0; /* No Set arguments */
         wrq.u.mode = 5; /* WE_MODULE_DOWN_IND sub-command */
         ret = ioctl(s, (SIOCIWFIRSTPRIV + 1), &wrq);
         if (ret < 0 ) {
-            strncpy(wrq.ifr_name, "softap.0", IFNAMSIZ);
+            strlcpy(wrq.ifr_name, "softap.0", IFNAMSIZ);
             ret = ioctl(s, (SIOCIWFIRSTPRIV + 1), &wrq);
             if (ret < 0 ) {
                ALOGE("ioctl failed: %s", strerror(errno));
@@ -295,7 +294,7 @@ s32 qsap_send_init_ap(void)
 
      /* Equivalent to: iwpriv wlan0 initAP */
      if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
-        strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
+        strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
         wrq.u.data.length = 0; /* No Set arguments */
         wrq.u.data.flags = 2; /* WE_INIT_AP sub-command */
         ret = ioctl(s, (SIOCIWFIRSTPRIV + 6), &wrq);
@@ -323,7 +322,7 @@ s32 qsap_send_exit_ap(void)
 
      /* Equivalent to: iwpriv wlan0 exitAP */
      if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
-        strncpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
+        strlcpy(wrq.ifr_name, "wlan0", IFNAMSIZ);
         wrq.u.data.length = 0; /* No Set arguments */
         wrq.u.data.flags = 3;  /*WE_EXIT_AP sub-command */
 
@@ -409,7 +408,7 @@ s32 wifi_qsap_stop_bss(void)
         return eERR_STOP_BSS;
     }
 
-    strncpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
+    strlcpy(wrq.ifr_name, iface, sizeof(wrq.ifr_name));
     wrq.u.data.length = sizeof(cmd);
     wrq.u.data.pointer = cmd;
     wrq.u.data.flags = 0;
@@ -434,26 +433,22 @@ s32 wifi_qsap_stop_bss(void)
 
 s32 is_softap_enabled(void)
 {
-    FILE *fp;
+    s32 mode = 0;
-    char buf[1024];
+    int ret;
 
-    fp = popen("ps", "r");
+    ret = qsap_get_mode(&mode);
-    if (fp == NULL) {
+    if (eSUCCESS != ret) {
-       ALOGE("Failed to open file");
+       ALOGD("Failed to get the mode of operation\n");
        return eERR_UNKNOWN;
     }
 
-    while (fgets(buf, sizeof(buf)-1, fp) != NULL) {
+    if (mode == IW_MODE_MASTER) {
-       if(NULL !=(strstr(buf,"hostapd")))
+       ALOGD("HOSTAPD Enabled\n");
-       {
+       return ENABLE;
-           pclose(fp);
-           ALOGD("HOSTAPD enabled\n");
-           return ENABLE;
-       }
     }
 
-    ALOGD("HOSTAPD disabled\n");
+    ALOGD("HOSTAPD Disabled\n");
-    pclose(fp);
+
     return DISABLE;
 }
 
@@ -589,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.h

@@ -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
@@ -98,19 +99,19 @@ enum error_val {
 #define DEFAULT_ACCEPT_LIST_FILE_PATH "/system/etc/hostapd/hostapd.accept"
 
 /** Accept list file name */
-#define ACCEPT_LIST_FILE "/data/hostapd/hostapd.accept"
+#define ACCEPT_LIST_FILE "/data/misc/wifi/hostapd.accept"
 
 /** Default Deny list file name */
 #define DEFAULT_DENY_LIST_FILE_PATH "/system/etc/hostapd/hostapd.deny"
 
 /** Deny list file name */
-#define DENY_LIST_FILE "/data/hostapd/hostapd.deny"
+#define DENY_LIST_FILE "/data/misc/wifi/hostapd.deny"
 
 /** Default Ini file */
 #define DEFAULT_INI_FILE "/persist/qcom/softap/qcom_cfg_default.ini"
 
 /** SDK control interface path */
-#define SDK_CTRL_IF "/data/hostapd/softap_sdk_ctrl"
+#define SDK_CTRL_IF "/data/misc/wifi/softap_sdk_ctrl"
 
 /** Maximum length of the line in the configuration file */
 #define MAX_CONF_LINE_LEN  (156)
@@ -323,6 +324,7 @@ 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;
@@ -584,6 +586,7 @@ void check_for_configuration_files(void);
 void qsap_set_ini_filename(void);
 int qsap_set_channel_range(s8 * cmd);
 int qsap_get_sap_auto_channel_slection(s32 *pautochan);
+int qsap_get_mode(s32 *pmode);
 
 #if __cplusplus
 };  // extern "C"