wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-30 12:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: wt/mongoose:strpres
wt/mongoose:master wt/mongoose:dhcp wt/mongoose:memory-report wt/mongoose:strpres wt/mongoose:hesp wt/mongoose:defuri wt/mongoose:hcd wt/mongoose:w71 wt/mongoose:hardfault wt/mongoose:extra wt/mongoose:mongoose-os
wt/mongoose:7.23 wt/mongoose:7.22 wt/mongoose:7.21 wt/mongoose:7.20 wt/mongoose:7.19 wt/mongoose:7.18 wt/mongoose:7.17 wt/mongoose:7.16 wt/mongoose:7.15 wt/mongoose:7.14 wt/mongoose:7.13 wt/mongoose:7.12 wt/mongoose:7.11 wt/mongoose:7.10 wt/mongoose:7.9 wt/mongoose:7.8 wt/mongoose:7.7 wt/mongoose:7.6 wt/mongoose:7.5 wt/mongoose:7.4 wt/mongoose:7.3 wt/mongoose:7.2 wt/mongoose:7.1 wt/mongoose:7.0 wt/mongoose:6.18 wt/mongoose:6.17 wt/mongoose:6.16 wt/mongoose:6.15 wt/mongoose:6.14 wt/mongoose:6.13 wt/mongoose:6.12 wt/mongoose:6.11 wt/mongoose:6.10 wt/mongoose:6.9 wt/mongoose:6.8 wt/mongoose:6.7 wt/mongoose:6.6 wt/mongoose:6.5 wt/mongoose:6.4 wt/mongoose:6.3 wt/mongoose:6.2 wt/mongoose:6.1 wt/mongoose:6.0 wt/mongoose:5.6 wt/mongoose:5.5_20140120 wt/mongoose:5.5 wt/mongoose:5.4 wt/mongoose:5.3 wt/mongoose:5.2 wt/mongoose:5.1 wt/mongoose:5.0 wt/mongoose:4.1 wt/mongoose:4.0 wt/mongoose:3.8 wt/mongoose:3.7 wt/mongoose:3.6 wt/mongoose:3.5 wt/mongoose:3.4 wt/mongoose:3.3 wt/mongoose:3.2
...
compare: wt/mongoose:dhcp
wt/mongoose:master wt/mongoose:dhcp wt/mongoose:memory-report wt/mongoose:strpres wt/mongoose:hesp wt/mongoose:defuri wt/mongoose:hcd wt/mongoose:w71 wt/mongoose:hardfault wt/mongoose:extra wt/mongoose:mongoose-os
wt/mongoose:7.23 wt/mongoose:7.22 wt/mongoose:7.21 wt/mongoose:7.20 wt/mongoose:7.19 wt/mongoose:7.18 wt/mongoose:7.17 wt/mongoose:7.16 wt/mongoose:7.15 wt/mongoose:7.14 wt/mongoose:7.13 wt/mongoose:7.12 wt/mongoose:7.11 wt/mongoose:7.10 wt/mongoose:7.9 wt/mongoose:7.8 wt/mongoose:7.7 wt/mongoose:7.6 wt/mongoose:7.5 wt/mongoose:7.4 wt/mongoose:7.3 wt/mongoose:7.2 wt/mongoose:7.1 wt/mongoose:7.0 wt/mongoose:6.18 wt/mongoose:6.17 wt/mongoose:6.16 wt/mongoose:6.15 wt/mongoose:6.14 wt/mongoose:6.13 wt/mongoose:6.12 wt/mongoose:6.11 wt/mongoose:6.10 wt/mongoose:6.9 wt/mongoose:6.8 wt/mongoose:6.7 wt/mongoose:6.6 wt/mongoose:6.5 wt/mongoose:6.4 wt/mongoose:6.3 wt/mongoose:6.2 wt/mongoose:6.1 wt/mongoose:6.0 wt/mongoose:5.6 wt/mongoose:5.5_20140120 wt/mongoose:5.5 wt/mongoose:5.4 wt/mongoose:5.3 wt/mongoose:5.2 wt/mongoose:5.1 wt/mongoose:5.0 wt/mongoose:4.1 wt/mongoose:4.0 wt/mongoose:3.8 wt/mongoose:3.7 wt/mongoose:3.6 wt/mongoose:3.5 wt/mongoose:3.4 wt/mongoose:3.3 wt/mongoose:3.2
1 Commits
strpres ... dhcp
Author SHA1 Message Date
cpq 69e8c0a92f Fix: DHCP client stuck in REQUESTING state forever if the REQUEST or ACK is lost 2026-10-30 09:42:12 +00:00
3 changed files with 12 additions and 0 deletions
Expand all files Collapse all files

No files matched your search

