Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit bcb6c50

Browse files
author
Daniel Campora
committed
esp32: Add hidden SSID option. Enable websockets.
1 parent 482ca51 commit bcb6c50

File tree

9 files changed

+53
-29
lines changed

9 files changed

+53
-29
lines changed

‎esp32/ftp/ftp.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,14 @@ static ftp_result_t ftp_wait_for_connection (int32_t l_sd, int32_t *n_sd, uint32
512512
}
513513

514514
static ftp_result_t ftp_send_non_blocking (int32_t sd, void *data, int32_t Len) {
515+
// make it blocking
516+
uint32_t option = fcntl(sd, F_GETFL, 0);
517+
option &= ~O_NONBLOCK;
518+
fcntl(sd, F_SETFL, option);
515519
int32_t result = send(sd, data, Len, 0);
520+
// make it non-blocking again
521+
option |= O_NONBLOCK;
522+
fcntl(sd, F_SETFL, option);
516523

517524
if (result > 0) {
518525
ftp_data.txRetries = 0;

‎esp32/mods/lwipsocket.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ int lwipsocket_socket_socket(mod_network_socket_obj_t *s, int *_errno) {
8282

8383
// enable address reusing
8484
uint32_t option = 1;
85-
setsockopt(sd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
85+
lwip_setsockopt_r(sd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
8686

8787
s->sock_base.u.sd = sd;
8888
return 0;
@@ -104,15 +104,15 @@ void lwipsocket_socket_close(mod_network_socket_obj_t *s) {
104104
mbedtls_ctr_drbg_free(&ss->ctr_drbg);
105105
mbedtls_entropy_free(&ss->entropy);
106106
} else {
107-
close(s->sock_base.u.sd);
107+
lwip_close_r(s->sock_base.u.sd);
108108
}
109109
modusocket_socket_delete(s->sock_base.u.sd);
110110
s->sock_base.connected = false;
111111
}
112112

113113
int lwipsocket_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
114114
MAKE_SOCKADDR(addr, ip, port)
115-
int ret = bind(s->sock_base.u.sd, &addr, sizeof(addr));
115+
int ret = lwip_bind_r(s->sock_base.u.sd, &addr, sizeof(addr));
116116
if (ret != 0) {
117117
*_errno = errno;
118118
return -1;
@@ -121,7 +121,7 @@ int lwipsocket_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port
121121
}
122122

123123
int lwipsocket_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int *_errno) {
124-
int ret = listen(s->sock_base.u.sd, backlog);
124+
int ret = lwip_listen_r(s->sock_base.u.sd, backlog);
125125
if (ret != 0) {
126126
*_errno = errno;
127127
return -1;
@@ -135,7 +135,7 @@ int lwipsocket_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj
135135
struct sockaddr addr;
136136
socklen_t addr_len = sizeof(addr);
137137

138-
sd = accept(s->sock_base.u.sd, &addr, &addr_len);
138+
sd = lwip_accept_r(s->sock_base.u.sd, &addr, &addr_len);
139139
// save the socket descriptor
140140
s2->sock_base.u.sd = sd;
141141
if (sd < 0) {
@@ -152,7 +152,7 @@ int lwipsocket_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj
152152

153153
int lwipsocket_socket_connect(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno) {
154154
MAKE_SOCKADDR(addr, ip, port)
155-
int ret = connect(s->sock_base.u.sd, &addr, sizeof(addr));
155+
int ret = lwip_connect_r(s->sock_base.u.sd, &addr, sizeof(addr));
156156

157157
if (ret != 0) {
158158
// printf("Connect returned -0x%x\n", -ret);
@@ -216,7 +216,7 @@ int lwipsocket_socket_send(mod_network_socket_obj_t *s, const byte *buf, mp_uint
216216
}
217217
}
218218
} else {
219-
bytes = send(s->sock_base.u.sd, (const void *)buf, len, 0);
219+
bytes = lwip_send_r(s->sock_base.u.sd, (const void *)buf, len, 0);
220220
}
221221
}
222222
if (bytes <= 0) {
@@ -263,7 +263,7 @@ int lwipsocket_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len
263263
return -1;
264264
}
265265
} else {
266-
ret = recv(s->sock_base.u.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0);
266+
ret = lwip_recv_r(s->sock_base.u.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0);
267267
if (ret < 0) {
268268
*_errno = errno;
269269
return -1;
@@ -275,7 +275,7 @@ int lwipsocket_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len
275275
int lwipsocket_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
276276
if (len > 0) {
277277
MAKE_SOCKADDR(addr, ip, port)
278-
int ret = sendto(s->sock_base.u.sd, (byte*)buf, len, 0, (struct sockaddr*)&addr, sizeof(addr));
278+
int ret = lwip_sendto_r(s->sock_base.u.sd, (byte*)buf, len, 0, (struct sockaddr*)&addr, sizeof(addr));
279279
if (ret < 0) {
280280
*_errno = errno;
281281
return -1;
@@ -288,7 +288,7 @@ int lwipsocket_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_u
288288
int lwipsocket_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
289289
struct sockaddr addr;
290290
socklen_t addr_len = sizeof(addr);
291-
mp_int_t ret = recvfrom(s->sock_base.u.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0, &addr, &addr_len);
291+
mp_int_t ret = lwip_recvfrom_r(s->sock_base.u.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0, &addr, &addr_len);
292292
if (ret < 0) {
293293
*_errno = errno;
294294
return -1;
@@ -298,7 +298,7 @@ int lwipsocket_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t
298298
}
299299

300300
int lwipsocket_socket_setsockopt(mod_network_socket_obj_t *s, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
301-
int ret = setsockopt(s->sock_base.u.sd, level, opt, optval, optlen);
301+
int ret = lwip_setsockopt_r(s->sock_base.u.sd, level, opt, optval, optlen);
302302
if (ret < 0) {
303303
*_errno = errno;
304304
return -1;
@@ -308,7 +308,7 @@ int lwipsocket_socket_setsockopt(mod_network_socket_obj_t *s, mp_uint_t level, m
308308

309309
int lwipsocket_socket_settimeout(mod_network_socket_obj_t *s, mp_int_t timeout_ms, int *_errno) {
310310
int ret;
311-
uint32_t option = fcntl(s->sock_base.u.sd, F_GETFL, 0);
311+
uint32_t option = lwip_fcntl_r(s->sock_base.u.sd, F_GETFL, 0);
312312

313313
if (timeout_ms <= 0) {
314314
if (timeout_ms == 0) {
@@ -328,9 +328,9 @@ int lwipsocket_socket_settimeout(mod_network_socket_obj_t *s, mp_int_t timeout_m
328328
struct timeval tv;
329329
tv.tv_sec = timeout_ms / 1000; // seconds
330330
tv.tv_usec = (timeout_ms % 1000) * 1000; // microseconds
331-
ret = setsockopt(s->sock_base.u.sd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
332-
ret |= setsockopt(s->sock_base.u.sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
333-
ret |= fcntl(s->sock_base.u.sd, F_SETFL, option);
331+
ret = lwip_setsockopt_r(s->sock_base.u.sd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
332+
ret |= lwip_setsockopt_r(s->sock_base.u.sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
333+
ret |= lwip_fcntl_r(s->sock_base.u.sd, F_SETFL, option);
334334

335335
if (ret != 0) {
336336
*_errno = errno;
@@ -369,7 +369,7 @@ int lwipsocket_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_
369369
struct timeval tv;
370370
tv.tv_sec = 0;
371371
tv.tv_usec = 10;
372-
int32_t nfds = select(sd + 1, &rfds, &wfds, &xfds, &tv);
372+
int32_t nfds = lwip_select(sd + 1, &rfds, &wfds, &xfds, &tv);
373373

374374
// check for errors
375375
if (nfds < 0) {

‎esp32/mods/modwlan.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ STATIC void wlan_servers_stop (void);
133133
//STATIC void wlan_reset (void);
134134
STATIC void wlan_validate_mode (uint mode);
135135
STATIC void wlan_set_mode (uint mode);
136-
STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uint32_t channel, bool add_mac);
136+
STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uint32_t channel, bool add_mac, bool hidden);
137137
STATIC void wlan_validate_ssid_len (uint32_t len);
138138
STATIC uint32_t wlan_set_ssid_internal (const char *ssid, uint8_t len, bool add_mac);
139139
STATIC void wlan_validate_security (uint8_t auth, const char *key);
@@ -167,7 +167,7 @@ void wlan_pre_init (void) {
167167
wlan_obj.base.type = (mp_obj_t)&mod_network_nic_type_wlan;
168168
}
169169

170-
void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key, uint32_t channel, uint32_t antenna, bool add_mac) {
170+
void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key, uint32_t channel, uint32_t antenna, bool add_mac, bool hidden) {
171171

172172
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
173173
ESP_ERROR_CHECK(esp_wifi_init(&cfg));
@@ -185,7 +185,7 @@ void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key,
185185
wlan_set_mode(mode);
186186

187187
if (mode != WIFI_MODE_STA) {
188-
wlan_setup_ap (ssid, auth, key, channel, add_mac);
188+
wlan_setup_ap (ssid, auth, key, channel, add_mac, hidden);
189189
}
190190

191191
esp_wifi_start();
@@ -308,7 +308,7 @@ STATIC void wlan_servers_stop (void) {
308308
}
309309
}
310310

311-
STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uint32_t channel, bool add_mac) {
311+
STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uint32_t channel, bool add_mac, bool hidden) {
312312
uint32_t ssid_len = wlan_set_ssid_internal (ssid, strlen(ssid), add_mac);
313313
wlan_set_security_internal(auth, key);
314314

@@ -322,6 +322,7 @@ STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uin
322322
config.ap.channel = channel;
323323
wlan_obj.channel = channel;
324324
config.ap.max_connection = 4;
325+
config.ap.ssid_hidden = (uint8_t)hidden;
325326
esp_wifi_set_config(WIFI_IF_AP, &config);
326327
}
327328

@@ -653,6 +654,7 @@ STATIC mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
653654
antenna_validate_antenna(antenna);
654655

655656
wlan_obj.pwrsave = args[5].u_bool;
657+
bool hidden = args[6].u_bool;
656658

657659
if (mode != WIFI_MODE_STA) {
658660
if (ssid == NULL) {
@@ -664,7 +666,7 @@ STATIC mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
664666
}
665667

666668
// initialize the wlan subsystem
667-
wlan_setup(mode, (const char *)ssid, auth, (const char *)key, channel, antenna, false);
669+
wlan_setup(mode, (const char *)ssid, auth, (const char *)key, channel, antenna, false, hidden);
668670
mod_network_register_nic(&wlan_obj);
669671

670672
return mp_const_none;
@@ -678,6 +680,7 @@ STATIC const mp_arg_t wlan_init_args[] = {
678680
{ MP_QSTR_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
679681
{ MP_QSTR_antenna, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
680682
{ MP_QSTR_power_save, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
683+
{ MP_QSTR_hidden, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
681684
};
682685
STATIC mp_obj_t wlan_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *all_args) {
683686
// parse args

‎esp32/mods/modwlan.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ extern wlan_obj_t wlan_obj;
7474
DECLARE PUBLIC FUNCTIONS
7575
******************************************************************************/
7676
extern void wlan_pre_init (void);
77-
extern void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key, uint32_t channel, uint32_t antenna, bool add_mac);
77+
extern void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key, uint32_t channel, uint32_t antenna, bool add_mac, bool ssid_hidden);
7878
extern void wlan_update(void);
7979
extern void wlan_get_mac (uint8_t *macAddress);
8080
extern void wlan_get_ip (uint32_t *ip);

‎esp32/mpconfigport.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
#define MICROPY_PY_BUILTINS_SLICE (1)
6666
#define MICROPY_PY_BUILTINS_PROPERTY (1)
6767
#define MICROPY_PY_BUILTINS_EXECFILE (1)
68+
#define MICROPY_PY_WEBSOCKET (1)
6869
#define MICROPY_PY___FILE__ (1)
6970
#define MICROPY_PY_GC (1)
7071
#define MICROPY_PY_ARRAY (1)

‎esp32/mptask.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ STATIC void mptask_enable_wifi_ap (void) {
443443
uint8_t wifi_pwd[64];
444444
config_get_wifi_pwd(wifi_pwd);
445445
wlan_setup (WIFI_MODE_AP, (wifi_ssid[0]==0x00) ? DEFAULT_AP_SSID : (const char*) wifi_ssid , WIFI_AUTH_WPA2_PSK, (wifi_pwd[0]==0x00) ? DEFAULT_AP_PASSWORD : (const char*) wifi_pwd ,
446-
DEFAULT_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, (wifi_ssid[0]==0x00) ? true:false);
446+
DEFAULT_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, (wifi_ssid[0]==0x00) ? true:false, false);
447447
mod_network_register_nic(&wlan_obj);
448448
}
449449

‎esp32/telnet/telnet.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,25 @@ static bool telnet_send_with_retries (int32_t sd, const void *pBuf, int32_t len)
557557
uint32_t delay = TELNET_WAIT_TIME_MS;
558558

559559
do {
560+
// make it blocking
561+
uint32_t option = fcntl(sd, F_GETFL, 0);
562+
option &= ~O_NONBLOCK;
563+
fcntl(sd, F_SETFL, option);
560564
if (send(sd, pBuf, len, 0) > 0) {
565+
// make it non-blocking again
566+
option |= O_NONBLOCK;
567+
fcntl(sd, F_SETFL, option);
561568
return true;
562569
} else if (EAGAIN != errno) {
570+
// make it non-blocking again
571+
option |= O_NONBLOCK;
572+
fcntl(sd, F_SETFL, option);
563573
return false;
564574
}
565575
// start with the default delay and increment it on each retry
566576
mp_hal_delay_ms(delay++);
567577
} while (++retries <= TELNET_TX_RETRIES_MAX);
578+
568579
return false;
569580
}
570581

‎extmod/modwebsocket.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
#include <stdio.h>
2828
#include <stdint.h>
2929
#include <string.h>
30-
#include <errno.h>
3130

32-
#include "py/nlr.h"
33-
#include "py/obj.h"
3431
#include "py/runtime.h"
3532
#include "py/stream.h"
3633
#include "extmod/modwebsocket.h"
@@ -88,7 +85,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
8885
self->buf_pos += out_sz;
8986
self->to_recv -= out_sz;
9087
if (self->to_recv != 0) {
91-
*errcode = EAGAIN;
88+
*errcode = MP_EAGAIN;
9289
return MP_STREAM_ERROR;
9390
}
9491
}
@@ -132,7 +129,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
132129

133130
self->buf_pos = 0;
134131
self->to_recv = to_recv;
135-
self->msg_sz = sz; // May be overriden by FRAME_OPT
132+
self->msg_sz = sz; // May be overridden by FRAME_OPT
136133
if (to_recv != 0) {
137134
self->state = FRAME_OPT;
138135
} else {
@@ -267,7 +264,7 @@ STATIC mp_uint_t websocket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t
267264
return cur;
268265
}
269266
default:
270-
*errcode = EINVAL;
267+
*errcode = MP_EINVAL;
271268
return MP_STREAM_ERROR;
272269
}
273270
}

‎extmod/modwebsocket.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
#ifndef MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
2+
#define MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
3+
14
#define FRAME_OPCODE_MASK 0x0f
25
enum {
36
FRAME_CONT, FRAME_TXT, FRAME_BIN,
47
FRAME_CLOSE = 0x8, FRAME_PING, FRAME_PONG
58
};
9+
10+
#endif // MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H

0 commit comments

Comments
 (0)