userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduced memory allocate for variable value, handle errors in wifi scan

Browse Source 
api function
This commit is contained in:
Bogdan Pilyugin 2023-08-15 13:39:51 +02:00
parent 16386dc07a
commit e815020210
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SystemApplication.h
View File

@ -32,7 +32,7 @@
#define EXPECTED_MAX_DATA_RESPONSE_SIZE (4096) #define EXPECTED_MAX_DATA_RESPONSE_SIZE (4096)
#define VAR_MAX_NAME_LENGTH MAX_DYNVAR_NAME_LENGTH #define VAR_MAX_NAME_LENGTH MAX_DYNVAR_NAME_LENGTH
#define VAR_MAX_VALUE_LENGTH (2048) #define VAR_MAX_VALUE_LENGTH (1024)
typedef enum typedef enum
{ {

25
src/RestApiHandler.c
View File

@ -140,22 +140,6 @@ static void funct_wifiscanres(char *argres, int rw)
{ {
int arg = atoi(argres); int arg = atoi(argres);
wifi_ap_record_t *Rec; wifi_ap_record_t *Rec;
/*
char onerec[64];
strcpy(argres, "[");
for (int i = 0; i < arg; i++)
{
Rec = GetWiFiAPRecord(i);
if (!Rec)
return;
snprintf(onerec, MAX_DYNVAR_LENGTH, "{\"ssid\":\"%s\",\"rssi\":%i,\"ch\":%d}", Rec->ssid, Rec->rssi,
Rec->primary);
strcat(argres, onerec);
if (i < arg - 1)
strcat(argres, ",");
}
strcat(argres, "]");
*/
struct jWriteControl jwc; struct jWriteControl jwc;
jwOpen(&jwc, argres, VAR_MAX_VALUE_LENGTH, JW_ARRAY, JW_COMPACT); jwOpen(&jwc, argres, VAR_MAX_VALUE_LENGTH, JW_ARRAY, JW_COMPACT);
for (int i = 0; i < arg; i++) for (int i = 0; i < arg; i++)
@ -170,8 +154,13 @@ static void funct_wifiscanres(char *argres, int rw)
jwEnd(&jwc); jwEnd(&jwc);
} }
} }
jwClose(&jwc); int err = jwClose(&jwc);
if (err == JWRITE_OK)
return;
if(err > JWRITE_BUF_FULL )
strcpy(argres, "\"SYS_ERROR_NO_MEMORY\"");
else
strcpy(argres, "\"SYS_ERROR_UNKNOWN\"");
} }
const int hw_rev = CONFIG_BOARD_HARDWARE_REVISION; const int hw_rev = CONFIG_BOARD_HARDWARE_REVISION;