8000 Implement hostname and bandwidth setting · Pull Request #165 · pycom/pycom-micropython-sigfox · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Implement hostname and bandwidth setting #165

Closed
wants to merge 1 commit into from
Closed

Implement hostname and bandwidth setting #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 118 additions & 5 deletions esp32/mods/modwlan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ STATIC void wlan_servers_stop (void);
//STATIC void wlan_reset (void);
STATIC void wlan_validate_mode (uint mode);
STATIC void wlan_set_mode (uint mode);
STATIC void wlan_validate_bandwidth (wifi_bandwidth_t mode);
STATIC bool wlan_set_bandwidth (wifi_bandwidth_t mode);
STATIC void wlan_validate_hostname (const char *hostname);
STATIC bool wlan_set_hostname (const char *hostname);
STATIC esp_err_t wlan_update_hostname ();
STATIC void wlan_setup_ap (const char *ssid, uint32_t auth, const char *key, uint32_t channel, bool add_mac, bool hidden);
STATIC void wlan_validate_ssid_len (uint32_t len);
STATIC uint32_t wlan_set_ssid_internal (const char *ssid, uint8_t len, bool add_mac);
Expand All @@ -141,7 +146,7 @@ STATIC void wlan_set_security_internal (uint8_t auth, const char *key);
STATIC void wlan_validate_channel (uint8_t channel);
STATIC void wlan_set_antenna (uint8_t antenna);
static esp_err_t wlan_event_handler(void *ctx, system_event_t *event);
STATIC void wlan_do_connect (const char* ssid, const char* bssid, const wifi_auth_mode_t auth, const char* key, int32_t timeout, const wlan_wpa2_ent_obj_t * const wpa2_ent);
STATIC void wlan_do_connect (const char* ssid, const char* bssid, const wifi_auth_mode_t auth, const char* key, int32_t timeout, const wlan_wpa2_ent_obj_t * const wpa2_ent, const char *hostname);
//STATIC void wlan_get_sl_mac (void);
//STATIC void wlan_wep_key_unhexlify (const char *key, char *key_out);
//STATIC void wlan_lpds_irq_enable (mp_obj_t self_in);
Expand All @@ -167,7 +172,7 @@ void wlan_pre_init (void) {
wlan_obj.base.type = (mp_obj_t)&mod_network_nic_type_wlan;
}

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) {
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, wifi_bandwidth_t bandwidth) {

wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_wifi_init(&cfg));
Expand All @@ -183,6 +188,7 @@ void wlan_setup (int32_t mode, const char *ssid, uint32_t auth, const char *key,

wlan_set_antenna(antenna);
wlan_set_mode(mode);
wlan_set_bandwidth(bandwidth);

if (mode != WIFI_MODE_STA) {
wlan_setup_ap (ssid, auth, key, channel, add_mac, hidden);
Expand Down Expand Up @@ -351,6 +357,66 @@ STATIC void wlan_set_mode (uint mode) {
esp_wifi_set_ps(wifi_ps_type);
}

STATIC void wlan_validate_bandwidth (wifi_bandwidth_t bandwidth) {
if (bandwidth < WIFI_BW_HT20 || bandwidth > WIFI_BW_HT40) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
}
}

STATIC bool wlan_set_bandwidth (wifi_bandwidth_t bandwidth)
{
if (wlan_obj.mode == WIFI_MODE_STA)
{
if(esp_wifi_set_bandwidth(WIFI_IF_STA, bandwidth) != ESP_OK)
return false;
} else
{
if(esp_wifi_set_bandwidth(WIFI_IF_AP, bandwidth) != ESP_OK)
return false;
}
wlan_obj.bandwidth = bandwidth;
return true;
}

STATIC void wlan_validate_hostname (const char *hostname) {
//dont set hostname it if is null, so its a valid hostname
if (hostname == NULL) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
}

uint8_t len = strlen(hostname);
if(len == 0 || len > TCPIP_HOSTNAME_MAX_SIZE){
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
}
}

STATIC bool wlan_set_hostname (const char *hostname) {
if (wlan_obj.mode == WIFI_MODE_STA)
{
if(tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, hostname) != ESP_OK)
return false;
} else
{
if(tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_AP, hostname) != ESP_OK)
return false;
}

strlcpy((char*)wlan_obj.hostname, hostname, TCPIP_HOSTNAME_MAX_SIZE);
return true;
}

