Fix ARP handling with UDP #2905
Merged
+56
−32
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scaprile
commented
Sep 24, 2024
Comment on lines
-4934
to
4935
| #define MIP_TCP_ARP_MS 100 // Timeout for ARP response | ||
| #define MIP_ARP_RESP_MS 100 // Timeout for ARP response | ||
| #define MIP_TCP_SYN_MS 15000 // Timeout for connection establishment |
There was a problem hiding this comment.
The name itself induced the error...
scaprile
commented
Sep 24, 2024
Comment on lines
-5287
to
-5288
| send_syn(c); | ||
| settmout(c, MIP_TTYPE_SYN); |
There was a problem hiding this comment.
UDP ARP lookup was causing bogus TCP SYNs
scaprile
commented
Sep 24, 2024
| @@ -5869,18 +5870,20 @@ static void mg_tcpip_poll(struct mg_tcpip_if *ifp, uint64_t now) { | |||
|
|
|||
| // Process timeouts | |||
| for (c = ifp->mgr->conns; c != NULL; c = c->next) { | |||
| if (c->is_udp || c->is_listening || c->is_resolving) continue; | |||
| if ((c->is_udp && !c->is_arplooking) || c->is_listening || c->is_resolving) continue; | |||
| struct connstate *s = (struct connstate *) (c + 1); | |||
There was a problem hiding this comment.
ARP lookups never timed out for UDP
scaprile
commented
Sep 24, 2024
Comment on lines
+5878
to
+5881
| if (s->ttype == MIP_TTYPE_ARP) { | ||
| mg_error(c, "ARP timeout"); | ||
| } else if (c->is_udp) { | ||
| continue; |
There was a problem hiding this comment.
First check for ARP and then exit if UDP
scaprile
commented
Sep 24, 2024
| static void mac_resolved(struct mg_connection *c) { | ||
| if (c->is_udp) { | ||
| c->is_connecting = 0; | ||
| mg_call(c, MG_EV_CONNECT, NULL); |
There was a problem hiding this comment.
MG_EV_CONNECT was being fired for UDP connections only for remote hosts, when the destination MAC was set as the gateway MAC
is_connect wasn't being cleared either
scaprile
commented
Sep 24, 2024
Comment on lines
+6086
to
+6088
| } else if (c->is_udp && (c->is_arplooking || c->is_resolving)) { | ||
| // Fail to send, no target MAC or IP | ||
| MG_VERBOSE(("still resolving...")); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.