Skip to content

Commit b2a8ea7

Browse files
committed
Merge branch 'develop'
2 parents 8137158 + 6f2b361 commit b2a8ea7

File tree

8 files changed

+666
-431
lines changed

8 files changed

+666
-431
lines changed

README.md

Lines changed: 656 additions & 428 deletions
Large diffs are not rendered by default.

example/DYI_01.jpg

230 KB
Loading

example/DYI_02.jpg

235 KB
Loading

example/DYI_03.jpg

268 KB
Loading

example/dashboard_screenshot.PNG

-110 KB
Binary file not shown.

example/dashboard_screenshot.png

116 KB
Loading

include/service/udpctl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
* M1 = (Header1, H1, Auth1, Body1)
3333
* Control Request #2:
3434
* H2 = hmac( Header2, H1, Body2 )
35-
* M2 = (Header2, H2, Body1)
35+
* M2 = (Header2, H2, Body2)
3636
* Control Answer #3:
37-
* H2 = hmac( Header2, H1, Body2 )
38-
* M2 = (Header2, H2, Body1)
37+
* H3 = hmac( Header3, H2, Body3 )
38+
* M3 = (Header3, H3, Body3)
3939
* ...
4040
*
4141
*/

service/espadmin.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,18 +541,25 @@ espadmin_on_cfgupd (dtlv_ctx_t * conf)
541541

542542
if (conf) {
543543
const char *sysdescr = NULL;
544+
const char *hostname = NULL;
544545

545546
dtlv_ctx_t wifi_conf;
546547
os_memset (&wifi_conf, 0, sizeof (dtlv_ctx_t));
547548

548549
dtlv_seq_decode_begin (conf, ESPADMIN_SERVICE_ID);
549550
dtlv_seq_decode_group (ESPADMIN_AVP_WIRELESS, wifi_conf.buf, wifi_conf.datalen);
550551
dtlv_seq_decode_ptr (COMMON_AVP_SYSTEM_DESCRIPTION, sysdescr, char);
552+
dtlv_seq_decode_ptr (COMMON_AVP_HOST_NAME, hostname, char);
551553
dtlv_seq_decode_end (conf);
552554

553555
if (sysdescr)
554556
system_set_description (sysdescr);
555557

558+
if (hostname && os_strlen (hostname)) {
559+
if (! wifi_station_set_hostname (hostname))
560+
d_log_eprintf (ESPADMIN_SERVICE_NAME, "failed set hostname: %s", hostname);
561+
}
562+
556563
if (wifi_conf.buf) {
557564
dtlv_ctx_reset_decode (&wifi_conf);
558565

0 commit comments

Comments
 (0)