psmattas/android_system_qcom-lineage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'LA.UM.6.4.r1-05900-8x98.0' of https://source.codeaurora.org/quic/la/platform/system/qcom into HEAD

Browse Source 
"LA.UM.6.4.r1-05900-8x98.0"
This commit is contained in:
Michael Bestas
2018-01-17 17:07:19 +02:00
parent d55eb82100 4d42a1d281
commit a0d762d22f
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
softap/sdk/qsap_api.c Executable file → Normal file
View File

@@ -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)) { while(NULL != fgets(buf, MAX_CONF_LINE_LEN, fcfg)) {
s8 *pline = buf; s8 *pline = buf;
if (strlen(buf) == 0)
continue;
/** Skip the commented lines */ /** Skip the commented lines */
if(buf[0] == '#') { if(buf[0] == '#') {
if (ignore_comment) { 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); pVal = pcmd + strlen(cmd_list[cNum].name);
if( (cNum != eCMD_COMMIT) && if( (cNum != eCMD_COMMIT) &&
(cNum != eCMD_RESET_TO_DEFAULT) && (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); *plen = qsap_scnprintf(presp, *plen, "%s", ERR_INVALID_ARG);
return; return;
} }
@@ -3157,7 +3160,7 @@ int qsapsetSoftap(int argc, char *argv[])
int i; int i;
int hidden = 0; int hidden = 0;
int sec = SEC_MODE_NONE; int sec = SEC_MODE_NONE;
char setCmd[SET_BUF_LEN]; char setCmd[SET_BUF_LEN] = "set";
int offset = 0; int offset = 0;
ALOGD("%s, %s, %s, %d\n", __FUNCTION__, argv[0], argv[1], argc); 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 // 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]); snprintf(setCmd, SET_BUF_LEN, "set %s", argv[2]);
offset = 1; offset = 1;
argc--; argc--;
} else {
snprintf(setCmd, SET_BUF_LEN, "set");
offset = 0;
}
} }
/* set interface */ /* set interface */

2
softap/sdk/qsap_api.h Executable file → Normal file
View File

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