STATIC esp_err_t wlan_update_hostname () {
char* hostname = NULL;
tcpip_adapter_if_t interface = wlan_obj.mode == WIFI_MODE_STA ? TCPIP_ADAPTER_IF_STA : TCPIP_ADAPTER_IF_AP;

esp_err_t err = tcpip_adapter_get_hostname(interface, (const char**)&hostname);
if(err != ESP_OK)
return err;

strlcpy((char*)wlan_obj.hostname, hostname, TCPIP_HOSTNAME_MAX_SIZE);
return err;
}

STATIC void wlan_validate_ssid_len (uint32_t len) {
if (len > MODWLAN_SSID_LEN_MAX) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
Expand Down Expand Up @@ -433,7 +499,7 @@ STATIC void wlan_validate_certificates (wlan_wpa2_ent_obj_t *wpa2_ent) {
}

STATIC void wlan_do_connect (const char* ssid, const char* bssid, const wifi_auth_mode_t auth, const char* key,
int32_t timeout, const wlan_wpa2_ent_obj_t * const wpa2_ent) {
int32_t timeout, const wlan_wpa2_ent_obj_t * const wpa2_ent, const char* hostname) {

esp_wpa2_config_t wpa2_config = WPA2_CONFIG_INIT_DEFAULT();
wifi_config_t wifi_config;
Expand Down Expand Up @@ -505,6 +571,11 @@ STATIC void wlan_do_connect (const char* ssid, const char* bssid, const wifi_aut
}
}

if(hostname != NULL)
wlan_set_hostname(hostname);
else
wlan_update_hostname();

if (ESP_OK != esp_wifi_connect()) {
goto os_error;
}
Expand Down Expand Up @@ -665,8 +736,11 @@ STATIC mp_obj_t wlan_init_helper(wlan_obj_t *self, const mp_arg_val_t *args) {
}
}

int32_t bandwidth = args[7].u_int;
wlan_validate_bandwidth(bandwidth);

// initialize the wlan subsystem
wlan_setup(mode, (const char *)ssid, auth, (const char *)key, channel, antenna, false, hidden);
wlan_setup(mode, (const char *)ssid, auth, (const char *)key, channel, antenna, false, hidden, bandwidth);
mod_network_register_nic(&wlan_obj);

return mp_const_none;
Expand All @@ -681,6 +755,7 @@ STATIC const mp_arg_t wlan_init_args[] = {
{ MP_QSTR_antenna, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
{ MP_QSTR_power_save, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
{ MP_QSTR_hidden, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
{ MP_QSTR_bandwidth, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = WIFI_BW_HT40} },
};
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) {
// parse args
Expand Down Expand Up @@ -789,6 +864,7 @@ STATIC mp_obj_t wlan_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
{ MP_QSTR_keyfile, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_certfile, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_identity, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
};

// check for the correct wlan mode
Expand Down Expand Up @@ -875,13 +951,19 @@ STATIC mp_obj_t wlan_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
wpa2_ent.identity = mp_obj_str_get_str(args[7].u_obj);
}

const char *hostname = NULL;
if (args[8].u_obj != mp_const_none) {
hostname = mp_obj_str_get_str(args[8].u_obj);
wlan_validate_hostname(hostname);
}

if (auth == WIFI_AUTH_WPA2_ENTERPRISE) {
wpa2_ent.username = user;
wlan_validate_certificates(&wpa2_ent);
}

// connect to the requested access point
wlan_do_connect (ssid, bssid, auth, key, timeout, &wpa2_ent);
wlan_do_connect (ssid, bssid, auth, key, timeout, &wpa2_ent, hostname);

return mp_const_none;

Expand Down Expand Up @@ -997,6 +1079,18 @@ STATIC mp_obj_t wlan_mode (mp_uint_t n_args, const mp_obj_t *args) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_mode_obj, 1, 2, wlan_mode);

