softap: sdk: Add 'vendor.' prefix to wlan.driver.config

* In 126af66b04,
  the prop wlan.driver.config was renamed to vendor.wlan.driver.config.
  Therefore, make the same change on softap as well.

Change-Id: I696d851c8ecd35ec42cf680149c402b3b8044cfc

softap/sdk/Android.mk

@@ -16,7 +16,7 @@ endif
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
-LOCAL_LDLIBS := -llog
+LOCAL_USE_VNDK := true
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/qsap_api.h \
                                $(LOCAL_PATH)/qsap.h
@@ -61,12 +61,23 @@ ifdef WIFI_DRIVER_DEF_CONF_FILE
 LOCAL_CFLAGS += -DWIFI_DRIVER_DEF_CONF_FILE=\"$(WIFI_DRIVER_DEF_CONF_FILE)\"
 endif
 
+LOCAL_CFLAGS += \
+    -Wall \
+    -Werror \
+    -Wno-unused-variable \
+    -Wno-unused-value \
+    -Wno-format \
+    -Wno-sometimes-uninitialized \
+    -Wno-enum-conversion \
+    -Wno-unused-parameter \
+    -Wno-implicit-function-declaration
+
 LOCAL_SRC_FILES := qsap_api.c \
                    qsap.c
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl
+LOCAL_SHARED_LIBRARIES := libnetutils libutils libbinder libcutils libhardware_legacy libnl liblog
 
 LOCAL_HEADER_LIBRARIES := libcutils_headers
 

softap/sdk/qsap_api.c

@@ -90,7 +90,8 @@ s8 *Cmd_req[eCMD_REQ_LAST] = {
   */
 s8 *Conf_req[CONF_REQ_LAST] = {
     "dual2g",
-    "dual5g"
+    "dual5g",
+    "owe"
 };
 
 /*
@@ -185,6 +186,8 @@ static struct Command cmd_list[eCMD_LAST] = {
     { "wowlan_triggers",       "any"            },
     { "accept_mac_file",       NULL             },
     { "deny_mac_file",         NULL             },
+    { "owe_transition_ifname", NULL             },
+    { "sae_require_mfp",       NULL             },
 
 };
 
@@ -1916,6 +1919,7 @@ static esap_cmd_t qsap_get_cmd_num(s8 *cName)
 
     for(i=0; i<eCMD_LAST; i++)     {
         len = strlen(cmd_list[i].name);
+
         if(!strncmp(cmd_list[i].name, cName, len)) {
             if((cName[len] == '=') || (cName[len] == '\0'))
                 return i;
@@ -2598,6 +2602,9 @@ static void qsap_handle_set_request(s8 *pcmd, s8 *presp, u32 *plen)
     } else if (!(strncmp(pcmd, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
            pcmd += strlen(Conf_req[CONF_5g]);
            SKIP_BLANK_SPACE(pcmd);
+    } else if (!(strncmp(pcmd, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
+           pcmd += strlen(Conf_req[CONF_owe]);
+           SKIP_BLANK_SPACE(pcmd);
     } else {
 	    // DO NOTHING
     }
@@ -3172,6 +3179,8 @@ void qsap_hostd_exec_cmd(s8 *pcmd, s8 *presp, u32 *plen)
            pconffile = CONFIG_FILE_2G;
        } else if (!(strncmp(pcmd+4, Conf_req[CONF_5g], strlen(Conf_req[CONF_5g])))) {
            pconffile = CONFIG_FILE_5G;
+       } else if (!(strncmp(pcmd+4, Conf_req[CONF_owe], strlen(Conf_req[CONF_owe])))) {
+           pconffile = CONFIG_FILE_OWE;
        } else {
            pconffile = CONFIG_FILE;
        }
@@ -3231,7 +3240,9 @@ int qsapsetSoftap(int argc, char *argv[])
     }
 
     // check if 2nd arg is dual2g/dual5g
-    if (argc > 2 && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0)) {
+    if (argc > 2
+         && (strncmp(argv[2], Conf_req[CONF_2g], 4) == 0
+             || strncmp(argv[2], Conf_req[CONF_owe], 3) == 0)) {
             snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
             offset = 1;
             argc--;
@@ -3439,7 +3450,7 @@ void check_for_configuration_files(void)
 
 void qsap_set_ini_filename(void)
 {
-    if (property_get("wlan.driver.config", ini_file, NULL)) {
+    if (property_get("vendor.wlan.driver.config", ini_file, NULL)) {
         fIni = ini_file;
         ALOGE("INI FILE PROP PRESENT %s\n", fIni);
     } else

softap/sdk/qsap_api.h

@@ -92,20 +92,23 @@ enum error_val {
 #define CONFIG_FILE_2G "/data/vendor/wifi/hostapd/hostapd_dual2g.conf"
 #define CONFIG_FILE_5G "/data/vendor/wifi/hostapd/hostapd_dual5g.conf"
 
+/** Configuration file name for OWE-transition */
+#define CONFIG_FILE_OWE "/data/vendor/wifi/hostapd/hostapd_owe.conf"
+
 /** Configuration file name */
 #define CONFIG_FILE "/data/vendor/wifi/hostapd/hostapd.conf"
 
 /** Default configuration file path */
-#define DEFAULT_CONFIG_FILE_PATH "/system/etc/hostapd/hostapd_default.conf"
+#define DEFAULT_CONFIG_FILE_PATH "/vendor/etc/hostapd/hostapd_default.conf"
 
 /** Default Accept list file name */
-#define DEFAULT_ACCEPT_LIST_FILE_PATH "/system/etc/hostapd/hostapd.accept"
+#define DEFAULT_ACCEPT_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.accept"
 
 /** Accept list file name */
 #define ACCEPT_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.accept"
 
 /** Default Deny list file name */
-#define DEFAULT_DENY_LIST_FILE_PATH "/system/etc/hostapd/hostapd.deny"
+#define DEFAULT_DENY_LIST_FILE_PATH "/vendor/etc/hostapd/hostapd.deny"
 
 /** Deny list file name */
 #define DENY_LIST_FILE "/data/vendor/wifi/hostapd/hostapd.deny"
@@ -252,6 +255,7 @@ enum eCmd_req {
 enum eConf_req {
     CONF_2g = 0,
     CONF_5g = 1,
+    CONF_owe = 2,
 
     CONF_REQ_LAST
 };
@@ -354,6 +358,8 @@ typedef enum esap_cmd {
     eCMD_WOWLAN_TRIGGERS     = 80,
     eCMD_ACCEPT_MAC_FILE     = 81,
     eCMD_DENY_MAC_FILE       = 82,
+    eCMD_OWE_TRANS_IFNAME    = 83,
+    eCMD_SAE_REQUIRE_MPF     = 84,
 
     eCMD_LAST     /** New command numbers should be added above this */
 } esap_cmd_t;