wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-07 16:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix IPv6

Browse Source
This commit is contained in:
Sergio R. Caprile committed 2025-12-05 16:22:16 -03:00
1 parent 80ed81583e
commit 60ce504489
2 files changed
+12 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+6 -5
View File
@@ -5300,9 +5300,10 @@ static void rx_icmp6(struct mg_tcpip_if *ifp, struct pkt *pkt) {
if (MG_IP6MATCH(target, ifp->ip6ll) || MG_IP6MATCH(target, ifp->ip6)) { if (MG_IP6MATCH(target, ifp->ip6ll) || MG_IP6MATCH(target, ifp->ip6)) {
size_t hlen = size_t hlen =
sizeof(struct eth) + sizeof(struct ip6) + sizeof(struct icmp6); sizeof(struct eth) + sizeof(struct ip6) + sizeof(struct icmp6);
size_t space = ifp->tx.len - hlen, plen = pkt->pay.len; size_t space, plen;
struct mg_addr ips; struct mg_addr ips;
ips.ip6[0] = pkt->ip6->src[0], ips.ip6[1] = pkt->ip6->src[1]; space = ifp->tx.len - hlen, plen = pkt->pay.len;
ips.addr.ip6[0] = pkt->ip6->src[0], ips.addr.ip6[1] = pkt->ip6->src[1];
ips.is_ip6 = true; ips.is_ip6 = true;
if (get_return_mac(ifp, &ips, false, pkt) == NULL) if (get_return_mac(ifp, &ips, false, pkt) == NULL)
return; // safety net for lousy networks return; // safety net for lousy networks
@@ -5344,11 +5345,11 @@ static uint8_t *get_return_mac(struct mg_tcpip_if *ifp, struct mg_addr *rem,
bool is_udp, struct pkt *pkt) { bool is_udp, struct pkt *pkt) {
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
if (rem->is_ip6) { if (rem->is_ip6) {
if (is_udp && MG_IP6MATCH(rem->ip6, ip6_allnodes.u)) // local broadcast if (is_udp && MG_IP6MATCH(rem->addr.ip6, ip6_allnodes.u)) // local broadcast
return (uint8_t *) ip6mac_allnodes; return (uint8_t *) ip6mac_allnodes;
if (rem->ip6[0] == ifp->ip6[0]) // TODO(): HANDLE PREFIX *** if (rem->addr.ip6[0] == ifp->ip6[0]) // TODO(): HANDLE PREFIX ***
return pkt->eth->src; // we're on the same LAN, get MAC from frame return pkt->eth->src; // we're on the same LAN, get MAC from frame
if (is_udp && *((uint8_t *) rem->ip6) == 0xFF) // multicast if (is_udp && *((uint8_t *) rem->addr.ip6) == 0xFF) // multicast
{ {
} // TODO(): ip6_mcastmac(s->mac, c->rem.ip6), l2 PR handles this better } // TODO(): ip6_mcastmac(s->mac, c->rem.ip6), l2 PR handles this better
if (ifp->gw6_ready) // use the router if (ifp->gw6_ready) // use the router
src/net_builtin.c
+6 -5
View File
@@ -908,9 +908,10 @@ static void rx_icmp6(struct mg_tcpip_if *ifp, struct pkt *pkt) {
if (MG_IP6MATCH(target, ifp->ip6ll) || MG_IP6MATCH(target, ifp->ip6)) { if (MG_IP6MATCH(target, ifp->ip6ll) || MG_IP6MATCH(target, ifp->ip6)) {
size_t hlen = size_t hlen =
sizeof(struct eth) + sizeof(struct ip6) + sizeof(struct icmp6); sizeof(struct eth) + sizeof(struct ip6) + sizeof(struct icmp6);
size_t space = ifp->tx.len - hlen, plen = pkt->pay.len; size_t space, plen;
struct mg_addr ips; struct mg_addr ips;
ips.ip6[0] = pkt->ip6->src[0], ips.ip6[1] = pkt->ip6->src[1]; space = ifp->tx.len - hlen, plen = pkt->pay.len;
ips.addr.ip6[0] = pkt->ip6->src[0], ips.addr.ip6[1] = pkt->ip6->src[1];
ips.is_ip6 = true; ips.is_ip6 = true;
if (get_return_mac(ifp, &ips, false, pkt) == NULL) if (get_return_mac(ifp, &ips, false, pkt) == NULL)
return; // safety net for lousy networks return; // safety net for lousy networks
@@ -952,11 +953,11 @@ static uint8_t *get_return_mac(struct mg_tcpip_if *ifp, struct mg_addr *rem,
bool is_udp, struct pkt *pkt) { bool is_udp, struct pkt *pkt) {
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
if (rem->is_ip6) { if (rem->is_ip6) {
if (is_udp && MG_IP6MATCH(rem->ip6, ip6_allnodes.u)) // local broadcast if (is_udp && MG_IP6MATCH(rem->addr.ip6, ip6_allnodes.u)) // local broadcast
return (uint8_t *) ip6mac_allnodes; return (uint8_t *) ip6mac_allnodes;
if (rem->ip6[0] == ifp->ip6[0]) // TODO(): HANDLE PREFIX *** if (rem->addr.ip6[0] == ifp->ip6[0]) // TODO(): HANDLE PREFIX ***
return pkt->eth->src; // we're on the same LAN, get MAC from frame return pkt->eth->src; // we're on the same LAN, get MAC from frame
if (is_udp && *((uint8_t *) rem->ip6) == 0xFF) // multicast if (is_udp && *((uint8_t *) rem->addr.ip6) == 0xFF) // multicast
{ {
} // TODO(): ip6_mcastmac(s->mac, c->rem.ip6), l2 PR handles this better } // TODO(): ip6_mcastmac(s->mac, c->rem.ip6), l2 PR handles this better
if (ifp->gw6_ready) // use the router if (ifp->gw6_ready) // use the router