STATIC mp_obj_t wlan_bandwidth (mp_uint_t n_args, const mp_obj_t *args) {
wlan_obj_t *self = args[0];
if (n_args == 1) {
return mp_obj_new_int(self->bandwidth);
} else {
uint bandwidth = mp_obj_get_int(args[1]);
wlan_validate_bandwidth(bandwidth);
return mp_obj_new_bool(wlan_set_bandwidth(bandwidth));
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_bandwidth_obj, 1, 2, wlan_bandwidth);

STATIC mp_obj_t wlan_ssid (mp_uint_t n_args, const mp_obj_t *args) {
wlan_obj_t *self = args[0];
if (n_args == 1) {
Expand Down Expand Up @@ -1055,6 +1149,21 @@ STATIC mp_obj_t wlan_auth (mp_uint_t n_args, const mp_obj_t *args) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_auth_obj, 1, 2, wlan_auth);

STATIC mp_obj_t wlan_hostname (mp_uint_t n_args, const mp_obj_t *args) {
wlan_obj_t *self = args[0];
if (n_args == 1) {
return mp_obj_new_str((const char *)self->hostname, strlen((const char *)self->hostname), false);
} else {
const char *hostname = mp_obj_str_get_str(args[1]);
if(hostname == NULL)
return mp_obj_new_bool(false);

wlan_validate_hostname(hostname);
return mp_obj_new_bool(wlan_set_hostname(hostname));
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wlan_hostname_obj, 1, 2, wlan_hostname);

STATIC mp_obj_t wlan_channel (mp_uint_t n_args, const mp_obj_t *args) {
wlan_obj_t *self = args[0];
if (n_args == 1) {
Expand Down Expand Up @@ -1142,9 +1251,11 @@ STATIC const mp_map_elem_t wlan_locals_dict_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_isconnected), (mp_obj_t)&wlan_isconnected_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ifconfig), (mp_obj_t)&wlan_ifconfig_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_mode), (mp_obj_t)&wlan_mode_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_bandwidth), (mp_obj_t)&wlan_bandwidth_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssid), (mp_obj_t)&wlan_ssid_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_bssid), (mp_obj_t)&wlan_bssid_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_auth), (mp_obj_t)&wlan_auth_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_hostname), (mp_obj_t)&wlan_hostname_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_channel), (mp_obj_t)&wlan_channel_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_antenna), (mp_obj_t)&wlan_antenna_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_mac), (mp_obj_t)&wlan_mac_obj },
Expand All @@ -1162,6 +1273,8 @@ STATIC const mp_map_elem_t wlan_locals_dict_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_WPA2_ENT), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA2_ENTERPRISE) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_INT_ANT), MP_OBJ_NEW_SMALL_INT(ANTENNA_TYPE_INTERNAL) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_EXT_ANT), MP_OBJ_NEW_SMALL_INT(ANTENNA_TYPE_EXTERNAL) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_HT20), MP_OBJ_NEW_SMALL_INT(WIFI_BW_HT20) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_HT40), MP_OBJ_NEW_SMALL_INT(WIFI_BW_HT40) },
// { MP_OBJ_NEW_QSTR(MP_QSTR_ANY_EVENT), MP_OBJ_NEW_SMALL_INT(MODWLAN_WIFI_EVENT_ANY) },
};
STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
Expand Down
6 changes: 5 additions & 1 deletion esp32/mods/modwlan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef MODWLAN_H_
#define MODWLAN_H_

#include <tcpip_adapter.h>

/******************************************************************************
DEFINE CONSTANTS
******************************************************************************/
Expand Down Expand Up @@ -45,6 +47,7 @@ typedef struct _wlan_obj_t {
uint32_t ip;

int8_t mode;
int8_t bandwidth;
uint8_t auth;
uint8_t channel;
uint8_t antenna;
Expand All @@ -53,6 +56,7 @@ typedef struct _wlan_obj_t {
uint8_t ssid[(MODWLAN_SSID_LEN_MAX + 1)];
uint8_t key[65];
uint8_t mac[6];
uint8_t h 1E0A ostname[TCPIP_HOSTNAME_MAX_SIZE];

// the sssid (or name) and mac of the other device
uint8_t ssid_o[33];
Expand All @@ -74,7 +78,7 @@ extern wlan_obj_t wlan_obj;
DECLARE PUBLIC FUNCTIONS
******************************************************************************/
extern void wlan_pre_init (void);
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);
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, wifi_bandwidth_t bandwidth);
extern void wlan_update(void);
extern void wlan_get_mac (uint8_t *macAddress);
extern void wlan_get_ip (uint32_t *ip);
Expand Down
5 changes: 3 additions & 2 deletions esp32/mptask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,9 @@ STATIC void mptask_enable_wifi_ap (void) {
config_get_wifi_ssid(wifi_ssid);
uint8_t wifi_pwd[64];
config_get_wifi_pwd(wifi_pwd);
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 ,
DEFAULT_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, (wifi_ssid[0]==0x00) ? true:false, false);

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 ,
DEFAULT_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, (wifi_ssid[0]==0x00) ? true:false, false, WIFI_BW_HT40);
mod_network_register_nic(&wlan_obj);
}

Expand Down
0