Skip to content

Commit 6640db9

Browse files
microdev1microdev1
committed
make authmode settable
1 parent 7c84581 commit 6640db9

File tree

7 files changed

+69
-49
lines changed

7 files changed

+69
-49
lines changed

‎locale/circuitpython.pot

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ msgstr ""
350350
msgid "All state machines in use"
351351
msgstr ""
352352

353-
#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c
353+
#: ports/atmel-samd/audio_dma.c
354354
msgid "All sync event channels in use"
355355
msgstr ""
356356

@@ -441,6 +441,10 @@ msgstr ""
441441
msgid "Attempted heap allocation when VM not running."
442442
msgstr ""
443443

444+
#: shared-bindings/wifi/Radio.c
445+
msgid "AuthMode.OPEN is not used with password"
446+
msgstr ""
447+
444448
#: shared-bindings/wifi/Radio.c
445449
msgid "Authentication failure"
446450
msgstr ""
@@ -1193,6 +1197,10 @@ msgstr ""
11931197
msgid "Invalid ADC Unit value"
11941198
msgstr ""
11951199

1200+
#: ports/esp32s2/common-hal/wifi/Radio.c
1201+
msgid "Invalid AuthMode"
1202+
msgstr ""
1203+
11961204
#: shared-module/displayio/OnDiskBitmap.c
11971205
msgid "Invalid BMP file"
11981206
msgstr ""
@@ -2115,14 +2123,6 @@ msgstr ""
21152123
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21162124
msgstr ""
21172125

2118-
#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
2119-
msgid "Timeout waiting for DRDY"
2120-
msgstr ""
2121-
2122-
#: ports/atmel-samd/common-hal/imagecapture/ParallelImageCapture.c
2123-
msgid "Timeout waiting for VSYNC"
2124-
msgstr ""
2125-
21262126
#: supervisor/shared/safe_mode.c
21272127
msgid "To exit, please reset the board without "
21282128
msgstr ""
@@ -2352,10 +2352,6 @@ msgid ""
23522352
"To list built-in modules please do `help(\"modules\")`.\n"
23532353
msgstr ""
23542354

2355-
#: shared-bindings/wifi/Radio.c
2356-
msgid "WiFi password is not used with OPEN authentication"
2357-
msgstr ""
2358-
23592355
#: shared-bindings/wifi/Radio.c
23602356
msgid "WiFi password must be between 8 and 63 characters"
23612357
msgstr ""

‎ports/esp32s2/common-hal/wifi/Network.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
#include <string.h>
2828

29-
#include "py/enum.h"
3029
#include "shared-bindings/wifi/Network.h"
3130
#include "shared-bindings/wifi/AuthMode.h"
3231

‎ports/esp32s2/common-hal/wifi/Radio.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "py/runtime.h"
3636
#include "shared-bindings/ipaddress/IPv4Address.h"
3737
#include "shared-bindings/wifi/ScannedNetworks.h"
38+
#include "shared-bindings/wifi/AuthMode.h"
3839
#include "shared-module/ipaddress/__init__.h"
3940

