softap: Fix for VNDK_VERSION=current

Change-Id: I3925e794f5c065bd2843a4ea4c9fe122c182d5b3

softap/sdk/Android.mk

@@ -12,6 +12,8 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
+LOCAL_USE_VNDK := true
+
 LOCAL_COPY_HEADERS_TO := sdk/softap/include
 LOCAL_COPY_HEADERS := qsap_api.h
 LOCAL_COPY_HEADERS += qsap.h
@@ -63,5 +65,7 @@ LOCAL_PRELINK_MODULE := false
 
 LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl liblog
 
+LOCAL_VENDOR_MODULE := true
+
 include $(BUILD_SHARED_LIBRARY)
 

softap/sdk/qsap.c

@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sched.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -46,11 +47,11 @@
 
 #define LOG_TAG "QCLDR-"
 
-#include "cutils/log.h"
+#include "log/log.h"
 #include "cutils/memory.h"
 #include "cutils/misc.h"
 #include "cutils/properties.h"
-#include "private/android_filesystem_config.h"
+#include "cutils/android_filesystem_config.h"
 
 #include "qsap_api.h"
 #include "qsap.h"

softap/sdk/qsap_api.c

@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <private/android_filesystem_config.h>
+#include <cutils/android_filesystem_config.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netlink/netlink.h>
@@ -260,6 +260,9 @@ static s32 qsap_read_cfg(s8 *pfile, struct Command * pcmd, s8 *presp, u32 *plen,
     while(NULL != fgets(buf, MAX_CONF_LINE_LEN, fcfg)) {
         s8 *pline = buf;
 
+        if (strlen(buf) == 0)
+           continue;
+
         /** Skip the commented lines */
         if(buf[0] == '#') {
             if (ignore_comment) {
@@ -2544,7 +2547,7 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
     pVal = pcmd + strlen(cmd_list[cNum].name);
     if( (cNum != eCMD_COMMIT) &&
         (cNum != eCMD_RESET_TO_DEFAULT) &&
-        ((*pVal != '=') || (strlen(pVal) < 2)) ) {
+        ((*pVal != '=') || (((eCMD_PASSPHRASE != cNum)) && (strlen(pVal) < 2)))) {
         *plen = qsap_scnprintf(presp, *plen, "%s", ERR_INVALID_ARG);
         return;
     }
@@ -3157,7 +3160,7 @@ int qsapsetSoftap(int argc, char *argv[])
     int i;
     int hidden = 0;
     int sec = SEC_MODE_NONE;
-    char setCmd[SET_BUF_LEN];
+    char setCmd[SET_BUF_LEN] = "set";
     int offset = 0;
 
     ALOGD("%s, %s, %s, %d\n", __FUNCTION__, argv[0], argv[1], argc);
@@ -3167,16 +3170,10 @@ int qsapsetSoftap(int argc, char *argv[])
     }
 
     // check if 2nd arg is dual2g/dual5g
-    if (argc > 2) {
+    if (argc > 2 && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0)) {
-        // just match 'dual'
-        if (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0) {
             snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
             offset = 1;
             argc--;
-        } else {
-            snprintf(setCmd, SET_BUF_LEN, "set");
-            offset = 0;
-        }
     }
 
     /* set interface */

softap/sdk/qsap_api.h

@@ -509,7 +509,7 @@ typedef struct sap_auto_channel_info {
 #define IS_VALID_BSSID(x) (((value == ENABLE) || (value == DISABLE)) ? TRUE: FALSE)
 
 /** Validate the length of the passphrase */
-#define IS_VALID_PASSPHRASE_LEN(x) (((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) ? TRUE: FALSE)
+#define IS_VALID_PASSPHRASE_LEN(x) ((((x >= PASSPHRASE_MIN) && (x <= PASSPHRASE_MAX)) || (x == 0)) ? TRUE: FALSE)
 
 /** Validate the beacon interval */
 #define IS_VALID_BEACON(x) (((x >= BCN_INTERVAL_MIN) && (x <= BCN_INTERVAL_MAX)) ? TRUE: FALSE)