|
|
@@ -42,9 +42,8 @@ function to process requests, decode URLs, serve files, etc. etc.
|
|
|
#include "esp_system.h"
|
|
|
#include "freertos/FreeRTOS.h"
|
|
|
#include "freertos/task.h"
|
|
|
+#include "config.h"
|
|
|
|
|
|
-#define NVS_PARTITION_NAME "nvs"
|
|
|
-#define NUM_BUFFER_LEN 101
|
|
|
|
|
|
/* @brief tag used for ESP serial console messages */
|
|
|
static const char TAG[] = "http_server";
|
|
|
@@ -87,7 +86,7 @@ const static char http_redirect_hdr_end[] = "/\n\n";
|
|
|
|
|
|
|
|
|
void http_server_start() {
|
|
|
- ESP_LOGD(TAG,"http_server_start ");
|
|
|
+ ESP_LOGD(TAG, "http_server_start ");
|
|
|
if(task_http_server == NULL) {
|
|
|
xTaskCreate(&http_server, "http_server", 1024*5, NULL, WIFI_MANAGER_TASK_PRIORITY, &task_http_server);
|
|
|
}
|
|
|
@@ -99,7 +98,7 @@ void http_server(void *pvParameters) {
|
|
|
conn = netconn_new(NETCONN_TCP);
|
|
|
netconn_bind(conn, IP_ADDR_ANY, 80);
|
|
|
netconn_listen(conn);
|
|
|
- ESP_LOGI(TAG, "HTTP Server listening on 80/tcp");
|
|
|
+ ESP_LOGI(TAG, "HTTP Server listening on 80/tcp");
|
|
|
do {
|
|
|
err = netconn_accept(conn, &newconn);
|
|
|
if(err == ERR_OK) {
|
|
|
@@ -108,7 +107,7 @@ void http_server(void *pvParameters) {
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- ESP_LOGE(TAG,"Error accepting new connection. Terminating HTTP server");
|
|
|
+ ESP_LOGE(TAG, "Error accepting new connection. Terminating HTTP server");
|
|
|
}
|
|
|
taskYIELD(); /* allows the freeRTOS scheduler to take over if needed. */
|
|
|
} while(err == ERR_OK);
|
|
|
@@ -144,7 +143,7 @@ char* http_server_search_header(char *request, char *header_name, int *len, char
|
|
|
char *ptr = NULL;
|
|
|
int currentLength=0;
|
|
|
|
|
|
- ESP_LOGV(TAG, "searching for header name: [%s]", header_name);
|
|
|
+ ESP_LOGV(TAG, "searching for header name: [%s]", header_name);
|
|
|
ptr = strstr(request, header_name);
|
|
|
|
|
|
|
|
|
@@ -152,23 +151,23 @@ char* http_server_search_header(char *request, char *header_name, int *len, char
|
|
|
ret = ptr + strlen(header_name);
|
|
|
ptr = ret;
|
|
|
currentLength=(int)(ptr-request);
|
|
|
- ESP_LOGV(TAG, "found string at %d", currentLength);
|
|
|
+ ESP_LOGV(TAG, "found string at %d", currentLength);
|
|
|
|
|
|
while (*ptr != '\0' && *ptr != '\n' && *ptr != '\r' && *ptr != ':' && ptr<bufEnd) {
|
|
|
ptr++;
|
|
|
}
|
|
|
if(*ptr==':') {
|
|
|
currentLength=(int)(ptr-ret);
|
|
|
- ESP_LOGV(TAG, "Found parameter name end, length : %d", currentLength);
|
|
|
+ ESP_LOGV(TAG, "Found parameter name end, length : %d", currentLength);
|
|
|
// save the parameter name: the string between header name and ":"
|
|
|
*parm_name=malloc(currentLength+1);
|
|
|
if(*parm_name==NULL) {
|
|
|
- ESP_LOGE(TAG, "Unable to allocate memory for new header name");
|
|
|
+ ESP_LOGE(TAG, "Unable to allocate memory for new header name");
|
|
|
return NULL;
|
|
|
}
|
|
|
memset(*parm_name, 0x00,currentLength+1);
|
|
|
strncpy(*parm_name,ret,currentLength);
|
|
|
- ESP_LOGV(TAG, "Found parameter name : %s ", *parm_name);
|
|
|
+ ESP_LOGV(TAG, "Found parameter name : %s ", *parm_name);
|
|
|
ptr++;
|
|
|
while (*ptr == ' ' && ptr<bufEnd) {
|
|
|
ptr++;
|
|
|
@@ -183,12 +182,12 @@ char* http_server_search_header(char *request, char *header_name, int *len, char
|
|
|
// Terminate value inside its actual buffer so we can treat it as individual string
|
|
|
*ptr='\0';
|
|
|
currentLength=(int)(ptr-ret);
|
|
|
- ESP_LOGV(TAG, "Found parameter value end, length : %d, value: %s", currentLength,ret );
|
|
|
+ ESP_LOGV(TAG, "Found parameter value end, length : %d, value: %s", currentLength,ret );
|
|
|
|
|
|
*next_position=++ptr;
|
|
|
return ret;
|
|
|
}
|
|
|
- ESP_LOGD(TAG, "No more match for : %s", header_name);
|
|
|
+ ESP_LOGD(TAG, "No more match for : %s", header_name);
|
|
|
return NULL;
|
|
|
}
|
|
|
void http_server_send_resource_file(struct netconn *conn,const uint8_t * start, const uint8_t * end, char * content_type,char * encoding) {
|
|
|
@@ -196,7 +195,7 @@ void http_server_send_resource_file(struct netconn *conn,const uint8_t * start,
|
|
|
size_t buff_length= sizeof(http_hdr_template)+strlen(content_type)+strlen(encoding);
|
|
|
char * http_hdr=malloc(buff_length);
|
|
|
if( http_hdr == NULL) {
|
|
|
- ESP_LOGE(TAG,"Cound not allocate %d bytes for headers.",buff_length);
|
|
|
+ ESP_LOGE(TAG, "Cound not allocate %d bytes for headers.",buff_length);
|
|
|
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
}
|
|
|
else
|
|
|
@@ -204,73 +203,25 @@ void http_server_send_resource_file(struct netconn *conn,const uint8_t * start,
|
|
|
memset(http_hdr,0x00,buff_length);
|
|
|
snprintf(http_hdr, buff_length-1,http_hdr_template,content_type,len,encoding);
|
|
|
netconn_write(conn, http_hdr, strlen(http_hdr), NETCONN_NOCOPY);
|
|
|
- ESP_LOGD(TAG,"sending response : %s",http_hdr);
|
|
|
+ ESP_LOGD(TAG, "sending response : %s",http_hdr);
|
|
|
netconn_write(conn, start, end - start, NETCONN_NOCOPY);
|
|
|
free(http_hdr);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-err_t http_server_nvs_dump(struct netconn *conn, nvs_type_t nvs_type) {
|
|
|
- nvs_entry_info_t info;
|
|
|
- char * num_buffer = NULL;
|
|
|
- cJSON * nvs_json = cJSON_CreateObject();
|
|
|
- num_buffer = malloc(NUM_BUFFER_LEN);
|
|
|
- nvs_iterator_t it = nvs_entry_find(settings_partition, NULL, nvs_type);
|
|
|
- if(it == NULL) {
|
|
|
- ESP_LOGW(TAG, "No nvs entry found in %s",NVS_PARTITION_NAME );
|
|
|
+err_t http_server_send_config_json(struct netconn *conn) {
|
|
|
+ char * json = config_alloc_get_json(false);
|
|
|
+ if(json!=NULL){
|
|
|
+ ESP_LOGD(TAG, "config json : %s",json );
|
|
|
+ netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY);
|
|
|
+ netconn_write(conn, json, strlen(json), NETCONN_NOCOPY);
|
|
|
+ free(json);
|
|
|
}
|
|
|
- while (it != NULL) {
|
|
|
- nvs_entry_info(it, &info);
|
|
|
- memset(num_buffer,0x00,NUM_BUFFER_LEN);
|
|
|
- if(strstr(info.namespace_name, current_namespace)) {
|
|
|
- void * value = get_nvs_value_alloc(nvs_type,info.key);
|
|
|
- if(value==NULL)
|
|
|
- {
|
|
|
- ESP_LOGE(TAG,"nvs read failed.");
|
|
|
- netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY); //200ok
|
|
|
- free(num_buffer);
|
|
|
- cJSON_Delete(nvs_json);
|
|
|
- return ESP_FAIL;
|
|
|
- }
|
|
|
- switch (nvs_type) {
|
|
|
- case NVS_TYPE_I8:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%i", *(int8_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_I16:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%i", *(int16_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_I32:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%i", *(int32_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_U8:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%u", *(uint8_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_U16:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%u", *(uint16_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_U32:
|
|
|
- snprintf(num_buffer, NUM_BUFFER_LEN-1, "%u", *(uint32_t*)value);
|
|
|
- break;
|
|
|
- case NVS_TYPE_STR:
|
|
|
- // string will be processed directly below
|
|
|
- break;
|
|
|
- case NVS_TYPE_I64:
|
|
|
- case NVS_TYPE_U64:
|
|
|
- default:
|
|
|
- ESP_LOGE(TAG, "nvs type %u not supported", nvs_type);
|
|
|
- break;
|
|
|
- }
|
|
|
- cJSON_AddItemToObject(nvs_json, info.key, cJSON_CreateString((nvs_type==NVS_TYPE_STR)?(char *)value:num_buffer));
|
|
|
- free(value );
|
|
|
- }
|
|
|
- it = nvs_entry_next(it);
|
|
|
+ else{
|
|
|
+ ESP_LOGD(TAG, "Error retrieving config json string. ");
|
|
|
+ netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
}
|
|
|
- ESP_LOGD(TAG,"config json : %s\n", cJSON_Print(nvs_json));
|
|
|
|
|
|
- netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- netconn_write(conn, cJSON_Print(nvs_json), strlen(cJSON_Print(nvs_json)), NETCONN_NOCOPY);
|
|
|
- cJSON_Delete(nvs_json);
|
|
|
- free(num_buffer);
|
|
|
return ESP_OK;
|
|
|
}
|
|
|
|
|
|
@@ -285,8 +236,8 @@ void http_server_process_config(struct netconn *conn, char *inbuf) {
|
|
|
// /* extract the first line of the request */
|
|
|
// char *save_ptr = buf;
|
|
|
// char *line = strtok_r(save_ptr, new_line, &save_ptr);
|
|
|
-// ESP_LOGD(TAG,"Processing line %s",line);
|
|
|
- ESP_LOGD(TAG,"Processing request buffer: \n%s",inbuf);
|
|
|
+// ESP_LOGD(TAG, "Processing line %s",line);
|
|
|
+ ESP_LOGD(TAG, "Processing request buffer: \n%s",inbuf);
|
|
|
char *last = NULL;
|
|
|
char *ptr = NULL;
|
|
|
last = ptr = inbuf;
|
|
|
@@ -299,7 +250,7 @@ void http_server_process_config(struct netconn *conn, char *inbuf) {
|
|
|
}
|
|
|
// terminate the header string
|
|
|
if( *(ptr) == '\0' ) {
|
|
|
- ESP_LOGD(TAG, "End of buffer found");
|
|
|
+ ESP_LOGD(TAG, "End of buffer found");
|
|
|
return;
|
|
|
}
|
|
|
*ptr = '\0';
|
|
|
@@ -308,21 +259,21 @@ void http_server_process_config(struct netconn *conn, char *inbuf) {
|
|
|
ptr+=2;
|
|
|
}
|
|
|
if(ptr==last) {
|
|
|
- ESP_LOGD(TAG,"Processing body. ");
|
|
|
+ ESP_LOGD(TAG, "Processing body. ");
|
|
|
break;
|
|
|
}
|
|
|
if(strlen(last)>0) {
|
|
|
- ESP_LOGD(TAG,"Found Header Line %s ", last);
|
|
|
+ ESP_LOGD(TAG, "Found Header Line %s ", last);
|
|
|
//Content-Type: application/json
|
|
|
}
|
|
|
else {
|
|
|
- ESP_LOGD(TAG,"Found end of headers");
|
|
|
+ ESP_LOGD(TAG, "Found end of headers");
|
|
|
bHeaders = false;
|
|
|
}
|
|
|
last=ptr;
|
|
|
}
|
|
|
else {
|
|
|
- //ESP_LOGD(TAG,"Body content: %s", last);
|
|
|
+ //ESP_LOGD(TAG, "Body content: %s", last);
|
|
|
//cJSON * json = cJSON_Parse(last);
|
|
|
//cJSON_Delete(json);
|
|
|
//todo: implement body json parsing
|
|
|
@@ -336,13 +287,13 @@ void http_server_process_config(struct netconn *conn, char *inbuf) {
|
|
|
|
|
|
void dump_net_buffer(void * buf, u16_t buflen) {
|
|
|
char * curbuf = malloc(buflen+1);
|
|
|
- ESP_LOGD(TAG,"netconn buffer, length=%u",buflen);
|
|
|
+ ESP_LOGV(TAG, "netconn buffer, length=%u",buflen);
|
|
|
if(curbuf==NULL) {
|
|
|
- ESP_LOGE(TAG,"Unable to show netconn buffer. Malloc failed");
|
|
|
+ ESP_LOGE(TAG, "Unable to show netconn buffer. Malloc failed");
|
|
|
}
|
|
|
memset(curbuf,0x0, buflen+1);
|
|
|
memcpy(curbuf,buf,buflen);
|
|
|
- ESP_LOGV(TAG,"netconn buffer content:\n%s",curbuf);
|
|
|
+ ESP_LOGV(TAG, "netconn buffer content:\n%s",curbuf);
|
|
|
free(curbuf);
|
|
|
}
|
|
|
|
|
|
@@ -354,22 +305,22 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
err_t err;
|
|
|
ip_addr_t remote_add;
|
|
|
u16_t port;
|
|
|
- ESP_LOGD(TAG,"Serving page. Getting device AP address.");
|
|
|
+ ESP_LOGV(TAG, "Serving page. Getting device AP address.");
|
|
|
const char new_line[2] = "\n";
|
|
|
- char * ap_ip_address= get_nvs_value_alloc_default(NVS_TYPE_STR, "ap_ip_address", DEFAULT_AP_IP, 0);
|
|
|
+ char * ap_ip_address= config_alloc_get_default(NVS_TYPE_STR, "ap_ip_address", DEFAULT_AP_IP, 0);
|
|
|
if(ap_ip_address==NULL){
|
|
|
- ESP_LOGE(TAG,"Unable to retrieve default AP IP Address");
|
|
|
+ ESP_LOGE(TAG, "Unable to retrieve default AP IP Address");
|
|
|
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
netconn_close(conn);
|
|
|
return;
|
|
|
}
|
|
|
- ESP_LOGD(TAG,"Getting remote device IP address.");
|
|
|
+ ESP_LOGV(TAG, "Getting remote device IP address.");
|
|
|
netconn_getaddr(conn, &remote_add, &port, 0);
|
|
|
char * remote_address = strdup(ip4addr_ntoa(ip_2_ip4(&remote_add)));
|
|
|
- ESP_LOGD(TAG,"Local Access Point IP address is: %s. Remote device IP address is %s. Receiving request buffer", ap_ip_address, remote_address);
|
|
|
+ ESP_LOGD(TAG, "Local Access Point IP address is: %s. Remote device IP address is %s. Receiving request buffer", ap_ip_address, remote_address);
|
|
|
err = netconn_recv(conn, &inbuf);
|
|
|
if(err == ERR_OK) {
|
|
|
- ESP_LOGD(TAG,"Getting data buffer.");
|
|
|
+ ESP_LOGV(TAG, "Getting data buffer.");
|
|
|
netbuf_data(inbuf, (void**)&buf, &buflen);
|
|
|
dump_net_buffer(buf, buflen);
|
|
|
int lenH = 0;
|
|
|
@@ -382,14 +333,14 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
if(lenH>0){
|
|
|
strlcpy(host,temphost,lenH+1);
|
|
|
}
|
|
|
- ESP_LOGD(TAG,"http_server_netconn_serve Host: [%s], host: [%s], Processing line [%s]",remote_address,host,line);
|
|
|
+ ESP_LOGD(TAG, "http_server_netconn_serve Host: [%s], host: [%s], Processing line [%s]",remote_address,host,line);
|
|
|
|
|
|
if(line) {
|
|
|
|
|
|
/* captive portal functionality: redirect to access point IP for HOST that are not the access point IP OR the STA IP */
|
|
|
const char * host_name=NULL;
|
|
|
if((err=tcpip_adapter_get_hostname(TCPIP_ADAPTER_IF_STA, &host_name )) !=ESP_OK) {
|
|
|
- ESP_LOGE(TAG,"Unable to get host name. Error: %s",esp_err_to_name(err));
|
|
|
+ ESP_LOGE(TAG, "Unable to get host name. Error: %s",esp_err_to_name(err));
|
|
|
}
|
|
|
|
|
|
/* determine if Host is from the STA IP address */
|
|
|
@@ -399,7 +350,7 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
bool access_from_host_name = (host_name!=NULL) && strstr(host, host_name);
|
|
|
|
|
|
if(lenH > 0 && !strstr(host, ap_ip_address) && !(access_from_sta_ip || access_from_host_name)) {
|
|
|
- ESP_LOGI(TAG,"Redirecting host [%s] to AP IP Address : %s",remote_address, ap_ip_address);
|
|
|
+ ESP_LOGI(TAG, "Redirecting host [%s] to AP IP Address : %s",remote_address, ap_ip_address);
|
|
|
netconn_write(conn, http_redirect_hdr_start, sizeof(http_redirect_hdr_start) - 1, NETCONN_NOCOPY);
|
|
|
netconn_write(conn, ap_ip_address, strlen(ap_ip_address), NETCONN_NOCOPY);
|
|
|
netconn_write(conn, http_redirect_hdr_end, sizeof(http_redirect_hdr_end) - 1, NETCONN_NOCOPY);
|
|
|
@@ -433,32 +384,43 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
}
|
|
|
|
|
|
//dynamic stuff
|
|
|
+ else if(strstr(line, "GET /scan.json ")) {
|
|
|
+ ESP_LOGI(TAG, "Starting wifi scan");
|
|
|
+ wifi_manager_scan_async();
|
|
|
+ }
|
|
|
else if(strstr(line, "GET /ap.json ")) {
|
|
|
/* if we can get the mutex, write the last version of the AP list */
|
|
|
- ESP_LOGI(TAG,"Processing ap.json request");
|
|
|
+ ESP_LOGI(TAG, "Processing ap.json request");
|
|
|
if(wifi_manager_lock_json_buffer(( TickType_t ) 10)) {
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- char *buff = wifi_manager_get_ap_list_json();
|
|
|
- netconn_write(conn, buff, strlen(buff), NETCONN_NOCOPY);
|
|
|
+ char *buff = wifi_manager_alloc_get_ap_list_json();
|
|
|
wifi_manager_unlock_json_buffer();
|
|
|
+ if(buff!=NULL){
|
|
|
+ netconn_write(conn, buff, strlen(buff), NETCONN_NOCOPY);
|
|
|
+ free(buff);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ ESP_LOGD(TAG, "Error retrieving ap list json string. ");
|
|
|
+ netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
+ }
|
|
|
}
|
|
|
else {
|
|
|
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- ESP_LOGE(TAG, "http_server_netconn_serve: GET /ap.json failed to obtain mutex");
|
|
|
+ ESP_LOGE(TAG, "http_server_netconn_serve: GET /ap.json failed to obtain mutex");
|
|
|
}
|
|
|
/* request a wifi scan */
|
|
|
- ESP_LOGI(TAG,"Starting wifi scan");
|
|
|
+ ESP_LOGI(TAG, "Starting wifi scan");
|
|
|
wifi_manager_scan_async();
|
|
|
- ESP_LOGI(TAG,"Done serving ap.json");
|
|
|
+ ESP_LOGI(TAG, "Done serving ap.json");
|
|
|
}
|
|
|
else if(strstr(line, "GET /config.json ")) {
|
|
|
- ESP_LOGI(TAG,"Serving config.json");
|
|
|
- ESP_LOGI(TAG, "About to get config from flash");
|
|
|
- http_server_nvs_dump(conn,NVS_TYPE_STR);
|
|
|
- ESP_LOGD(TAG,"Done serving config.json");
|
|
|
+ ESP_LOGI(TAG, "Serving config.json");
|
|
|
+ ESP_LOGI(TAG, "About to get config from flash");
|
|
|
+ http_server_send_config_json(conn);
|
|
|
+ ESP_LOGD(TAG, "Done serving config.json");
|
|
|
}
|
|
|
else if(strstr(line, "POST /config.json ")) {
|
|
|
- ESP_LOGI(TAG,"Serving POST config.json");
|
|
|
+ ESP_LOGI(TAG, "Serving POST config.json");
|
|
|
int lenA=0;
|
|
|
char * last_parm=save_ptr;
|
|
|
char * next_parm=save_ptr;
|
|
|
@@ -471,20 +433,21 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
|
|
|
while(last_parm!=NULL) {
|
|
|
// Search will return
|
|
|
- ESP_LOGD(TAG, "Getting parameters from X-Custom headers");
|
|
|
+ ESP_LOGD(TAG, "Getting parameters from X-Custom headers");
|
|
|
last_parm = http_server_search_header(next_parm, "X-Custom-", &lenA, &last_parm_name,&next_parm,buf+buflen);
|
|
|
if(last_parm!=NULL && last_parm_name!=NULL) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: POST config.json, config %s=%s", last_parm_name, last_parm);
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: POST config.json, config %s=%s", last_parm_name, last_parm);
|
|
|
if(strcmp(last_parm_name, "fwurl")==0) {
|
|
|
// we're getting a request to do an OTA from that URL
|
|
|
- ESP_LOGW(TAG, "Found OTA request!");
|
|
|
+ ESP_LOGW(TAG, "Found OTA request!");
|
|
|
otaURL=strdup(last_parm);
|
|
|
bOTA=true;
|
|
|
}
|
|
|
else {
|
|
|
- ESP_LOGV(TAG, "http_server_netconn_serve: POST config.json Storing parameter");
|
|
|
- err= store_nvs_value(NVS_TYPE_STR, last_parm_name , last_parm);
|
|
|
- if(err!=ESP_OK) ESP_LOGE(TAG,"Unable to save nvs value. Error: %s",esp_err_to_name(err));
|
|
|
+ ESP_LOGV(TAG, "http_server_netconn_serve: POST config.json Storing parameter");
|
|
|
+ if(config_set_value(NVS_TYPE_STR, last_parm_name , last_parm) != ESP_OK){
|
|
|
+ ESP_LOGE(TAG, "Unable to save nvs value.");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if(last_parm_name!=NULL) {
|
|
|
@@ -498,10 +461,11 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
else {
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); //200ok
|
|
|
if(bOTA) {
|
|
|
+
|
|
|
#if RECOVERY_APPLICATION
|
|
|
- ESP_LOGW(TAG, "Starting process OTA for url %s",otaURL);
|
|
|
+ ESP_LOGW(TAG, "Starting process OTA for url %s",otaURL);
|
|
|
#else
|
|
|
- ESP_LOGW(TAG, "Restarting system to process OTA for url %s",otaURL);
|
|
|
+ ESP_LOGW(TAG, "Restarting system to process OTA for url %s",otaURL);
|
|
|
// close the connection cleanly
|
|
|
netconn_close(conn);
|
|
|
netconn_delete(conn);
|
|
|
@@ -510,97 +474,109 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
free(otaURL);
|
|
|
}
|
|
|
}
|
|
|
- ESP_LOGI(TAG,"Done Serving POST config.json");
|
|
|
+ ESP_LOGI(TAG, "Done Serving POST config.json");
|
|
|
}
|
|
|
else if(strstr(line, "POST /connect.json ")) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: POST /connect.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: POST /connect.json");
|
|
|
bool found = false;
|
|
|
- int lenS = 0, lenP = 0;
|
|
|
+ int lenS = 0, lenP = 0, lenN = 0;
|
|
|
char *ssid = NULL, *password = NULL;
|
|
|
ssid = http_server_get_header(save_ptr, "X-Custom-ssid: ", &lenS);
|
|
|
password = http_server_get_header(save_ptr, "X-Custom-pwd: ", &lenP);
|
|
|
+ char * new_host_name_b = http_server_get_header(save_ptr, "X-Custom-host_name: ", &lenN);
|
|
|
+ if(lenN > 0){
|
|
|
+ lenN++;
|
|
|
+ char * new_host_name = malloc(lenN);
|
|
|
+ strlcpy(new_host_name, new_host_name_b, lenN);
|
|
|
+ if(config_set_value(NVS_TYPE_STR, "host_name", new_host_name) != ESP_OK){
|
|
|
+ ESP_LOGE(TAG, "Unable to save host name configuration");
|
|
|
+ }
|
|
|
+ free(new_host_name);
|
|
|
+ }
|
|
|
|
|
|
if(ssid && lenS <= MAX_SSID_SIZE && password && lenP <= MAX_PASSWORD_SIZE) {
|
|
|
wifi_config_t* config = wifi_manager_get_wifi_sta_config();
|
|
|
memset(config, 0x00, sizeof(wifi_config_t));
|
|
|
memcpy(config->sta.ssid, ssid, lenS);
|
|
|
memcpy(config->sta.password, password, lenP);
|
|
|
- ESP_LOGD(TAG, "http_server_netconn_serve: wifi_manager_connect_async() call, with ssid: %s, password: %s", config->sta.ssid, config->sta.password);
|
|
|
+ ESP_LOGD(TAG, "http_server_netconn_serve: wifi_manager_connect_async() call, with ssid: %s, password: %s", config->sta.ssid, config->sta.password);
|
|
|
wifi_manager_connect_async();
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); //200ok
|
|
|
found = true;
|
|
|
}
|
|
|
else{
|
|
|
- ESP_LOGE(TAG,"SSID or Password invalid");
|
|
|
+ ESP_LOGE(TAG, "SSID or Password invalid");
|
|
|
}
|
|
|
|
|
|
|
|
|
if(!found) {
|
|
|
/* bad request the authentification header is not complete/not the correct format */
|
|
|
netconn_write(conn, http_400_hdr, sizeof(http_400_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- ESP_LOGE(TAG, "bad request the authentification header is not complete/not the correct format");
|
|
|
+ ESP_LOGE(TAG, "bad request the authentification header is not complete/not the correct format");
|
|
|
}
|
|
|
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: done serving connect.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: done serving connect.json");
|
|
|
}
|
|
|
else if(strstr(line, "DELETE /connect.json ")) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: DELETE /connect.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: DELETE /connect.json");
|
|
|
/* request a disconnection from wifi and forget about it */
|
|
|
wifi_manager_disconnect_async();
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: done serving DELETE /connect.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: done serving DELETE /connect.json");
|
|
|
}
|
|
|
else if(strstr(line, "POST /reboot_ota.json ")) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: POST reboot.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: POST reboot.json");
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
|
|
|
netconn_close(conn);
|
|
|
netconn_delete(conn);
|
|
|
guided_restart_ota();
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST reboot.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST reboot.json");
|
|
|
}
|
|
|
else if(strstr(line, "POST /reboot.json ")) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: POST restart.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: POST restart.json");
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
|
|
|
netconn_close(conn);
|
|
|
netconn_delete(conn);
|
|
|
simple_restart();
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST restart.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST restart.json");
|
|
|
}
|
|
|
else if(strstr(line, "POST /recovery.json ")) {
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: POST recovery.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: POST recovery.json");
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
|
|
|
netconn_close(conn);
|
|
|
netconn_delete(conn);
|
|
|
guided_factory();
|
|
|
- ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST recovery.json");
|
|
|
+ ESP_LOGI(TAG, "http_server_netconn_serve: done serving POST recovery.json");
|
|
|
}
|
|
|
else if(strstr(line, "GET /status.json ")) {
|
|
|
- ESP_LOGI(TAG,"Serving status.json");
|
|
|
+ ESP_LOGI(TAG, "Serving status.json");
|
|
|
if(wifi_manager_lock_json_buffer(( TickType_t ) 10)) {
|
|
|
- char *buff = wifi_manager_get_ip_info_json();
|
|
|
+ char *buff = wifi_manager_alloc_get_ip_info_json();
|
|
|
+ wifi_manager_unlock_json_buffer();
|
|
|
if(buff) {
|
|
|
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY);
|
|
|
netconn_write(conn, buff, strlen(buff), NETCONN_NOCOPY);
|
|
|
+ free(buff);
|
|
|
}
|
|
|
else {
|
|
|
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
}
|
|
|
- wifi_manager_unlock_json_buffer();
|
|
|
+
|
|
|
}
|
|
|
else {
|
|
|
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- ESP_LOGE(TAG, "http_server_netconn_serve: GET /status failed to obtain mutex");
|
|
|
+ ESP_LOGE(TAG, "http_server_netconn_serve: GET /status failed to obtain mutex");
|
|
|
}
|
|
|
- ESP_LOGI(TAG,"Done Serving status.json");
|
|
|
+ ESP_LOGI(TAG, "Done Serving status.json");
|
|
|
}
|
|
|
else {
|
|
|
netconn_write(conn, http_400_hdr, sizeof(http_400_hdr) - 1, NETCONN_NOCOPY);
|
|
|
- ESP_LOGE(TAG, "bad request from host: %s, request %s",remote_address, line);
|
|
|
+ ESP_LOGE(TAG, "bad request from host: %s, request %s",remote_address, line);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- ESP_LOGE(TAG, "URL not found processing for remote host : %s",remote_address);
|
|
|
+ ESP_LOGE(TAG, "URL not found processing for remote host : %s",remote_address);
|
|
|
netconn_write(conn, http_404_hdr, sizeof(http_404_hdr) - 1, NETCONN_NOCOPY);
|
|
|
}
|
|
|
free(host);
|
|
|
@@ -616,26 +592,26 @@ void http_server_netconn_serve(struct netconn *conn) {
|
|
|
}
|
|
|
|
|
|
bool http_server_lock_json_object(TickType_t xTicksToWait) {
|
|
|
- ESP_LOGD(TAG,"Locking config json object");
|
|
|
+ ESP_LOGD(TAG, "Locking config json object");
|
|
|
if(http_server_config_mutex) {
|
|
|
if( xSemaphoreTake( http_server_config_mutex, xTicksToWait ) == pdTRUE ) {
|
|
|
- ESP_LOGV(TAG,"config Json object locked!");
|
|
|
+ ESP_LOGV(TAG, "config Json object locked!");
|
|
|
return true;
|
|
|
}
|
|
|
else {
|
|
|
- ESP_LOGW(TAG,"Semaphore take failed. Unable to lock config Json object mutex");
|
|
|
+ ESP_LOGW(TAG, "Semaphore take failed. Unable to lock config Json object mutex");
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- ESP_LOGW(TAG,"Unable to lock config Json object mutex");
|
|
|
+ ESP_LOGW(TAG, "Unable to lock config Json object mutex");
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
void http_server_unlock_json_object() {
|
|
|
- ESP_LOGD(TAG,"Unlocking json buffer!");
|
|
|
+ ESP_LOGD(TAG, "Unlocking json buffer!");
|
|
|
xSemaphoreGive( http_server_config_mutex );
|
|
|
}
|
|
|
|
Sebastien