4041
#include "components/esp_wifi/include/esp_wifi.h"
@@ -165,6 +166,33 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
165166
void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint8_t authmode) {
166167
set_mode_ap(self, true);
167168

169+
switch (authmode) {
170+
case (1 << AUTHMODE_OPEN):
171+
authmode = WIFI_AUTH_OPEN;
172+
break;
173+
case ((1 << AUTHMODE_WPA) | (1 << AUTHMODE_PSK)):
174+
authmode = WIFI_AUTH_WPA_PSK;
175+
break;
176+
case ((1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK)):
177+
authmode = WIFI_AUTH_WPA2_PSK;
178+
break;
179+
case ((1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK)):
180+
authmode = WIFI_AUTH_WPA_WPA2_PSK;
181+
break;
182+
case ((1 << AUTHMODE_WPA2) | (1 << AUTHMODE_ENTERPRISE)):
183+
authmode = WIFI_AUTH_WPA2_ENTERPRISE;
184+
break;
185+
case ((1 << AUTHMODE_WPA3) | (1 << AUTHMODE_PSK)):
186+
authmode = WIFI_AUTH_WPA3_PSK;
187+
break;
188+
case ((1 << AUTHMODE_WPA2) | (1 << AUTHMODE_WPA3) | (1 << AUTHMODE_PSK)):
189+
authmode = WIFI_AUTH_WPA2_WPA3_PSK;
190+
break;
191+
default:
192+
mp_raise_ValueError(translate("Invalid AuthMode"));
193+
break;
194+
}
195+
168196
wifi_config_t *config = &self->ap_config;
169197
memcpy(&config->ap.ssid, ssid, ssid_len);
170198
config->ap.ssid[ssid_len] = 0;

‎shared-bindings/wifi/AuthMode.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_WIFI_AUTHMODE_H
2828
#define MICROPY_INCLUDED_SHARED_BINDINGS_WIFI_AUTHMODE_H
2929

30+
#include "py/enum.h"
31+
3032
typedef enum {
3133
AUTHMODE_OPEN,
3234
AUTHMODE_WEP,
@@ -38,5 +40,6 @@ typedef enum {
3840
} wifi_authmode_t;
3941

4042
extern const mp_obj_type_t wifi_authmode_type;
43+
extern const cp_enum_obj_t authmode_OPEN_obj;
4144

4245
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_WIFI_AUTHMODE_H

‎shared-bindings/wifi/Radio.c

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626

2727
#include "shared-bindings/wifi/__init__.h"
28+
#include "shared-bindings/wifi/AuthMode.h"
2829

2930
#include <regex.h>
3031
#include <string.h>
@@ -190,19 +191,13 @@ STATIC mp_obj_t wifi_radio_stop_station(mp_obj_t self) {
190191
}
191192
MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station);
192193

193-
//| OPEN: int
194-
//| WPA_PSK: int
195-
//| WPA2_PSK: int
196-
//| WPA_WPA2_PSK: int
197-
//|
198194
//| def start_ap(self,
199195
//| ssid: ReadableBuffer,
200196
//| password: ReadableBuffer = b"",
201197
//| *,
202198
//| channel: Optional[int] = 1,
203-
//| authmode: Optional[int] = WPA_WPA2_PSK) -> None:
204-
//| """Starts an Access Point with the specified ssid and password
205-
//| If an empty.
199+
//| authmode: Optional[AuthMode]) -> None:
200+
//| """Starts an Access Point with the specified ssid and password.
206201
//|
207202
//| If ``channel`` is given, the access point will use that channel unless
208203
//| a station is already operating on a different channel.
@@ -217,29 +212,42 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_
217212
{ MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ },
218213
{ MP_QSTR_password, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
219214
{ MP_QSTR_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
220-
{ MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = WIFI_RADIO_AUTH_WPA_WPA2_PSK} },
215+
{ MP_QSTR_authmode, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
221216
};
222217

223218
wifi_radio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
224219
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
225220
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
226221

222+
uint8_t authmode = 0;
223+
if (args[ARG_authmode].u_obj != MP_OBJ_NULL) {
224+
mp_obj_iter_buf_t iter_buf;
225+
mp_obj_t item, iterable = mp_getiter(args[ARG_authmode].u_obj, &iter_buf);
226+
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
227+
authmode |= (1 << (wifi_authmode_t)cp_enum_value(&wifi_authmode_type, item));
228+
}
229+
}
230+
227231
mp_buffer_info_t ssid;
228232
mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ);
229233

230234
mp_buffer_info_t password;
231235
password.len = 0;
232236
if (args[ARG_password].u_obj != MP_OBJ_NULL) {
237+
if (authmode == 1) {
238+
mp_raise_ValueError(translate("AuthMode.OPEN is not used with password"));
239+
} else if (authmode == 0) {
240+
authmode = (1 << AUTHMODE_WPA) | (1 << AUTHMODE_WPA2) | (1 << AUTHMODE_PSK);
241+
}
233242
mp_get_buffer_raise(args[ARG_password].u_obj, &password, MP_BUFFER_READ);
234243
if (password.len > 0 && (password.len < 8 || password.len > 63)) {
235244
mp_raise_ValueError(translate("WiFi password must be between 8 and 63 characters"));
236245
}
237-
if (args[ARG_authmode].u_int == WIFI_RADIO_AUTH_OPEN) {
238-
mp_raise_ValueError(translate("WiFi password is not used with OPEN authentication"));
239-
}
246+
} else {
247+
authmode = 1;
240248
}
241249

