mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-10 16:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #34426: tcp_zero_window_probe() transmits incorrect byte value when pcb->unacked != NULL

Browse Source
This commit is contained in:
Simon Goldschmidt 2011-10-09 20:11:33 +02:00
parent 9d31401d47
commit f29bdd21a7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -69,6 +69,10 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2011-10-09: Simon Goldschmidt
* tcp_out.c: fixed bug #34426: tcp_zero_window_probe() transmits incorrect
byte value when pcb->unacked != NULL
2011-10-09: Simon Goldschmidt 2011-10-09: Simon Goldschmidt
* ip4.c: fixed bug #34447 LWIP_IP_ACCEPT_UDP_PORT(dst_port) wrong * ip4.c: fixed bug #34447 LWIP_IP_ACCEPT_UDP_PORT(dst_port) wrong

6
src/core/tcp_out.c
View File

@ -1456,9 +1456,11 @@ tcp_zero_window_probe(struct tcp_pcb *pcb)
TCPH_FLAGS_SET(tcphdr, TCP_ACK | TCP_FIN); TCPH_FLAGS_SET(tcphdr, TCP_ACK | TCP_FIN);
} else { } else {
/* Data segment, copy in one byte from the head of the unacked queue */ /* Data segment, copy in one byte from the head of the unacked queue */
struct tcp_hdr *thdr = (struct tcp_hdr *)seg->p->payload;
char *d = ((char *)p->payload + TCP_HLEN); char *d = ((char *)p->payload + TCP_HLEN);
pbuf_copy_partial(seg->p, d, 1, TCPH_HDRLEN(thdr) * 4); /* Depending on whether the segment has already been sent (unacked) or not
(unsent), seg->p->payload points to the IP header or TCP header.
Ensure we copy the first TCP data byte: */
pbuf_copy_partial(seg->p, d, 1, seg->p->tot_len - seg->len);
} }
#if CHECKSUM_GEN_TCP #if CHECKSUM_GEN_TCP