mongoose.c
+4
View File
@@ -9399,6 +9399,7 @@ static void rx_dhcp_client(struct mg_tcpip_if *ifp, struct pkt *pkt) {
: pkt->dhcp->siaddr ? pkt->dhcp->siaddr : pkt->dhcp->siaddr ? pkt->dhcp->siaddr
: pkt->ip->src); : pkt->ip->src);
ifp->state = MG_TCPIP_STATE_REQ; // REQUESTING state ifp->state = MG_TCPIP_STATE_REQ; // REQUESTING state
ifp->lease_expire = ifp->now + 5000; // No ACK by then: start over
} else if (msgtype == 5) { // DHCPACK } else if (msgtype == 5) { // DHCPACK
if (ifp->state == MG_TCPIP_STATE_REQ && ip && gw && lease) { // got an IP if (ifp->state == MG_TCPIP_STATE_REQ && ip && gw && lease) { // got an IP
uint64_t rand; uint64_t rand;
@@ -10706,6 +10707,9 @@ static void mg_ip_poll(struct mg_tcpip_if *ifp, bool s1) {
if (ifp->enable_dhcp_client && s1) { if (ifp->enable_dhcp_client && s1) {
if (ifp->state == MG_TCPIP_STATE_UP) { if (ifp->state == MG_TCPIP_STATE_UP) {
tx_dhcp_discover(ifp); // INIT (4.4.1) tx_dhcp_discover(ifp); // INIT (4.4.1)
} else if (ifp->state == MG_TCPIP_STATE_REQ &&
ifp->now >= ifp->lease_expire) {
ifp->state = MG_TCPIP_STATE_UP; // REQUEST or ACK lost: DISCOVER again
} else if (ifp->state == MG_TCPIP_STATE_READY && } else if (ifp->state == MG_TCPIP_STATE_READY &&
ifp->lease_expire > 0) { // BOUND / RENEWING / REBINDING ifp->lease_expire > 0) { // BOUND / RENEWING / REBINDING
if (ifp->now >= ifp->lease_expire) { if (ifp->now >= ifp->lease_expire) {
src/net_builtin.c
+4
View File
@@ -734,6 +734,7 @@ static void rx_dhcp_client(struct mg_tcpip_if *ifp, struct pkt *pkt) {
: pkt->dhcp->siaddr ? pkt->dhcp->siaddr : pkt->dhcp->siaddr ? pkt->dhcp->siaddr
: pkt->ip->src); : pkt->ip->src);
ifp->state = MG_TCPIP_STATE_REQ; // REQUESTING state ifp->state = MG_TCPIP_STATE_REQ; // REQUESTING state
ifp->lease_expire = ifp->now + 5000; // No ACK by then: start over
} else if (msgtype == 5) { // DHCPACK } else if (msgtype == 5) { // DHCPACK
if (ifp->state == MG_TCPIP_STATE_REQ && ip && gw && lease) { // got an IP if (ifp->state == MG_TCPIP_STATE_REQ && ip && gw && lease) { // got an IP
uint64_t rand; uint64_t rand;
@@ -2041,6 +2042,9 @@ static void mg_ip_poll(struct mg_tcpip_if *ifp, bool s1) {
if (ifp->enable_dhcp_client && s1) { if (ifp->enable_dhcp_client && s1) {
if (ifp->state == MG_TCPIP_STATE_UP) { if (ifp->state == MG_TCPIP_STATE_UP) {
tx_dhcp_discover(ifp); // INIT (4.4.1) tx_dhcp_discover(ifp); // INIT (4.4.1)
} else if (ifp->state == MG_TCPIP_STATE_REQ &&
ifp->now >= ifp->lease_expire) {
ifp->state = MG_TCPIP_STATE_UP; // REQUEST or ACK lost: DISCOVER again
} else if (ifp->state == MG_TCPIP_STATE_READY && } else if (ifp->state == MG_TCPIP_STATE_READY &&
ifp->lease_expire > 0) { // BOUND / RENEWING / REBINDING ifp->lease_expire > 0) { // BOUND / RENEWING / REBINDING
if (ifp->now >= ifp->lease_expire) { if (ifp->now >= ifp->lease_expire) {
test/mip_test.c
+4
View File
@@ -80,6 +80,10 @@ static void test_statechange(void) {
onstatechange(&iface); onstatechange(&iface);
ASSERT(executed == true); ASSERT(executed == true);
executed = false; executed = false;
iface.enable_dhcp_client = true; // DHCP REQUEST unanswered: start over
iface.state = MG_TCPIP_STATE_REQ, iface.lease_expire = 0;
mg_ip_poll(&iface, true);
ASSERT(iface.state == MG_TCPIP_STATE_UP);
} }
#if MG_ENABLE_IPV6 #if MG_ENABLE_IPV6
static void mif6_fn(struct mg_tcpip_if *ifp, int ev, void *ev_data) { static void mif6_fn(struct mg_tcpip_if *ifp, int ev, void *ev_data) {