242-
common_hal_wifi_radio_start_ap(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, args[ARG_authmode].u_int);
250+
common_hal_wifi_radio_start_ap(self, ssid.buf, ssid.len, password.buf, password.len, args[ARG_channel].u_int, authmode);
243251
return mp_const_none;
244252
}
245253
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_ap);
@@ -503,10 +511,6 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
503511
{ MP_ROM_QSTR(MP_QSTR_stop_station), MP_ROM_PTR(&wifi_radio_stop_station_obj) },
504512
{ MP_ROM_QSTR(MP_QSTR_stop_ap), MP_ROM_PTR(&wifi_radio_stop_ap_obj) },
505513
{ MP_ROM_QSTR(MP_QSTR_start_ap), MP_ROM_PTR(&wifi_radio_start_ap_obj) },
506-
{ MP_ROM_QSTR(MP_QSTR_OPEN), MP_ROM_INT(WIFI_RADIO_AUTH_OPEN) },
507-
{ MP_ROM_QSTR(MP_QSTR_WPA_PSK), MP_ROM_INT(WIFI_RADIO_AUTH_WPA_PSK) },
508-
{ MP_ROM_QSTR(MP_QSTR_WPA2_PSK), MP_ROM_INT(WIFI_RADIO_AUTH_WPA2_PSK) },
509-
{ MP_ROM_QSTR(MP_QSTR_WPA_WPA2_PSK), MP_ROM_INT(WIFI_RADIO_AUTH_WPA_WPA2_PSK) },
510514

511515
{ MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&wifi_radio_connect_obj) },
512516
// { MP_ROM_QSTR(MP_QSTR_connect_to_enterprise), MP_ROM_PTR(&wifi_radio_connect_to_enterprise_obj) },

‎shared-bindings/wifi/Radio.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@ typedef enum {
7171
WIFI_RADIO_ERROR_AP_TSF_RESET = 206,
7272
} wifi_radio_error_t;
7373

74-
typedef enum {
75-
WIFI_RADIO_AUTH_OPEN = 0, // OK
76-
WIFI_RADIO_AUTH_WEP, // not supported in SoftAP
77-
WIFI_RADIO_AUTH_WPA_PSK, // OK
78-
WIFI_RADIO_AUTH_WPA2_PSK, // OK
79-
WIFI_RADIO_AUTH_WPA_WPA2_PSK, // OK
80-
WIFI_RADIO_AUTH_WPA2_ENTERPRISE, // not currently supported
81-
WIFI_RADIO_AUTH_WPA3_PSK, // not currently supported
82-
WIFI_RADIO_AUTH_WPA2_WPA3_PSK, // not currently supported
83-
WIFI_RADIO_AUTH_MAX, // not currently supported
84-
} wifi_radio_authmode_t;
85-
8674
extern bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self);
8775
extern void common_hal_wifi_radio_set_enabled(wifi_radio_obj_t *self, bool enabled);
8876

‎shared-bindings/wifi/__init__.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
#include "py/objexcept.h"
2828
#include "py/runtime.h"
2929
#include "shared-bindings/wifi/__init__.h"
30+
#include "shared-bindings/wifi/AuthMode.h"
3031
#include "shared-bindings/wifi/Network.h"
3132
#include "shared-bindings/wifi/Radio.h"
3233

3334
//| """
34-
//| The `wifi` module provides necessary low-level functionality for managing wifi
35+
//| The `wifi` module provides necessary low-level functionality for managing
3536
//| wifi connections. Use `socketpool` for communicating over the network."""
3637
//|
3738
//| radio: Radio
@@ -49,15 +50,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(wifi___init___obj, wifi___init__);
4950

5051

5152
STATIC const mp_rom_map_elem_t wifi_module_globals_table[] = {
52-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_wifi) },
53-
{ MP_ROM_QSTR(MP_QSTR_Network), MP_ROM_PTR(&wifi_network_type) },
54-
{ MP_ROM_QSTR(MP_QSTR_Radio), MP_ROM_PTR(&wifi_radio_type) },
53+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_wifi) },
54+
{ MP_ROM_QSTR(MP_QSTR_Radio), MP_ROM_PTR(&wifi_radio_type) },
55+
{ MP_ROM_QSTR(MP_QSTR_Network), MP_ROM_PTR(&wifi_network_type) },
56+
{ MP_ROM_QSTR(MP_QSTR_AuthMode), MP_ROM_PTR(&wifi_authmode_type) },
5557

5658
// Properties
57-
{ MP_ROM_QSTR(MP_QSTR_radio), MP_ROM_PTR(&common_hal_wifi_radio_obj) },
59+
{ MP_ROM_QSTR(MP_QSTR_radio), MP_ROM_PTR(&common_hal_wifi_radio_obj) },
5860

5961
// Initialization
60-
{ MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&wifi___init___obj) },
62+
{ MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&wifi___init___obj) },
6163

6264
};
6365

0 commit comments

Comments
 (0)