Skip to content

Tcp fixes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tcp fixes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06d3ec2
Fix handling of option size in received TCP packets
zeldin Aug 1, 2025
0499081
Stop retransmitting packets when everything is ACKed
zeldin Aug 1, 2025
f4f3b40
Fix handing of sequence number on TCP transmit
zeldin Aug 1, 2025
d2d17df
Remove disconnect event prior to completion of handshake
zeldin Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/nwk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ byte_t nwk_tick (byte_t sig)
for_each(_sockets, _sckt) {
if(_sckt->type != SOCKET_TCP) continue; // UDP socket or unused.

if(_sckt->state == _CONNECT) continue; // Not waiting for the peer to ack anything

// if(_sckt->time == 0) continue; // does not have timing requirements.

Expand Down Expand Up @@ -200,14 +201,12 @@ byte_t nwk_tick (byte_t sig)
default:
_sckt->toSend = ACK;
_sckt->time = SOCKET_TIMEOUT(_sckt);
_sckt->timeout = FALSE;
break;
}
if(_sckt->toSend) {
/*
* Force nwk_upstream() to execute.
*/
_sckt->timeout = TRUE;
#ifdef INSTANT_ACK
nwk_upstream(0);
#endif
Expand Down Expand Up @@ -436,6 +435,7 @@ byte_t nwk_upstream (byte_t sig)
if(_sckt->toSend & (SYN | FIN)) seq.d++;
if( (_sckt->toSend & (SYN | ACK)) == (SYN|ACK) ) seq.d++;
_sckt->seq.d = seq.d;
_sckt->timeout = TRUE;
}
}

Expand Down Expand Up @@ -491,7 +491,6 @@ byte_t nwk_upstream (byte_t sig)
eth_packet_send();

_sckt->toSend = 0;
_sckt->timeout = FALSE;
_sckt->time = SOCKET_TIMEOUT(_sckt);

} else {
Expand Down Expand Up @@ -664,9 +663,10 @@ void nwk_downstream(void)
* Check flags.
*/
_flags = 0;
// XXX - Assumes no TCP options! Fix!
// Like it is now, it can't communicate to another instance of itself!
data_size -= 40;
// XXX Correct buffer offset processing to handle variable
// header lengths
data_ofs=((IPH(ver_length)&0x0f)<<2)+((TCPH(hlen)>>4)<<2);
data_size -= data_ofs;


// No data to return, unless we discover otherwise
Expand Down Expand Up @@ -752,9 +752,6 @@ void nwk_downstream(void)
*/

if(data_size > _sckt->rx_size) data_size = _sckt->rx_size;
// XXX Correct buffer offset processing to handle variable
// header lengths
data_ofs=((IPH(ver_length)&0x0f)<<2)+((TCPH(hlen)>>4)<<2);

if (rel_sequence.d>_sckt->rx_size
|| rel_sequence.d+data_size>_sckt->rx_size) {
Expand Down Expand Up @@ -1002,7 +999,7 @@ void nwk_downstream(void)
#endif
_sckt->state = _FIN_REC;
_sckt->toSend = ACK | FIN;
ev = WEEIP_EV_DISCONNECT; // TESTE
// ev = WEEIP_EV_DISCONNECT; // TESTE
break;
}

Expand Down
1 change: 1 addition & 0 deletions src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ socket_send
_sckt->tx_size = size;
_sckt->toSend = ACK | PSH;
_sckt->retry = RETRIES_TCP;
_sckt->timeout = FALSE;
task_cancel(nwk_upstream);
task_add(nwk_upstream, 0, 0,"upstream");
return TRUE;
Expand Down