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

Merge branch 'master' of github.com:cesanta/mongoose

Browse Source
This commit is contained in:
cpq 2023-07-18 17:47:02 +01:00
commit e1c91b5763
3 changed files with 173 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mongoose.c
View File

@ -8142,9 +8142,11 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
if (s->ack == ack) {
MG_VERBOSE(("ignoring duplicate pkt"));
} else {
// TODO(cpq): peer sent us SEQ which we don't expect. Retransmit
// rather than close this connection
mg_error(c, "SEQ != ACK: %x %x %x", seq, s->ack, ack);
uint32_t rem_ip;
memcpy(&rem_ip, c->rem.ip, sizeof(uint32_t));
MG_DEBUG(("SEQ != ACK: %x %x %x", seq, s->ack, ack));
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, s->mac, rem_ip, TH_ACK, c->loc.port,
c->rem.port, mg_htonl(s->seq), mg_htonl(s->ack), "", 0);
}
} else if (io->size - io->len < pkt->pay.len &&
!mg_iobuf_resize(io, io->len + pkt->pay.len)) {
@ -8163,8 +8165,10 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
s->ack = (uint32_t) (mg_htonl(pkt->tcp->seq) + pkt->pay.len);
#if 0
// Send ACK immediately
uint32_t rem_ip;
memcpy(&rem_ip, c->rem.ip, sizeof(uint32_t));
MG_DEBUG((" imm ACK", c->id, mg_htonl(pkt->tcp->seq), s->ack));
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, c->rem.ip, TH_ACK, c->loc.port,
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, s->mac, rem_ip, TH_ACK, c->loc.port,
c->rem.port, mg_htonl(s->seq), mg_htonl(s->ack), "", 0);
#else
// if not already running, setup a timer to send an ACK later

12
src/tcpip/tcpip.c
View File

