stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

esp32: otf and use group-role as hostname if present

Browse source
This commit is contained in:
Andy Green 2017-05-22 14:01:08 +08:00
parent decbbc506b
commit 49769a7c24
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/lws-plat-esp32.c
View file

@ -1366,10 +1366,13 @@ lws_esp32_wlan_nvs_get(int retry)
s = sizeof(lws_esp32.role);
nvs_get_str(nvh, "role", lws_esp32.role, &s);
lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
"%s-%s-%s", lws_esp32.model,
lws_esp32.group,
lws_esp32.serial);
/* if group and role defined: group-role */
if (lws_esp32.group[0] && lws_esp32.role[0])
lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
"%s-%s", lws_esp32.group, lws_esp32.role);
else /* otherwise model-serial */
lws_snprintf(lws_esp32.hostname, sizeof(lws_esp32.hostname) - 1,
"%s-%s", lws_esp32.model, lws_esp32.serial);
nvs_close(nvh);

3
lib/server.c
View file

@ -308,6 +308,9 @@ lws_get_mimetype(const char *file, const struct lws_http_mount *m)
if (!strcmp(&file[n - 4], ".ttf"))
return "application/x-font-ttf";
if (!strcmp(&file[n - 4], ".otf"))
return "application/font-woff";
if (!strcmp(&file[n - 5], ".woff"))
return "application/font-woff";