Compare commits

..
Author SHA1 Message Date
Sergio R. Caprile 9d0b015217 update archs 2026-11-20 14:26:55 -03:00
Sergio R. Caprile 1620b2ae03 Merge pull request #3785 from cesanta/bsdud
Add improved datagram support for BSD
2026-11-20 13:52:41 -03:00
Sergio R. Caprile 0914048424 Add improved datagram support for BSD 2026-11-20 13:50:25 -03:00
Sergio R. Caprile 0f319e3060 Merge pull request #3783 from cesanta/tlsmaint
make callers agree with API
2026-11-18 18:38:26 -03:00
Sergey Lyubka d612b7f1c4 Merge pull request #3782 from cesanta/no46loop
avoid IPv6 querying forever
2026-11-18 21:34:32 +00:00
Sergey Lyubka 6d5f4a5a20 Merge pull request #3781 from cesanta/freewilly
free DER data too
2026-11-18 21:34:01 +00:00
Sergey Lyubka cd10b35de4 Merge pull request #3780 from cesanta/recvfrom6
fix recvfrom in IPv6
2026-11-18 21:33:37 +00:00
Sergey Lyubka f04cb5333e Merge pull request #3779 from cesanta/nonstr
don't use strncpy on a mg_str
2026-11-18 21:33:13 +00:00
cpq 28e3b347d4 Tutorials - nits and mqtt client adoption 2026-11-18 20:28:36 +00:00
Sergio R. Caprile 63aaad829a make callers agree with API 2026-11-17 15:45:47 -03:00
Sergio R. Caprile 9322227886 avoid IPv6 querying forever 2026-11-17 11:53:09 -03:00
Sergio R. Caprile e3a78d513e free DER data too 2026-11-16 16:22:36 -03:00
Sergio R. Caprile ee338b7bba fix recvfrom in IPv6 2026-11-16 16:00:56 -03:00
Sergio R. Caprile 0f157bd23b don't use strncpy on a mg_str 2026-11-16 15:48:16 -03:00
30 changed files with 690 additions and 1184 deletions

No files matched your search

