Merge "Modify NDC commands to write to hostapd.conf"
diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index 935bf08..17e8be8 100644
--- a/softap/sdk/qsap_api.c
+++ b/softap/sdk/qsap_api.c
@@ -154,6 +154,10 @@
{ "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] = {
@@ -3230,6 +3234,7 @@
void check_for_configuration_files(void)
{
FILE * fp;
+ char *pfile;
/* Check if configuration files are present, if not create the default files */
@@ -3259,6 +3264,18 @@
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);
@@ -3272,6 +3289,18 @@
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;
}
diff --git a/softap/sdk/qsap_api.h b/softap/sdk/qsap_api.h
index cdff946..0d63b6d 100644
--- a/softap/sdk/qsap_api.h
+++ b/softap/sdk/qsap_api.h
@@ -325,6 +325,10 @@
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;