@ -579,9 +579,11 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
if (s->ack == ack) {
MG_VERBOSE(("ignoring duplicate pkt"));
} else {
// TODO(cpq): peer sent us SEQ which we don't expect. Retransmit
// rather than close this connection
mg_error(c, "SEQ != ACK: %x %x %x", seq, s->ack, ack);
uint32_t rem_ip;
memcpy(&rem_ip, c->rem.ip, sizeof(uint32_t));
MG_DEBUG(("SEQ != ACK: %x %x %x", seq, s->ack, ack));
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, s->mac, rem_ip, TH_ACK, c->loc.port,
c->rem.port, mg_htonl(s->seq), mg_htonl(s->ack), "", 0);
}
} else if (io->size - io->len < pkt->pay.len &&
!mg_iobuf_resize(io, io->len + pkt->pay.len)) {
@ -600,8 +602,10 @@ static void read_conn(struct mg_connection *c, struct pkt *pkt) {
s->ack = (uint32_t) (mg_htonl(pkt->tcp->seq) + pkt->pay.len);
#if 0
// Send ACK immediately
uint32_t rem_ip;
memcpy(&rem_ip, c->rem.ip, sizeof(uint32_t));
MG_DEBUG((" imm ACK", c->id, mg_htonl(pkt->tcp->seq), s->ack));
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, c->rem.ip, TH_ACK, c->loc.port,
tx_tcp((struct mg_tcpip_if *) c->mgr->priv, s->mac, rem_ip, TH_ACK, c->loc.port,
c->rem.port, mg_htonl(s->seq), mg_htonl(s->ack), "", 0);
#else
// if not already running, setup a timer to send an ACK later

157
test/mip_test.c
View File

@ -48,9 +48,166 @@ static void test_poll(void) {
mg_mgr_free(&mgr);
}
#define DRIVER_BUF_SIZE 1540
struct driver_data {
char buf[DRIVER_BUF_SIZE];
size_t len;
bool tx_ready; // data can be read from tx
};
static struct driver_data s_driver_data;
static size_t if_tx(const void *buf, size_t len, struct mg_tcpip_if *ifp) {
struct driver_data *driver_data = (struct driver_data *) ifp->driver_data;
if (len > DRIVER_BUF_SIZE) len = DRIVER_BUF_SIZE;
driver_data->len = len;
memcpy(driver_data->buf, buf, len);
driver_data->tx_ready = true;
return len;
}
static bool if_up(struct mg_tcpip_if *ifp) {
return ifp->driver_data ? true : false;
}
static size_t if_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) {
struct driver_data *driver_data = (struct driver_data *) ifp->driver_data;
if (!driver_data->len) return 0;
if (len > driver_data->len) len = driver_data->len;
memcpy(buf, driver_data->buf, len);
driver_data->len = 0; // cleaning up the buffer
return len;
}
static bool received_response(struct driver_data *driver) {
bool was_ready = driver->tx_ready;
driver->tx_ready = false;
return was_ready;
}
static void create_tcp_pkt(struct eth *e, struct ip *ip, uint32_t seq,
uint32_t ack, uint8_t flags, size_t payload_len) {
struct tcp t;
memset(&t, 0, sizeof(struct tcp));
t.flags = flags;
t.seq = mg_htonl(seq);
t.ack = mg_htonl(ack);
t.off = 5 << 4;
memcpy(s_driver_data.buf, e, sizeof(*e));
memcpy(s_driver_data.buf + sizeof(*e), ip, sizeof(*ip));
memcpy(s_driver_data.buf + sizeof(*e) + sizeof(*ip), &t, sizeof(struct tcp));
s_driver_data.len = sizeof(*e) + sizeof(*ip)
+ sizeof(struct tcp) + payload_len;
}
static void test_retransmit(void) {
struct mg_mgr mgr;
struct eth e;
struct ip ip;
struct tcp *t;
uint64_t start, now;
bool response_recv = true;
struct mg_tcpip_driver driver;
struct mg_tcpip_if mif;
struct mg_connection *c;
mg_mgr_init(&mgr);
memset(&mif, 0, sizeof(mif));
memset(&s_driver_data, 0, sizeof(struct driver_data));
driver.init = NULL, driver.tx = if_tx, driver.up = if_up, driver.rx = if_rx;
mif.driver = &driver;
mif.driver_data = &s_driver_data;
mg_tcpip_init(&mgr, &mif);
c = mg_alloc_conn(&mgr); // create dummy connection
LIST_ADD_HEAD(struct mg_connection, &mgr.conns, c);
c->is_listening = 1;
mg_mgr_poll(&mgr, 0);
// setting the Ethernet header
memset(&e, 0, sizeof(e));
memcpy(e.dst, mif.mac, 6 * sizeof(uint8_t));
e.type = mg_htons(0x800);
// setting the IP header
memset(&ip, 0, sizeof(ip));
ip.ver = 4 << 4, ip.proto = 6;
ip.len = mg_htons(sizeof(ip) + sizeof(struct tcp));
// SYN
create_tcp_pkt(&e, &ip, 1000, 0, TH_SYN | TH_ACK, 0);
mg_mgr_poll(&mgr, 0);
// SYN-ACK
while(!received_response(&s_driver_data)) mg_mgr_poll(&mgr, 0);
t = (struct tcp *) (s_driver_data.buf + sizeof(struct eth) +
sizeof(struct ip));
ASSERT((t->flags == (TH_SYN | TH_ACK)));
ASSERT((t->ack == mg_htonl(1001)));
// ACK
create_tcp_pkt(&e, &ip, 1001, 1, TH_ACK, 0);
mg_mgr_poll(&mgr, 0);
// packet with seq_no = 1001
ip.len =
mg_htons(sizeof(struct ip) + sizeof(struct tcp) + /* TCP Payload */ 1);
create_tcp_pkt(&e, &ip, 1001, 1, TH_PUSH | TH_ACK, 1);
mg_mgr_poll(&mgr, 0);
while(!received_response(&s_driver_data)) mg_mgr_poll(&mgr, 0);
t = (struct tcp *) (s_driver_data.buf + sizeof(struct eth) +
sizeof(struct ip));
ASSERT((t->flags == TH_ACK));
ASSERT((t->ack == mg_htonl(1002))); // OK
// resend packet with seq_no = 1001 (e.g.: MIP ACK lost)
create_tcp_pkt(&e, &ip, 1001, 1, TH_PUSH | TH_ACK, 1);
mg_mgr_poll(&mgr, 0);
start = mg_millis();
while(!received_response(&s_driver_data)) {
mg_mgr_poll(&mgr, 0);
now = mg_millis() - start;
// we wait enough time for a reply
if (now > 2 * MIP_TCP_ACK_MS) {
response_recv = false;
break;
}
}
ASSERT((!response_recv)); // replies should not be sent for duplicate packets
// packet with seq_no = 1002 got lost/delayed, send seq_no = 1003
create_tcp_pkt(&e, &ip, 1003, 1, TH_PUSH | TH_ACK, 1);
mg_mgr_poll(&mgr, 0);
start = mg_millis();
while(!received_response(&s_driver_data)) {
mg_mgr_poll(&mgr, 0);
now = mg_millis() - start;
if (now > 2 * MIP_TCP_ACK_MS)
ASSERT(0); // response should have been received by now
}
t = (struct tcp *) (s_driver_data.buf + sizeof(struct eth) +
sizeof(struct ip));
ASSERT((t->flags == TH_ACK));
ASSERT((t->ack == mg_htonl(1002))); // dup ACK
// retransmitting packet with seq_no = 1002
create_tcp_pkt(&e, &ip, 1002, 1, TH_PUSH | TH_ACK, 1);
mg_mgr_poll(&mgr, 0);
while(!received_response(&s_driver_data)) mg_mgr_poll(&mgr, 0);
t = (struct tcp *) (s_driver_data.buf + sizeof(struct eth) +
sizeof(struct ip));
ASSERT((t->flags == TH_ACK));
ASSERT((t->ack == mg_htonl(1003))); // OK
s_driver_data.len = 0;
mg_mgr_free(&mgr);
mg_tcpip_free(&mif);
}
int main(void) {
test_statechange();
test_poll();
test_retransmit();
printf("SUCCESS. Total tests: %d\n", s_num_tests);
return 0;
}