-14
View File
@@ -1,14 +0,0 @@
name: CPQ UDP Assessment
on:
workflow_dispatch:
jobs:
cpq-udp:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
with: { fetch-depth: 2 }
- run: |
source ./test/setup_ga_network.sh
make -C test/bsd -f failMakefile
+159 -73
View File
@@ -167,6 +167,7 @@ fail:
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#if MG_ENABLE_BSD_SOCKETS && MG_ENABLE_FREERTOS #if MG_ENABLE_BSD_SOCKETS && MG_ENABLE_FREERTOS
@@ -298,6 +299,46 @@ static struct mg_connection *bsd_new_conn(struct mg_bsd_sock *s) {
return c; 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 #if MG_ENABLE_FREERTOS
// Complete operations blocked on c before Mongoose destroys it. // Complete operations blocked on c before Mongoose destroys it.
static void bsd_finish_waiters(struct mg_bsd_sock *s, bool error) { static void bsd_finish_waiters(struct mg_bsd_sock *s, bool error) {
@@ -482,9 +523,10 @@ static int bsd_ready(struct mg_bsd_sock *s) {
if (s->is_shut_rd || s->c->recv.len > 0 || s->c->is_draining) if (s->is_shut_rd || s->c->recv.len > 0 || s->c->is_draining)
ready |= BSD_READ; ready |= BSD_READ;
if (s->is_shut_wr) ready |= BSD_ERROR; if (s->is_shut_wr) ready |= BSD_ERROR;
if (!s->is_shut_wr && !s->is_udp && !s->c->is_connecting && if (!s->is_shut_wr && (s->is_udp || !s->c->is_connecting) &&
!s->c->is_closing && !s->c->is_draining) !s->c->is_closing && !s->c->is_draining &&
ready |= BSD_WRITE; // Established TCP socket (!s->is_udp || s->c->send.len == 0))
ready |= BSD_WRITE; // UDP socket or established TCP socket
return ready; return ready;
} }
@@ -498,7 +540,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
if (t->orphan && t->listener == s) { if (t->orphan && t->listener == s) {
if (t->c != NULL) { if (t->c != NULL) {
t->c->fn_data = NULL; t->c->fn_data = NULL;
mg_close_conn(t->c); t->c->is_draining = 1;
t->c = NULL; t->c = NULL;
} }
memset(t, 0, sizeof(*t)); // Release orphan memset(t, 0, sizeof(*t)); // Release orphan
@@ -506,7 +548,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
} }
if (s->c != NULL) { if (s->c != NULL) {
s->c->fn_data = NULL; s->c->fn_data = NULL;
mg_close_conn(s->c); s->c->is_draining = 1;
s->c = NULL; s->c = NULL;
} }
memset(s, 0, sizeof(*s)); // Release socket memset(s, 0, sizeof(*s)); // Release socket
@@ -696,8 +738,8 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
cmd->result = -1, cmd->err = ECONNREFUSED; cmd->result = -1, cmd->err = ECONNREFUSED;
return true; return true;
} }
if (!c->is_connecting) { if (s->is_udp || !c->is_connecting) {
cmd->result = 0; cmd->result = 0; // UDP may still resolve ARP; TCP waits for SYN/SYN-ACK
return true; return true;
} }
if (s->nonblock) { if (s->nonblock) {
@@ -722,11 +764,8 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
return true; return true;
} }
if (c->recv.len > 0) { if (c->recv.len > 0) {
size_t n = cmd->op_recv.len; cmd->result = (int) bsd_recv(s, cmd->op_recv.buf, cmd->op_recv.len,
if (c->recv.len < n) n = c->recv.len; cmd->op_recv.flags, NULL, NULL);
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;
return true; return true;
} }
if (s->err != 0) { if (s->err != 0) {
@@ -750,7 +789,25 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
} else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 || } else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
c->is_closing || c->is_draining) { c->is_closing || c->is_draining) {
cmd->result = -1, cmd->err = EPIPE; 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; cmd->result = (int) cmd->op_send.len;
} else if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) { } else if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) {
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
@@ -767,25 +824,49 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
if ((s = bsd_get(cmd->op_sendto.fd)) == NULL) { if ((s = bsd_get(cmd->op_sendto.fd)) == NULL) {
cmd->result = -1, cmd->err = EBADF; 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, } else if ((err = bsd_addr4(cmd->op_sendto.addr,
cmd->op_sendto.addrlen)) != 0) { cmd->op_sendto.addrlen)) != 0) {
cmd->result = -1, cmd->err = err; cmd->result = -1, cmd->err = err;
} else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 || } else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
c->is_closing || c->is_draining) { c->is_closing || c->is_draining) {
cmd->result = -1, cmd->err = EPIPE; cmd->result = -1, cmd->err = EPIPE;
} else if (c->is_client) {
cmd->result = -1, cmd->err = EISCONN;
} else { } else {
const struct sockaddr_in *sa = const struct sockaddr_in *sa =
(const struct sockaddr_in *) cmd->op_sendto.addr; (const struct sockaddr_in *) cmd->op_sendto.addr;
c->rem.port = sa->sin_port; if (cmd->op_sendto.len == 0) {
c->rem.addr.ip4 = sa->sin_addr.s_addr; cmd->result = 0;
c->rem.is_ip6 = false; } else if (bsd_udp_too_big(c, cmd->op_sendto.len)) {
if (mg_send(c, cmd->op_sendto.buf, cmd->op_sendto.len)) { cmd->result = -1, cmd->err = EMSGSIZE;
cmd->result = (int) cmd->op_sendto.len; } 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 (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 {
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)) { } else if (s->nonblock || (cmd->op_sendto.flags & MSG_DONTWAIT)) {
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
} else { } else {
#if MG_ENABLE_FREERTOS #if MG_ENABLE_FREERTOS
return false; // No send buffer space yet, wait return false; // One UDP datagram is pending, wait
#else #else
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
#endif #endif
@@ -797,6 +878,9 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
if ((s = bsd_get(cmd->op_recvfrom.fd)) == NULL) { if ((s = bsd_get(cmd->op_recvfrom.fd)) == NULL) {
cmd->result = -1, cmd->err = EBADF; cmd->result = -1, cmd->err = EBADF;
return true; return true;
} else if (!s->is_udp) {
cmd->result = -1, cmd->err = EOPNOTSUPP;
return true;
} }
if (s->is_shut_rd) { if (s->is_shut_rd) {
cmd->result = 0; cmd->result = 0;
@@ -808,25 +892,11 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
return true; return true;
} }
if (c->recv.len > 0) { if (c->recv.len > 0) {
size_t n = cmd->op_recvfrom.len; cmd->result = (int) bsd_recv(s, cmd->op_recvfrom.buf,
cmd->op_recvfrom.len,
if (cmd->op_recvfrom.src != NULL && cmd->op_recvfrom.flags,
(cmd->op_recvfrom.addrlen == NULL || cmd->op_recvfrom.src,
*cmd->op_recvfrom.addrlen < sizeof(struct sockaddr_in))) { cmd->op_recvfrom.addrlen);
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;
return true; return true;
} }
if (s->err != 0) { if (s->err != 0) {
@@ -2146,12 +2216,13 @@ bool mg_dns_parse(const uint8_t *buf, size_t len, struct mg_dns_message *dm) {
dm->txnid = mg_ntohs(h->txnid); dm->txnid = mg_ntohs(h->txnid);
is_response = mg_ntohs(h->flags) & 0x8000; 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; 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)); // 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)); mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name));
ofs += n; ofs += n;
} } // on unresolved responses, we got the name and query type, at least
if (!is_response) { if (!is_response) {
// For queries, there is no need to parse the answers. In this way, // For queries, there is no need to parse the answers. In this way,
@@ -10899,24 +10970,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) { static bool rx_udp(struct mg_tcpip_if *ifp, struct pkt *pkt) {
struct mg_connection *c = getpeer(ifp->mgr, pkt, true); struct mg_connection *c = getpeer(ifp->mgr, pkt, true);
struct connstate *s; struct connstate *s;
struct mg_addr rem;
uint8_t *l2addr; uint8_t *l2addr;
if (c == NULL) return false; // No UDP listener on this port if (c == NULL) return false; // No UDP listener on this port
// BSD socket has an unread datagram: drop this one to keep boundaries // 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->recv.len > 0) return true;
if (c->is_bsd && !c->is_client && c->send.len > 0) return true;
s = (struct connstate *) (c + 1); s = (struct connstate *) (c + 1);
c->rem.port = pkt->udp->sport;
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
if (c->loc.is_ip6) { // matching of v4/v6 to dest is done bt getpeer() if (c->loc.is_ip6) { // matching of v4/v6 to dest is done bt getpeer()
if (!udp6csum_ok(pkt->ip6, pkt->udp)) return false; if (!udp6csum_ok(pkt->ip6, pkt->udp)) return false;
c->rem.addr.ip6[0] = pkt->ip6->src[0], if (c->is_bsd && c->is_client &&
c->rem.addr.ip6[1] = pkt->ip6->src[1], c->rem.is_ip6 = true; (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 } else
#endif #endif
{ {
if (!udpcsum_ok(pkt->ip, pkt->udp)) return false; 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 return false; // safety net for lousy networks
memcpy(s->mac, l2addr, sizeof(s->mac)); memcpy(s->mac, l2addr, sizeof(s->mac));
if (c->recv.len >= MG_MAX_RECV_SIZE) { if (c->recv.len >= MG_MAX_RECV_SIZE) {
@@ -12022,20 +12103,25 @@ void mg_connect_resolved(struct mg_connection *c) {
s->retransmit = ifp->enable_tcp_retransmit; s->retransmit = ifp->enable_tcp_retransmit;
s->txq.align = MG_TCPIP_TXQ_ALIGN; s->txq.align = MG_TCPIP_TXQ_ALIGN;
c->is_resolving = 0; c->is_resolving = 0;
if (ifp->eport < MG_EPHEMERAL_PORT_BASE) ifp->eport = MG_EPHEMERAL_PORT_BASE; if (c->loc.port == 0) {
c->loc.port = mg_htons(ifp->eport++); 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 MG_ENABLE_IPV6
if (c->rem.is_ip6) { 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]; 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]; 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; c->loc.is_ip6 = true;
} else } else
#endif #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, MG_DEBUG(("%lu %M -> %M", c->id, mg_print_ip_port, &c->loc, mg_print_ip_port,
&c->rem)); &c->rem));
@@ -12066,7 +12152,7 @@ void mg_connect_resolved(struct mg_connection *c) {
uint32_t rem_ip = c->rem.addr.ip4; uint32_t rem_ip = c->rem.addr.ip4;
if (ifp->ip && MG_IPISLOCAL(ifp, rem_ip) && if (ifp->ip && MG_IPISLOCAL(ifp, rem_ip) &&
rem_ip != ifp->gw) { // skip if gw (onstatechange -> ARP) 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_DEBUG(("%lu ARP lookup...", c->id));
mg_tcpip_arp_request(ifp, rem_ip, NULL); mg_tcpip_arp_request(ifp, rem_ip, NULL);
settmout(c, MIP_TTYPE_ARP); settmout(c, MIP_TTYPE_ARP);
@@ -16402,9 +16488,9 @@ static long recv_raw(struct mg_connection *c, void *buf, size_t len) {
long n = 0; long n = 0;
if (c->is_udp) { if (c->is_udp) {
union usa usa; 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); 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 { } else {
n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING); n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING);
} }
@@ -19168,8 +19254,8 @@ static bool mg_tls_server_send_hello(struct mg_connection *c) {
// calculate P-256 keyshare and the shared secret // calculate P-256 keyshare and the shared secret
pub[0] = 0x04; // uncompressed point 0x04 || X || Y pub[0] = 0x04; // uncompressed point 0x04 || X || Y
if (!mg_p256_make_key(pub + 1, prv) || if (mg_p256_make_key(pub + 1, prv) == 0 ||
!mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec)) { mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec) == 0) {
mg_bzero(prv, sizeof(prv)); mg_bzero(prv, sizeof(prv));
mg_error(c, "bad key"); mg_error(c, "bad key");
return false; return false;
@@ -19584,7 +19670,7 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
size_t sigsz, verifysz = 0; size_t sigsz, verifysz = 0;
int adj1, adj2; int adj1, adj2;
uint8_t sig[64] = {0}; 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"); mg_error(c, "P-256 sign");
return false; return false;
} }
@@ -19716,7 +19802,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 // 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"); mg_error(c, "P-256 key");
return false; return false;
} }
@@ -19806,8 +19892,8 @@ static int mg_tls_client_recv_hello(struct mg_connection *c) {
return -1; return -1;
} }
if (key_exchange_len != 65 || key_exchange[0] != 0x04 || if (key_exchange_len != 65 || key_exchange[0] != 0x04 ||
!mg_p256_shared_secret(key_exchange + 1, tls->p256_cli, mg_p256_shared_secret(key_exchange + 1, tls->p256_cli,
tls->ecdhe_sec)) { // Validates the point tls->ecdhe_sec) == 0) { // Validates the point
mg_error(c, "bad key"); mg_error(c, "bad key");
return -1; return -1;
} }
@@ -20188,14 +20274,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; 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) { if (mg_der_find_oid(subj, (uint8_t *) "\x55\x04\x03", 3, &v) > 0) {
struct mg_str hn, cn; struct mg_str hn, cn;
MG_VERBOSE(("using CN: %.*s <-> %s", v.len, v.value, host)); MG_VERBOSE(("using CN: %.*s <-> %s", v.len, v.value, host));
hn = mg_str(host), cn = mg_str_n((char *) v.value, v.len); 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; return matched;
} }
@@ -20318,8 +20404,8 @@ static int mg_tls_recv_cert(struct mg_connection *c, bool is_client) {
san = mg_tls_verify_cert_san(cert, certsz, tls->hostname, san = mg_tls_verify_cert_san(cert, certsz, tls->hostname,
is_addr ? &addr : NULL); is_addr ? &addr : NULL);
if (san < 0 || // RFC 6125 6.4.4 allow legacy fallback to CN if (san < 0 || // RFC 6125 6.4.4 allow legacy fallback to CN
(san == 0 && (is_addr || mg_tls_verify_cert_cn( (san == 0 &&
&ci->subj, tls->hostname) <= 0))) { (is_addr || !mg_tls_verify_cert_cn(&ci->subj, tls->hostname)))) {
mg_error(c, "failed to verify host"); mg_error(c, "failed to verify host");
return -1; return -1;
} }
@@ -21155,8 +21241,8 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
mg_error(c, "hostname too long"); mg_error(c, "hostname too long");
return; return;
} }
strncpy((char *) tls->hostname, opts->name.buf, sizeof(tls->hostname) - 1); memcpy(tls->hostname, opts->name.buf, opts->name.len);
tls->hostname[opts->name.len] = 0; tls->hostname[opts->name.len] = '\0';
} }
// server CA certificate; parse PEM [bundle] or DER // server CA certificate; parse PEM [bundle] or DER
@@ -21169,15 +21255,16 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
tls->ca_bundle_der = all_certs; tls->ca_bundle_der = all_certs;
MG_VERBOSE(("%d-cert bundle", cert_count)); MG_VERBOSE(("%d-cert bundle", cert_count));
} else if (cert_count > 0) { } else if (cert_count > 0) {
tls->ca_der.buf = all_certs[0].buf; int i;
tls->ca_der.len = all_certs[0].len; tls->ca_der = all_certs[0];
for (i = 1; i < cert_count; i++) mg_free((void *) all_certs[i].buf);
mg_free(all_certs); mg_free(all_certs);
} else { // parse again for a possible DER (or a truncated begin string) } 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) { if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
mg_error(c, "Failed to load CA certificate"); mg_error(c, "Failed to load CA certificate");
return; return;
} }
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle } // ca_bundle_len != 0 && ca_der.len = 0 => bundle
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
} }
@@ -21196,8 +21283,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); int cert_count = mg_parse_pem_certs(opts->cert, &all_certs);
if (cert_count > 0) { if (cert_count > 0) {
tls->cert_der.buf = all_certs[0].buf; tls->cert_der = all_certs[0];
tls->cert_der.len = all_certs[0].len;
if (cert_count > 1) { if (cert_count > 1) {
tls->chain_len = (size_t) cert_count; tls->chain_len = (size_t) cert_count;
tls->chain_der = all_certs; tls->chain_der = all_certs;
+12
View File
@@ -5065,6 +5065,18 @@ void mg_bsd_poll(struct mg_mgr *);
#ifndef ENOSPC #ifndef ENOSPC
#define ENOSPC 28 #define ENOSPC 28
#endif #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 #ifndef EPROTONOSUPPORT
#define EPROTONOSUPPORT 93 #define EPROTONOSUPPORT 93
#endif #endif
+2
View File
@@ -1,7 +1,9 @@
#pragma once #pragma once
#if MG_ARCH == MG_ARCH_ARMGCC #if MG_ARCH == MG_ARCH_ARMGCC
#ifndef _POSIX_TIMERS // Some newlib builds, e.g. Espressif's, define it
#define _POSIX_TIMERS #define _POSIX_TIMERS
#endif
#include <ctype.h> #include <ctype.h>
#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP #if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP
+7 -5
View File
@@ -52,16 +52,18 @@
#define MG_TLS MG_TLS_BUILTIN #define MG_TLS MG_TLS_BUILTIN
#endif #endif
#if !defined(MG_OTA) && defined(STM32F1) || defined(STM32F2) || \ #ifndef MG_OTA // Pick OTA for the STM32 family, unless set by the user
defined(STM32F4) || defined(STM32F7) #if defined(STM32F1) || defined(STM32F2) || defined(STM32F4) || \
defined(STM32F7)
#define MG_OTA MG_OTA_STM32F #define MG_OTA MG_OTA_STM32F
#elif !defined(MG_OTA) && defined(STM32H5) #elif defined(STM32H5)
#define MG_OTA MG_OTA_STM32H5 #define MG_OTA MG_OTA_STM32H5
#elif !defined(MG_OTA) && defined(STM32H7) #elif defined(STM32H7)
#define MG_OTA MG_OTA_STM32H7 #define MG_OTA MG_OTA_STM32H7
#elif !defined(MG_OTA) && defined(STM32C5) #elif defined(STM32C5)
#define MG_OTA MG_OTA_STM32C5 #define MG_OTA MG_OTA_STM32C5
#endif #endif
#endif
// use HAL-defined execute-in-ram section // use HAL-defined execute-in-ram section
#ifndef MG_IRAM #ifndef MG_IRAM
+108 -38
View File
@@ -1,5 +1,6 @@
#include "bsd.h" #include "bsd.h"
#include "dns.h" #include "dns.h"
#include "util.h"
#include <stdarg.h> #include <stdarg.h>
#if MG_ENABLE_BSD_SOCKETS && MG_ENABLE_FREERTOS #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; 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 #if MG_ENABLE_FREERTOS
// Complete operations blocked on c before Mongoose destroys it. // Complete operations blocked on c before Mongoose destroys it.
static void bsd_finish_waiters(struct mg_bsd_sock *s, bool error) { 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) if (s->is_shut_rd || s->c->recv.len > 0 || s->c->is_draining)
ready |= BSD_READ; ready |= BSD_READ;
if (s->is_shut_wr) ready |= BSD_ERROR; if (s->is_shut_wr) ready |= BSD_ERROR;
if (!s->is_shut_wr && !s->is_udp && !s->c->is_connecting && if (!s->is_shut_wr && (s->is_udp || !s->c->is_connecting) &&
!s->c->is_closing && !s->c->is_draining) !s->c->is_closing && !s->c->is_draining &&
ready |= BSD_WRITE; // Established TCP socket (!s->is_udp || s->c->send.len == 0))
ready |= BSD_WRITE; // UDP socket or established TCP socket
return ready; return ready;
} }
@@ -331,7 +373,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
if (t->orphan && t->listener == s) { if (t->orphan && t->listener == s) {
if (t->c != NULL) { if (t->c != NULL) {
t->c->fn_data = NULL; t->c->fn_data = NULL;
mg_close_conn(t->c); t->c->is_draining = 1;
t->c = NULL; t->c = NULL;
} }
memset(t, 0, sizeof(*t)); // Release orphan memset(t, 0, sizeof(*t)); // Release orphan
@@ -339,7 +381,7 @@ static void bsd_close(struct mg_bsd_sock *s) {
} }
if (s->c != NULL) { if (s->c != NULL) {
s->c->fn_data = NULL; s->c->fn_data = NULL;
mg_close_conn(s->c); s->c->is_draining = 1;
s->c = NULL; s->c = NULL;
} }
memset(s, 0, sizeof(*s)); // Release socket 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; cmd->result = -1, cmd->err = ECONNREFUSED;
return true; return true;
} }
if (!c->is_connecting) { if (s->is_udp || !c->is_connecting) {
cmd->result = 0; cmd->result = 0; // UDP may still resolve ARP; TCP waits for SYN/SYN-ACK
return true; return true;
} }
if (s->nonblock) { if (s->nonblock) {
@@ -555,11 +597,8 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
return true; return true;
} }
if (c->recv.len > 0) { if (c->recv.len > 0) {
size_t n = cmd->op_recv.len; cmd->result = (int) bsd_recv(s, cmd->op_recv.buf, cmd->op_recv.len,
if (c->recv.len < n) n = c->recv.len; cmd->op_recv.flags, NULL, NULL);
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;
return true; return true;
} }
if (s->err != 0) { 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 || } else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
c->is_closing || c->is_draining) { c->is_closing || c->is_draining) {
cmd->result = -1, cmd->err = EPIPE; 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; cmd->result = (int) cmd->op_send.len;
} else if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) { } else if (s->nonblock || (cmd->op_send.flags & MSG_DONTWAIT)) {
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
@@ -600,25 +657,49 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
if ((s = bsd_get(cmd->op_sendto.fd)) == NULL) { if ((s = bsd_get(cmd->op_sendto.fd)) == NULL) {
cmd->result = -1, cmd->err = EBADF; 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, } else if ((err = bsd_addr4(cmd->op_sendto.addr,
cmd->op_sendto.addrlen)) != 0) { cmd->op_sendto.addrlen)) != 0) {
cmd->result = -1, cmd->err = err; cmd->result = -1, cmd->err = err;
} else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 || } else if (s->is_shut_wr || (c = s->c) == NULL || s->err != 0 ||
c->is_closing || c->is_draining) { c->is_closing || c->is_draining) {
cmd->result = -1, cmd->err = EPIPE; cmd->result = -1, cmd->err = EPIPE;
} else if (c->is_client) {
cmd->result = -1, cmd->err = EISCONN;
} else { } else {
const struct sockaddr_in *sa = const struct sockaddr_in *sa =
(const struct sockaddr_in *) cmd->op_sendto.addr; (const struct sockaddr_in *) cmd->op_sendto.addr;
c->rem.port = sa->sin_port; if (cmd->op_sendto.len == 0) {
c->rem.addr.ip4 = sa->sin_addr.s_addr; cmd->result = 0;
c->rem.is_ip6 = false; } else if (bsd_udp_too_big(c, cmd->op_sendto.len)) {
if (mg_send(c, cmd->op_sendto.buf, cmd->op_sendto.len)) { cmd->result = -1, cmd->err = EMSGSIZE;
cmd->result = (int) cmd->op_sendto.len; } 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 (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 {
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)) { } else if (s->nonblock || (cmd->op_sendto.flags & MSG_DONTWAIT)) {
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
} else { } else {
#if MG_ENABLE_FREERTOS #if MG_ENABLE_FREERTOS
return false; // No send buffer space yet, wait return false; // One UDP datagram is pending, wait
#else #else
cmd->result = -1, cmd->err = EAGAIN; cmd->result = -1, cmd->err = EAGAIN;
#endif #endif
@@ -630,6 +711,9 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
if ((s = bsd_get(cmd->op_recvfrom.fd)) == NULL) { if ((s = bsd_get(cmd->op_recvfrom.fd)) == NULL) {
cmd->result = -1, cmd->err = EBADF; cmd->result = -1, cmd->err = EBADF;
return true; return true;
} else if (!s->is_udp) {
cmd->result = -1, cmd->err = EOPNOTSUPP;
return true;
} }
if (s->is_shut_rd) { if (s->is_shut_rd) {
cmd->result = 0; cmd->result = 0;
@@ -641,25 +725,11 @@ static bool bsd_run(struct mg_bsd_cmd *cmd) {
return true; return true;
} }
if (c->recv.len > 0) { if (c->recv.len > 0) {
size_t n = cmd->op_recvfrom.len; cmd->result = (int) bsd_recv(s, cmd->op_recvfrom.buf,
cmd->op_recvfrom.len,
if (cmd->op_recvfrom.src != NULL && cmd->op_recvfrom.flags,
(cmd->op_recvfrom.addrlen == NULL || cmd->op_recvfrom.src,
*cmd->op_recvfrom.addrlen < sizeof(struct sockaddr_in))) { cmd->op_recvfrom.addrlen);
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;
return true; return true;
} }
if (s->err != 0) { if (s->err != 0) {
+12
View File
@@ -64,6 +64,18 @@ void mg_bsd_poll(struct mg_mgr *);
#ifndef ENOSPC #ifndef ENOSPC
#define ENOSPC 28 #define ENOSPC 28
#endif #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 #ifndef EPROTONOSUPPORT
#define EPROTONOSUPPORT 93 #define EPROTONOSUPPORT 93
#endif #endif
+3 -2
View File
@@ -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); dm->txnid = mg_ntohs(h->txnid);
is_response = mg_ntohs(h->flags) & 0x8000; 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; 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)); // 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)); mg_dns_parse_name(buf, len, ofs, dm->name, sizeof(dm->name));
ofs += n; ofs += n;
} } // on unresolved responses, we got the name and query type, at least
if (!is_response) { if (!is_response) {
// For queries, there is no need to parse the answers. In this way, // For queries, there is no need to parse the answers. In this way,
+27 -12
View File
@@ -1224,24 +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) { static bool rx_udp(struct mg_tcpip_if *ifp, struct pkt *pkt) {
struct mg_connection *c = getpeer(ifp->mgr, pkt, true); struct mg_connection *c = getpeer(ifp->mgr, pkt, true);
struct connstate *s; struct connstate *s;
struct mg_addr rem;
uint8_t *l2addr; uint8_t *l2addr;
if (c == NULL) return false; // No UDP listener on this port if (c == NULL) return false; // No UDP listener on this port
// BSD socket has an unread datagram: drop this one to keep boundaries // 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->recv.len > 0) return true;
if (c->is_bsd && !c->is_client && c->send.len > 0) return true;
s = (struct connstate *) (c + 1); s = (struct connstate *) (c + 1);
c->rem.port = pkt->udp->sport;
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
if (c->loc.is_ip6) { // matching of v4/v6 to dest is done bt getpeer() if (c->loc.is_ip6) { // matching of v4/v6 to dest is done bt getpeer()
if (!udp6csum_ok(pkt->ip6, pkt->udp)) return false; if (!udp6csum_ok(pkt->ip6, pkt->udp)) return false;
c->rem.addr.ip6[0] = pkt->ip6->src[0], if (c->is_bsd && c->is_client &&
c->rem.addr.ip6[1] = pkt->ip6->src[1], c->rem.is_ip6 = true; (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 } else
#endif #endif
{ {
if (!udpcsum_ok(pkt->ip, pkt->udp)) return false; 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 return false; // safety net for lousy networks
memcpy(s->mac, l2addr, sizeof(s->mac)); memcpy(s->mac, l2addr, sizeof(s->mac));
if (c->recv.len >= MG_MAX_RECV_SIZE) { if (c->recv.len >= MG_MAX_RECV_SIZE) {
@@ -2347,20 +2357,25 @@ void mg_connect_resolved(struct mg_connection *c) {
s->retransmit = ifp->enable_tcp_retransmit; s->retransmit = ifp->enable_tcp_retransmit;
s->txq.align = MG_TCPIP_TXQ_ALIGN; s->txq.align = MG_TCPIP_TXQ_ALIGN;
c->is_resolving = 0; c->is_resolving = 0;
if (ifp->eport < MG_EPHEMERAL_PORT_BASE) ifp->eport = MG_EPHEMERAL_PORT_BASE; if (c->loc.port == 0) {
c->loc.port = mg_htons(ifp->eport++); 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 MG_ENABLE_IPV6
if (c->rem.is_ip6) { 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]; 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]; 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; c->loc.is_ip6 = true;
} else } else
#endif #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, MG_DEBUG(("%lu %M -> %M", c->id, mg_print_ip_port, &c->loc, mg_print_ip_port,
&c->rem)); &c->rem));
@@ -2391,7 +2406,7 @@ void mg_connect_resolved(struct mg_connection *c) {
uint32_t rem_ip = c->rem.addr.ip4; uint32_t rem_ip = c->rem.addr.ip4;
if (ifp->ip && MG_IPISLOCAL(ifp, rem_ip) && if (ifp->ip && MG_IPISLOCAL(ifp, rem_ip) &&
rem_ip != ifp->gw) { // skip if gw (onstatechange -> ARP) 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_DEBUG(("%lu ARP lookup...", c->id));
mg_tcpip_arp_request(ifp, rem_ip, NULL); mg_tcpip_arp_request(ifp, rem_ip, NULL);
settmout(c, MIP_TTYPE_ARP); settmout(c, MIP_TTYPE_ARP);
+2 -2
View File
@@ -297,9 +297,9 @@ static long recv_raw(struct mg_connection *c, void *buf, size_t len) {
long n = 0; long n = 0;
if (c->is_udp) { if (c->is_udp) {
union usa usa; 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); 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 { } else {
n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING); n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING);
} }
+19 -19
View File
@@ -761,8 +761,8 @@ static bool mg_tls_server_send_hello(struct mg_connection *c) {
// calculate P-256 keyshare and the shared secret // calculate P-256 keyshare and the shared secret
pub[0] = 0x04; // uncompressed point 0x04 || X || Y pub[0] = 0x04; // uncompressed point 0x04 || X || Y
if (!mg_p256_make_key(pub + 1, prv) || if (mg_p256_make_key(pub + 1, prv) == 0 ||
!mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec)) { mg_p256_shared_secret(tls->p256_peer, prv, tls->ecdhe_sec) == 0) {
mg_bzero(prv, sizeof(prv)); mg_bzero(prv, sizeof(prv));
mg_error(c, "bad key"); mg_error(c, "bad key");
return false; 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; size_t sigsz, verifysz = 0;
int adj1, adj2; int adj1, adj2;
uint8_t sig[64] = {0}; 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"); mg_error(c, "P-256 sign");
return false; 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 // 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"); mg_error(c, "P-256 key");
return false; return false;
} }
@@ -1399,8 +1399,8 @@ static int mg_tls_client_recv_hello(struct mg_connection *c) {
return -1; return -1;
} }
if (key_exchange_len != 65 || key_exchange[0] != 0x04 || if (key_exchange_len != 65 || key_exchange[0] != 0x04 ||
!mg_p256_shared_secret(key_exchange + 1, tls->p256_cli, mg_p256_shared_secret(key_exchange + 1, tls->p256_cli,
tls->ecdhe_sec)) { // Validates the point tls->ecdhe_sec) == 0) { // Validates the point
mg_error(c, "bad key"); mg_error(c, "bad key");
return -1; 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; 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) { if (mg_der_find_oid(subj, (uint8_t *) "\x55\x04\x03", 3, &v) > 0) {
struct mg_str hn, cn; struct mg_str hn, cn;
MG_VERBOSE(("using CN: %.*s <-> %s", v.len, v.value, host)); MG_VERBOSE(("using CN: %.*s <-> %s", v.len, v.value, host));
hn = mg_str(host), cn = mg_str_n((char *) v.value, v.len); 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; 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, san = mg_tls_verify_cert_san(cert, certsz, tls->hostname,
is_addr ? &addr : NULL); is_addr ? &addr : NULL);
if (san < 0 || // RFC 6125 6.4.4 allow legacy fallback to CN if (san < 0 || // RFC 6125 6.4.4 allow legacy fallback to CN
(san == 0 && (is_addr || mg_tls_verify_cert_cn( (san == 0 &&
&ci->subj, tls->hostname) <= 0))) { (is_addr || !mg_tls_verify_cert_cn(&ci->subj, tls->hostname)))) {
mg_error(c, "failed to verify host"); mg_error(c, "failed to verify host");
return -1; 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"); mg_error(c, "hostname too long");
return; return;
} }
strncpy((char *) tls->hostname, opts->name.buf, sizeof(tls->hostname) - 1); memcpy(tls->hostname, opts->name.buf, opts->name.len);
tls->hostname[opts->name.len] = 0; tls->hostname[opts->name.len] = '\0';
} }
// server CA certificate; parse PEM [bundle] or DER // server CA certificate; parse PEM [bundle] or DER
@@ -2762,15 +2762,16 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
tls->ca_bundle_der = all_certs; tls->ca_bundle_der = all_certs;
MG_VERBOSE(("%d-cert bundle", cert_count)); MG_VERBOSE(("%d-cert bundle", cert_count));
} else if (cert_count > 0) { } else if (cert_count > 0) {
tls->ca_der.buf = all_certs[0].buf; int i;
tls->ca_der.len = all_certs[0].len; tls->ca_der = all_certs[0];
for (i = 1; i < cert_count; i++) mg_free((void *) all_certs[i].buf);
mg_free(all_certs); mg_free(all_certs);
} else { // parse again for a possible DER (or a truncated begin string) } 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) { if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
mg_error(c, "Failed to load CA certificate"); mg_error(c, "Failed to load CA certificate");
return; return;
} }
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle } // ca_bundle_len != 0 && ca_der.len = 0 => bundle
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
} }
@@ -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); int cert_count = mg_parse_pem_certs(opts->cert, &all_certs);
if (cert_count > 0) { if (cert_count > 0) {
tls->cert_der.buf = all_certs[0].buf; tls->cert_der = all_certs[0];
tls->cert_der.len = all_certs[0].len;
if (cert_count > 1) { if (cert_count > 1) {
tls->chain_len = (size_t) cert_count; tls->chain_len = (size_t) cert_count;
tls->chain_der = all_certs; tls->chain_der = all_certs;
+9 -6
View File
@@ -13,7 +13,7 @@ else
C_WARN ?= -Wno-deprecated C_WARN ?= -Wno-deprecated
endif 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 shm_port_bridge bsd_s390 bsd_nortos_s390 clean
TEST_SOURCES = bsd_shm_test.c 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 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) ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_test $(ARGS)
# also # 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) ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./bsd_nortos_test $(ARGS)
# requires shm_tap_bridge to be running # requires shm_tap_bridge to be running
@@ -70,6 +70,9 @@ bsd_nortos_test:
bsd_client: bsd_client.c bsd_client: bsd_client.c
$(CC) bsd_client.c -pthread -o $@ $(CC) bsd_client.c -pthread -o $@
bsd_udp: bsd_udp.c
$(CC) bsd_udp.c -o $@
# bridge shm queue <--> TAP interface # bridge shm queue <--> TAP interface
shm_tap_bridge: shm_tap_bridge.c shm_queue.h shm_tap_bridge: shm_tap_bridge.c shm_queue.h
$(CC) shm_tap_bridge.c -pthread -o $@ $(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: ASAN=
bsd_s390: CC = $(DOCKER) mdashnet/s390 cc bsd_s390: CC = $(DOCKER) mdashnet/s390 cc
bsd_s390: RUN = $(DOCKER) --init mdashnet/s390 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' $(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 #also
@@ -87,14 +90,14 @@ bsd_nortos_s390: CFLAGS_MONGOOSE += -DMG_ENABLE_BSD_PROTOTYPES=0
bsd_nortos_s390: ASAN= bsd_nortos_s390: ASAN=
bsd_nortos_s390: CC = $(DOCKER) mdashnet/s390 cc bsd_nortos_s390: CC = $(DOCKER) mdashnet/s390 cc
bsd_nortos_s390: RUN = $(DOCKER) --init mdashnet/s390 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' $(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 shm_port_bridge: shm_port_bridge.c shm_queue.h
$(CC) shm_port_bridge.c $(CFLAGS) -pthread -o $@ $(CC) shm_port_bridge.c $(CFLAGS) -pthread -o $@
clean: # Cleanup. Delete built program and all build artifacts 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 FreeRTOS-Kernel: # FreeRTOS sources
git clone -q -c advice.detachedHead=false --depth 1 -b V11.2.0 https://github.com/FreeRTOS/FreeRTOS-Kernel $@ git clone -q -c advice.detachedHead=false --depth 1 -b V11.2.0 https://github.com/FreeRTOS/FreeRTOS-Kernel $@
-120
View File
@@ -1,120 +0,0 @@
#include <errno.h>
#include <spawn.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/wait.h>
#include "FreeRTOS.h"
#include "task.h"
volatile bool s_cpq_done;
volatile bool s_cpq_ready;
bool s_cpq_remote;
static bool s_cpq_ok;
#include "bsd_udp_cpq_fail.c"
static void cpq_log(char ch, void *param) {
(void) param;
putchar(ch);
}
static void cpq_task1(void *args) {
struct mg_mgr *mgr = (struct mg_mgr *) args;
const char *remote_peer = getenv("CPQ_REMOTE_PEER");
char *ip = NULL;
char *argv[5];
pid_t pid;
pid_t r;
int status;
extern char **environ;
while (mgr->ifp->ip == 0 && mg_millis() < 5000) {
mg_mgr_poll(mgr, 0);
vTaskDelay(1);
}
if (mgr->ifp->ip == 0) {
printf("FAIL setup: DHCP lease timed out\n");
s_cpq_ok = false;
goto done;
}
while (mgr->ifp->state != MG_TCPIP_STATE_READY) {
mg_mgr_poll(mgr, 0);
vTaskDelay(1);
}
s_cpq_remote = remote_peer != NULL && remote_peer[0] != '\0';
s_cpq_done = false;
s_cpq_ready = false;
if (xTaskCreate(bsd_udp_cpq_fail_task, "cpq", 1024, NULL,
configMAX_PRIORITIES - 1, NULL) != pdPASS) {
printf("FAIL setup: cannot create CPQ task\n");
s_cpq_ok = false;
goto done;
}
while (!s_cpq_ready && !s_cpq_done) {
mg_mgr_poll(mgr, 0);
vTaskDelay(1);
}
if (!s_cpq_ready) {
printf("FAIL setup: CPQ task did not bind sockets\n");
s_cpq_ok = false;
goto done;
}
printf("CPQ: sockets ready\n");
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip);
printf("CPQ: Mongoose IP %s\n", ip);
argv[0] = (char *) "./bsd_udp_cpq_peer";
argv[1] = s_cpq_remote ? (char *) "--helper" : ip;
argv[2] = s_cpq_remote ? (char *) remote_peer : NULL;
argv[3] = s_cpq_remote ? ip : NULL;
argv[4] = NULL;
if (posix_spawn(&pid, argv[0], NULL, NULL, argv, environ) != 0) {
printf("FAIL setup: cannot start CPQ helper\n");
s_cpq_ok = false;
goto done;
}
printf("CPQ: %s started\n", s_cpq_remote ? "helper" : "peer");
while (!s_cpq_done) {
mg_mgr_poll(mgr, 0);
vTaskDelay(1);
}
while ((r = waitpid(pid, &status, WNOHANG)) == 0) {
mg_mgr_poll(mgr, 0);
vTaskDelay(1);
}
if (r != pid || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
printf("FAIL setup: CPQ peer failed\n");
s_cpq_ok = false;
}
done:
mg_free(ip);
mg_mgr_free(mgr);
vTaskEndScheduler();
}
static bool bsd_cpq_test(struct mg_tcpip_driver *driver, void *driver_data,
const char *mac, const char *debug_level) {
struct mg_mgr mgr;
struct mg_tcpip_if mif;
mg_log_set(atoi(debug_level == NULL ? "3" : debug_level));
mg_log_set_fn(cpq_log, NULL);
mg_mgr_init(&mgr);
memset(&mif, 0, sizeof(mif));
mif.driver = driver;
mif.driver_data = driver_data;
sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &mif.mac[0], &mif.mac[1],
&mif.mac[2], &mif.mac[3], &mif.mac[4], &mif.mac[5]);
mg_tcpip_init(&mgr, &mif);
if (mgr.ifp == NULL ||
xTaskCreate(cpq_task1, "cpqnet", 2048, &mgr,
configMAX_PRIORITIES - 2, NULL) != pdPASS)
return false;
s_cpq_ok = true;
vTaskStartScheduler();
return s_cpq_ok;
}
-8
View File
@@ -95,11 +95,7 @@ bool mg_random(void *buf, size_t len) {
} }
#ifdef CPQ_TEST
#include "bsd_cpq_test.c"
#else
#include "bsd_x_test.c" #include "bsd_x_test.c"
#endif
int main(void) { int main(void) {
@@ -111,11 +107,7 @@ int main(void) {
printf("Opening SHM interface\n"); printf("Opening SHM interface\n");
usleep(200000); // 200 ms usleep(200000); // 200 ms
#ifdef CPQ_TEST
result = bsd_cpq_test(&shm_driver, &shm_data, mac, debug_level);
#else
result = bsd_x_test(&shm_driver, &shm_data, mac, debug_level); result = bsd_x_test(&shm_driver, &shm_data, mac, debug_level);
#endif
if (shm_data.shm != NULL) munmap(shm_data.shm, sizeof(*shm_data.shm)); if (shm_data.shm != NULL) munmap(shm_data.shm, sizeof(*shm_data.shm));
if (shm_data.fp != NULL) fclose(shm_data.fp); if (shm_data.fp != NULL) fclose(shm_data.fp);
if (!result) return EXIT_FAILURE; if (!result) return EXIT_FAILURE;
+60
View File
@@ -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;
}
-174
View File
@@ -1,174 +0,0 @@
// Demonstrates UDP behavior with the CPQ patch. Run this task with
// bsd_udp_cpq_peer against a Mongoose interface whose address it receives.
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include "mongoose.h"
#include "FreeRTOS.h"
#include "task.h"
#define DATA_PORT 1234
#define CONTROL_PORT 1235
#define SEND_PORT 1236
#define PEER_A_PORT 14001
static char s_big[1600];
extern volatile bool s_cpq_done;
extern volatile bool s_cpq_ready;
extern bool s_cpq_remote;
void bsd_udp_cpq_fail_task(void *args);
static int udp_bind(unsigned port) {
struct sockaddr_in sa;
int fd = socket(AF_INET, SOCK_DGRAM, 0);
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons((uint16_t) port);
if (fd < 0 || bind(fd, (struct sockaddr *) &sa, sizeof(sa)) != 0) {
printf("cannot bind UDP port %u: %d\n", port, errno);
return -1;
}
return fd;
}
static void go(int fd) {
if (send(fd, "go", 2, 0) != 2) printf("control send failed: %d\n", errno);
}
static void wait_for_packets(void) {
vTaskDelay(pdMS_TO_TICKS(100)); // Let the manager collect peer datagrams
}
void bsd_udp_cpq_fail_task(void *args) {
struct sockaddr_in control_peer, peer, local, other;
socklen_t peerlen, locallen;
char buf[16];
int data = -1, control = -1, out = -1, fd = -1, connected = -1;
ssize_t n;
(void) args;
data = udp_bind(DATA_PORT);
control = udp_bind(CONTROL_PORT);
out = udp_bind(SEND_PORT);
if (data < 0 || control < 0 || out < 0) goto done;
s_cpq_ready = true;
printf("CPQ: control socket waiting\n");
// The peer identifies itself on the control socket, which learns its MAC.
peerlen = sizeof(control_peer);
n = recvfrom(control, buf, sizeof(buf), 0,
(struct sockaddr *) &control_peer, &peerlen);
if (n != 5 || memcmp(buf, "ready", 5) != 0) goto done;
printf("CPQ: peer ready\n");
fd = udp_bind(1237);
n = fd < 0 ? -1 : send(fd, "x", 1, 0);
printf("%s send: expected EDESTADDRREQ, got %d: no peer check\n",
n < 0 && errno == EDESTADDRREQ ? "PASS" : "FAIL", (int) n);
if (fd >= 0) close(fd);
fd = udp_bind(1238);
n = fd < 0 ? -1 : connect(fd, (struct sockaddr *) &control_peer, peerlen);
locallen = sizeof(local);
if (n == 0 && getsockname(fd, (struct sockaddr *) &local, &locallen) == 0) {
printf("%s bind: expected 1238, got %u: connect replaced bind\n",
mg_ntohs(local.sin_port) == 1238 ? "PASS" : "FAIL",
(unsigned) mg_ntohs(local.sin_port));
} else {
printf("FAIL bind: connect failed errno %d\n", errno);
}
if (fd >= 0) close(fd);
fd = udp_bind(1239);
other = control_peer, other.sin_port = htons(14998);
n = fd < 0 ? -1 : sendto(fd, s_big, sizeof(s_big), 0,
(struct sockaddr *) &other, sizeof(other));
printf("%s oversize: expected EMSGSIZE, got %d: later truncated\n",
n < 0 && errno == EMSGSIZE ? "PASS" : "FAIL", (int) n);
if (fd >= 0) close(fd);
// The patch keeps the first nonempty datagram and drops the second.
go(control);
wait_for_packets();
peerlen = sizeof(peer);
n = recvfrom(data, buf, sizeof(buf), 0, (struct sockaddr *) &peer, &peerlen);
if (n == 3 && memcmp(buf, "one", 3) == 0 &&
mg_ntohs(peer.sin_port) == PEER_A_PORT &&
recvfrom(data, buf, sizeof(buf), MSG_DONTWAIT, NULL, NULL) < 0 &&
errno == EAGAIN) {
printf("PASS drop: kept one, dropped two\n");
} else {
printf("FAIL drop: expected one then EAGAIN, got %d \"%.*s\"\n", (int) n,
(int) (n > 0 ? n : 0), buf);
}
// A short UDP receive must discard the rest of that datagram.
go(control);
wait_for_packets();
n = recvfrom(data, buf, 2, 0, NULL, NULL);
n = recvfrom(data, buf, sizeof(buf), MSG_DONTWAIT, NULL, NULL);
printf("%s short: expected EAGAIN, got %d \"%.*s\": tail retained\n",
n < 0 && errno == EAGAIN ? "PASS" : "FAIL", (int) n,
(int) (n > 0 ? n : 0), buf);
// A zero-length datagram is data and recvfrom() must return zero for it.
go(control);
wait_for_packets();
n = recvfrom(data, buf, sizeof(buf), MSG_DONTWAIT, NULL, NULL);
printf("%s empty: expected 0, got %d errno %d: no marker\n",
n == 0 ? "PASS" : "FAIL", (int) n, errno);
// An unbound connected socket must reject another sender's datagram.
if (send(control, "connect", 7, 0) != 7 ||
(connected = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ||
connect(connected, (struct sockaddr *) &control_peer,
sizeof(control_peer)) != 0 ||
send(connected, "hello", 5, 0) != 5) {
goto done;
}
wait_for_packets();
n = recv(connected, buf, sizeof(buf), MSG_DONTWAIT);
printf("%s peer: expected EAGAIN, got %d \"%.*s\": no peer filter\n",
n < 0 && errno == EAGAIN ? "PASS" : "FAIL", (int) n,
(int) (n > 0 ? n : 0), buf);
n = send(connected, "reply", 5, 0);
printf("reply: sent %d bytes; peer reports its destination below\n", (int) n);
if (recv(control, buf, sizeof(buf), 0) < 0) goto done; // Peer checked reply
other = control_peer, other.sin_port = htons(14999);
n = sendto(connected, "x", 1, 0, (struct sockaddr *) &other, sizeof(other));
printf("%s sendto: expected EISCONN, got %d: connected socket accepted it\n",
n < 0 && errno == EISCONN ? "PASS" : "FAIL", (int) n);
// sendto() reports success before this socket has learned a destination MAC.
go(control);
if (recv(control, buf, sizeof(buf), 0) < 0) goto done;
n = sendto(out, "lost", 4, 0, (struct sockaddr *) &control_peer,
sizeof(control_peer));
printf("%s sendto: expected delivery, got %d: no resolution\n",
n == 4 ? "FAIL" : "PASS", (int) n);
if (recv(control, buf, sizeof(buf), 0) < 0) goto done; // Peer reports miss
// sendto() changes c->rem, so send() incorrectly succeeds on this socket.
go(control);
if (recvfrom(out, buf, sizeof(buf), 0, NULL, NULL) < 0) goto done;
n = sendto(out, s_cpq_remote ? "stale" : "sendto", s_cpq_remote ? 5 : 6,
0, (struct sockaddr *) &control_peer, sizeof(control_peer));
printf("sendto after RX: got %d\n", (int) n);
if (s_cpq_remote) go(control); // Server checks its packet used helper's MAC
n = send(out, "send", 4, 0);
printf("%s send: expected EDESTADDRREQ, got %d: sendto set peer\n",
n < 0 && errno == EDESTADDRREQ ? "PASS" : "FAIL", (int) n);
done:
if (data >= 0) close(data);
if (control >= 0) close(control);
if (out >= 0) close(out);
if (connected >= 0) close(connected);
s_cpq_done = true;
vTaskDelete(NULL);
}
-218
View File
@@ -1,218 +0,0 @@
#include <arpa/inet.h>
#include <errno.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <unistd.h>
#define DATA_PORT 1234
#define CONTROL_PORT 1235
#define SEND_PORT 1236
#define CONTROL_PEER_PORT 14000
#define PEER_A_PORT 14001
#define PEER_B_PORT 14002
#define HELPER_PORT 14003
static int open_peer(unsigned port) {
struct sockaddr_in sa;
struct timeval timeout = {1, 0};
int fd = socket(AF_INET, SOCK_DGRAM, 0);
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_ANY);
sa.sin_port = htons((uint16_t) port);
if (fd < 0 || bind(fd, (struct sockaddr *) &sa, sizeof(sa)) != 0 ||
setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) != 0)
return -1;
return fd;
}
static int make_peer(struct sockaddr_in *sa, const char *ip, unsigned port) {
memset(sa, 0, sizeof(*sa));
sa->sin_family = AF_INET;
sa->sin_port = htons((uint16_t) port);
return inet_pton(AF_INET, ip, &sa->sin_addr) == 1 ? 0 : -1;
}
static int send_packet(int fd, const struct sockaddr_in *sa, const char *buf,
size_t len) {
return sendto(fd, buf, len, 0, (const struct sockaddr *) sa, sizeof(*sa)) ==
(ssize_t) len
? 0
: -1;
}
static int wait_go(int fd, const char *step) {
char buf[8];
int n = recv(fd, buf, sizeof(buf), 0);
if (n == 2 && memcmp(buf, "go", 2) == 0) return 0;
printf("peer: %s failed: %d\n", step, n);
return -1;
}
static void stale_packet(void) {
printf("TRACE stale MAC: Server received packet despite wrong L2 address\n");
}
static int wait_stale_go(int fd) {
char buf[8];
int n, stale = 0;
for (;;) {
n = recv(fd, buf, sizeof(buf), 0);
if (n == 5 && memcmp(buf, "stale", 5) == 0) {
stale = 1;
stale_packet();
} else if (n == 2 && memcmp(buf, "go", 2) == 0) {
if (stale) return 0;
n = recv(fd, buf, sizeof(buf), 0);
if (n == 5 && memcmp(buf, "stale", 5) == 0)
stale_packet();
else
printf("FAIL stale MAC: expected packet, got none\n");
return 0;
} else {
printf("peer: stale MAC handoff failed: %d\n", n);
return -1;
}
}
}
static int wait_connect(int fd, struct sockaddr_in *peer) {
char buf[8];
socklen_t len = sizeof(*peer);
return recv(fd, buf, sizeof(buf), 0) == 7 && memcmp(buf, "connect", 7) == 0 &&
recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) peer, &len) == 5 &&
memcmp(buf, "hello", 5) == 0
? 0
: -1;
}
static int wait_helper(int fd, struct sockaddr_in *peer) {
char buf[8];
socklen_t len = sizeof(*peer);
ssize_t n;
while ((n = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) peer,
&len)) < 0)
len = sizeof(*peer);
return n == 5 && memcmp(buf, "ready", 5) == 0 ? 0 : -1;
}
static int run_helper(const char *server_ip, const char *target_ip) {
struct sockaddr_in server, target;
char buf[32];
unsigned port;
int fd, n;
if (make_peer(&server, server_ip, HELPER_PORT) != 0 ||
make_peer(&target, target_ip, 0) != 0 || (fd = open_peer(0)) < 0)
return 1;
for (;;) {
if (send_packet(fd, &server, "ready", 5) != 0) break;
n = recv(fd, buf, sizeof(buf) - 1, 0);
if (n <= 0) continue; // Retry ready until the Server receives it
buf[n] = '\0';
if (sscanf(buf, "intrude %u", &port) == 1 && port < 65536) {
target.sin_port = htons((uint16_t) port);
if (send_packet(fd, &target, "intruder", 8) != 0) break;
} else if (strcmp(buf, "prime") == 0) {
target.sin_port = htons(SEND_PORT);
if (send_packet(fd, &target, "prime", 5) != 0) break;
return 0;
} else if (strcmp(buf, "reply") == 0) {
printf("FAIL connected peer: helper received reply\n");
}
}
close(fd);
return 1;
}
static int run_peer(const char *target_ip, int remote) {
struct sockaddr_in data, control, out, peer, helper_peer;
char buf[32], cmd[32];
int a, b, ctl, helper = -1;
ssize_t n;
if (make_peer(&data, target_ip, DATA_PORT) != 0) return 1;
control = data, out = data;
control.sin_port = htons(CONTROL_PORT);
out.sin_port = htons(SEND_PORT);
ctl = open_peer(CONTROL_PEER_PORT);
a = open_peer(PEER_A_PORT);
b = open_peer(PEER_B_PORT);
if (remote) helper = open_peer(HELPER_PORT);
if (ctl < 0 || a < 0 || b < 0 || (remote && helper < 0)) return 1;
if (remote && wait_helper(helper, &helper_peer) != 0) return 1;
if (remote) printf("peer: helper ready\n");
if (send_packet(ctl, &control, "ready", 5) != 0 ||
wait_go(ctl, "initial go") != 0)
return 1;
if (send_packet(a, &data, "one", 3) != 0 ||
send_packet(b, &data, "two", 3) != 0 ||
wait_go(ctl, "two datagrams") != 0)
return 1;
if (send_packet(b, &data, "ABCDE", 5) != 0 ||
wait_go(ctl, "short datagram") != 0)
return 1;
if (send_packet(b, &data, "", 0) != 0 || wait_connect(ctl, &peer) != 0) {
printf("peer: connect handshake failed\n");
return 1;
}
if (remote) {
snprintf(cmd, sizeof(cmd), "intrude %u", (unsigned) ntohs(peer.sin_port));
if (send_packet(helper, &helper_peer, cmd, strlen(cmd)) != 0) return 1;
} else if (send_packet(b, &peer, "intruder", 8) != 0) {
return 1;
}
n = recv(ctl, buf, sizeof(buf), 0);
printf("%s reply: expected control, got %s: intruder replaced peer\n",
n < 0 ? "FAIL" : "PASS", n < 0 ? "none" : "control");
if (!remote) {
n = recv(b, buf, sizeof(buf), 0);
printf("%s reply: intruder got %.*s\n", n > 0 ? "FAIL" : "PASS",
(int) (n > 0 ? n : 0), buf);
}
if (send_packet(ctl, &control, "done", 4) != 0 ||
wait_go(ctl, "first sendto") != 0 ||
send_packet(ctl, &control, "sendlost", 8) != 0)
return 1;
n = recv(ctl, buf, sizeof(buf), 0);
printf("%s sendto: expected packet, got %s\n", n < 0 ? "FAIL" : "PASS",
n < 0 ? "none" : "packet");
if (send_packet(ctl, &control, "miss", 4) != 0 ||
wait_go(ctl, "prime") != 0)
return 1;
if (remote) {
if (send_packet(helper, &helper_peer, "prime", 5) != 0 ||
wait_stale_go(ctl) != 0)
return 1;
} else {
if (send_packet(ctl, &out, "prime", 5) != 0) return 1;
n = recv(ctl, buf, sizeof(buf), 0);
printf("sendto after RX: %.*s\n", (int) (n > 0 ? n : 0), buf);
n = recv(ctl, buf, sizeof(buf), 0);
printf("%s send: expected none, got %.*s\n", n > 0 ? "FAIL" : "PASS",
(int) (n > 0 ? n : 0), buf);
}
close(a);
close(b);
close(ctl);
if (helper >= 0) close(helper);
return 0;
}
int main(int argc, char *argv[]) {
if (argc == 2) return run_peer(argv[1], 0);
if (argc == 3 && strcmp(argv[1], "--remote") == 0)
return run_peer(argv[2], 1);
if (argc == 4 && strcmp(argv[1], "--helper") == 0)
return run_helper(argv[2], argv[3]);
return 1;
}
+253 -2
View File
@@ -33,6 +33,198 @@ static int s_abort = 0;
#define DASHBOARD(x) \ #define DASHBOARD(x) \
printf("HEALTH_DASHBOARD\t\"%s\": %s,\n", x, s_error ? "false" : "true") 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) { static pid_t start_client(const char *ip, const char *connections) {
char *cmd[4]; char *cmd[4];
pid_t pid; pid_t pid;
@@ -46,6 +238,18 @@ static pid_t start_client(const char *ip, const char *connections) {
return pid; 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) { static bool client_done(pid_t pid, int *status) {
pid_t r = waitpid(pid, status, WNOHANG); pid_t r = waitpid(pid, status, WNOHANG);
ASSERT(r >= 0); ASSERT(r >= 0);
@@ -60,12 +264,17 @@ static void check_client(int status) {
static int open_listener(int backlog, bool nonblock) { static int open_listener(int backlog, bool nonblock) {
int lfd = socket(AF_INET, SOCK_STREAM, 0); int lfd = socket(AF_INET, SOCK_STREAM, 0);
struct sockaddr_in sa; struct sockaddr_in sa;
char buf;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_port = htons(1234); sa.sin_port = htons(1234);
sa.sin_addr.s_addr = INADDR_ANY; sa.sin_addr.s_addr = INADDR_ANY;
ASSERT(lfd >= 0); 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(bind(lfd, (struct sockaddr *) &sa, sizeof(sa)) == 0);
ASSERT(listen(lfd, backlog) == 0); ASSERT(listen(lfd, backlog) == 0);
if (nonblock) ASSERT(fcntl(lfd, F_SETFL, O_NONBLOCK) == 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_poll_waiting, s_poll_done;
static volatile bool s_ready_waiting, s_ready_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_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_waiting;
static volatile bool s_send_done, s_send_expect_error, s_send_expect_shutdown; 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_start, s_recv_waiting, s_recv_done;
static volatile bool s_recv_expect_error; static volatile bool s_recv_expect_error;
static volatile bool s_shutdown_waiting, s_shutdown_done; 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 *); static size_t (*s_tx)(const void *, size_t, struct mg_tcpip_if *);
struct client_data { struct client_data {
@@ -170,6 +380,7 @@ static void readiness_task(void *args);
static void backlog_task(void *args); static void backlog_task(void *args);
static void tx_gate_task(void *args); static void tx_gate_task(void *args);
static void shutdown_task(void *args); static void shutdown_task(void *args);
static void udp_task(void *args);
struct atask_args { struct atask_args {
bool listener_nonblock; bool listener_nonblock;
@@ -329,6 +540,21 @@ static void tx_gate_task(void *args) {
(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) { static void recv_wait_task(void *args) {
char buf; char buf;
int fd = (int) (uintptr_t) args; 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 struct mg_mgr *mgr = (struct mg_mgr *)args; // Event manager
char *ip; char *ip;
int status; int status;
pid_t first, second; pid_t first, second, udp;
vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms vTaskDelay(pdMS_TO_TICKS(500)); // 500 ms
s_error = false; s_error = false;
s_wait = false; s_wait = false;
ip = mg_mprintf("%M", mg_print_ip4, &mgr->ifp->ip); 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; s_poll_waiting = s_poll_done = false;
ASSERT(xTaskCreate(poll_task, "poll", 512, NULL, ASSERT(xTaskCreate(poll_task, "poll", 512, NULL,
configMAX_PRIORITIES - 1, NULL) == pdPASS); 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); 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 void nortos_test(struct mg_mgr *mgr) {
static const char bootstrap = '\0'; static const char bootstrap = '\0';
static const char grow[512] = {0}; static const char grow[512] = {0};
@@ -1083,6 +1333,7 @@ static void nortos_test(struct mg_mgr *mgr) {
ASSERT(close(fd) == 0); ASSERT(close(fd) == 0);
mg_mgr_poll(mgr, 0); mg_mgr_poll(mgr, 0);
DASHBOARD("nortos_nonblocking_connect"); DASHBOARD("nortos_nonblocking_connect");
nortos_udp(mgr, ip);
mg_free(ip); mg_free(ip);
} }
-14
View File
@@ -1,14 +0,0 @@
.DEFAULT_GOAL := cpq_udp
include Makefile
.PHONY: cpq_udp bsd_cpq_test bsd_udp_cpq_peer
cpq_udp: shm_tap_bridge bsd_cpq_test bsd_udp_cpq_peer
sh -c 'TRACE_UDP=1 ./shm_tap_bridge & pid=$$!; sleep 1; timeout 30s ./bsd_cpq_test; rc=$$?; kill $$pid >/dev/null 2>&1; wait $$pid >/dev/null 2>&1; exit $$rc'
bsd_cpq_test: CFLAGS_MONGOOSE += -DMG_ENABLE_FREERTOS=1 -DCPQ_TEST
bsd_cpq_test: FreeRTOS-Kernel bsd_cpq_test.c bsd_udp_cpq_fail.c bsd_shm_test.c
$(CC) $(C_INPUTS) $(FREERTOS_INPUTS) -x c bsd_shm_test.c $(CFLAGS) $(CFLAGS_MONGOOSE) $(CFLAGS_EXTRA) -o $@
bsd_udp_cpq_peer: bsd_udp_cpq_peer.c
$(CC) bsd_udp_cpq_peer.c -o $@
-11
View File
@@ -18,15 +18,6 @@
#include "shm_queue.h" #include "shm_queue.h"
static volatile sig_atomic_t s_signo; static volatile sig_atomic_t s_signo;
static int s_trace_udp;
static void trace_udp(const uint8_t *p, size_t len) {
if (!s_trace_udp || len < 34 || p[12] != 8 || p[13] != 0 || p[23] != 17)
return;
printf("UDP IP dst %u.%u.%u.%u -> Ethernet dst %02x:%02x:%02x:%02x:%02x:%02x\n",
p[30], p[31], p[32], p[33], p[0], p[1], p[2], p[3], p[4], p[5]);
}
void signal_handler(int signo) { void signal_handler(int signo) {
s_signo = signo; s_signo = signo;
} }
@@ -67,7 +58,6 @@ int main(void) {
} }
memset(shm, 0, sizeof(*shm)); memset(shm, 0, sizeof(*shm));
s_trace_udp = getenv("TRACE_UDP") != NULL;
printf("Opened shared memory: %s\n", SHM_NAME); printf("Opened shared memory: %s\n", SHM_NAME);
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler); signal(SIGTERM, signal_handler);
@@ -104,7 +94,6 @@ int main(void) {
uint8_t buf[FRAME_SIZE]; uint8_t buf[FRAME_SIZE];
size_t n = shm_queue_pop(&shm->to_tap, buf, sizeof(buf)); size_t n = shm_queue_pop(&shm->to_tap, buf, sizeof(buf));
if (n > 0) { if (n > 0) {
trace_udp(buf, n);
// printf("Got at SHM: %d bytes\n", (int) f->len); // printf("Got at SHM: %d bytes\n", (int) f->len);
write(fd, buf, n); write(fd, buf, n);
// printf("Sent to TAP\n"); // printf("Sent to TAP\n");
-457
View File
@@ -1,457 +0,0 @@
# UDP CPQ Patch Assessment
## Scope
This assesses the CPQ patch applied to `master`, with only this receive-side
change:
```c
if (c->is_bsd && c->recv.len > 0) return true;
```
It deliberately does not require the bsdudp TX framing, peer filtering, or
neighbor-cache work. The rule keeps the first unread nonempty datagram and
discards later ones.
## What The CPQ Patch Provides
When two nonempty UDP datagrams arrive before a BSD application calls
`recv()` or `recvfrom()`, the first remains in `c->recv` and later packets are
discarded. Therefore the first payload is no longer concatenated with the
second one, and its source address remains in `c->rem` until it is read.
That is a valid deliberately lossy receive policy. It only addresses this one
case. The rest of the odd/incorrect behaviors found when initially writing code in the bsdudp branch are detailed in subsequent paragraphs. The rest of the missing functionality also observed before is NOT described here, only what is claimed to be functional is evaluated; these are somehow enumerated at the end of this document, just before the appendixes
See [B.1](#b1-cpq-unread-datagram-policy) for the test evidence.
## Rate Limit Of The One-Datagram Policy
The retained datagram is a one-slot loss queue: while the BSD application has
not called `recv()` or `recvfrom()`, every later nonempty datagram is dropped.
If the application needs 4 ms to read it, independent traffic has these
approximate collision probabilities:
| Aggregate UDP rate | Probability of another datagram within 4 ms |
| ---: | ---: |
| 25 packets/s | 9.5% |
| 50 packets/s | 18.1% |
| 100 packets/s | 33.0% |
| 250 packets/s | 63.2% |
| 1000 packets/s | 98.2% |
This is basic queueing theory under an independent-arrivals assumption. See
[Appendix A](#appendix-a-one-slot-queue-model) for the model and limits of the
estimate.
## Baseline Failures
`bsd_udp_cpq_fail.c` and `bsd_udp_cpq_peer.c` print the wire-level effects for
short receives, empty datagrams, connected peers, and `sendto()`.
The target runs Mongoose's built-in TCP/IP stack. A bridge connects its packet
interface to the LAN because this path cannot use BSD sockets: BSD is the API
being tested.
The default runner is self-contained for CI: it starts the peer on the same
host (Workstation) and exercises every failure except a mismatched Ethernet destination. To
show that L2 failure, run the primary peer on a second machine (Laptop):
```text
Laptop: ./bsd_udp_cpq_peer --remote <Mongoose-IP>
Workstation: CPQ_REMOTE_PEER=<Laptop-IP> ./bsd_cpq_test
```
Remote mode starts a Workstation helper automatically. The Laptop and helper
have distinct MAC addresses. The helper first redirects a connected-socket
reply, then populates the unconnected `sendto()` socket with its MAC. The
following `sendto()` names the Laptop IP, but `TRACE_UDP=1` shows the helper's
Ethernet destination. The evidence below was collected with Workstation IP
forwarding disabled, so the Laptop cannot receive a frame addressed to the
helper MAC.
### Short `recvfrom()` turns one datagram into two reads
The CPQ code removes only the copied byte count from `c->recv`. Reading two
bytes of `ABCDE` leaves `CDE` in the buffer, so the next `recvfrom()` returns
it as if it were a new UDP datagram. UDP must discard the unread tail of a
datagram after a non-peek short receive. Dropping later packets does not repair
this: the tail is already in the retained packet.
See [B.2](#b2-short-recvfrom) for the test evidence.
### A connected UDP socket accepts traffic from any sender
`rx_udp()` overwrites `c->rem` and the return L2 address for every accepted
packet. It does not check that an incoming peer matches the peer selected by
`connect()`. An unrelated sender can therefore place data in a connected
socket and replace its reply destination. The demonstrator sends `intruder`
from a third peer: the connected receive succeeds when it should return
`EAGAIN`, and the subsequent `send()` goes to the intruder rather than the
connected peer.
See [B.3](#b3-connected-udp-accepts-another-peer) for the test evidence.
### Unconnected `send()` reports success
`bsd_dispatch(BSD_OP_SEND)` passes UDP bytes to `mg_send()` without checking
whether the socket has a peer. A real UDP socket has nowhere to send in this
state and reports `EDESTADDRREQ`. Here, the API reports that the datagram was
accepted even though it has no valid destination.
See [B.4](#b4-unconnected-send) for the test evidence.
### `sendto()` uses one stale L2 destination
`BSD_OP_SENDTO` changes the destination IP and UDP port in `c->rem`, but calls
`mg_send()` with the one L2 MAC currently stored for the socket. That MAC was
learned when a packet arrived, or while a UDP `connect()` resolved its peer;
there is no resolution or MAC lookup for each `sendto()` destination. An
application using `sendto()` for several peers therefore has one usable L2
destination, not one per peer.
- A single-destination application can appear to work: its only peer is the
one that caused the MAC to be learned. This is likely the tested case.
- Sending to another local-LAN host changes the IP address but keeps that first
host's MAC. The Ethernet frame reaches the first host, which drops it
because its IP destination names the second host. `sendto()` still reports
success.
- Several off-link destinations can also appear to work if the stored MAC is
the common router MAC. The router is the correct L2 next hop for all of
them. This does not make the socket generally correct.
- A socket that has neither received a datagram nor been connected has no
usable destination MAC. Its first proactive `sendto()` reports success but
cannot be delivered correctly.
Receiving an unrelated datagram can also break a destination that was working.
For example, A sends to this UDP port, so the socket stores A's MAC and a
later `sendto(A)` works. B then sends any datagram to the same port.
`rx_udp()` replaces the stored MAC with B's. The next `sendto(A)` still names
A in the IP header, but addresses the Ethernet frame to B; A no longer gets
it. The same overwrite occurs after UDP `connect()`, because the CPQ code does
not filter non-peer senders. Remote traffic through the same router can hide
this again because its Ethernet source MAC remains the router's MAC.
The two-host remote test covers both cases: [B.5](#b5-first-unconnected-sendto)
shows the first `sendto()` without an L2 address, and
[B.6](#b6-sendto-corrupts-later-sends-and-uses-a-stale-mac) shows a Laptop IP
sent with the helper MAC. Two sockets on one Linux host are not sufficient for
the latter because they share one NIC MAC. The bridge prints each outgoing UDP
IP destination beside its Ethernet destination MAC, independently confirming
the wrong L2 destination.
(In branch bsdudp, we fixed this by using a framing transporting TX records between the BSD side and the Mongoose side; a correct `sendto()` must wait
for ARP resolution without losing that destination, so those records/frames are queued at the send buffer and the extraction then can decide whether to start an ARP, thing that is minimized with a small cache-like table holding 4 entries)
See [B.5](#b5-first-unconnected-sendto) and
[B.6](#b6-sendto-corrupts-later-sends-and-uses-a-stale-mac) for the test
evidence.
### `sendto()` changes the meaning of later `send()` calls
The same direct update makes an unconnected socket look connected after a
`sendto()`. A later `send()` succeeds and uses the previous `sendto()` target,
although BSD requires `EDESTADDRREQ` until `connect()` selects a peer. It is
state corruption from the application's point of view: an operation intended
to name one datagram's destination changes the socket's default destination.
See [B.6](#b6-sendto-corrupts-later-sends-and-uses-a-stale-mac) for the test
evidence.
### `bind()` followed by UDP `connect()` loses the bound port
`mg_connect_resolved()` assigns an ephemeral local port unconditionally.
Calling `connect()` on a UDP socket already bound to a specific port replaces
that port. This is independent of receive buffering; the local identity used
by replies changes after `connect()`.
See [B.7](#b7-bind-followed-by-udp-connect) for the test evidence.
### `sendto()` on a connected UDP socket reports success
A connected UDP socket already has a selected peer. `sendto()` must fail with
`EISCONN`, but the CPQ implementation accepts it and changes that peer.
See [B.8](#b8-sendto-on-a-connected-udp-socket) for the test evidence.
### Oversized UDP writes report success after truncation
The CPQ code passes an oversized payload through `mg_send()`. The built-in UDP
path trims to its payload capacity and transmits only that prefix. BSD callers
are told that the whole datagram was sent. A UDP datagram must be sent whole
or fail; partial transmission is not meaningful.
See [B.9](#b9-oversized-udp-write) for the test evidence.
### Empty datagrams disappear
An empty UDP datagram does not increase `c->recv.len`. No later `recv()` can
distinguish it from no packet, so it returns `EAGAIN` or blocks instead of
returning zero. The proposed condition is also false for an empty retained
datagram, so it cannot represent or protect one.
Yes, it has been agreed that is a known and accepted behavior.
For completeness, see [B.10](#b10-empty-datagram) for the test evidence.
## bsdudp Branch Fixes and Additions
These are additional capabilities, not prerequisites for the one-datagram
drop policy above:
- RX drops the complete retained datagram after a short non-peek read.
- RX filters packets from non-peer senders on connected UDP sockets.
- TX records carry each UDP destination, so queued `sendto()` calls retain
their individual targets.
- TX triggers and reuses L2 resolution for `sendto()` destinations.
- Unconnected `send()` returns `EDESTADDRREQ`; connected UDP `sendto()`
returns `EISCONN`.
- `bind()` followed by UDP `connect()` keeps the selected local port.
- BSD writes reject oversized datagrams with `EMSGSIZE` before queuing them.
Empty UDP receives still require an explicit marker or framing record and are
not solved by either the CPQ patch or the current bsdudp simplification.
## Appendix A: One-Slot Queue Model
Let `D` be the time from receiving a datagram until the BSD application reads
it. Let `N` peers each send at `r` packets/s, so the aggregate arrival rate is
`lambda = N * r`. For independent arrivals approximated as a Poisson process,
the probability that at least one later datagram arrives during the unread
window is:
```text
P(collision) = 1 - exp(-lambda * D)
```
The table above uses `D = 4 ms`. It is a collision probability, not a precise
packet-loss percentage: the latter also depends on the scheduler and on when
the application calls `recv()`.
For evenly spaced periodic traffic, the aggregate packet spacing must be at
least `D` to avoid drops. Therefore each of `N` equal-rate peers needs a period
of at least `N * D`: with `D = 4 ms`, 10 peers need at least 40 ms per packet
per peer, while 100 peers need at least 400 ms.
## Appendix B: Two-Host Test Evidence
This run used Mongoose at `192.168.69.231`, the Laptop at
`192.168.69.73`, and a Workstation helper at `192.168.69.11`. The Laptop MAC
learned for normal control traffic was `3c:0a:f3:8c:ce:ef`; the helper MAC was
`06:3f:ad:7e:3f:1c`. Startup and
DHCP are omitted below.
### B.1 CPQ unread-datagram policy
**Test.** Two peers send `one` and `two` before the application reads port
`1234`.
**Expected.** The CPQ rule retains `one` and drops `two`.
**Observed.**
```text
Workstation: PASS drop: kept one, dropped two
Laptop: no separate observation
Bridge: no separate observation
```
**Internal reason.** `rx_udp()` returns once a BSD connection has a nonempty
`c->recv`. It is a one-datagram loss queue, not a UDP receive queue.
### B.2 Short `recvfrom()`
**Test.** A peer sends one five-byte datagram, `ABCDE`. The application first
reads two bytes, then reads again.
**Expected.** The first call returns `AB`; UDP discards the unread `CDE` tail.
The second call returns `EAGAIN` until another datagram arrives.
**Observed.**
```text
Workstation: FAIL short: expected EAGAIN, got 3 "CDE": tail retained
Laptop: sent ABCDE
Bridge: no separate observation
```
**Internal reason.** `BSD_OP_RECVFROM` removes only the copied byte count from
the stream-shaped `c->recv` iobuf. It has no record length to discard the rest
of the datagram.
### B.3 Connected UDP accepts another peer
**Test.** The socket connects to the Laptop. The Workstation helper then sends
`intruder` to that connected socket.
**Expected.** The helper datagram is ignored. A following `send()` still goes
to the Laptop.
**Observed.**
```text
Workstation: FAIL peer: expected EAGAIN, got 8 "intruder": no peer filter
Mongoose: mg_connect_ 7 192.168.69.231:64103 -> 192.168.69.73:14000
Mongoose: mg_connect_ 7 ARP lookup...
Mongoose: rx_arp 7 ARP resolved 192.168.69.73 -> 3c:0a:f3:8c:ce:ef
Workstation: reply: sent 5 bytes; peer reports its destination below
Laptop: FAIL reply: expected control, got none: intruder replaced peer
Helper: FAIL connected peer: helper received reply
Bridge: UDP IP dst 192.168.69.11 -> Ethernet dst 06:3f:ad:7e:3f:1c
```
**Internal reason.** `mg_connect_resolved()` correctly starts an ARP lookup for
the configured Laptop peer and stores its MAC. `rx_udp()` then accepts every
sender matching the local port. Before the BSD read runs, it overwrites
`c->rem` and the connection return MAC with the helper's source. The later
`send()` therefore replies to the helper instead of the peer that was resolved
at `connect()` time.
### B.4 Unconnected `send()`
**Test.** Send one byte on a bound UDP socket that has never called
`connect()` or `sendto()`.
**Expected.** `send()` fails with `EDESTADDRREQ`: there is no peer.
**Observed.**
```text
Workstation: FAIL send: expected EDESTADDRREQ, got 1: no peer check
Laptop: no packet expected
Bridge: UDP IP dst 0.0.0.0 -> Ethernet dst 00:00:00:00:00:00
```
**Internal reason.** `BSD_OP_SEND` calls `mg_send()` without checking whether
the UDP socket has a selected peer. The zeroed remote address reaches the L2
transmit path.
### B.5 First unconnected `sendto()`
**Test.** Call `sendto()` to the Laptop before this socket has received any
packet or connected to a peer.
**Expected.** The implementation resolves the Laptop L2 address, waits if
needed, then delivers the datagram.
**Observed.**
```text
Workstation: FAIL sendto: expected delivery, got 4: no resolution
Laptop: FAIL sendto: expected packet, got none
Bridge: UDP IP dst 192.168.69.73 -> Ethernet dst 00:00:00:00:00:00
```
**Internal reason.** `BSD_OP_SENDTO` replaces only `c->rem` and immediately
calls `mg_send()`. Unlike the preceding `connect()` cases, this operation
produces no `mg_connect_ ... ARP lookup...` or `rx_arp ... ARP resolved ...`
log for the Laptop destination. It neither performs ARP/L2 resolution nor
retains the destination while resolution would be pending. The zero Ethernet
destination in the bridge trace is the direct result.
### B.6 `sendto()` corrupts later sends and uses a stale MAC
**Test.** The helper sends a datagram to the unconnected socket, establishing
the helper MAC. The application then calls `sendto()` to the Laptop and, after
that, calls `send()` on the same socket.
**Expected.** `sendto()` sends to the Laptop MAC without changing the socket's
default peer. The later `send()` fails with `EDESTADDRREQ`.
**Observed.**
```text
Workstation: sendto after RX: got 5
Workstation: FAIL send: expected EDESTADDRREQ, got 4: sendto set peer
Laptop: FAIL stale MAC: expected packet, got none
Bridge: UDP IP dst 192.168.69.73 -> Ethernet dst 3c:0a:f3:8c:ce:ef
Bridge: UDP IP dst 192.168.69.73 -> Ethernet dst 06:3f:ad:7e:3f:1c
```
The first bridge line is normal Laptop control traffic. The second names the
same Laptop IP but uses the helper MAC. The Laptop receives no packet.
**Internal reason.** The implementation keeps only one mutable `c->rem` and
one return MAC per Mongoose UDP connection. Receiving the helper datagram
updates that one MAC to `06:3f:ad:7e:3f:1c`. `sendto()` overwrites `c->rem`,
but does not start an ARP lookup for the Laptop and therefore retains the
helper MAC. There is no `mg_connect_ ... ARP lookup...` or `rx_arp ... ARP
resolved ...` sequence between this `sendto()` and the second bridge line. No
per-datagram destination record or neighbor cache exists.
### B.7 `bind()` followed by UDP `connect()`
**Test.** Bind local port `1238`, then connect to the Laptop and query the
local address.
**Expected.** The socket remains bound to `1238`.
**Observed.**
```text
Workstation: FAIL bind: expected 1238, got 64102: connect replaced bind
Mongoose: mg_connect_ 5 192.168.69.231:64102 -> 192.168.69.73:14000
Mongoose: mg_connect_ 5 ARP lookup...
Mongoose: rx_arp 5 ARP resolved 192.168.69.73 -> 3c:0a:f3:8c:ce:ef
Laptop: normal ARP/control peer
```
**Internal reason.** `mg_connect_resolved()` assigns an ephemeral local port
without preserving the BSD socket's existing bind state.
### B.8 `sendto()` on a connected UDP socket
**Test.** After UDP `connect()`, call `sendto()` with a different destination.
**Expected.** Fail with `EISCONN`; a connected UDP socket uses `send()`.
**Observed.**
```text
Workstation: FAIL sendto: expected EISCONN, got 1: connected socket accepted it
Laptop: no separate observation
Bridge: no separate observation
```
**Internal reason.** `BSD_OP_SENDTO` has no connected-UDP state check and
blindly replaces the peer address. The connected socket's ARP lookup happened
at `connect()` time in B.3; this operation does not validate that state or
start resolution for its replacement destination.
### B.9 Oversized UDP write
**Test.** Send a 1600-byte datagram.
**Expected.** Fail with `EMSGSIZE`; UDP cannot partially send one datagram.
**Observed.**
```text
Workstation: FAIL oversize: expected EMSGSIZE, got 1600: later truncated
Laptop: no receiving socket in this run
Bridge: no payload-length assertion in this run
```
**Internal reason.** The BSD layer does not reject an over-capacity datagram.
The built-in UDP transmit path later limits payload to its available capacity,
while the BSD caller has already been told all 1600 bytes were accepted.
This run proves the false-success API result. A receiver-side payload-length
assertion would additionally demonstrate the transmitted prefix length.
### B.10 Empty datagram
**Test.** Send a zero-byte UDP datagram, then call `recvfrom()`.
**Expected.** `recvfrom()` returns zero and preserves the source address.
**Observed.**
```text
Workstation: FAIL empty: expected 0, got -1 errno 11: no marker
Laptop: sent a zero-byte datagram
Bridge: no separate observation
```
**Internal reason.** An empty payload does not increase `c->recv.len`; the
stream iobuf cannot distinguish an empty datagram from no pending data.
+1 -3
View File
@@ -17,6 +17,4 @@ flash:
cd build && esptool --chip $(ARCH) --baud 460800 --port $(PORT) write-flash @flash_args cd build && esptool --chip $(ARCH) --baud 460800 --port $(PORT) write-flash @flash_args
clean: clean:
test -d build && (rm -rf build sdkconfig || true) test -d build && $(DOCKER) rm -rf build sdkconfig || true
.PHONY: build
@@ -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 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 = 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_clock.c
SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_trng.c SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_trng.c
SOURCES += cmsis_rw612/devices/RW612/drivers/fsl_reset.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 (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 # 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: clean:
rm -rf firmware.* cmsis_* mongoose/mongoose.* rm -rf firmware.* cmsis_* mongoose/mongoose.*
+2
View File
@@ -104,6 +104,7 @@ int main(void) {
// Start a minimal web server // Start a minimal web server
struct mg_mgr mgr; struct mg_mgr mgr;
mg_mgr_init(&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, "http://0.0.0.0", http_ev_handler, NULL);
mg_http_listen(&mgr, "https://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 (;;) { for (;;) {
mg_mgr_poll(&mgr, 0); mg_mgr_poll(&mgr, 0);
mg_mqtt_poll(&mgr);
blink_task(); blink_task();
} }
@@ -9,10 +9,11 @@
#define MG_ENABLE_CUSTOM_RANDOM 1 #define MG_ENABLE_CUSTOM_RANDOM 1
#define MG_OTA MG_OTA_RW612 #define MG_OTA MG_OTA_RW612
#define MG_TLS MG_TLS_BUILTIN #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_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_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_CR 51 // RMII MDC clock divider
// #define MG_DRIVER_MDC_HOLDTIME 3 // RMII MDC Holdtime (valid values [0-7]) // #define MG_DRIVER_MDC_HOLDTIME 3 // RMII MDC Holdtime (valid values [0-7])
+1 -1
View File
@@ -7,7 +7,7 @@ include(pico_sdk_import.cmake)
project(firmware) project(firmware)
pico_sdk_init() 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_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) target_link_libraries(firmware pico_stdlib hardware_spi pico_rand pico_cyw43_driver pico_cyw43_arch_none hardware_flash pico_bootrom)
+2
View File
@@ -65,11 +65,13 @@ static void run_mongoose(void) {
struct mg_mgr mgr; struct mg_mgr mgr;
mg_log_set_fn(log_fn, NULL); mg_log_set_fn(log_fn, NULL);
mg_mgr_init(&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, "http://0.0.0.0", http_ev_handler, NULL);
mg_http_listen(&mgr, "https://0.0.0.0", http_ev_handler, NULL); mg_http_listen(&mgr, "https://0.0.0.0", http_ev_handler, NULL);
for (;;) { for (;;) {
mg_mgr_poll(&mgr, 1); mg_mgr_poll(&mgr, 1);
mg_mqtt_poll(&mgr);
blink_task(); blink_task();
} }
} }
+1
View File
@@ -5,6 +5,7 @@
#define MG_TLS MG_TLS_BUILTIN #define MG_TLS MG_TLS_BUILTIN
#define MG_OTA MG_OTA_PICOSDK #define MG_OTA MG_OTA_PICOSDK
#define MG_IO_SIZE 2048 #define MG_IO_SIZE 2048
#define MQTT_CLIENT_ID "rp" // For tutorials/mqtt/mqtt-client
#define MG_ENABLE_TCPIP 1 #define MG_ENABLE_TCPIP 1
#define MG_ENABLE_DRIVER_PICO_W 1 #define MG_ENABLE_DRIVER_PICO_W 1
@@ -259,6 +259,7 @@ void mg_dash_init(struct mg_mgr *mgr) {
// Read settings from flash // Read settings from flash
struct mg_dash_user u = {.level = 9}; // Super mega user struct mg_dash_user u = {.level = 9}; // Super mega user
settings_fn(MG_DASH_READ, &u); settings_fn(MG_DASH_READ, &u);
s_dash.authenticate = s_enable_login ? authenticate : NULL;
mg_mem_files = mg_packed_files; mg_mem_files = mg_packed_files;
mg_http_listen(mgr, MG_HTTP_ADDR, mg_dash_ev_handler, &s_dash); mg_http_listen(mgr, MG_HTTP_ADDR, mg_dash_ev_handler, &s_dash);
@@ -6,7 +6,6 @@
#include "mongoose.h" #include "mongoose.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
struct echo_server { struct echo_server {
@@ -43,12 +42,12 @@ int echo_init(uint16_t port) {
if (fd < 0 || !echo_nonblock(fd) || if (fd < 0 || !echo_nonblock(fd) ||
bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0 || listen(fd, 3) < 0) { 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); if (fd >= 0) close(fd);
return 0; return 0;
} }
s_server.sock = fd; s_server.sock = fd;
printf("BSD echo server on port %hu\n", port); MG_INFO(("BSD echo server on port %hu", port));
return 1; return 1;
} }
@@ -80,7 +79,7 @@ void echo_poll(void) {
if (fd >= 0) { if (fd >= 0) {
c = (struct echo_client *) calloc(1, sizeof(*c)); c = (struct echo_client *) calloc(1, sizeof(*c));
if (c == NULL || !echo_nonblock(fd)) { 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); close(fd);
free(c); free(c);
} else { } else {