Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CYW43: Allow setting hostname. #8918

Closed
wants to merge 2 commits into from
Closed

CYW43: Allow setting hostname. #8918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1064a9
drivers/cyw43: Allow configuring the netif/mDNS hostname.
iabdalkader Jul 17, 2022
52810f6
extmod/network_cyw43: Add hostname config option.
iabdalkader Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions drivers/cyw43/cyw43.h
View file
Open in desktop
Expand Up @@ -47,6 +47,14 @@
#define CYW43_LINK_NONET (-2)
#define CYW43_LINK_BADAUTH (-3)

#ifndef MICROPY_BOARD_HOSTNAME
#define MICROPY_BOARD_HOSTNAME "PYBD"
#endif

#ifndef MICROPY_BOARD_HOSTNAME_LENGTH
#define MICROPY_BOARD_HOSTNAME_LENGTH 16
#endif

typedef struct _cyw43_t {
cyw43_ll_t cyw43_ll;

Expand Down Expand Up @@ -76,6 +84,7 @@ typedef struct _cyw43_t {
struct netif netif[2];
struct dhcp dhcp_client;
dhcp_server_t dhcp_server;
char hostname[MICROPY_BOARD_HOSTNAME_LENGTH];
} cyw43_t;

extern cyw43_t cyw43_state;
Expand Down
2 changes: 2 additions & 0 deletions drivers/cyw43/cyw43_ctrl.c
View file
Open in desktop
Expand Up @@ -101,6 +101,8 @@ void cyw43_init(cyw43_t *self) {
self->ap_channel = 3;
self->ap_ssid_len = 0;
self->ap_key_len = 0;
strncpy(self->hostname, MICROPY_BOARD_HOSTNAME, MICROPY_BOARD_HOSTNAME_LENGTH);
self->hostname[MICROPY_BOARD_HOSTNAME_LENGTH - 1] = 0;

cyw43_poll = NULL;
}
Expand Down
7 changes: 4 additions & 3 deletions drivers/cyw43/cyw43_lwip.c
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ void cyw43_tcpip_init(cyw43_t *self, int itf) {
#else
netif_add(n, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, cyw43_netif_init, netif_input);
#endif
netif_set_hostname(n, "PYBD");
netif_set_hostname(n, self->hostname);
netif_set_default(n);
netif_set_up(n);

Expand All @@ -132,8 +132,9 @@ void cyw43_tcpip_init(cyw43_t *self, int itf) {
#if LWIP_MDNS_RESPONDER
// TODO better to call after IP address is set
char mdns_hostname[9];
memcpy(&mdns_hostname[0], "PYBD", 4);
mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, &mdns_hostname[4]);
int len = MIN(strlen(self->hostname), 4);
memcpy(&mdns_hostname[0], self->hostname, len);
mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 4 + len, 8 - len, &mdns_hostname[len]);
mdns_hostname[8] = '\0';
mdns_resp_add_netif(n, mdns_hostname, 60);
#endif
Expand Down
9 changes: 9 additions & 0 deletions extmod/network_cyw43.c
View file
Open in desktop
Expand Up @@ -381,6 +381,9 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
cyw43_ioctl(self->cyw, CYW43_IOCTL_GET_VAR, 13, buf, self->itf);
return MP_OBJ_NEW_SMALL_INT(nw_get_le32(buf) / 4);
}
case MP_QSTR_hostname: {
return mp_obj_new_str(self->cyw->hostname, strlen(self->cyw->hostname));
}
default:
mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
}
Expand Down Expand Up @@ -453,6 +456,12 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
cyw43_ioctl(self->cyw, CYW43_IOCTL_SET_VAR, 9 + 4, buf, self->itf);
break;
}
case MP_QSTR_hostname: {
const char *hostname = mp_obj_str_get_str(e->value);
strncpy(self->cyw->hostname, hostname, MICROPY_BOARD_HOSTNAME_LENGTH);
self->cyw->hostname[MICROPY_BOARD_HOSTNAME_LENGTH - 1] = 0;
break;
}
default:
mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
}
Expand Down