mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-20 19:41:58 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5d0abc50e0 | ||
|
|
9d0b015217 | ||
|
|
1620b2ae03 | ||
|
|
0914048424 | ||
|
|
0f319e3060 | ||
|
|
d612b7f1c4 | ||
|
|
6d5f4a5a20 | ||
|
|
cd10b35de4 | ||
|
|
f04cb5333e | ||
|
|
28e3b347d4 | ||
|
|
069ab78c02 | ||
|
|
1ce7e416b0 | ||
|
|
63aaad829a | ||
|
|
9322227886 | ||
|
|
e3a78d513e | ||
|
|
ee338b7bba | ||
|
|
0f157bd23b |
No files matched your search
@@ -560,8 +560,7 @@ jobs:
|
||||
# - run: make -C tutorials/${{ matrix.example.path }} build
|
||||
|
||||
wizard_examples_arm:
|
||||
# Keep rp-ti on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK
|
||||
runs-on: ${{ matrix.group == 'rp-ti' && 'ubuntu-24.04' || 'ubuntu-latest' }}
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
|
||||
@@ -201,8 +201,7 @@ jobs:
|
||||
run: make -C tutorials/${{ matrix.example.path }} build
|
||||
|
||||
generic_examples_arm:
|
||||
# Keep RP on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK
|
||||
runs-on: ${{ startsWith(matrix.example.path, 'rp/') && 'ubuntu-24.04' || 'ubuntu-latest' }}
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@@ -245,8 +244,7 @@ jobs:
|
||||
run: make -C tutorials/${{ matrix.example.path }} build
|
||||
|
||||
device_dashboard_examples_arm:
|
||||
# Keep RP on 24.04: Pico SDK 2.1.1 pioasm fails with GCC 15; update SDK
|
||||
runs-on: ${{ startsWith(matrix.example.path, 'rp/') && 'ubuntu-24.04' || 'ubuntu-latest' }}
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@@ -272,8 +270,7 @@ jobs:
|
||||
run: make -C tutorials/${{ matrix.example.path }} build
|
||||
|
||||
mqtt_dashboard_examples_arm:
|
||||
# Pico SDK 2.1.0 pioasm fails with GCC 15; update SDK to unpin
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
|
||||
+467
-162
File diff suppressed because it is too large.
Load diff
+101
-13
@@ -113,7 +113,9 @@ extern "C" {
|
||||
|
||||
|
||||
#if MG_ARCH == MG_ARCH_ARMGCC
|
||||
#ifndef _POSIX_TIMERS // Some newlib builds, e.g. Espressif's, define it
|
||||
#define _POSIX_TIMERS
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP
|
||||
@@ -189,16 +191,18 @@ extern "C" {
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#endif
|
||||
|
||||
#if !defined(MG_OTA) && defined(STM32F1) || defined(STM32F2) || \
|
||||
defined(STM32F4) || defined(STM32F7)
|
||||
#ifndef MG_OTA // Pick OTA for the STM32 family, unless set by the user
|
||||
#if defined(STM32F1) || defined(STM32F2) || defined(STM32F4) || \
|
||||
defined(STM32F7)
|
||||
#define MG_OTA MG_OTA_STM32F
|
||||
#elif !defined(MG_OTA) && defined(STM32H5)
|
||||
#elif defined(STM32H5)
|
||||
#define MG_OTA MG_OTA_STM32H5
|
||||
#elif !defined(MG_OTA) && defined(STM32H7)
|
||||
#elif defined(STM32H7)
|
||||
#define MG_OTA MG_OTA_STM32H7
|
||||
#elif !defined(MG_OTA) && defined(STM32C5)
|
||||
#elif defined(STM32C5)
|
||||
#define MG_OTA MG_OTA_STM32C5
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// use HAL-defined execute-in-ram section
|
||||
#ifndef MG_IRAM
|
||||
@@ -1224,6 +1228,10 @@ struct timeval {
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 0
|
||||
#endif
|
||||
|
||||
#ifndef MG_ENABLE_CUSTOM_MICROS
|
||||
#define MG_ENABLE_CUSTOM_MICROS 0
|
||||
#endif
|
||||
|
||||
#ifndef MG_ENABLE_ASSERT
|
||||
#define MG_ENABLE_ASSERT 0
|
||||
#endif
|
||||
@@ -3430,11 +3438,13 @@ size_t mg_ws_vprintf(struct mg_connection *c, int op, const char *fmt,
|
||||
|
||||
|
||||
|
||||
// Return milliseconds since boot (uptime). Never goes backwards.
|
||||
// On RTOS targets (FreeRTOS, ThreadX, Zephyr, etc.) uses the RTOS tick count.
|
||||
// On STM32/Cube uses HAL_GetTick(). On Arduino uses millis().
|
||||
// On Linux/macOS uses CLOCK_MONOTONIC_RAW or CLOCK_MONOTONIC; falls back to
|
||||
// CLOCK_REALTIME if neither is available.
|
||||
// Return microseconds since boot. Never goes backwards.
|
||||
// To define your own implementation, set MG_ENABLE_CUSTOM_MICROS=1
|
||||
uint64_t mg_micros(void);
|
||||
|
||||
// Return milliseconds since boot. Never goes backwards. Calls mg_micros().
|
||||
// To define your own implementation, set MG_ENABLE_CUSTOM_MILLIS=1
|
||||
// Deprecated: use mg_micros() instead.
|
||||
uint64_t mg_millis(void);
|
||||
|
||||
// Boot timestamp in ms since Epoch. 0 until the first successful SNTP sync;
|
||||
@@ -4867,6 +4877,7 @@ extern struct mg_tcpip_driver mg_tcpip_driver_netc;
|
||||
|
||||
|
||||
|
||||
|
||||
// SPI bus abstraction for SPI-attached network chips (e.g. W5500).
|
||||
// Populate and assign to the driver's driver_data field.
|
||||
struct mg_tcpip_spi {
|
||||
@@ -4933,9 +4944,6 @@ struct mg_tcpip_spi {
|
||||
|
||||
#if MG_ENABLE_TCPIP
|
||||
|
||||
// Monotonic time in microseconds.
|
||||
uint64_t mg_micros(void);
|
||||
|
||||
// A radio standard
|
||||
struct mg_radio {
|
||||
const char *name; // For logs
|
||||
@@ -4965,6 +4973,21 @@ struct mg_radio {
|
||||
#define MG_802154_CHANNEL 15
|
||||
#endif
|
||||
|
||||
// A turn's answer must arrive this soon after the turn's last frame ends on
|
||||
// air, or the turn ends. A node that would answer later stays silent and keeps
|
||||
// its frame for the next turn. Covers the node's poll latency, the radio
|
||||
// turnaround and one full fragment's airtime, 4.3 ms on 802.15.4
|
||||
#ifndef MG_MESH_ANSWER_TIMEOUT_US
|
||||
#define MG_MESH_ANSWER_TIMEOUT_US 8000
|
||||
#endif
|
||||
|
||||
// Misses in a row before giving up, 1 to 127. The bridge removes a member
|
||||
// that did not answer this many turns. A node leaves the mesh after this
|
||||
// many rounds without a turn
|
||||
#ifndef MG_MESH_MAX_MISSES
|
||||
#define MG_MESH_MAX_MISSES 10
|
||||
#endif
|
||||
|
||||
extern const struct mg_radio mg_radio_802154;
|
||||
|
||||
struct mg_mesh_node {
|
||||
@@ -4974,6 +4997,7 @@ struct mg_mesh_node {
|
||||
size_t (*tx)(struct mg_tcpip_if *, const void *, size_t); // Radio frame TX
|
||||
size_t rx_len; // Complete Ethernet frame in the interface RX buffer
|
||||
uint64_t now; // Current driver poll time, us
|
||||
uint64_t rx_at; // Arrival time of the radio frame being handled, us
|
||||
uint64_t tx_at; // Earliest next transmission, us
|
||||
void *data; // Private state owned by the strategy
|
||||
size_t ram_used; // Live mesh state bytes
|
||||
@@ -4998,6 +5022,18 @@ struct mg_mesh {
|
||||
|
||||
extern const struct mg_mesh mg_mesh_default;
|
||||
|
||||
// Put a received radio frame into the driver's receive queue, together with
|
||||
// its arrival time from mg_micros(). Call it when the frame arrives, from the
|
||||
// radio interrupt if the driver has one. If the queue is full, the frame is
|
||||
// dropped and counted in ifp->ndrop
|
||||
void mg_mesh_rx_queue(struct mg_queue *q, struct mg_tcpip_if *ifp,
|
||||
const void *frame, size_t len);
|
||||
|
||||
// Pass queued radio frames to the mesh, oldest first. Before each frame,
|
||||
// node->rx_at is set to its arrival time. Stops while the node holds a
|
||||
// received Ethernet frame the TCP/IP stack has not taken yet
|
||||
void mg_mesh_rx_drain(struct mg_mesh_node *node, struct mg_queue *q);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -5065,6 +5101,18 @@ void mg_bsd_poll(struct mg_mgr *);
|
||||
#ifndef ENOSPC
|
||||
#define ENOSPC 28
|
||||
#endif
|
||||
#ifndef EOPNOTSUPP
|
||||
#define EOPNOTSUPP 95
|
||||
#endif
|
||||
#ifndef EISCONN
|
||||
#define EISCONN 106
|
||||
#endif
|
||||
#ifndef EDESTADDRREQ
|
||||
#define EDESTADDRREQ 121
|
||||
#endif
|
||||
#ifndef EMSGSIZE
|
||||
#define EMSGSIZE 90
|
||||
#endif
|
||||
#ifndef EPROTONOSUPPORT
|
||||
#define EPROTONOSUPPORT 93
|
||||
#endif
|
||||
@@ -5293,6 +5341,46 @@ struct mg_tcpip_driver_cyw_data {
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
// Copyright (c) 2026 Cesanta Software Limited
|
||||
// All rights reserved
|
||||
|
||||
|
||||
|
||||
#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_ESP32_802154) && \
|
||||
MG_ENABLE_DRIVER_ESP32_802154
|
||||
|
||||
// ESP32-C6 IEEE 802.15.4 radio, as an Ethernet interface through the mesh.
|
||||
// Needs MG_ARCH_ESP32 and CONFIG_IEEE802154_ENABLED: it uses ESP-IDF's
|
||||
// esp_ieee802154 driver, and defines its esp_ieee802154_receive_done(),
|
||||
// esp_ieee802154_transmit_done() and esp_ieee802154_transmit_failed()
|
||||
// callbacks. See tutorials/esp32/minimal-802.15.4
|
||||
struct mg_tcpip_driver_esp32_802154_data {
|
||||
struct mg_mesh_node *mesh; // Driver-owned runtime state
|
||||
const struct mg_mesh *strategy; // NULL selects mg_mesh_default
|
||||
};
|
||||
|
||||
extern struct mg_tcpip_driver mg_tcpip_driver_esp32_802154;
|
||||
|
||||
#define MG_TCPIP_DRIVER_ESP32_802154_INIT(manager) \
|
||||
do { \
|
||||
static struct mg_tcpip_driver_esp32_802154_data driver_data_; \
|
||||
static struct mg_tcpip_if mif_; \
|
||||
MG_SET_MAC_ADDRESS(mif_.mac); \
|
||||
mif_.ip = MG_TCPIP_IP; \
|
||||
mif_.mask = MG_TCPIP_MASK; \
|
||||
mif_.gw = MG_TCPIP_GW; \
|
||||
mif_.mgr = (manager); \
|
||||
mif_.driver = &mg_tcpip_driver_esp32_802154; \
|
||||
mif_.driver_data = &driver_data_; \
|
||||
mg_tcpip_init((manager), &mif_); \
|
||||
MG_INFO(("Driver: esp32_802154, MAC: %M", mg_print_mac, mif_.mac)); \
|
||||
} while (0)
|
||||
|
||||
#ifndef MG_TCPIP_DRIVER_INIT
|
||||
#define MG_TCPIP_DRIVER_INIT(x) MG_TCPIP_DRIVER_ESP32_802154_INIT(x)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if MG_ENABLE_TCPIP && \
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#if MG_ARCH == MG_ARCH_ARMGCC
|
||||
#ifndef _POSIX_TIMERS // Some newlib builds, e.g. Espressif's, define it
|
||||
#define _POSIX_TIMERS
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP
|
||||
|
||||
+7
-5
@@ -52,16 +52,18 @@
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#endif
|
||||
|
||||
#if !defined(MG_OTA) && defined(STM32F1) || defined(STM32F2) || \
|
||||
defined(STM32F4) || defined(STM32F7)
|
||||
#ifndef MG_OTA // Pick OTA for the STM32 family, unless set by the user
|
||||
#if defined(STM32F1) || defined(STM32F2) || defined(STM32F4) || \
|
||||
defined(STM32F7)
|
||||
#define MG_OTA MG_OTA_STM32F
|
||||
#elif !defined(MG_OTA) && defined(STM32H5)
|
||||
#elif defined(STM32H5)
|
||||
#define MG_OTA MG_OTA_STM32H5
|
||||
#elif !defined(MG_OTA) && defined(STM32H7)
|
||||
#elif defined(STM32H7)
|
||||
#define MG_OTA MG_OTA_STM32H7
|
||||
#elif !defined(MG_OTA) && defined(STM32C5)
|
||||
#elif defined(STM32C5)
|
||||
#define MG_OTA MG_OTA_STM32C5
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// use HAL-defined execute-in-ram section
|
||||
#ifndef MG_IRAM
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "bsd.h"
|
||||
#include "dns.h"
|
||||
#include "util.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#if MG_ENABLE_BSD_SOCKETS && MG_ENABLE_FREERTOS
|
||||
@@ -131,6 +132,46 @@ static struct mg_connection *bsd_new_conn(struct mg_bsd_sock *s) {
|
||||
return c;
|
||||
}
|
||||
|
||||
// Mirror net_builtin.c::trim_len() logic
|
||||
static bool bsd_udp_too_big(struct mg_connection *c, size_t len) {
|
||||
struct mg_tcpip_if *ifp = c->mgr->ifp;
|
||||
size_t hlen = c->rem.is_ip6 ? 48 : 32; // IP plus UDP headers
|
||||
size_t cap = ifp->mtu - hlen;
|
||||
size_t room = ifp->tx.len - (ifp->framesize - ifp->l2mtu) - hlen;
|
||||
|
||||
return len > cap || len > room;
|
||||
}
|
||||
|
||||
static bool bsd_udp_queue(struct mg_connection *c, const void *buf,
|
||||
size_t len) {
|
||||
// One raw datagram occupies c->send until write_conn() drains it.
|
||||
return mg_iobuf_add(&c->send, c->send.len, buf, len) == len;
|
||||
}
|
||||
|
||||
static size_t bsd_recv(struct mg_bsd_sock *s, void *buf, size_t len,
|
||||
int flags, struct sockaddr *src, socklen_t *addrlen) {
|
||||
struct mg_connection *c = s->c;
|
||||
size_t n;
|
||||
|
||||
if (!s->is_udp) {
|
||||
n = c->recv.len < len ? c->recv.len : len;
|
||||
memcpy(buf, c->recv.buf, n);
|
||||
if (!(flags & MSG_PEEK)) mg_iobuf_del(&c->recv, 0, n);
|
||||
} else {
|
||||
n = c->recv.len < len ? c->recv.len : len;
|
||||
memcpy(buf, c->recv.buf, n);
|
||||
if (src != NULL && addrlen != NULL) {
|
||||
struct sockaddr_in *sa = (struct sockaddr_in *) src;
|
||||
sa->sin_family = AF_INET;
|
||||
sa->sin_port = c->rem.port;
|
||||
sa->sin_addr.s_addr = c->rem.addr.ip4;
|
||||
*addrlen = sizeof(*sa);
|
||||
}
|
||||
if (!(flags & MSG_PEEK)) mg_iobuf_del(&c->recv, 0, c->recv.len);
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
#if MG_ENABLE_FREERTOS
|
||||
// Complete operations blocked on c before Mongoose destroys it.
|
||||
static void bsd_finish_waiters(struct mg_bsd_sock *s, bool error) {
|
||||
@@ -315,9 +356,10 @@ static int bsd_ready(struct mg_bsd_sock *s) {
|
||||
if (s->is_shut_rd || s->c->recv.len > 0 || s->c->is_draining)
|
||||
ready |= BSD_READ;
|
||||
if (s->is_shut_wr) ready |= BSD_ERROR;
|
||||
if (!s->is_shut_wr && !s->is_udp && !s->c->is_connecting &&
|
||||
!s->c->is_closing && !s->c->is_draining)
|
||||
ready |= BSD_WRITE; // Established TCP socket
|
||||
if (!s->is_shut_wr && (s->is_udp || !s->c->is_connecting) &&
|
||||
!s->c->is_closing && !s->c->is_draining &&
|
||||
(!s->is_udp || s->c->send.len == 0))
|
||||
ready |= BSD_WRITE; // UDP socket or established TCP socket
|
||||
return ready;
|
||||
}
|
||||
|
||||
@@ -331,7 +373,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
|
||||
if (t->orphan && t->listener == s) {
|
||||
if (t->c != NULL) {
|
||||
t->c->fn_data = NULL;
|
||||
mg_close_conn(t->c);
|
||||
t->c->is_draining = 1;
|
||||
t->c = NULL;
|
||||
}
|
||||
memset(t, 0, sizeof(*t)); // Release orphan
|
||||
@@ -339,7 +381,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
|
||||
}
|
||||
if (s->c != NULL) {
|
||||
s->c->fn_data = NULL;
|
||||
mg_close_conn(s->c);
|
||||
s->c->is_draining = 1;
|
||||
s->c = NULL;
|
||||
}
|
||||
memset(s, 0, sizeof(*s)); // Release socket
|
||||
@@ -529,8 +571,8 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
cmd->result = -1, cmd->err = ECONNREFUSED;
|
||||
return true;
|
||||
}
|
||||
if (!c->is_connecting) {
|
||||
cmd->result = 0;
|
||||
if (s->is_udp || !c->is_connecting) {
|
||||
cmd->result = 0; // UDP may still resolve ARP; TCP waits for SYN/SYN-ACK
|
||||
return true;
|
||||
}
|
||||
if (s->nonblock) {
|
||||
@@ -555,11 +597,8 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
return true;
|
||||
}
|
||||
if (c->recv.len > 0) {
|
||||
size_t n = cmd->op_recv.len;
|
||||
if (c->recv.len < n) n = c->recv.len;
|
||||
memcpy(cmd->op_recv.buf, c->recv.buf, n);
|
||||
if (!(cmd->op_recv.flags & MSG_PEEK)) mg_iobuf_del(&c->recv, 0, n);
|
||||
cmd->result = (int) n;
|
||||
cmd->result = (int) bsd_recv(s, cmd->op_recv.buf, cmd->op_recv.len,
|
||||
cmd->op_recv.flags, NULL, NULL);
|
||||
return true;
|
||||
}
|
||||
if (s->err != 0) {
|
||||
@@ -583,7 +622,25 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
} else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
|
||||
c->is_closing || c->is_draining) {
|
||||
cmd->result = -1, cmd->err = EPIPE;
|
||||
} else if (mg_send(c, cmd->op_send.buf, cmd->op_send.len)) {
|
||||
} else if (c == NULL || (s->is_udp && !c->is_client)) {
|
||||
cmd->result = -1, cmd->err = s->is_udp ? EDESTADDRREQ : EPIPE;
|
||||
} else if (s->is_udp && cmd->op_send.len == 0) {
|
||||
cmd->result = 0;
|
||||
} else if (s->is_udp && bsd_udp_too_big(c, cmd->op_send.len)) {
|
||||
cmd->result = -1, cmd->err = EMSGSIZE;
|
||||
} else if (s->is_udp && c->send.len > 0) {
|
||||
if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) {
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
} else {
|
||||
#if MG_ENABLE_FREERTOS
|
||||
return false; // One UDP datagram is pending, wait
|
||||
#else
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
#endif
|
||||
}
|
||||
} else if ((s->is_udp
|
||||
? bsd_udp_queue(c, cmd->op_send.buf, cmd->op_send.len)
|
||||
: mg_send(c, cmd->op_send.buf, cmd->op_send.len))) {
|
||||
cmd->result = (int) cmd->op_send.len;
|
||||
} else if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) {
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
@@ -600,27 +657,51 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
|
||||
if ((s = bsd_get(cmd->op_sendto.fd)) == NULL) {
|
||||
cmd->result = -1, cmd->err = EBADF;
|
||||
} else if (!s->is_udp) {
|
||||
cmd->result = -1, cmd->err = EOPNOTSUPP;
|
||||
} else if ((err = bsd_addr4(cmd->op_sendto.addr,
|
||||
cmd->op_sendto.addrlen)) != 0) {
|
||||
cmd->result = -1, cmd->err = err;
|
||||
} else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
|
||||
c->is_closing || c->is_draining) {
|
||||
cmd->result = -1, cmd->err = EPIPE;
|
||||
} else if (c->is_client) {
|
||||
cmd->result = -1, cmd->err = EISCONN;
|
||||
} else {
|
||||
const struct sockaddr_in *sa =
|
||||
(const struct sockaddr_in *) cmd->op_sendto.addr;
|
||||
if (cmd->op_sendto.len == 0) {
|
||||
cmd->result = 0;
|
||||
} else if (bsd_udp_too_big(c, cmd->op_sendto.len)) {
|
||||
cmd->result = -1, cmd->err = EMSGSIZE;
|
||||
} else if (c->send.len == 0) {
|
||||
struct mg_addr rem = c->rem;
|
||||
bool resolve = rem.is_ip6 || rem.addr.ip4 != sa->sin_addr.s_addr;
|
||||
c->rem.port = sa->sin_port;
|
||||
c->rem.addr.ip4 = sa->sin_addr.s_addr;
|
||||
c->rem.is_ip6 = false;
|
||||
if (mg_send(c, cmd->op_sendto.buf, cmd->op_sendto.len)) {
|
||||
if (bsd_udp_queue(c, cmd->op_sendto.buf, cmd->op_sendto.len)) {
|
||||
if (resolve) mg_connect_resolved(c);
|
||||
cmd->result = (int) cmd->op_sendto.len;
|
||||
} else if (s->nonblock || (cmd->op_sendto.flags & MSG_DONTWAIT)) {
|
||||
} else {
|
||||
c->rem = rem;
|
||||
if (s->nonblock || (cmd->op_sendto.flags & MSG_DONTWAIT)) {
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
} else {
|
||||
#if MG_ENABLE_FREERTOS
|
||||
return false; // No send buffer space yet, wait
|
||||
#else
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
} else if (s->nonblock || (cmd->op_sendto.flags & MSG_DONTWAIT)) {
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
} else {
|
||||
#if MG_ENABLE_FREERTOS
|
||||
return false; // One UDP datagram is pending, wait
|
||||
#else
|
||||
cmd->result = -1, cmd->err = EAGAIN;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -630,6 +711,9 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
if ((s = bsd_get(cmd->op_recvfrom.fd)) == NULL) {
|
||||
cmd->result = -1, cmd->err = EBADF;
|
||||
return true;
|
||||
} else if (!s->is_udp) {
|
||||
cmd->result = -1, cmd->err = EOPNOTSUPP;
|
||||
return true;
|
||||
}
|
||||
if (s->is_shut_rd) {
|
||||
cmd->result = 0;
|
||||
@@ -641,25 +725,11 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
|
||||
return true;
|
||||
}
|
||||
if (c->recv.len > 0) {
|
||||
size_t n = cmd->op_recvfrom.len;
|
||||
|
||||
if (cmd->op_recvfrom.src != NULL &&
|
||||
(cmd->op_recvfrom.addrlen == NULL ||
|
||||
*cmd->op_recvfrom.addrlen < sizeof(struct sockaddr_in))) {
|
||||
cmd->result = -1, cmd->err = EINVAL;
|
||||
return true;
|
||||
}
|
||||
if (c->recv.len < n) n = c->recv.len;
|
||||
memcpy(cmd->op_recvfrom.buf, c->recv.buf, n);
|
||||
if (!(cmd->op_recvfrom.flags & MSG_PEEK)) mg_iobuf_del(&c->recv, 0, n);
|
||||
if (cmd->op_recvfrom.src != NULL && cmd->op_recvfrom.addrlen != NULL) {
|
||||
struct sockaddr_in *sa = (struct sockaddr_in *) cmd->op_recvfrom.src;
|
||||
sa->sin_family = AF_INET;
|
||||
sa->sin_port = c->rem.port;
|
||||
sa->sin_addr.s_addr = c->rem.addr.ip4;
|
||||
*cmd->op_recvfrom.addrlen = sizeof(*sa);
|
||||
}
|
||||
cmd->result = (int) n;
|
||||
cmd->result = (int) bsd_recv(s, cmd->op_recvfrom.buf,
|
||||
cmd->op_recvfrom.len,
|
||||
cmd->op_recvfrom.flags,
|
||||
cmd->op_recvfrom.src,
|
||||
cmd->op_recvfrom.addrlen);
|
||||
return true;
|
||||
}
|
||||
if (s->err != 0) {
|
||||
|
||||
@@ -64,6 +64,18 @@ void mg_bsd_poll(struct mg_mgr *);
|
||||
#ifndef ENOSPC
|
||||
#define ENOSPC 28
|
||||
#endif
|
||||
#ifndef EOPNOTSUPP
|
||||
#define EOPNOTSUPP 95
|
||||
#endif
|
||||
#ifndef EISCONN
|
||||
#define EISCONN 106
|
||||
#endif
|
||||
#ifndef EDESTADDRREQ
|
||||
#define EDESTADDRREQ 121
|
||||
#endif
|
||||
#ifndef EMSGSIZE
|
||||
#define EMSGSIZE 90
|
||||
#endif
|
||||
#ifndef EPROTONOSUPPORT
|
||||
#define EPROTONOSUPPORT 93
|
||||
#endif
|
||||
|
||||
@@ -94,6 +94,10 @@
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 0
|
||||
#endif
|
||||
|
||||
#ifndef MG_ENABLE_CUSTOM_MICROS
|
||||
#define MG_ENABLE_CUSTOM_MICROS 0
|
||||
#endif
|
||||
|
||||
#ifndef MG_ENABLE_ASSERT
|
||||
#define MG_ENABLE_ASSERT 0
|
||||
#endif
|
||||
|
||||
@@ -136,12 +136,13 @@ bool mg_dns_parse(const uint8_t *buf, size_t len, struct mg_dns_message *dm) {
|
||||
dm->txnid = mg_ntohs(h->txnid);
|
||||
is_response = mg_ntohs(h->flags) & 0x8000;
|
||||
|
||||
for (i = 0; i < mg_ntohs(h->num_questions); i++) {
|
||||
for (i = 0; i < mg_ntohs(h->num_questions); i++) { // advance past queries
|
||||
if ((n = mg_dns_parse_rr(buf, len, ofs, true, &rr)) == 0) return false;
|
||||
// MG_INFO(("Q %lu %lu %hu/%hu", ofs, n, rr.atype, rr.aclass));
|
||||
dm->addr.is_ip6 = (rr.atype == MG_DNS_RTYPE_AAAA);
|
||||
mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name));
|
||||
ofs += n;
|
||||
}
|
||||
} // on unresolved responses, we got the name and query type, at least
|
||||
|
||||
if (!is_response) {
|
||||
// For queries, there is no need to parse the answers. In this way,
|
||||
|
||||
@@ -0,0 +1,189 @@
|
||||
#include "l2_mesh.h"
|
||||
#include "log.h"
|
||||
#include "net_builtin.h"
|
||||
|
||||
#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_ESP32_802154) && \
|
||||
MG_ENABLE_DRIVER_ESP32_802154
|
||||
|
||||
#if MG_ARCH != MG_ARCH_ESP32
|
||||
#error "MG_ENABLE_DRIVER_ESP32_802154 needs MG_ARCH_ESP32 (ESP-IDF)"
|
||||
#endif
|
||||
|
||||
// ESP-IDF owns the PHY, coexistence and interrupts. Its callbacks run in
|
||||
// interrupt context and pass radio frames through a lock-free queue, read by
|
||||
// mgi_esp32_802154_poll(). In both directions frame[0] is the PHR, the length
|
||||
// including FCS
|
||||
#include <esp_attr.h>
|
||||
#include <esp_ieee802154.h>
|
||||
#include <esp_timer.h>
|
||||
|
||||
#define MG_ESP32_802154_TX_TIMEOUT_US 60000
|
||||
|
||||
static struct mg_tcpip_if *s_esp32_802154_ifp;
|
||||
static struct mg_queue s_esp32_802154_rx;
|
||||
static char s_esp32_802154_rxbuf[2048];
|
||||
static volatile bool s_esp32_802154_txing, s_esp32_802154_tx_done;
|
||||
static uint64_t s_esp32_802154_txstart; // Send start, us
|
||||
// Frame for the radio: PHR, the length including FCS, then the PSDU
|
||||
static uint8_t s_esp32_802154_txframe[128] __attribute__((aligned(4)));
|
||||
|
||||
// Queue a received PSDU without its FCS
|
||||
static void mg_esp32_802154_rx_frame(const uint8_t *psdu, size_t len) {
|
||||
mg_mesh_rx_queue(&s_esp32_802154_rx, s_esp32_802154_ifp, psdu, len);
|
||||
}
|
||||
|
||||
// A transmission refused by Wi-Fi coexistence, a busy channel or an abort is
|
||||
// sent again after this pause, until MG_ESP32_802154_TX_TIMEOUT_US. Without
|
||||
// it, the mesh would count the refused frame as sent
|
||||
#define MG_ESP32_802154_RETRY_US 200
|
||||
|
||||
static volatile bool s_esp32_802154_retry; // A resend is pending
|
||||
static volatile uint32_t s_esp32_802154_retry_at; // When to resend, us
|
||||
|
||||
void IRAM_ATTR esp_ieee802154_receive_done(uint8_t *frame,
|
||||
esp_ieee802154_frame_info_t *info) {
|
||||
(void) info;
|
||||
if (frame[0] > 2) mg_esp32_802154_rx_frame(frame + 1, frame[0] - 2U);
|
||||
esp_ieee802154_receive_handle_done(frame);
|
||||
}
|
||||
|
||||
void IRAM_ATTR esp_ieee802154_transmit_done(const uint8_t *frame,
|
||||
const uint8_t *ack,
|
||||
esp_ieee802154_frame_info_t *info) {
|
||||
(void) frame, (void) info;
|
||||
if (ack != NULL) esp_ieee802154_receive_handle_done(ack);
|
||||
s_esp32_802154_tx_done = true;
|
||||
}
|
||||
|
||||
void IRAM_ATTR esp_ieee802154_transmit_failed(const uint8_t *frame,
|
||||
esp_ieee802154_tx_error_t err) {
|
||||
(void) frame;
|
||||
if (err == ESP_IEEE802154_TX_ERR_COEXIST ||
|
||||
err == ESP_IEEE802154_TX_ERR_CCA_BUSY ||
|
||||
err == ESP_IEEE802154_TX_ERR_ABORT) {
|
||||
s_esp32_802154_retry_at =
|
||||
(uint32_t) esp_timer_get_time() + MG_ESP32_802154_RETRY_US;
|
||||
s_esp32_802154_retry = true; // Set last: the poll reads it first
|
||||
} else {
|
||||
s_esp32_802154_tx_done = true;
|
||||
}
|
||||
}
|
||||
|
||||
static bool mg_esp32_802154_hw_init(uint16_t address) {
|
||||
// rx_when_idle: the driver returns to receive after each transmission
|
||||
return esp_ieee802154_enable() == ESP_OK &&
|
||||
esp_ieee802154_set_promiscuous(false) == ESP_OK &&
|
||||
esp_ieee802154_set_coordinator(false) == ESP_OK &&
|
||||
esp_ieee802154_set_rx_when_idle(true) == ESP_OK &&
|
||||
esp_ieee802154_set_panid(MG_802154_PAN_ID) == ESP_OK &&
|
||||
esp_ieee802154_set_short_address(address) == ESP_OK &&
|
||||
esp_ieee802154_set_channel(MG_802154_CHANNEL) == ESP_OK &&
|
||||
esp_ieee802154_set_txpower(0) == ESP_OK &&
|
||||
esp_ieee802154_receive() == ESP_OK;
|
||||
}
|
||||
|
||||
static bool mg_esp32_802154_hw_tx(void) {
|
||||
s_esp32_802154_retry = false;
|
||||
return esp_ieee802154_transmit(s_esp32_802154_txframe, false) == ESP_OK;
|
||||
}
|
||||
|
||||
static void mg_esp32_802154_hw_abort(void) {
|
||||
s_esp32_802154_retry = false;
|
||||
esp_ieee802154_receive(); // Stops the current operation
|
||||
}
|
||||
|
||||
// Resend a refused frame when its pause is over. If the radio does not take
|
||||
// it, give up: the frame counts as done
|
||||
static void mg_esp32_802154_hw_poll(void) {
|
||||
uint32_t now;
|
||||
if (!s_esp32_802154_retry) return;
|
||||
now = (uint32_t) esp_timer_get_time();
|
||||
if ((int32_t) (now - s_esp32_802154_retry_at) < 0) return;
|
||||
s_esp32_802154_retry = false;
|
||||
if (esp_ieee802154_transmit(s_esp32_802154_txframe, false) != ESP_OK) {
|
||||
s_esp32_802154_tx_done = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Mesh radio transmit. The hardware adds the FCS
|
||||
static size_t mgi_esp32_802154_radio_tx(struct mg_tcpip_if *ifp,
|
||||
const void *buf, size_t len) {
|
||||
(void) ifp;
|
||||
if (len > 125 || s_esp32_802154_txing) return 0;
|
||||
s_esp32_802154_txframe[0] = (uint8_t) (len + 2);
|
||||
memcpy(s_esp32_802154_txframe + 1, buf, len);
|
||||
s_esp32_802154_tx_done = false;
|
||||
s_esp32_802154_txing = true, s_esp32_802154_txstart = mg_micros();
|
||||
if (!mg_esp32_802154_hw_tx()) {
|
||||
s_esp32_802154_txing = false;
|
||||
return 0;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
static size_t mgi_esp32_802154_tx(const void *buf, size_t len,
|
||||
struct mg_tcpip_if *ifp) {
|
||||
struct mg_tcpip_driver_esp32_802154_data *data = ifp->driver_data;
|
||||
return data->mesh->strategy->tx(data->mesh, buf, len);
|
||||
}
|
||||
|
||||
static size_t mgi_esp32_802154_rx(void *buf, size_t cap,
|
||||
struct mg_tcpip_if *ifp) {
|
||||
struct mg_tcpip_driver_esp32_802154_data *data = ifp->driver_data;
|
||||
size_t len = data->mesh->rx_len;
|
||||
if (len > cap) return 0;
|
||||
if (len != 0 && buf != ifp->recv_queue.buf)
|
||||
memcpy(buf, ifp->recv_queue.buf, len);
|
||||
data->mesh->rx_len = 0;
|
||||
return len;
|
||||
}
|
||||
|
||||
static bool mgi_esp32_802154_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
struct mg_tcpip_driver_esp32_802154_data *data = ifp->driver_data;
|
||||
struct mg_mesh_node *node = data->mesh;
|
||||
uint64_t now = mg_micros();
|
||||
(void) s1;
|
||||
node->now = now;
|
||||
mg_esp32_802154_hw_poll();
|
||||
if (s_esp32_802154_txing &&
|
||||
(s_esp32_802154_tx_done ||
|
||||
now - s_esp32_802154_txstart > MG_ESP32_802154_TX_TIMEOUT_US)) {
|
||||
if (!s_esp32_802154_tx_done) mg_esp32_802154_hw_abort();
|
||||
s_esp32_802154_txing = false;
|
||||
node->tx_at = now + node->strategy->radio->ifs_us;
|
||||
}
|
||||
mg_mesh_rx_drain(node, &s_esp32_802154_rx);
|
||||
node->strategy->tick(node, now);
|
||||
return node->joined;
|
||||
}
|
||||
|
||||
static bool mgi_esp32_802154_init(struct mg_tcpip_if *ifp) {
|
||||
struct mg_tcpip_driver_esp32_802154_data *data = ifp->driver_data;
|
||||
const struct mg_mesh *strategy = data->strategy;
|
||||
uint16_t address =
|
||||
(uint16_t) (2 + ((unsigned) ifp->mac[4] * 256 + ifp->mac[5]) % 65532u);
|
||||
if (strategy == NULL) strategy = &mg_mesh_default;
|
||||
data->mesh = mg_calloc(1, sizeof(*data->mesh));
|
||||
if (data->mesh == NULL) return false;
|
||||
if (!strategy->init(data->mesh, ifp, NULL, address)) {
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
data->mesh->strategy = strategy;
|
||||
data->mesh->tx = mgi_esp32_802154_radio_tx;
|
||||
mg_queue_init(&s_esp32_802154_rx, s_esp32_802154_rxbuf,
|
||||
sizeof(s_esp32_802154_rxbuf));
|
||||
s_esp32_802154_ifp = ifp;
|
||||
if (mg_esp32_802154_hw_init(address)) return true;
|
||||
MG_ERROR(("802.15.4 radio init failed"));
|
||||
data->mesh->strategy->free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
struct mg_tcpip_driver mg_tcpip_driver_esp32_802154 = {
|
||||
mgi_esp32_802154_init, mgi_esp32_802154_tx, mgi_esp32_802154_rx,
|
||||
mgi_esp32_802154_poll};
|
||||
#endif
|
||||
@@ -0,0 +1,40 @@
|
||||
// Copyright (c) 2026 Cesanta Software Limited
|
||||
// All rights reserved
|
||||
|
||||
#pragma once
|
||||
|
||||
#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_ESP32_802154) && \
|
||||
MG_ENABLE_DRIVER_ESP32_802154
|
||||
|
||||
// ESP32-C6 IEEE 802.15.4 radio, as an Ethernet interface through the mesh.
|
||||
// Needs MG_ARCH_ESP32 and CONFIG_IEEE802154_ENABLED: it uses ESP-IDF's
|
||||
// esp_ieee802154 driver, and defines its esp_ieee802154_receive_done(),
|
||||
// esp_ieee802154_transmit_done() and esp_ieee802154_transmit_failed()
|
||||
// callbacks. See tutorials/esp32/minimal-802.15.4
|
||||
struct mg_tcpip_driver_esp32_802154_data {
|
||||
struct mg_mesh_node *mesh; // Driver-owned runtime state
|
||||
const struct mg_mesh *strategy; // NULL selects mg_mesh_default
|
||||
};
|
||||
|
||||
extern struct mg_tcpip_driver mg_tcpip_driver_esp32_802154;
|
||||
|
||||
#define MG_TCPIP_DRIVER_ESP32_802154_INIT(manager) \
|
||||
do { \
|
||||
static struct mg_tcpip_driver_esp32_802154_data driver_data_; \
|
||||
static struct mg_tcpip_if mif_; \
|
||||
MG_SET_MAC_ADDRESS(mif_.mac); \
|
||||
mif_.ip = MG_TCPIP_IP; \
|
||||
mif_.mask = MG_TCPIP_MASK; \
|
||||
mif_.gw = MG_TCPIP_GW; \
|
||||
mif_.mgr = (manager); \
|
||||
mif_.driver = &mg_tcpip_driver_esp32_802154; \
|
||||
mif_.driver_data = &driver_data_; \
|
||||
mg_tcpip_init((manager), &mif_); \
|
||||
MG_INFO(("Driver: esp32_802154, MAC: %M", mg_print_mac, mif_.mac)); \
|
||||
} while (0)
|
||||
|
||||
#ifndef MG_TCPIP_DRIVER_INIT
|
||||
#define MG_TCPIP_DRIVER_INIT(x) MG_TCPIP_DRIVER_ESP32_802154_INIT(x)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
+5
-18
@@ -110,15 +110,7 @@ void RF_802_15_4_IRQHandler(void) {
|
||||
n = n >= 2 ? n - 2 : 0;
|
||||
if (n > 0 && n <= sizeof(frame)) {
|
||||
for (i = 0; i < n; i++) frame[i] = MGI_RX_PB[i];
|
||||
{
|
||||
char *dst;
|
||||
if (mg_queue_book(&s_mcxw71_rx, &dst, n) >= n) {
|
||||
memcpy(dst, frame, n);
|
||||
mg_queue_add(&s_mcxw71_rx, n);
|
||||
} else {
|
||||
s_mcxw71_ifp->ndrop++;
|
||||
}
|
||||
}
|
||||
mg_mesh_rx_queue(&s_mcxw71_rx, s_mcxw71_ifp, frame, n);
|
||||
}
|
||||
}
|
||||
mg_mcxw71_listen();
|
||||
@@ -179,8 +171,6 @@ static bool mgi_mcxw71_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
struct mg_tcpip_driver_mcxw71_data *data = ifp->driver_data;
|
||||
struct mg_mesh_node *node = data->mesh;
|
||||
uint64_t now = mg_micros();
|
||||
char *buf;
|
||||
size_t len;
|
||||
(void) s1;
|
||||
if (s_mcxw71_txing &&
|
||||
mg_millis() > s_mcxw71_sendstart + MGI_SEND_TIMEOUT_MS) {
|
||||
@@ -199,10 +189,7 @@ static bool mgi_mcxw71_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
node->tx_at = now + node->strategy->radio->ifs_us;
|
||||
}
|
||||
node->now = now;
|
||||
while (node->rx_len == 0 && (len = mg_queue_next(&s_mcxw71_rx, &buf)) != 0) {
|
||||
node->strategy->rx(node, buf, len);
|
||||
mg_queue_del(&s_mcxw71_rx, len);
|
||||
}
|
||||
mg_mesh_rx_drain(node, &s_mcxw71_rx);
|
||||
node->strategy->tick(node, now);
|
||||
return node->joined;
|
||||
}
|
||||
@@ -214,10 +201,10 @@ static bool mgi_mcxw71_init(struct mg_tcpip_if *ifp) {
|
||||
address =
|
||||
(uint16_t) (2 + ((unsigned) ifp->mac[4] * 256 + ifp->mac[5]) % 65532u);
|
||||
if (strategy == NULL) strategy = &mg_mesh_default;
|
||||
data->mesh = calloc(1, sizeof(*data->mesh));
|
||||
data->mesh = mg_calloc(1, sizeof(*data->mesh));
|
||||
if (data->mesh == NULL) return false;
|
||||
if (!strategy->init(data->mesh, ifp, NULL, address)) {
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
@@ -226,7 +213,7 @@ static bool mgi_mcxw71_init(struct mg_tcpip_if *ifp) {
|
||||
mg_queue_init(&s_mcxw71_rx, s_mcxw71_queue, sizeof(s_mcxw71_queue));
|
||||
if (mgi_mcxw71_radio_init(ifp)) return true;
|
||||
strategy->free(data->mesh);
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
+5
-16
@@ -23,7 +23,6 @@ static void mg_mg24_rx_frame(RAIL_Handle_t h) {
|
||||
RAIL_RxPacketInfo_t info;
|
||||
uint8_t f[128];
|
||||
size_t n;
|
||||
char *dst;
|
||||
if (RAIL_GetRxPacketInfo(h, RAIL_RX_PACKET_HANDLE_NEWEST, &info) ==
|
||||
RAIL_RX_PACKET_HANDLE_INVALID ||
|
||||
info.packetStatus != RAIL_RX_PACKET_READY_SUCCESS ||
|
||||
@@ -33,12 +32,7 @@ static void mg_mg24_rx_frame(RAIL_Handle_t h) {
|
||||
RAIL_CopyRxPacket(f, &info);
|
||||
n = info.packetBytes - 1U; // Strip PHR
|
||||
if (n == f[0]) n -= 2; // FCS stored, strip it
|
||||
if (mg_queue_book(&s_mg24_rx, &dst, n) >= n) {
|
||||
memcpy(dst, f + 1, n);
|
||||
mg_queue_add(&s_mg24_rx, n);
|
||||
} else {
|
||||
s_mg24_ifp->ndrop++;
|
||||
}
|
||||
mg_mesh_rx_queue(&s_mg24_rx, s_mg24_ifp, f + 1, n);
|
||||
}
|
||||
|
||||
// RAIL event callback, runs in interrupt context
|
||||
@@ -136,8 +130,6 @@ static bool mgi_mg24_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
struct mg_tcpip_driver_mg24_data *data = ifp->driver_data;
|
||||
struct mg_mesh_node *node = data->mesh;
|
||||
uint64_t now = mg_micros();
|
||||
char *buf;
|
||||
size_t len;
|
||||
(void) s1;
|
||||
node->now = now;
|
||||
if (s_mg24_txing && (s_mg24_tx_done || RAIL_GetTime() - s_mg24_txstart >
|
||||
@@ -149,10 +141,7 @@ static bool mgi_mg24_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
s_mg24_txing = false;
|
||||
node->tx_at = now + node->strategy->radio->ifs_us;
|
||||
}
|
||||
while (node->rx_len == 0 && (len = mg_queue_next(&s_mg24_rx, &buf)) != 0) {
|
||||
node->strategy->rx(node, buf, len);
|
||||
mg_queue_del(&s_mg24_rx, len);
|
||||
}
|
||||
mg_mesh_rx_drain(node, &s_mg24_rx);
|
||||
node->strategy->tick(node, now);
|
||||
return node->joined;
|
||||
}
|
||||
@@ -162,10 +151,10 @@ static bool mgi_mg24_init(struct mg_tcpip_if *ifp) {
|
||||
uint16_t address =
|
||||
(uint16_t) (2 + ((unsigned) ifp->mac[4] * 256 + ifp->mac[5]) % 65532u);
|
||||
if (strategy == NULL) strategy = &mg_mesh_default;
|
||||
data->mesh = calloc(1, sizeof(*data->mesh));
|
||||
data->mesh = mg_calloc(1, sizeof(*data->mesh));
|
||||
if (data->mesh == NULL) return false;
|
||||
if (!strategy->init(data->mesh, ifp, NULL, address)) {
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
@@ -174,7 +163,7 @@ static bool mgi_mg24_init(struct mg_tcpip_if *ifp) {
|
||||
mg_queue_init(&s_mg24_rx, s_mg24_rxbuf, sizeof(s_mg24_rxbuf));
|
||||
if (mgi_mg24_radio_init(ifp)) return true;
|
||||
data->mesh->strategy->free(data->mesh);
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
+5
-16
@@ -45,13 +45,7 @@ void RADIO_IRQHandler(void) {
|
||||
mg_radio_802154.parse_hdr(&mg_radio_802154, frame, len, &dst, &src) !=
|
||||
0 &&
|
||||
(dst == 0xffffu || dst == node->radio_address)) {
|
||||
char *dst;
|
||||
if (mg_queue_book(&s_nrf52_rx, &dst, len) >= len) {
|
||||
memcpy(dst, frame, len);
|
||||
mg_queue_add(&s_nrf52_rx, len);
|
||||
} else {
|
||||
s_nrf52_ifp->ndrop++;
|
||||
}
|
||||
mg_mesh_rx_queue(&s_nrf52_rx, s_nrf52_ifp, frame, len);
|
||||
}
|
||||
}
|
||||
mgi_nrf52_listen();
|
||||
@@ -126,8 +120,6 @@ static bool mgi_nrf52_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
struct mg_tcpip_driver_nrf52_data *data = ifp->driver_data;
|
||||
struct mg_mesh_node *node = data->mesh;
|
||||
uint64_t now = mg_micros();
|
||||
char *buf;
|
||||
size_t len;
|
||||
(void) s1;
|
||||
if (s_nrf52_txing && mg_micros() - s_nrf52_started > 60000) {
|
||||
NVIC_DisableIRQ(RADIO_IRQn);
|
||||
@@ -142,10 +134,7 @@ static bool mgi_nrf52_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
node->tx_at = now + node->strategy->radio->ifs_us;
|
||||
}
|
||||
node->now = now;
|
||||
while (node->rx_len == 0 && (len = mg_queue_next(&s_nrf52_rx, &buf)) != 0) {
|
||||
node->strategy->rx(node, buf, len);
|
||||
mg_queue_del(&s_nrf52_rx, len);
|
||||
}
|
||||
mg_mesh_rx_drain(node, &s_nrf52_rx);
|
||||
node->strategy->tick(node, now);
|
||||
return node->joined;
|
||||
}
|
||||
@@ -157,10 +146,10 @@ static bool mgi_nrf52_init(struct mg_tcpip_if *ifp) {
|
||||
address =
|
||||
(uint16_t) (2 + ((unsigned) ifp->mac[4] * 256 + ifp->mac[5]) % 65532u);
|
||||
if (strategy == NULL) strategy = &mg_mesh_default;
|
||||
data->mesh = calloc(1, sizeof(*data->mesh));
|
||||
data->mesh = mg_calloc(1, sizeof(*data->mesh));
|
||||
if (data->mesh == NULL) return false;
|
||||
if (!strategy->init(data->mesh, ifp, NULL, address)) {
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
@@ -169,7 +158,7 @@ static bool mgi_nrf52_init(struct mg_tcpip_if *ifp) {
|
||||
mg_queue_init(&s_nrf52_rx, s_nrf52_queue, sizeof(s_nrf52_queue));
|
||||
if (mgi_nrf52_radio_init(ifp)) return true;
|
||||
strategy->free(data->mesh);
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
+5
-18
@@ -138,15 +138,7 @@ static void mg_rw612_control(uint8_t subtype, uint32_t a, uint32_t b,
|
||||
}
|
||||
|
||||
static void mg_rw612_queue_rx(const uint8_t *frame, size_t len) {
|
||||
{
|
||||
char *dst;
|
||||
if (mg_queue_book(&s_rw612w_rx, &dst, len) >= len) {
|
||||
memcpy(dst, frame, len);
|
||||
mg_queue_add(&s_rw612w_rx, len);
|
||||
} else {
|
||||
s_rw612.ifp->ndrop++;
|
||||
}
|
||||
}
|
||||
mg_mesh_rx_queue(&s_rw612w_rx, s_rw612.ifp, frame, len);
|
||||
}
|
||||
|
||||
// Spinel packed unsigned integer: 7 bits per byte, LSB first
|
||||
@@ -457,8 +449,6 @@ static bool mgi_rw612w_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
struct mg_tcpip_driver_rw612w_data *data = ifp->driver_data;
|
||||
struct mg_mesh_node *node = data->mesh;
|
||||
uint64_t now = mg_micros();
|
||||
char *buf;
|
||||
size_t len;
|
||||
(void) s1;
|
||||
bool was_sending = s_rw612.txing;
|
||||
mg_rw612_poll_imu();
|
||||
@@ -470,10 +460,7 @@ static bool mgi_rw612w_poll(struct mg_tcpip_if *ifp, bool s1) {
|
||||
if (was_sending && !s_rw612.txing)
|
||||
node->tx_at = now + node->strategy->radio->ifs_us;
|
||||
node->now = now;
|
||||
while (node->rx_len == 0 && (len = mg_queue_next(&s_rw612w_rx, &buf)) != 0) {
|
||||
node->strategy->rx(node, buf, len);
|
||||
mg_queue_del(&s_rw612w_rx, len);
|
||||
}
|
||||
mg_mesh_rx_drain(node, &s_rw612w_rx);
|
||||
node->strategy->tick(node, now);
|
||||
return node->joined;
|
||||
}
|
||||
@@ -491,10 +478,10 @@ static bool mgi_rw612w_init(struct mg_tcpip_if *ifp) {
|
||||
address =
|
||||
(uint16_t) (2 + ((unsigned) ifp->mac[4] * 256 + ifp->mac[5]) % 65532u);
|
||||
if (strategy == NULL) strategy = &mg_mesh_default;
|
||||
data->mesh = calloc(1, sizeof(*data->mesh));
|
||||
data->mesh = mg_calloc(1, sizeof(*data->mesh));
|
||||
if (data->mesh == NULL) return false;
|
||||
if (!strategy->init(data->mesh, ifp, NULL, address)) {
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
@@ -503,7 +490,7 @@ static bool mgi_rw612w_init(struct mg_tcpip_if *ifp) {
|
||||
mg_queue_init(&s_rw612w_rx, s_rw612w_queue, sizeof(s_rw612w_queue));
|
||||
if (mgi_rw612w_radio_init(ifp)) return true;
|
||||
strategy->free(data->mesh);
|
||||
free(data->mesh);
|
||||
mg_free(data->mesh);
|
||||
data->mesh = NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
+71
-10
@@ -108,6 +108,8 @@ static size_t mgi_mesh_b_queue(struct mg_mesh_node *node, struct mg_queue *q,
|
||||
#define MGI_JOIN_JITTER_US 640
|
||||
#define MGI_DATA_QUEUE_SIZE 2048
|
||||
#define MGI_TX_RETRY_US 32
|
||||
#define MGI_ANSWER_MARGIN_US 500 // Node: finish the first answer frame this
|
||||
// much before the bridge stops waiting
|
||||
// Our frames: the radio header, with the radio addresses, then the mesh
|
||||
// header MG_MESH_HDR_LEN, then the payload
|
||||
#define MGI_JOIN_UP_LEN \
|
||||
@@ -134,6 +136,7 @@ struct mgi_mesh_b_data {
|
||||
int8_t missed_rounds; // -1 after a grant; otherwise completed rounds missed
|
||||
uint16_t coordinator; // Coordinator radio address
|
||||
uint8_t phase; // MGI_TURN_IDLE, MGI_TURN_JOIN, or MGI_TURN_DATA
|
||||
uint64_t answer_by; // Node: first answer frame must end on air by then
|
||||
};
|
||||
|
||||
struct mgi_mesh_b_peer {
|
||||
@@ -246,11 +249,24 @@ static void mgi_mesh_b_tx_step(struct mgi_mesh_b_data *data, uint64_t now) {
|
||||
} else {
|
||||
mgi_mesh_b_frame_header(frame, dst, node->radio_address, command, 0);
|
||||
}
|
||||
// A node's first answer frame: if it cannot end on air before the bridge
|
||||
// stops waiting, stay silent. The queued frame waits for the next turn
|
||||
if (node->lan == NULL &&
|
||||
(data->tx_offset == 0 || data->tx_offset == MGI_TX_DST_LEN) &&
|
||||
now + mgi_mesh_b_airtime(len) > data->answer_by) {
|
||||
data->tx_offset = 0;
|
||||
data->tx_at = (uint64_t) -1;
|
||||
return;
|
||||
}
|
||||
if (now < data->node->tx_at || data->node->tx(radio, frame, len) != len) {
|
||||
data->tx_at = now + MGI_TX_RETRY_US;
|
||||
return;
|
||||
}
|
||||
if (data->tx_offset == 0 || (data->tx_offset += len + 1) == record_len) {
|
||||
// Bridge: the turn's last frame is out, wait for the answer
|
||||
if (node->lan != NULL)
|
||||
data->deadline =
|
||||
now + mgi_mesh_b_airtime(len) + MG_MESH_ANSWER_TIMEOUT_US;
|
||||
mgi_mesh_b_tx_finish(data);
|
||||
} else {
|
||||
data->tx_at = now + mgi_mesh_b_airtime(len) + s_mesh_default_radio->ifs_us;
|
||||
@@ -260,6 +276,7 @@ static void mgi_mesh_b_tx_step(struct mgi_mesh_b_data *data, uint64_t now) {
|
||||
static void mgi_mesh_b_tx_begin(struct mgi_mesh_b_data *data, bool burst,
|
||||
uint64_t now, uint64_t deadline) {
|
||||
data->phase = MGI_TURN_DATA;
|
||||
data->answer_by = (uint64_t) -1; // Node sets it after a grant
|
||||
data->tx_offset = burst ? MGI_TX_DST_LEN : 0;
|
||||
data->tx_at = now;
|
||||
data->deadline = deadline;
|
||||
@@ -290,6 +307,11 @@ static int mgi_mesh_b_data_receive(struct mgi_mesh_b_data *data,
|
||||
memcpy(data->rx_buf + offset, frame + MG_MESH_FRAME_HDR_LEN, chunk);
|
||||
if (index < last) {
|
||||
data->rx_expected = (uint8_t) (burst + 0x10);
|
||||
// Bridge: an answer is under way, wait for its next fragment
|
||||
if (data->node->lan != NULL)
|
||||
data->deadline =
|
||||
now + mgi_mesh_b_airtime(s_mesh_default_radio->max_frame_size) +
|
||||
s_mesh_default_radio->ifs_us + MG_MESH_ANSWER_TIMEOUT_US;
|
||||
return -1;
|
||||
}
|
||||
data->rx_expected = 0xff;
|
||||
@@ -299,7 +321,6 @@ static int mgi_mesh_b_data_receive(struct mgi_mesh_b_data *data,
|
||||
|
||||
// Bridge scheduling and Ethernet forwarding.
|
||||
|
||||
#define MGI_MAX_MISSES 3 // Turns in a row without an answer: remove the member
|
||||
|
||||
static uint16_t mgi_mesh_b_join_field(const uint8_t *p) {
|
||||
return (uint16_t) ((unsigned) p[0] * 256 + p[1]);
|
||||
@@ -400,13 +421,13 @@ static void mgi_mesh_b_bridge_rx(uint64_t now, struct mg_mesh_node *b,
|
||||
memcpy(peer->mac, frame + MG_MESH_FRAME_HDR_LEN, sizeof(peer->mac));
|
||||
}
|
||||
|
||||
// Member peer did not answer its turn. After MGI_MAX_MISSES in a row, it is
|
||||
// gone: remove it, and its queued downlink frames
|
||||
// Member peer did not answer its turn. After MG_MESH_MAX_MISSES in a row, it
|
||||
// is gone: remove it, and its queued downlink frames
|
||||
static void mgi_mesh_b_member_missed(struct mgi_mesh_b_data *data,
|
||||
struct mgi_mesh_b_peer *peer) {
|
||||
if (++peer->misses < MGI_MAX_MISSES) return;
|
||||
if (++peer->misses < MG_MESH_MAX_MISSES) return;
|
||||
MG_INFO(("Member %M removed: no answer %d times", mg_print_mac, peer->mac,
|
||||
MGI_MAX_MISSES));
|
||||
MG_MESH_MAX_MISSES));
|
||||
if (data->fanout == peer) {
|
||||
data->fanout = peer->next;
|
||||
if (data->fanout == NULL) {
|
||||
@@ -499,7 +520,7 @@ static void mgi_mesh_b_node_rx(struct mg_mesh_node *n, uint64_t now,
|
||||
if (command == MGI_JOIN_DOWN && len == MG_MESH_FRAME_HDR_LEN &&
|
||||
dst == 0xffffu) {
|
||||
if (n->joined && src == data->coordinator &&
|
||||
++data->missed_rounds >= MGI_MAX_MISSES) {
|
||||
++data->missed_rounds >= MG_MESH_MAX_MISSES) {
|
||||
n->joined = false;
|
||||
data->phase = MGI_TURN_IDLE;
|
||||
data->tx_at = (uint64_t) -1;
|
||||
@@ -534,17 +555,22 @@ static void mgi_mesh_b_node_rx(struct mg_mesh_node *n, uint64_t now,
|
||||
now + mgi_mesh_b_burst_time(MGI_ETH_MAX) +
|
||||
2 * s_mesh_default_radio->ifs_us +
|
||||
MGI_JOIN_TURN_US);
|
||||
data->answer_by = now + MG_MESH_ANSWER_TIMEOUT_US - MGI_ANSWER_MARGIN_US;
|
||||
}
|
||||
}
|
||||
|
||||
// Receive timing counts from the frame's arrival, see mg_mesh_rx_drain().
|
||||
// Without an arrival time, e.g. when called directly, use the poll time
|
||||
static void mgi_mesh_b_input(struct mg_mesh_node *node, void *buf, size_t len) {
|
||||
uint64_t ready = node->now + node->strategy->radio->turnaround_us;
|
||||
uint64_t arrived = node->rx_at != 0 ? node->rx_at : node->now;
|
||||
if (node->tx_at < ready) node->tx_at = ready;
|
||||
node->next_tick = node->now;
|
||||
if (node->lan != NULL)
|
||||
mgi_mesh_b_bridge_rx(node->now, node, (const uint8_t *) buf, len);
|
||||
else
|
||||
mgi_mesh_b_node_rx(node, node->now, (uint8_t *) buf, len);
|
||||
if (node->lan != NULL) {
|
||||
mgi_mesh_b_bridge_rx(arrived, node, (const uint8_t *) buf, len);
|
||||
} else {
|
||||
mgi_mesh_b_node_rx(node, arrived, (uint8_t *) buf, len);
|
||||
}
|
||||
}
|
||||
|
||||
static void mgi_mesh_b_tick(struct mg_mesh_node *node, uint64_t now) {
|
||||
@@ -601,6 +627,41 @@ static void mgi_mesh_b_free(struct mg_mesh_node *node) {
|
||||
node->data = NULL;
|
||||
}
|
||||
|
||||
// Receive queue record: arrival time, then the radio frame
|
||||
#define MGI_RX_STAMP_LEN sizeof(uint64_t)
|
||||
|
||||
void mg_mesh_rx_queue(struct mg_queue *q, struct mg_tcpip_if *ifp,
|
||||
const void *frame, size_t len) {
|
||||
uint64_t arrived = mg_micros();
|
||||
size_t need = MGI_RX_STAMP_LEN + len;
|
||||
char *dst;
|
||||
|
||||
if (mg_queue_book(q, &dst, need) < need) {
|
||||
if (ifp != NULL) ifp->ndrop++;
|
||||
return;
|
||||
}
|
||||
memcpy(dst, &arrived, MGI_RX_STAMP_LEN);
|
||||
memcpy(dst + MGI_RX_STAMP_LEN, frame, len);
|
||||
mg_queue_add(q, need);
|
||||
}
|
||||
|
||||
void mg_mesh_rx_drain(struct mg_mesh_node *node, struct mg_queue *q) {
|
||||
char *record;
|
||||
size_t len;
|
||||
|
||||
while (node->rx_len == 0) {
|
||||
len = mg_queue_next(q, &record);
|
||||
if (len == 0) break;
|
||||
if (len > MGI_RX_STAMP_LEN) {
|
||||
memcpy(&node->rx_at, record, MGI_RX_STAMP_LEN);
|
||||
node->strategy->rx(node, record + MGI_RX_STAMP_LEN,
|
||||
len - MGI_RX_STAMP_LEN);
|
||||
node->rx_at = 0;
|
||||
}
|
||||
mg_queue_del(q, len);
|
||||
}
|
||||
}
|
||||
|
||||
const struct mg_mesh mg_mesh_default = {
|
||||
"default",
|
||||
mgi_mesh_b_init,
|
||||
|
||||
+28
-3
@@ -12,9 +12,6 @@
|
||||
|
||||
#if MG_ENABLE_TCPIP
|
||||
|
||||
// Monotonic time in microseconds.
|
||||
uint64_t mg_micros(void);
|
||||
|
||||
// A radio standard
|
||||
struct mg_radio {
|
||||
const char *name; // For logs
|
||||
@@ -44,6 +41,21 @@ struct mg_radio {
|
||||
#define MG_802154_CHANNEL 15
|
||||
#endif
|
||||
|
||||
// A turn's answer must arrive this soon after the turn's last frame ends on
|
||||
// air, or the turn ends. A node that would answer later stays silent and keeps
|
||||
// its frame for the next turn. Covers the node's poll latency, the radio
|
||||
// turnaround and one full fragment's airtime, 4.3 ms on 802.15.4
|
||||
#ifndef MG_MESH_ANSWER_TIMEOUT_US
|
||||
#define MG_MESH_ANSWER_TIMEOUT_US 8000
|
||||
#endif
|
||||
|
||||
// Misses in a row before giving up, 1 to 127. The bridge removes a member
|
||||
// that did not answer this many turns. A node leaves the mesh after this
|
||||
// many rounds without a turn
|
||||
#ifndef MG_MESH_MAX_MISSES
|
||||
#define MG_MESH_MAX_MISSES 10
|
||||
#endif
|
||||
|
||||
extern const struct mg_radio mg_radio_802154;
|
||||
|
||||
struct mg_mesh_node {
|
||||
@@ -53,6 +65,7 @@ struct mg_mesh_node {
|
||||
size_t (*tx)(struct mg_tcpip_if *, const void *, size_t); // Radio frame TX
|
||||
size_t rx_len; // Complete Ethernet frame in the interface RX buffer
|
||||
uint64_t now; // Current driver poll time, us
|
||||
uint64_t rx_at; // Arrival time of the radio frame being handled, us
|
||||
uint64_t tx_at; // Earliest next transmission, us
|
||||
void *data; // Private state owned by the strategy
|
||||
size_t ram_used; // Live mesh state bytes
|
||||
@@ -77,4 +90,16 @@ struct mg_mesh {
|
||||
|
||||
extern const struct mg_mesh mg_mesh_default;
|
||||
|
||||
// Put a received radio frame into the driver's receive queue, together with
|
||||
// its arrival time from mg_micros(). Call it when the frame arrives, from the
|
||||
// radio interrupt if the driver has one. If the queue is full, the frame is
|
||||
// dropped and counted in ifp->ndrop
|
||||
void mg_mesh_rx_queue(struct mg_queue *q, struct mg_tcpip_if *ifp,
|
||||
const void *frame, size_t len);
|
||||
|
||||
// Pass queued radio frames to the mesh, oldest first. Before each frame,
|
||||
// node->rx_at is set to its arrival time. Stops while the node holds a
|
||||
// received Ethernet frame the TCP/IP stack has not taken yet
|
||||
void mg_mesh_rx_drain(struct mg_mesh_node *node, struct mg_queue *q);
|
||||
|
||||
#endif
|
||||
+28
-11
@@ -1224,22 +1224,34 @@ static void proto_error(struct mg_connection *c, bool r, const char *f, ...) {
|
||||
static bool rx_udp(struct mg_tcpip_if *ifp, struct pkt *pkt) {
|
||||
struct mg_connection *c = getpeer(ifp->mgr, pkt, true);
|
||||
struct connstate *s;
|
||||
struct mg_addr rem;
|
||||
uint8_t *l2addr;
|
||||
if (c == NULL) return false; // No UDP listener on this port
|
||||
// BSD socket has an unread datagram: drop this one to keep boundaries
|
||||
if (c->is_bsd && c->recv.len > 0) return true;
|
||||
if (c->is_bsd && !c->is_client && c->send.len > 0) return true;
|
||||
s = (struct connstate *) (c + 1);
|
||||
c->rem.port = pkt->udp->sport;
|
||||
#if MG_ENABLE_IPV6
|
||||
if (c->loc.is_ip6) { // matching of v4/v6 to dest is done bt getpeer()
|
||||
if (!udp6csum_ok(pkt->ip6, pkt->udp)) return false;
|
||||
c->rem.addr.ip6[0] = pkt->ip6->src[0],
|
||||
c->rem.addr.ip6[1] = pkt->ip6->src[1], c->rem.is_ip6 = true;
|
||||
if (c->is_bsd && c->is_client &&
|
||||
(c->rem.port != pkt->udp->sport ||
|
||||
!MG_IP6MATCH(c->rem.addr.ip6, pkt->ip6->src)))
|
||||
return true;
|
||||
rem.addr.ip6[0] = pkt->ip6->src[0],
|
||||
rem.addr.ip6[1] = pkt->ip6->src[1], rem.is_ip6 = true;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
if (!udpcsum_ok(pkt->ip, pkt->udp)) return false;
|
||||
c->rem.addr.ip4 = pkt->ip->src;
|
||||
if (c->is_bsd && c->is_client &&
|
||||
(c->rem.port != pkt->udp->sport || c->rem.addr.ip4 != pkt->ip->src))
|
||||
return true;
|
||||
rem.addr.ip4 = pkt->ip->src, rem.is_ip6 = false;
|
||||
}
|
||||
if ((l2addr = get_return_l2addr(ifp, &c->rem, true, pkt)) == NULL)
|
||||
rem.port = pkt->udp->sport;
|
||||
c->rem = rem;
|
||||
if ((l2addr = get_return_l2addr(ifp, &rem, true, pkt)) == NULL)
|
||||
return false; // safety net for lousy networks
|
||||
memcpy(s->mac, l2addr, sizeof(s->mac));
|
||||
if (c->recv.len >= MG_MAX_RECV_SIZE) {
|
||||
@@ -2345,20 +2357,25 @@ void mg_connect_resolved(struct mg_connection *c) {
|
||||
s->retransmit = ifp->enable_tcp_retransmit;
|
||||
s->txq.align = MG_TCPIP_TXQ_ALIGN;
|
||||
c->is_resolving = 0;
|
||||
if (ifp->eport < MG_EPHEMERAL_PORT_BASE) ifp->eport = MG_EPHEMERAL_PORT_BASE;
|
||||
if (c->loc.port == 0) {
|
||||
if (ifp->eport < MG_EPHEMERAL_PORT_BASE)
|
||||
ifp->eport = MG_EPHEMERAL_PORT_BASE;
|
||||
c->loc.port = mg_htons(ifp->eport++);
|
||||
} // otherwise retain an existing bound port
|
||||
#if MG_ENABLE_IPV6
|
||||
if (c->rem.is_ip6) {
|
||||
if (c->rem.addr.ip6[0] == ifp->ip6ll[0]) { // same local LAN, use ll
|
||||
if (c->loc.addr.ip6[0] == 0 && c->loc.addr.ip6[1] == 0 &&
|
||||
c->rem.addr.ip6[0] == ifp->ip6ll[0]) { // same local LAN, use ll
|
||||
c->loc.addr.ip6[0] = ifp->ip6ll[0], c->loc.addr.ip6[1] = ifp->ip6ll[1];
|
||||
} else { // use global address
|
||||
} else if (c->loc.addr.ip6[0] == 0 && c->loc.addr.ip6[1] == 0) {
|
||||
// Use global address
|
||||
c->loc.addr.ip6[0] = ifp->ip6[0], c->loc.addr.ip6[1] = ifp->ip6[1];
|
||||
}
|
||||
} // otherwise retain an existing bound address
|
||||
c->loc.is_ip6 = true;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
c->loc.addr.ip4 = ifp->ip;
|
||||
if (c->loc.addr.ip4 == 0) c->loc.addr.ip4 = ifp->ip;
|
||||
}
|
||||
MG_DEBUG(("%lu %M -> %M", c->id, mg_print_ip_port, &c->loc, mg_print_ip_port,
|
||||
&c->rem));
|
||||
@@ -2389,7 +2406,7 @@ void mg_connect_resolved(struct mg_connection *c) {
|
||||
uint32_t rem_ip = c->rem.addr.ip4;
|
||||
if (ifp->ip && MG_IPISLOCAL(ifp, rem_ip) &&
|
||||
rem_ip != ifp->gw) { // skip if gw (onstatechange -> ARP)
|
||||
// If we're in the same LAN, fire an ARP lookup.
|
||||
// We're in the same LAN, fire an ARP lookup.
|
||||
MG_DEBUG(("%lu ARP lookup...", c->id));
|
||||
mg_tcpip_arp_request(ifp, rem_ip, NULL);
|
||||
settmout(c, MIP_TTYPE_ARP);
|
||||
|
||||
@@ -159,6 +159,7 @@ extern struct mg_tcpip_driver mg_tcpip_driver_netc;
|
||||
#include "drivers/mcxw71.h"
|
||||
#include "drivers/nrf52.h"
|
||||
#include "drivers/rw612w.h"
|
||||
#include "drivers/esp32_802154.h"
|
||||
|
||||
// SPI bus abstraction for SPI-attached network chips (e.g. W5500).
|
||||
// Populate and assign to the driver's driver_data field.
|
||||
|
||||
+7
-5
@@ -4,11 +4,13 @@
|
||||
|
||||
#include "net.h"
|
||||
|
||||
// Return milliseconds since boot (uptime). Never goes backwards.
|
||||
// On RTOS targets (FreeRTOS, ThreadX, Zephyr, etc.) uses the RTOS tick count.
|
||||
// On STM32/Cube uses HAL_GetTick(). On Arduino uses millis().
|
||||
// On Linux/macOS uses CLOCK_MONOTONIC_RAW or CLOCK_MONOTONIC; falls back to
|
||||
// CLOCK_REALTIME if neither is available.
|
||||
// Return microseconds since boot. Never goes backwards.
|
||||
// To define your own implementation, set MG_ENABLE_CUSTOM_MICROS=1
|
||||
uint64_t mg_micros(void);
|
||||
|
||||
// Return milliseconds since boot. Never goes backwards. Calls mg_micros().
|
||||
// To define your own implementation, set MG_ENABLE_CUSTOM_MILLIS=1
|
||||
// Deprecated: use mg_micros() instead.
|
||||
uint64_t mg_millis(void);
|
||||
|
||||
// Boot timestamp in ms since Epoch. 0 until the first successful SNTP sync;
|
||||
|
||||
+2
-2
@@ -297,9 +297,9 @@ static long recv_raw(struct mg_connection *c, void *buf, size_t len) {
|
||||
long n = 0;
|
||||
if (c->is_udp) {
|
||||
union usa usa;
|
||||
socklen_t slen = tousa(&c->rem, &usa);
|
||||
socklen_t slen = sizeof(usa);
|
||||
n = recvfrom(FD(c), (char *) buf, len, 0, &usa.sa, &slen);
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, slen != sizeof(usa.sin));
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, usa.sa.sa_family == AF_INET6);
|
||||
} else {
|
||||
n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING);
|
||||
}
|
||||
|
||||
+17
-17
@@ -761,8 +761,8 @@ static bool mg_tls_server_send_hello(struct mg_connection *c) {
|
||||
|
||||
// calculate P-256 keyshare and the shared secret
|
||||
pub[0] = 0x04; // uncompressed point 0x04 || X || Y
|
||||
if (!mg_p256_make_key(pub + 1, prv) ||
|
||||
!mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec)) {
|
||||
if (mg_p256_make_key(pub + 1, prv) == 0 ||
|
||||
mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec) == 0) {
|
||||
mg_bzero(prv, sizeof(prv));
|
||||
mg_error(c, "bad key");
|
||||
return false;
|
||||
@@ -1177,7 +1177,7 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
|
||||
size_t sigsz, verifysz = 0;
|
||||
int adj1, adj2;
|
||||
uint8_t sig[64] = {0};
|
||||
if (!mg_p256_sign(tls->ec_key, hash, sizeof(hash), sig)) {
|
||||
if (mg_p256_sign(tls->ec_key, hash, sizeof(hash), sig) != 1) {
|
||||
mg_error(c, "P-256 sign");
|
||||
return false;
|
||||
}
|
||||
@@ -1309,7 +1309,7 @@ static bool mg_tls_client_send_hello(struct mg_connection *c) {
|
||||
}
|
||||
|
||||
// calc+fill keyshare; X || Y, sent as an uncompressed point 0x04 || X || Y
|
||||
if (!mg_p256_make_key(msg_client_hello + 95, tls->p256_cli)) {
|
||||
if (mg_p256_make_key(msg_client_hello + 95, tls->p256_cli) == 0) {
|
||||
mg_error(c, "P-256 key");
|
||||
return false;
|
||||
}
|
||||
@@ -1399,8 +1399,8 @@ static int mg_tls_client_recv_hello(struct mg_connection *c) {
|
||||
return -1;
|
||||
}
|
||||
if (key_exchange_len != 65 || key_exchange[0] != 0x04 ||
|
||||
!mg_p256_shared_secret(key_exchange + 1, tls->p256_cli,
|
||||
tls->ecdhe_sec)) { // Validates the point
|
||||
mg_p256_shared_secret(key_exchange + 1, tls->p256_cli,
|
||||
tls->ecdhe_sec) == 0) { // Validates the point
|
||||
mg_error(c, "bad key");
|
||||
return -1;
|
||||
}
|
||||
@@ -1781,14 +1781,14 @@ static bool mg_tls_verify_cert_signature(const struct mg_tls_cert *cert,
|
||||
}
|
||||
}
|
||||
|
||||
static int mg_tls_verify_cert_cn(struct mg_der_tlv *subj, const char *host) {
|
||||
static bool mg_tls_verify_cert_cn(struct mg_der_tlv *subj, const char *host) {
|
||||
struct mg_der_tlv v;
|
||||
int matched = 0;
|
||||
bool matched = false;
|
||||
if (mg_der_find_oid(subj, (uint8_t *) "\x55\x04\x03", 3, &v) > 0) {
|
||||
struct mg_str hn, cn;
|
||||
MG_VERBOSE(("using CN: %.*s <-> %s", v.len, v.value, host));
|
||||
hn = mg_str(host), cn = mg_str_n((char *) v.value, v.len);
|
||||
matched = (int) (countdots(hn) == countdots(cn) && mg_match(hn, cn, NULL));
|
||||
matched = (countdots(hn) == countdots(cn) && mg_match(hn, cn, NULL));
|
||||
}
|
||||
return matched;
|
||||
}
|
||||
@@ -1911,8 +1911,8 @@ static int mg_tls_recv_cert(struct mg_connection *c, bool is_client) {
|
||||
san = mg_tls_verify_cert_san(cert, certsz, tls->hostname,
|
||||
is_addr ? &addr : NULL);
|
||||
if (san < 0 || // RFC 6125 6.4.4 allow legacy fallback to CN
|
||||
(san == 0 && (is_addr || mg_tls_verify_cert_cn(
|
||||
&ci->subj, tls->hostname) <= 0))) {
|
||||
(san == 0 &&
|
||||
(is_addr || !mg_tls_verify_cert_cn(&ci->subj, tls->hostname)))) {
|
||||
mg_error(c, "failed to verify host");
|
||||
return -1;
|
||||
}
|
||||
@@ -2748,8 +2748,8 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
||||
mg_error(c, "hostname too long");
|
||||
return;
|
||||
}
|
||||
strncpy((char *) tls->hostname, opts->name.buf, sizeof(tls->hostname) - 1);
|
||||
tls->hostname[opts->name.len] = 0;
|
||||
memcpy(tls->hostname, opts->name.buf, opts->name.len);
|
||||
tls->hostname[opts->name.len] = '\0';
|
||||
}
|
||||
|
||||
// server CA certificate; parse PEM [bundle] or DER
|
||||
@@ -2762,8 +2762,9 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
||||
tls->ca_bundle_der = all_certs;
|
||||
MG_VERBOSE(("%d-cert bundle", cert_count));
|
||||
} else if (cert_count > 0) {
|
||||
tls->ca_der.buf = all_certs[0].buf;
|
||||
tls->ca_der.len = all_certs[0].len;
|
||||
int i;
|
||||
tls->ca_der = all_certs[0];
|
||||
for (i = 1; i < cert_count; i++) mg_free((void *) all_certs[i].buf);
|
||||
mg_free(all_certs);
|
||||
} else { // parse again for a possible DER (or a truncated begin string)
|
||||
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
||||
@@ -2789,8 +2790,7 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
||||
int cert_count = mg_parse_pem_certs(opts->cert, &all_certs);
|
||||
|
||||
if (cert_count > 0) {
|
||||
tls->cert_der.buf = all_certs[0].buf;
|
||||
tls->cert_der.len = all_certs[0].len;
|
||||
tls->cert_der = all_certs[0];
|
||||
if (cert_count > 1) {
|
||||
tls->chain_len = (size_t) cert_count;
|
||||
tls->chain_der = all_certs;
|
||||
|
||||
+29
-18
@@ -197,33 +197,38 @@ bool mg_path_is_sane(const struct mg_str path) {
|
||||
return true;
|
||||
}
|
||||
|
||||
#if MG_ENABLE_CUSTOM_MILLIS
|
||||
#else
|
||||
uint64_t mg_millis(void) {
|
||||
#if MG_ARCH == MG_ARCH_ESP32 || MG_ENABLE_FREERTOS
|
||||
return xTaskGetTickCount() * portTICK_PERIOD_MS;
|
||||
// The clock lives in mg_micros(), mg_millis() is derived from it. Either one
|
||||
// can be replaced, see MG_ENABLE_CUSTOM_MICROS and MG_ENABLE_CUSTOM_MILLIS
|
||||
#if MG_ENABLE_CUSTOM_MICROS == 0
|
||||
uint64_t mg_micros(void) {
|
||||
#if MG_ARCH == MG_ARCH_ESP32
|
||||
return (uint64_t) esp_timer_get_time();
|
||||
#elif MG_ENABLE_FREERTOS
|
||||
return (uint64_t) xTaskGetTickCount() * portTICK_PERIOD_MS * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_THREADX
|
||||
return tx_time_get() * (1000 /* MS per SEC */ / TX_TIMER_TICKS_PER_SECOND);
|
||||
return (uint64_t) tx_time_get() *
|
||||
(1000 /* MS per SEC */ / TX_TIMER_TICKS_PER_SECOND) * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_TIRTOS
|
||||
return (uint64_t) Clock_getTicks();
|
||||
return (uint64_t) Clock_getTicks() * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_ZEPHYR
|
||||
return (uint64_t) k_uptime_get();
|
||||
return k_ticks_to_us_floor64((uint64_t) k_uptime_ticks());
|
||||
#elif MG_ARCH == MG_ARCH_CMSIS_RTOS1
|
||||
return (uint64_t) rt_time_get();
|
||||
return (uint64_t) rt_time_get() * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_CMSIS_RTOS2
|
||||
return (uint64_t) ((osKernelGetTickCount() * 1000) / osKernelGetTickFreq());
|
||||
return (uint64_t) ((osKernelGetTickCount() * 1000) / osKernelGetTickFreq()) *
|
||||
1000;
|
||||
#elif MG_ARCH == MG_ARCH_RTTHREAD
|
||||
return (uint64_t) ((rt_tick_get() * 1000) / RT_TICK_PER_SECOND);
|
||||
return (uint64_t) ((rt_tick_get() * 1000) / RT_TICK_PER_SECOND) * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_WIN32
|
||||
return GetTickCount();
|
||||
return (uint64_t) GetTickCount() * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_PICOSDK
|
||||
return time_us_64() / 1000;
|
||||
return time_us_64();
|
||||
#elif MG_ARCH == MG_ARCH_CUBE
|
||||
return (uint64_t) HAL_GetTick();
|
||||
return (uint64_t) HAL_GetTick() * 1000;
|
||||
#elif MG_ARCH == MG_ARCH_UNIX && defined(__APPLE__)
|
||||
// Apple CLOCK_MONOTONIC_RAW is equivalent to CLOCK_BOOTTIME on linux
|
||||
// Apple CLOCK_UPTIME_RAW is equivalent to CLOCK_MONOTONIC_RAW on linux
|
||||
return clock_gettime_nsec_np(CLOCK_UPTIME_RAW) / 1000000;
|
||||
return clock_gettime_nsec_np(CLOCK_UPTIME_RAW) / 1000;
|
||||
#elif MG_ARCH == MG_ARCH_UNIX
|
||||
struct timespec ts = {0, 0};
|
||||
// See #1615 - prefer monotonic clock
|
||||
@@ -238,15 +243,21 @@ uint64_t mg_millis(void) {
|
||||
// adjustments performed by adjtime and NTP
|
||||
clock_gettime(CLOCK_REALTIME, &ts);
|
||||
#endif
|
||||
return ((uint64_t) ts.tv_sec * 1000 + (uint64_t) ts.tv_nsec / 1000000);
|
||||
return ((uint64_t) ts.tv_sec * 1000000 + (uint64_t) ts.tv_nsec / 1000);
|
||||
#elif defined(ARDUINO)
|
||||
return (uint64_t) millis();
|
||||
return (uint64_t) micros();
|
||||
#else
|
||||
return (uint64_t) (time(NULL) * 1000);
|
||||
return (uint64_t) time(NULL) * 1000000;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
#if MG_ENABLE_CUSTOM_MILLIS == 0
|
||||
uint64_t mg_millis(void) {
|
||||
return mg_micros() / 1000;
|
||||
}
|
||||
#endif
|
||||
|
||||
// network format equates big endian order
|
||||
uint16_t mg_ntohs(uint16_t net) {
|
||||
return MG_LOAD_BE16(&net);
|
||||
|
||||
+9
-6
@@ -13,7 +13,7 @@ else
|
||||
C_WARN ?= -Wno-deprecated
|
||||
endif
|
||||
|
||||
.PHONY: all bsd bsd_test bsd_client bsd_nortos bsd_nortos_test shm_tap_bridge \
|
||||
.PHONY: all bsd bsd_test bsd_client bsd_udp bsd_nortos bsd_nortos_test shm_tap_bridge \
|
||||
shm_port_bridge bsd_s390 bsd_nortos_s390 clean
|
||||
|
||||
TEST_SOURCES = bsd_shm_test.c
|
||||
@@ -47,11 +47,11 @@ DOCKER ?= $(DOCKER_BIN) run --platform linux/amd64 --net=host --rm $(ENV) -v $(R
|
||||
CFLAGS_MONGOOSE += -DMG_ARCH=MG_ARCH_CUSTOM
|
||||
|
||||
|
||||
all bsd: shm_tap_bridge bsd_client FreeRTOS-Kernel bsd_test
|
||||
all bsd: shm_tap_bridge bsd_client bsd_udp FreeRTOS-Kernel bsd_test
|
||||
ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_test $(ARGS)
|
||||
|
||||
# also
|
||||
bsd_nortos: shm_tap_bridge bsd_client bsd_nortos_test
|
||||
bsd_nortos: shm_tap_bridge bsd_client bsd_udp bsd_nortos_test
|
||||
ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_nortos_test $(ARGS)
|
||||
|
||||
# requires shm_tap_bridge to be running
|
||||
@@ -70,6 +70,9 @@ bsd_nortos_test:
|
||||
bsd_client: bsd_client.c
|
||||
$(CC) bsd_client.c -pthread -o $@
|
||||
|
||||
bsd_udp: bsd_udp.c
|
||||
$(CC) bsd_udp.c -o $@
|
||||
|
||||
# bridge shm queue <--> TAP interface
|
||||
shm_tap_bridge: shm_tap_bridge.c shm_queue.h
|
||||
$(CC) shm_tap_bridge.c -pthread -o $@
|
||||
@@ -79,7 +82,7 @@ bsd_s390: CFLAGS_MONGOOSE += -DMG_ENABLE_BSD_PROTOTYPES=0
|
||||
bsd_s390: ASAN=
|
||||
bsd_s390: CC = $(DOCKER) mdashnet/s390 cc
|
||||
bsd_s390: RUN = $(DOCKER) --init mdashnet/s390
|
||||
bsd_s390: shm_port_bridge bsd_client FreeRTOS-Kernel bsd_test
|
||||
bsd_s390: shm_port_bridge bsd_client bsd_udp FreeRTOS-Kernel bsd_test
|
||||
$(RUN) sh -c './shm_port_bridge & pid=$$!; sleep 1; ./bsd_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
|
||||
|
||||
#also
|
||||
@@ -87,14 +90,14 @@ bsd_nortos_s390: CFLAGS_MONGOOSE += -DMG_ENABLE_BSD_PROTOTYPES=0
|
||||
bsd_nortos_s390: ASAN=
|
||||
bsd_nortos_s390: CC = $(DOCKER) mdashnet/s390 cc
|
||||
bsd_nortos_s390: RUN = $(DOCKER) --init mdashnet/s390
|
||||
bsd_nortos_s390: shm_port_bridge bsd_client bsd_nortos_test
|
||||
bsd_nortos_s390: shm_port_bridge bsd_client bsd_udp bsd_nortos_test
|
||||
$(RUN) sh -c './shm_port_bridge & pid=$$!; sleep 1; ./bsd_nortos_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
|
||||
|
||||
shm_port_bridge: shm_port_bridge.c shm_queue.h
|
||||
$(CC) shm_port_bridge.c $(CFLAGS) -pthread -o $@
|
||||
|
||||
clean: # Cleanup. Delete built program and all build artifacts
|
||||
rm -rf bsd_test bsd_client shm_port_bridge *.o *.obj FreeRTOS-Kernel
|
||||
rm -rf bsd_test bsd_client bsd_udp shm_port_bridge *.o *.obj FreeRTOS-Kernel
|
||||
|
||||
FreeRTOS-Kernel: # FreeRTOS sources
|
||||
git clone -q -c advice.detachedHead=false --depth 1 -b V11.2.0 https://github.com/FreeRTOS/FreeRTOS-Kernel $@
|
||||
@@ -0,0 +1,60 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define PORT 1235
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
struct sockaddr_in sa;
|
||||
struct timeval timeout;
|
||||
char buf[8];
|
||||
ssize_t n;
|
||||
int fd, rogue;
|
||||
|
||||
if (argc != 2) return 1;
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_port = htons(PORT);
|
||||
if (inet_pton(AF_INET, argv[1], &sa.sin_addr) != 1) return 1;
|
||||
timeout.tv_sec = 5, timeout.tv_usec = 0;
|
||||
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ||
|
||||
setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) != 0 ||
|
||||
connect(fd, (struct sockaddr *) &sa, sizeof(sa)) != 0 ||
|
||||
send(fd, "hello", 5, 0) != 5 || recv(fd, buf, sizeof(buf), 0) != 5 ||
|
||||
memcmp(buf, "ready", 5) != 0)
|
||||
goto fail;
|
||||
if ((rogue = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ||
|
||||
setsockopt(rogue, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) !=
|
||||
0 ||
|
||||
sendto(rogue, "rogueid", 7, 0, (struct sockaddr *) &sa, sizeof(sa)) !=
|
||||
7 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 7 || memcmp(buf, "peerone", 7) != 0 ||
|
||||
recv(rogue, buf, sizeof(buf), 0) != 7 || memcmp(buf, "rogueok", 7) != 0 ||
|
||||
send(fd, "one", 3, 0) != 3 ||
|
||||
sendto(rogue, "two2", 4, 0, (struct sockaddr *) &sa, sizeof(sa)) != 4 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 4 || memcmp(buf, "drop", 4) != 0 ||
|
||||
send(fd, "truncate", 8, 0) != 8 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 5 || memcmp(buf, "short", 5) != 0 ||
|
||||
send(fd, "peek", 4, 0) != 4 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 4 || memcmp(buf, "peek", 4) != 0 ||
|
||||
sendto(rogue, "rogue", 5, 0, (struct sockaddr *) &sa, sizeof(sa)) != 5 ||
|
||||
send(fd, "more", 4, 0) != 4 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 7 || memcmp(buf, "checked", 7) != 0 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 3 || memcmp(buf, "one", 3) != 0 ||
|
||||
recv(fd, buf, sizeof(buf), 0) != 4 || memcmp(buf, "two2", 4) != 0 ||
|
||||
send(fd, "echo", 4, 0) != 4 || recv(fd, buf, sizeof(buf), 0) != 4 ||
|
||||
memcmp(buf, "echo", 4) != 0)
|
||||
goto fail_close_rogue;
|
||||
close(rogue);
|
||||
close(fd);
|
||||
return 0;
|
||||
|
||||
fail_close_rogue:
|
||||
close(rogue);
|
||||
fail:
|
||||
close(fd);
|
||||
return 1;
|
||||
}
|
||||
+253
-2
@@ -33,6 +33,198 @@ static int s_abort = 0;
|
||||
#define DASHBOARD(x) \
|
||||
printf("HEALTH_DASHBOARD\t\"%s\": %s,\n", x, s_error ? "false" : "true")
|
||||
|
||||
#define UDP_PORT 1235
|
||||
|
||||
#if MG_ENABLE_FREERTOS
|
||||
static volatile bool s_tx_held, s_tx_waits;
|
||||
#endif
|
||||
|
||||
static int open_udp(void) {
|
||||
struct sockaddr_in sa;
|
||||
char buf;
|
||||
int fd;
|
||||
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_port = htons(UDP_PORT);
|
||||
sa.sin_addr.s_addr = INADDR_ANY;
|
||||
ASSERT((fd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0);
|
||||
ASSERT(bind(fd, (struct sockaddr *) &sa, sizeof(sa)) == 0);
|
||||
ASSERT(send(fd, &buf, sizeof(buf), 0) < 0 && errno == EDESTADDRREQ);
|
||||
ASSERT(fcntl(fd, F_SETFL, O_NONBLOCK) == 0);
|
||||
return fd;
|
||||
}
|
||||
|
||||
static void check_udp_oversize(struct mg_mgr *mgr, int fd,
|
||||
const struct sockaddr *dst, socklen_t dstlen) {
|
||||
static char buf[1600];
|
||||
size_t len = mgr->ifp->mtu + 1;
|
||||
|
||||
ASSERT(len <= sizeof(buf));
|
||||
if (dst == NULL) {
|
||||
ASSERT(send(fd, buf, len, 0) < 0 && errno == EMSGSIZE);
|
||||
} else {
|
||||
ASSERT(sendto(fd, buf, len, 0, dst, dstlen) < 0 && errno == EMSGSIZE);
|
||||
}
|
||||
}
|
||||
|
||||
static void udp_exchange(struct mg_mgr *mgr, int fd,
|
||||
void (*progress)(struct mg_mgr *)) {
|
||||
struct sockaddr_in peer, sender;
|
||||
socklen_t peerlen, senderlen;
|
||||
uint64_t deadline;
|
||||
struct timeval zero = {0, 0};
|
||||
struct pollfd p;
|
||||
fd_set r, w, e;
|
||||
char buf[8];
|
||||
ssize_t n;
|
||||
|
||||
for (;;) {
|
||||
peerlen = sizeof(peer);
|
||||
n = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) &peer, &peerlen);
|
||||
if (n >= 0) break;
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 5 && memcmp(buf, "hello", 5) == 0);
|
||||
ASSERT(sendto(fd, "ready", 5, 0, (struct sockaddr *) &peer, peerlen) ==
|
||||
5);
|
||||
check_udp_oversize(mgr, fd, (struct sockaddr *) &peer, peerlen);
|
||||
do {
|
||||
senderlen = sizeof(sender);
|
||||
n = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) &sender,
|
||||
&senderlen);
|
||||
if (n < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
} while (n < 0);
|
||||
ASSERT(n == 7 && memcmp(buf, "rogueid", 7) == 0 &&
|
||||
sender.sin_port != peer.sin_port);
|
||||
#if MG_ENABLE_FREERTOS
|
||||
s_tx_waits = false, s_tx_held = true;
|
||||
#endif
|
||||
ASSERT(sendto(fd, "peerone", 7, 0, (struct sockaddr *) &peer, peerlen) ==
|
||||
7);
|
||||
ASSERT(sendto(fd, "rogueok", 7, 0, (struct sockaddr *) &sender,
|
||||
senderlen) < 0 && errno == EAGAIN);
|
||||
#if MG_ENABLE_FREERTOS
|
||||
while (!s_tx_waits) progress(mgr); // Keep peerone in the UDP slot
|
||||
s_tx_held = false;
|
||||
#endif
|
||||
while ((n = sendto(fd, "rogueok", 7, 0, (struct sockaddr *) &sender,
|
||||
senderlen)) < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 7);
|
||||
deadline = mg_millis() + 100;
|
||||
while (mg_millis() < deadline) progress(mgr); // Queue both; drop the second
|
||||
do {
|
||||
senderlen = sizeof(sender);
|
||||
n = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) &sender,
|
||||
&senderlen);
|
||||
if (n < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
} while (n < 0);
|
||||
ASSERT(n == 3 && memcmp(buf, "one", 3) == 0 &&
|
||||
sender.sin_port == peer.sin_port);
|
||||
ASSERT(recvfrom(fd, buf, sizeof(buf), MSG_DONTWAIT, NULL, NULL) < 0 &&
|
||||
errno == EAGAIN);
|
||||
ASSERT(connect(fd, (struct sockaddr *) &peer, peerlen) == 0);
|
||||
senderlen = sizeof(sender);
|
||||
ASSERT(getsockname(fd, (struct sockaddr *) &sender, &senderlen) == 0 &&
|
||||
sender.sin_port == htons(UDP_PORT));
|
||||
ASSERT(sendto(fd, "no", 2, 0, (struct sockaddr *) &peer, peerlen) < 0 &&
|
||||
errno == EISCONN);
|
||||
check_udp_oversize(mgr, fd, NULL, 0);
|
||||
ASSERT(send(fd, "drop", 4, 0) == 4);
|
||||
do {
|
||||
n = recv(fd, buf, 3, 0);
|
||||
if (n < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
} while (n < 0);
|
||||
ASSERT(n == 3 && memcmp(buf, "tru", 3) == 0);
|
||||
ASSERT(recv(fd, buf, sizeof(buf), MSG_DONTWAIT) < 0 && errno == EAGAIN);
|
||||
ASSERT(send(fd, "short", 5, 0) == 5);
|
||||
do {
|
||||
n = recv(fd, buf, sizeof(buf), MSG_PEEK);
|
||||
if (n < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
} while (n < 0);
|
||||
ASSERT(n == 4 && memcmp(buf, "peek", 4) == 0);
|
||||
ASSERT(recv(fd, buf, sizeof(buf), 0) == 4 && memcmp(buf, "peek", 4) == 0);
|
||||
ASSERT(send(fd, "peek", 4, 0) == 4);
|
||||
deadline = mg_millis() + 100;
|
||||
while (mg_millis() < deadline) progress(mgr); // Let rogue arrive; ignore it
|
||||
do {
|
||||
p.fd = fd, p.events = POLLIN | POLLOUT, p.revents = 0;
|
||||
ASSERT(poll(&p, 1, 0) == 1);
|
||||
if (!(p.revents & POLLIN)) progress(mgr);
|
||||
} while (!(p.revents & POLLIN));
|
||||
ASSERT(p.revents == (POLLIN | POLLOUT));
|
||||
FD_ZERO(&r);
|
||||
FD_ZERO(&w);
|
||||
FD_ZERO(&e);
|
||||
FD_SET(fd, &r);
|
||||
FD_SET(fd, &w);
|
||||
FD_SET(fd, &e);
|
||||
ASSERT(select(fd + 1, &r, &w, &e, &zero) == 1);
|
||||
ASSERT(FD_ISSET(fd, &r) && FD_ISSET(fd, &w) && !FD_ISSET(fd, &e));
|
||||
do {
|
||||
n = recv(fd, buf, sizeof(buf), 0);
|
||||
if (n < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
} while (n < 0);
|
||||
ASSERT(n == 4 && memcmp(buf, "more", 4) == 0);
|
||||
p.events = POLLIN | POLLOUT, p.revents = 0;
|
||||
ASSERT(poll(&p, 1, 0) == 1 && p.revents == POLLOUT);
|
||||
while ((n = send(fd, "checked", 7, 0)) < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 7);
|
||||
while ((n = send(fd, "one", 3, MSG_DONTWAIT)) < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 3);
|
||||
p.fd = fd, p.events = POLLOUT, p.revents = 0;
|
||||
ASSERT(poll(&p, 1, 0) == 0 && p.revents == 0);
|
||||
#if MG_ENABLE_FREERTOS
|
||||
s_tx_waits = false, s_tx_held = true;
|
||||
#endif
|
||||
ASSERT(send(fd, "two2", 4, MSG_DONTWAIT) < 0 && errno == EAGAIN);
|
||||
ASSERT(send(fd, "", 0, 0) == 0);
|
||||
#if MG_ENABLE_FREERTOS
|
||||
while (!s_tx_waits) progress(mgr); // MG_IO_WAIT keeps one datagram queued
|
||||
s_tx_held = false;
|
||||
#endif
|
||||
while ((n = send(fd, "two2", 4, MSG_DONTWAIT)) < 0) {
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 4);
|
||||
for (;;) {
|
||||
n = recv(fd, buf, sizeof(buf), 0);
|
||||
if (n >= 0) break;
|
||||
ASSERT(errno == EAGAIN);
|
||||
progress(mgr);
|
||||
}
|
||||
ASSERT(n == 4 && memcmp(buf, "echo", 4) == 0);
|
||||
ASSERT(send(fd, "echo", 4, 0) == 4);
|
||||
progress(mgr); // Drain the last queued datagram before close
|
||||
ASSERT(close(fd) == 0);
|
||||
}
|
||||
|
||||
static pid_t start_client(const char *ip, const char *connections) {
|
||||
char *cmd[4];
|
||||
pid_t pid;
|
||||
@@ -46,6 +238,18 @@ static pid_t start_client(const char *ip, const char *connections) {
|
||||
return pid;
|
||||
}
|
||||
|
||||
static pid_t start_udp(const char *ip) {
|
||||
char *cmd[3];
|
||||
pid_t pid;
|
||||
extern char **environ;
|
||||
|
||||
cmd[0] = (char *) "./bsd_udp";
|
||||
cmd[1] = (char *) ip;
|
||||
cmd[2] = NULL;
|
||||
ASSERT(posix_spawn(&pid, cmd[0], NULL, NULL, cmd, environ) == 0);
|
||||
return pid;
|
||||
}
|
||||
|
||||
static bool client_done(pid_t pid, int *status) {
|
||||
pid_t r = waitpid(pid, status, WNOHANG);
|
||||
ASSERT(r >= 0);
|
||||
@@ -60,12 +264,17 @@ static void check_client(int status) {
|
||||
static int open_listener(int backlog, bool nonblock) {
|
||||
int lfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
struct sockaddr_in sa;
|
||||
char buf;
|
||||
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.sin_family = AF_INET;
|
||||
sa.sin_port = htons(1234);
|
||||
sa.sin_addr.s_addr = INADDR_ANY;
|
||||
ASSERT(lfd >= 0);
|
||||
ASSERT(sendto(lfd, &buf, sizeof(buf), 0, (struct sockaddr *) &sa,
|
||||
sizeof(sa)) < 0 && errno == EOPNOTSUPP);
|
||||
ASSERT(recvfrom(lfd, &buf, sizeof(buf), 0, NULL, NULL) < 0 &&
|
||||
errno == EOPNOTSUPP);
|
||||
ASSERT(bind(lfd, (struct sockaddr *) &sa, sizeof(sa)) == 0);
|
||||
ASSERT(listen(lfd, backlog) == 0);
|
||||
if (nonblock) ASSERT(fcntl(lfd, F_SETFL, O_NONBLOCK) == 0);
|
||||
@@ -146,12 +355,13 @@ static volatile bool s_select_waiting, s_select_done;
|
||||
static volatile bool s_poll_waiting, s_poll_done;
|
||||
static volatile bool s_ready_waiting, s_ready_done;
|
||||
static volatile bool s_backlog_ready, s_backlog_full, s_backlog_accept;
|
||||
static volatile bool s_tx_held, s_tx_waits, s_tx_fail, s_tx_error;
|
||||
static volatile bool s_tx_fail, s_tx_error;
|
||||
static volatile bool s_send_waiting;
|
||||
static volatile bool s_send_done, s_send_expect_error, s_send_expect_shutdown;
|
||||
static volatile bool s_recv_start, s_recv_waiting, s_recv_done;
|
||||
static volatile bool s_recv_expect_error;
|
||||
static volatile bool s_shutdown_waiting, s_shutdown_done;
|
||||
static volatile bool s_udp_ready, s_udp_done;
|
||||
static size_t (*s_tx)(const void *, size_t, struct mg_tcpip_if *);
|
||||
|
||||
struct client_data {
|
||||
@@ -170,6 +380,7 @@ static void readiness_task(void *args);
|
||||
static void backlog_task(void *args);
|
||||
static void tx_gate_task(void *args);
|
||||
static void shutdown_task(void *args);
|
||||
static void udp_task(void *args);
|
||||
|
||||
struct atask_args {
|
||||
bool listener_nonblock;
|
||||
@@ -329,6 +540,21 @@ static void tx_gate_task(void *args) {
|
||||
(void) args;
|
||||
}
|
||||
|
||||
static void udp_delay(struct mg_mgr *mgr) {
|
||||
(void) mgr;
|
||||
vTaskDelay(1);
|
||||
}
|
||||
|
||||
static void udp_task(void *args) {
|
||||
struct mg_mgr *mgr = (struct mg_mgr *) args;
|
||||
int fd = open_udp();
|
||||
|
||||
s_udp_ready = true;
|
||||
udp_exchange(mgr, fd, udp_delay);
|
||||
s_udp_done = true;
|
||||
vTaskDelete(NULL);
|
||||
}
|
||||
|
||||
static void recv_wait_task(void *args) {
|
||||
char buf;
|
||||
int fd = (int) (uintptr_t) args;
|
||||
@@ -599,12 +825,22 @@ static void task2(void *args) {
|
||||
struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
|
||||
char *ip;
|
||||
int status;
|
||||
pid_t first, second;
|
||||
pid_t first, second, udp;
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
|
||||
s_error = false;
|
||||
s_wait = false;
|
||||
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip);
|
||||
s_udp_ready = s_udp_done = false;
|
||||
ASSERT(xTaskCreate(udp_task, "udp", 512, mgr, configMAX_PRIORITIES - 1,
|
||||
NULL) == pdPASS);
|
||||
while (!s_udp_ready) vTaskDelay(1);
|
||||
udp = start_udp(ip);
|
||||
while (!client_done(udp, &status)) vTaskDelay(1);
|
||||
check_client(status);
|
||||
while (!s_udp_done) vTaskDelay(1);
|
||||
DASHBOARD("udp");
|
||||
|
||||
s_poll_waiting = s_poll_done = false;
|
||||
ASSERT(xTaskCreate(poll_task, "poll", 512, NULL,
|
||||
configMAX_PRIORITIES - 1, NULL) == pdPASS);
|
||||
@@ -963,6 +1199,20 @@ static void nortos_echo(struct mg_mgr *mgr, struct nortos_echo_client *clients,
|
||||
nortos_wait_client(mgr, pid);
|
||||
}
|
||||
|
||||
static void udp_poll(struct mg_mgr *mgr) {
|
||||
mg_mgr_poll(mgr, 0);
|
||||
}
|
||||
|
||||
static void nortos_udp(struct mg_mgr *mgr, const char *ip) {
|
||||
pid_t pid;
|
||||
int fd = open_udp();
|
||||
|
||||
pid = start_udp(ip);
|
||||
udp_exchange(mgr, fd, udp_poll);
|
||||
nortos_wait_client(mgr, pid);
|
||||
DASHBOARD("nortos_udp");
|
||||
}
|
||||
|
||||
static void nortos_test(struct mg_mgr *mgr) {
|
||||
static const char bootstrap = '\0';
|
||||
static const char grow[512] = {0};
|
||||
@@ -1083,6 +1333,7 @@ static void nortos_test(struct mg_mgr *mgr) {
|
||||
ASSERT(close(fd) == 0);
|
||||
mg_mgr_poll(mgr, 0);
|
||||
DASHBOARD("nortos_nonblocking_connect");
|
||||
nortos_udp(mgr, ip);
|
||||
mg_free(ip);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ HDRS = simulator.h $(ROOT)/mongoose.h
|
||||
WARN = -pedantic -W -Wall -Werror -Wshadow -Wdouble-promotion -fno-common \
|
||||
-Wconversion -Wundef -Wmissing-prototypes -Wstrict-prototypes
|
||||
DEFS = -DMG_ENABLE_TCPIP=1 -DMG_ENABLE_TCPIP_DRIVER_INIT=0 -DMG_ENABLE_IPV6=0 \
|
||||
-DMG_ENABLE_CUSTOM_MILLIS=1 -DMG_ENABLE_TCPIP_TCPRTX=1 \
|
||||
-DMG_ENABLE_CUSTOM_MICROS=1 -DMG_ENABLE_TCPIP_TCPRTX=1 \
|
||||
-DMG_IO_SIZE=512 \
|
||||
-DMG_TCPIP_ARP_MS=1000 -DMG_TCPIP_ACK_MS=500 # Slow radio: wait longer
|
||||
CFLAGS ?= -O2 -g0 $(WARN)
|
||||
|
||||
+3
-3
@@ -277,7 +277,7 @@ The FRDM-RW612 example is the Ethernet bridge. The XIAO MG24 and
|
||||
FRDM-MCXW71 examples are radio clients. All three use the slotted mesh.
|
||||
|
||||
```sh
|
||||
make -C tutorials/nxp/frdm-rw612/bridge
|
||||
make -C tutorials/nxp/frdm-rw612/ethernet-to-802.15.4-bridge
|
||||
make -C tutorials/silabs/xiao-mg24/minimal
|
||||
make -C tutorials/nxp/frdm-mcxw71/minimal
|
||||
```
|
||||
@@ -292,7 +292,7 @@ MG24 is a node only; its radio address is derived from its MAC.
|
||||
The drivers in `src/drivers` send and receive raw 802.15.4 frames.
|
||||
They use the same slotted mesh implementation as the simulator.
|
||||
The board driver is initialized by `mg_mgr_init()`. The RW612 bridge
|
||||
has its own `bridge/main.c`, which initializes and polls the two drivers
|
||||
has its own `ethernet-to-802.15.4-bridge/main.c`, which initializes and polls the two drivers
|
||||
directly, without an event manager or local IP stack.
|
||||
|
||||
## Hardware integration
|
||||
@@ -306,7 +306,7 @@ A NULL strategy selects `mg_mesh_default`, named `"default"`; assigning another
|
||||
raw radio frames; the selected strategy owns joining, scheduling and Ethernet
|
||||
fragmentation. Driver initialization goes through `mg_tcpip_init()`.
|
||||
|
||||
Board examples are under `tutorials/nxp/frdm-rw612/bridge`,
|
||||
Board examples are under `tutorials/nxp/frdm-rw612/ethernet-to-802.15.4-bridge`,
|
||||
`tutorials/nxp/frdm-mcxw71/minimal`, `tutorials/silabs/xiao-mg24/minimal`, and
|
||||
`tutorials/nordic/xiao-52840/minimal`. Their HALs supply `mg_micros()`.
|
||||
|
||||
|
||||
@@ -18,10 +18,6 @@ uint64_t mg_micros(void) {
|
||||
return s_sim.now;
|
||||
}
|
||||
|
||||
uint64_t mg_millis(void) {
|
||||
return mg_micros() / 1000;
|
||||
}
|
||||
|
||||
// Parse "X,Y,Z", or "X,Y" with Z 0. Return false if it is not that
|
||||
static bool parse_pos(const char *s, struct pos *p) {
|
||||
int n = 0; // Characters parsed
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
PROJECTS ?= $(wildcard ../../tutorials/pico-sdk/*-picosdk-*)
|
||||
SDK_PATH ?= $(realpath $(PWD))/pico-sdk
|
||||
SDK_VERSION ?= 2.1.0
|
||||
SDK_VERSION ?= 2.2.0
|
||||
|
||||
all: $(PROJECTS)
|
||||
echo
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
set(IDF_TARGET esp32c6)
|
||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||
project(mongoose-minimal-802154)
|
||||
@@ -0,0 +1,23 @@
|
||||
# Environment setup: https://mongoose.ws/documentation/tutorials/tools/
|
||||
# Build: ESP-IDF from the espressif/idf Docker image. Flash: esptool.
|
||||
# Monitor: esputil, https://github.com/cpq/esputil
|
||||
|
||||
THISDIR = $(realpath $(CURDIR))
|
||||
ROOTDIR = $(realpath $(CURDIR)/../../..)
|
||||
DOCKER ?= docker run --rm -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) espressif/idf
|
||||
PORT ?= /dev/cu.usbmodem2101
|
||||
|
||||
all build:
|
||||
$(DOCKER) idf.py build
|
||||
|
||||
flash: build
|
||||
cd build && esptool --chip esp32c6 -p $(PORT) -b 460800 write-flash @flash_args
|
||||
|
||||
monitor:
|
||||
esputil -p $(PORT) monitor
|
||||
|
||||
menuconfig:
|
||||
docker run --rm -it -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) espressif/idf idf.py menuconfig
|
||||
|
||||
clean:
|
||||
test -d build && $(DOCKER) rm -rf build sdkconfig || true
|
||||
@@ -0,0 +1,5 @@
|
||||
idf_component_register(SRCS "main.c" "../../../../mongoose.c"
|
||||
"../../../mqtt/mqtt-client/mongoose_mqtt.c"
|
||||
INCLUDE_DIRS "." "../../../.."
|
||||
REQUIRES ieee802154 esp_timer esp_hw_support
|
||||
esp_driver_gpio app_update)
|
||||
@@ -0,0 +1,99 @@
|
||||
// Copyright (c) 2026 Cesanta Software Limited
|
||||
// All rights reserved
|
||||
|
||||
#include <driver/gpio.h>
|
||||
#include <esp_heap_caps.h>
|
||||
|
||||
#include "mongoose.h"
|
||||
|
||||
void mg_mqtt_init(struct mg_mgr *mgr); // From tutorials/mqtt/mqtt-client
|
||||
void mg_mqtt_poll(struct mg_mgr *mgr);
|
||||
|
||||
// Seeed XIAO ESP32-C6
|
||||
#define LED1 GPIO_NUM_15 // User LED, active low
|
||||
#define RF_SW_PWR GPIO_NUM_3 // RF switch power, active low
|
||||
#define RF_SW_SEL GPIO_NUM_14 // Antenna select: low built-in, high U.FL
|
||||
|
||||
// Self-signed P-256 certificate and key for the HTTPS listener. Created by:
|
||||
// openssl ecparam -genkey -name prime256v1 -noout -out key.pem
|
||||
// openssl req -x509 -key key.pem -out cert.pem -days 3650 -subj /CN=mg
|
||||
#define TLS_CERT \
|
||||
"-----BEGIN CERTIFICATE-----\n" \
|
||||
"MIIBgjCCASegAwIBAgIUIJOq77Qn7lHbH6WseMemeqorR50wCgYIKoZIzj0EAwIw\n" \
|
||||
"FjEUMBIGA1UEAwwLbnVjbGVvLWg3MjMwHhcNMjYxMDEyMTUwMjE5WhcNMzYxMDA5\n" \
|
||||
"MTUwMjE5WjAWMRQwEgYDVQQDDAtudWNsZW8taDcyMzBZMBMGByqGSM49AgEGCCqG\n" \
|
||||
"SM49AwEHA0IABB6IQJNmzrsdQL+2BnZYS7GYOaj7sz8f6cjBmz3n8D9Em19XodlU\n" \
|
||||
"uy4ybIvyhr766lL0ERoTmMUivb/lGmzx9C+jUzBRMB0GA1UdDgQWBBQqxMuc4gj7\n" \
|
||||
"MTMzreWlRMNI3QMqTzAfBgNVHSMEGDAWgBQqxMuc4gj7MTMzreWlRMNI3QMqTzAP\n" \
|
||||
"BgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0kAMEYCIQDY4xaJpuxq6b3rHK3b\n" \
|
||||
"lOIQyfkQX+orCRqQUkseplqpqwIhAKswZFNn+2zUNRRNY8+cHmdIwmdpsmxtoWYP\n" \
|
||||
"BCjX++LI\n" \
|
||||
"-----END CERTIFICATE-----\n"
|
||||
|
||||
#define TLS_KEY \
|
||||
"-----BEGIN EC PRIVATE KEY-----\n" \
|
||||
"MHcCAQEEIJ/GBl0TlD52q9PMg1KWaNIdXqp8b/HyIsABmBpqC+O1oAoGCCqGSM49\n" \
|
||||
"AwEHoUQDQgAEHohAk2bOux1Av7YGdlhLsZg5qPuzPx/pyMGbPefwP0SbX1eh2VS7\n" \
|
||||
"LjJsi/KGvvrqUvQRGhOYxSK9v+UabPH0Lw==\n" \
|
||||
"-----END EC PRIVATE KEY-----\n"
|
||||
|
||||
// Power the XIAO RF switch and select the built-in antenna
|
||||
static void antenna_init(void) {
|
||||
gpio_set_direction(RF_SW_PWR, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(RF_SW_PWR, 0);
|
||||
gpio_set_direction(RF_SW_SEL, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(RF_SW_SEL, 0);
|
||||
}
|
||||
|
||||
// Toggle the user LED twice a second
|
||||
static void blink_task(void) {
|
||||
static uint64_t blink_timer = 0;
|
||||
static int on = 0;
|
||||
if (mg_timer_expired(&blink_timer, 500, mg_millis())) {
|
||||
gpio_set_level(LED1, on ^= 1);
|
||||
}
|
||||
}
|
||||
|
||||
static void http_ev_handler(struct mg_connection *c, int ev, void *ev_data) {
|
||||
if (ev == MG_EV_ACCEPT && c->is_tls) { // Accepted on the https:// listener
|
||||
struct mg_tls_opts opts = {.cert = mg_str(TLS_CERT),
|
||||
.key = mg_str(TLS_KEY)};
|
||||
mg_tls_init(c, &opts);
|
||||
} else if (ev == MG_EV_HTTP_MSG) {
|
||||
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
|
||||
if (mg_match(hm->uri, mg_str("/api/tick"), NULL)) {
|
||||
mg_http_reply(c, 200, "", "{%m:%llu}\n", MG_ESC("tick"), mg_millis());
|
||||
} else if (mg_match(hm->uri, mg_str("/api/crash"), NULL)) {
|
||||
__asm volatile("unimp"); // Illegal instruction: ESP-IDF prints a panic
|
||||
} else {
|
||||
mg_http_reply(c, 200, "",
|
||||
"Hi from Mongoose!\n"
|
||||
"tick: %llu\n"
|
||||
"ram free: %zu\n"
|
||||
"ram min: %zu\n",
|
||||
mg_millis(), heap_caps_get_free_size(MALLOC_CAP_DEFAULT),
|
||||
heap_caps_get_minimum_free_size(MALLOC_CAP_DEFAULT));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void app_main(void) {
|
||||
struct mg_mgr mgr;
|
||||
|
||||
antenna_init();
|
||||
gpio_set_direction(LED1, GPIO_MODE_OUTPUT);
|
||||
|
||||
mg_mgr_init(&mgr); // Also starts the 802.15.4 driver
|
||||
mg_http_listen(&mgr, "http://0.0.0.0", http_ev_handler, NULL);
|
||||
mg_http_listen(&mgr, "https://0.0.0.0", http_ev_handler, NULL);
|
||||
mg_mqtt_init(&mgr);
|
||||
|
||||
MG_INFO(("Initialised. RAM free: %zu",
|
||||
heap_caps_get_free_size(MALLOC_CAP_DEFAULT)));
|
||||
|
||||
for (;;) {
|
||||
mg_mgr_poll(&mgr, 0);
|
||||
mg_mqtt_poll(&mgr);
|
||||
blink_task();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
#pragma once
|
||||
|
||||
#include <esp_mac.h>
|
||||
|
||||
// See https://mongoose.ws/docs/getting-started/build-options/
|
||||
#define MG_ARCH MG_ARCH_ESP32
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#define MQTT_CLIENT_ID "esp32c6" // For tutorials/mqtt/mqtt-client
|
||||
|
||||
#define MG_ENABLE_TCPIP 1 // Built-in TCP/IP stack, not lwIP
|
||||
#define MG_ENABLE_DRIVER_ESP32_802154 1 // ESP32-C6 802.15.4 radio
|
||||
#define MG_ENABLE_TCPIP_TCPRTX 1 // Link can be lossy, enable retransmit
|
||||
|
||||
// Stable MAC, so the DHCP address stays the same across reboots: the factory
|
||||
// MAC, locally administered
|
||||
#define MG_SET_MAC_ADDRESS(mac) \
|
||||
do { \
|
||||
esp_read_mac(mac, ESP_MAC_BASE); \
|
||||
(mac)[0] |= 2; \
|
||||
} while (0)
|
||||
|
||||
// mdash.net device management service support
|
||||
#define MG_ENABLE_MDASH 0
|
||||
#define MG_MDASH_KEY "..." // Set this - mDash device token
|
||||
#define MG_FIRMWARE_VERSION "esp32c6.1.0.0"
|
||||
@@ -0,0 +1,8 @@
|
||||
CONFIG_IDF_TARGET="esp32c6"
|
||||
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
|
||||
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
|
||||
CONFIG_IEEE802154_ENABLED=y
|
||||
# Built-in TLS handshakes need a larger stack
|
||||
CONFIG_ESP_MAIN_TASK_STACK_SIZE=12288
|
||||
# The main task busy-loops the mesh, so the idle task does not run
|
||||
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
|
||||
@@ -17,6 +17,4 @@ flash:
|
||||
cd build && esptool --chip $(ARCH) --baud 460800 --port $(PORT) write-flash @flash_args
|
||||
|
||||
clean:
|
||||
test -d build && (rm -rf build sdkconfig || true)
|
||||
|
||||
.PHONY: build
|
||||
test -d build && $(DOCKER) rm -rf build sdkconfig || true
|
||||
@@ -17,9 +17,6 @@ static void blink_task(void) {
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t mg_millis(void) {
|
||||
return hal_get_tick();
|
||||
}
|
||||
|
||||
bool mg_random(void *buf, size_t len) {
|
||||
for (size_t n = 0; n < len; n += sizeof(uint32_t)) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#define MG_ENABLE_TCPIP 1
|
||||
#define MG_ENABLE_DRIVER_NRF52 1
|
||||
#define MG_ENABLE_TCPIP_TCPRTX 1
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||
#define MG_ENABLE_CUSTOM_MICROS 1
|
||||
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#define MQTT_CLIENT_ID "xiao-nrf52840"
|
||||
|
||||
@@ -25,9 +25,6 @@ static void blink_task(void) {
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t mg_millis(void) {
|
||||
return hal_get_tick();
|
||||
}
|
||||
|
||||
bool mg_random(void *buf, size_t len) {
|
||||
for (size_t n = 0; n < len; n += sizeof(uint32_t)) {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#define MG_ENABLE_TCPIP 1
|
||||
#define MG_ENABLE_DRIVER_MCXW71 1
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||
#define MG_ENABLE_CUSTOM_MICROS 1
|
||||
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||
#define MG_ENABLE_TCPIP_TCPRTX 1 // Link can be lossy, enable retransmit
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
-3
@@ -43,9 +43,6 @@ static void log_fn(char ch, void *arg) {
|
||||
hal_uart_write_buf(arg, &ch, 1);
|
||||
}
|
||||
|
||||
uint64_t mg_millis(void) {
|
||||
return hal_get_tick();
|
||||
}
|
||||
|
||||
int main(void) {
|
||||
static struct mg_tcpip_driver_rw612_data eth_data;
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#define MG_ENABLE_TCPIP 1
|
||||
#define MG_ENABLE_DRIVER_RW612 1 // Ethernet
|
||||
#define MG_ENABLE_DRIVER_RW612W 1 // Mesh bridge over raw 802.15.4
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||
#define MG_ENABLE_CUSTOM_MICROS 1
|
||||
|
||||
|
||||
// The bridge initializes and polls its two L2 interfaces directly.
|
||||
File renamed without changes.
File renamed without changes.
@@ -15,6 +15,7 @@ CFLAGS += -mcpu=cortex-m33+nodsp -mthumb -mfloat-abi=hard -mfpu=fpv5-sp-d16 $(CF
|
||||
LDFLAGS ?= -Tlink.ld -nostdlib -nostartfiles --specs=nano.specs -lc -lgcc -Wl,--gc-sections
|
||||
|
||||
SOURCES = main.c hal.c startup.c flexspi.c flash_config.c $(MGDIR)/mongoose.c
|
||||
SOURCES += $(MGDIR)/tutorials/mqtt/mqtt-client/mongoose_mqtt.c
|
||||
SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_clock.c
|
||||
SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_trng.c
|
||||
SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_reset.c
|
||||
@@ -44,5 +45,8 @@ flash: firmware.bin
|
||||
(echo 'loadfile firmware.elf'; echo 'reset'; echo 'exit';) | JLinkExe -device RW612 -if SWD -speed 4000 -autoconnect 1 -NoGui 1 -ExitOnError 1
|
||||
# JRun --nogui --device RW612 --if SWD firmware.elf
|
||||
|
||||
erase:
|
||||
(echo halt && echo exec EnableEraseAllFlashBanks && echo erase && echo exit) | JLinkExe -device RW612 -if SWD -speed 4000 -autoconnect 1 -NoGui 1 -ExitOnError 1
|
||||
|
||||
clean:
|
||||
rm -rf firmware.* cmsis_* mongoose/mongoose.*
|
||||
@@ -104,6 +104,7 @@ int main(void) {
|
||||
// Start a minimal web server
|
||||
struct mg_mgr mgr;
|
||||
mg_mgr_init(&mgr);
|
||||
mg_mqtt_init(&mgr);
|
||||
mg_http_listen(&mgr, "http://0.0.0.0", http_ev_handler, NULL);
|
||||
mg_http_listen(&mgr, "https://0.0.0.0", http_ev_handler, NULL);
|
||||
|
||||
@@ -113,6 +114,7 @@ int main(void) {
|
||||
|
||||
for (;;) {
|
||||
mg_mgr_poll(&mgr, 0);
|
||||
mg_mqtt_poll(&mgr);
|
||||
blink_task();
|
||||
}
|
||||
|
||||
|
||||
@@ -9,10 +9,11 @@
|
||||
#define MG_ENABLE_CUSTOM_RANDOM 1
|
||||
#define MG_OTA MG_OTA_RW612
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#define MQTT_CLIENT_ID "rw612" // For tutorials/mqtt/mqtt-client
|
||||
|
||||
#define MG_ENABLE_MDASH 0 // Set to 1 to enable https://mdash.net
|
||||
#define MG_MDASH_KEY "..." // Edit, see https://mdash.net/docs/#mongoose-library
|
||||
#define MG_FIRMWARE_VERSION "1.0.1"
|
||||
#define MG_FIRMWARE_VERSION "rw612.1.0.1"
|
||||
|
||||
// #define MG_DRIVER_MDC_CR 51 // RMII MDC clock divider
|
||||
// #define MG_DRIVER_MDC_HOLDTIME 3 // RMII MDC Holdtime (valid values [0-7])
|
||||
|
||||
@@ -31,5 +31,5 @@ clean:
|
||||
$(RM) build pico_sdk_import.cmake $(SDK_PATH)
|
||||
|
||||
$(SDK_PATH):
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --quiet --init
|
||||
@@ -31,5 +31,5 @@ clean:
|
||||
$(RM) build pico_sdk_import.cmake $(SDK_PATH)
|
||||
|
||||
$(SDK_PATH):
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --quiet --init
|
||||
@@ -19,7 +19,7 @@ net.h: ../../mqtt/mqtt-dashboard/device/net.h
|
||||
cp $< $@
|
||||
|
||||
pico-sdk:
|
||||
git clone --depth 1 -b 2.1.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --init
|
||||
|
||||
clean:
|
||||
|
||||
@@ -31,5 +31,5 @@ clean:
|
||||
$(RM) build pico_sdk_import.cmake $(SDK_PATH)
|
||||
|
||||
$(SDK_PATH):
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --quiet --init
|
||||
@@ -7,7 +7,7 @@ include(pico_sdk_import.cmake)
|
||||
project(firmware)
|
||||
pico_sdk_init()
|
||||
|
||||
add_executable(firmware main.c wifi.c ../../../mongoose.c)
|
||||
add_executable(firmware main.c wifi.c ../../../mongoose.c ../../mqtt/mqtt-client/mongoose_mqtt.c)
|
||||
target_include_directories(firmware PRIVATE ../../.. ./)
|
||||
|
||||
target_link_libraries(firmware pico_stdlib hardware_spi pico_rand pico_cyw43_driver pico_cyw43_arch_none hardware_flash pico_bootrom)
|
||||
|
||||
@@ -65,11 +65,13 @@ static void run_mongoose(void) {
|
||||
struct mg_mgr mgr;
|
||||
mg_log_set_fn(log_fn, NULL);
|
||||
mg_mgr_init(&mgr);
|
||||
mg_mqtt_init(&mgr);
|
||||
mg_http_listen(&mgr, "http://0.0.0.0", http_ev_handler, NULL);
|
||||
mg_http_listen(&mgr, "https://0.0.0.0", http_ev_handler, NULL);
|
||||
|
||||
for (;;) {
|
||||
mg_mgr_poll(&mgr, 1);
|
||||
mg_mqtt_poll(&mgr);
|
||||
blink_task();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#define MG_TLS MG_TLS_BUILTIN
|
||||
#define MG_OTA MG_OTA_PICOSDK
|
||||
#define MG_IO_SIZE 2048
|
||||
#define MQTT_CLIENT_ID "rp" // For tutorials/mqtt/mqtt-client
|
||||
|
||||
#define MG_ENABLE_TCPIP 1
|
||||
#define MG_ENABLE_DRIVER_PICO_W 1
|
||||
|
||||
@@ -31,7 +31,7 @@ clean:
|
||||
$(RM) build pico_sdk_import.cmake $(SDK_PATH)
|
||||
|
||||
$(SDK_PATH):
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --quiet --init
|
||||
|
||||
# Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/
|
||||
|
||||
@@ -31,7 +31,7 @@ clean:
|
||||
$(RM) build pico_sdk_import.cmake $(SDK_PATH)
|
||||
|
||||
$(SDK_PATH):
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.1.1 https://github.com/raspberrypi/pico-sdk $@
|
||||
git clone -c advice.detachedHead=false --quiet --depth 1 -b 2.2.0 https://github.com/raspberrypi/pico-sdk $@
|
||||
cd $@ && git submodule update --quiet --init
|
||||
|
||||
# Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/
|
||||
|
||||
@@ -26,9 +26,6 @@ static void blink_task(void) {
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t mg_millis(void) {
|
||||
return hal_get_tick();
|
||||
}
|
||||
|
||||
bool mg_random(void *buf, size_t len) {
|
||||
for (size_t n = 0; n < len; n += sizeof(uint32_t)) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#define MG_ENABLE_TCPIP 1
|
||||
#define MG_ENABLE_DRIVER_MG24 1
|
||||
#define MG_ENABLE_CUSTOM_MILLIS 1
|
||||
#define MG_ENABLE_CUSTOM_MICROS 1
|
||||
#define MG_ENABLE_CUSTOM_RANDOM 1 // Secure Engine TRNG, see hal.c
|
||||
#define MG_ENABLE_TCPIP_TCPRTX 1 // Link can be lossy, enable retransmit
|
||||
|
||||
|
||||
@@ -259,6 +259,7 @@ void mg_dash_init(struct mg_mgr *mgr) {
|
||||
// Read settings from flash
|
||||
struct mg_dash_user u = {.level = 9}; // Super mega user
|
||||
settings_fn(MG_DASH_READ, &u);
|
||||
s_dash.authenticate = s_enable_login ? authenticate : NULL;
|
||||
|
||||
mg_mem_files = mg_packed_files;
|
||||
mg_http_listen(mgr, MG_HTTP_ADDR, mg_dash_ev_handler, &s_dash);
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "mongoose.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
struct echo_server {
|
||||
@@ -43,12 +42,12 @@ int echo_init(uint16_t port) {
|
||||
|
||||
if (fd < 0 || !echo_nonblock(fd) ||
|
||||
bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 || listen(fd, 3) < 0) {
|
||||
printf("BSD echo init: %d\n", errno);
|
||||
MG_ERROR(("BSD echo init: %d", errno));
|
||||
if (fd >= 0) close(fd);
|
||||
return 0;
|
||||
}
|
||||
s_server.sock = fd;
|
||||
printf("BSD echo server on port %hu\n", port);
|
||||
MG_INFO(("BSD echo server on port %hu", port));
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -80,7 +79,7 @@ void echo_poll(void) {
|
||||
if (fd >= 0) {
|
||||
c = (struct echo_client *) calloc(1, sizeof(*c));
|
||||
if (c == NULL || !echo_nonblock(fd)) {
|
||||
printf("BSD echo accept: %d\n", c == NULL ? ENOMEM : errno);
|
||||
MG_ERROR(("BSD echo accept: %d", c == NULL ? ENOMEM : errno));
|
||||
close(fd);
|
||||
free(c);
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user