3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-27 06:51:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1704 from cesanta/acknow

Browse Source 
Re-enable sending ACKs until proper mechanism is in place
This commit is contained in:
Sergey Lyubka 2022-09-03 07:46:43 +01:00 committed by GitHub
commit a113e344a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mip/mip.c
View File

@ -531,7 +531,7 @@ static struct mg_connection *accept_conn(struct mg_connection *lsn,
return c;
}
static void read_conn(struct mg_connection *c, struct pkt *pkt) {
static bool read_conn(struct mg_connection *c, struct pkt *pkt) {
struct tcpstate *s = (struct tcpstate *) (c + 1);
if (pkt->tcp->flags & TH_FIN) {
s->ack = mg_htonl(pkt->tcp->seq) + 1, s->seq = mg_htonl(pkt->tcp->ack);
@ -548,12 +548,9 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
c->recv.len += pkt->pay.len;
struct mg_str evd = mg_str_n((char *) pkt->pay.buf, pkt->pay.len);
mg_call(c, MG_EV_READ, &evd);
#if 0
// Send ACK immediately
tx_tcp(ifp, c->rem.ip, TH_ACK, c->loc.port, c->rem.port, mg_htonl(s->seq),
mg_htonl(s->ack), NULL, 0);
#endif
return true;
}
return false;
}
static void rx_tcp(struct mip_if *ifp, struct pkt *pkt) {
@ -575,7 +572,14 @@ static void rx_tcp(struct mip_if *ifp, struct pkt *pkt) {
mg_ntohl(pkt->ip->dst), mg_ntohs(pkt->tcp->dport)));
mg_hexdump(pkt->pay.buf, pkt->pay.len);
#endif
read_conn(c, pkt);
if(read_conn(c, pkt)) {
// Send ACK immediately, no piggyback yet
// TODO() Set a timer and send ACK if timer expires and no segment was sent ?
// (clear timer on segment sent)
struct tcpstate *s = (struct tcpstate *) (c + 1);
tx_tcp(ifp, c->rem.ip, TH_ACK, c->loc.port, c->rem.port, mg_htonl(s->seq),
mg_htonl(s->ack), NULL, 0);
}
} else if ((c = getpeer(ifp->mgr, pkt, true)) == NULL) {
tx_tcp_pkt(ifp, pkt, TH_RST | TH_ACK, pkt->tcp->ack, NULL, 0);
} else if (pkt->tcp->flags & TH_SYN) {

18
mongoose.c
View File

@ -6815,7 +6815,7 @@ static struct mg_connection *accept_conn(struct mg_connection *lsn,
return c;
}
static void read_conn(struct mg_connection *c, struct pkt *pkt) {
static bool read_conn(struct mg_connection *c, struct pkt *pkt) {
struct tcpstate *s = (struct tcpstate *) (c + 1);
if (pkt->tcp->flags & TH_FIN) {
s->ack = mg_htonl(pkt->tcp->seq) + 1, s->seq = mg_htonl(pkt->tcp->ack);
@ -6832,12 +6832,9 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
c->recv.len += pkt->pay.len;
struct mg_str evd = mg_str_n((char *) pkt->pay.buf, pkt->pay.len);
mg_call(c, MG_EV_READ, &evd);
#if 0
// Send ACK immediately
tx_tcp(ifp, c->rem.ip, TH_ACK, c->loc.port, c->rem.port, mg_htonl(s->seq),
mg_htonl(s->ack), NULL, 0);
#endif
return true;
}
return false;
}
static void rx_tcp(struct mip_if *ifp, struct pkt *pkt) {
@ -6859,7 +6856,14 @@ static void rx_tcp(struct mip_if *ifp, struct pkt *pkt) {
mg_ntohl(pkt->ip->dst), mg_ntohs(pkt->tcp->dport)));
mg_hexdump(pkt->pay.buf, pkt->pay.len);
#endif
read_conn(c, pkt);
if(read_conn(c, pkt)) {
// Send ACK immediately, no piggyback yet
// TODO() Set a timer and send ACK if timer expires and no segment was sent ?
// (clear timer on segment sent)
struct tcpstate *s = (struct tcpstate *) (c + 1);
tx_tcp(ifp, c->rem.ip, TH_ACK, c->loc.port, c->rem.port, mg_htonl(s->seq),
mg_htonl(s->ack), NULL, 0);
}
} else if ((c = getpeer(ifp->mgr, pkt, true)) == NULL) {
tx_tcp_pkt(ifp, pkt, TH_RST | TH_ACK, pkt->tcp->ack, NULL, 0);
} else if (pkt->tcp->flags & TH_SYN) {