Guus Sliepen [Sun, 13 Aug 2017 14:22:39 +0000 (16:22 +0200)]
Remove debug message.
Guus Sliepen [Sun, 13 Aug 2017 12:48:49 +0000 (14:48 +0200)]
Enable retransmit timer for SYN packets.
Guus Sliepen [Thu, 27 Jul 2017 09:25:50 +0000 (11:25 +0200)]
Call the poll callback with len = 0 on errors.
Guus Sliepen [Mon, 3 Jul 2017 21:16:01 +0000 (23:16 +0200)]
Add UDP semantics.
Basically, never retransmit, and whatever we get we immediately pass up to
the application. The only thing we do handle the TCP way is the FIN packet.
This also introduces the use of the aux entry in the header. We know that
older versions of UTCP ignore this field, and also ignore any extra data
in SYN packets, so we can add anything here in a backwards-compatible way.
Guus Sliepen [Mon, 3 Jul 2017 20:31:50 +0000 (22:31 +0200)]
Introduce utcp_connect_ex().
This takes an extra argument "flags", which can be used to change the type
of connection to create. Possible flags are UTCP_INORDER, UTCP_RELIABLE and
UTCP_FRAMED, which can be bitwise-or'd together, or UTCP_TCP or UTCP_UDP as
shortcuts for what is assumed will be common combinations of those flags.
Guus Sliepen [Sun, 2 Jul 2017 19:35:55 +0000 (21:35 +0200)]
Fix handling packets partially overlapping the start of the receive buffer.
Guus Sliepen [Sun, 2 Jul 2017 13:43:57 +0000 (15:43 +0200)]
Fix handling retransmitted data when the receive buffer is full.
Guus Sliepen [Sun, 2 Jul 2017 12:58:56 +0000 (14:58 +0200)]
Remove two unnecessary calls to abort().
Guus Sliepen [Sun, 2 Jul 2017 12:58:08 +0000 (14:58 +0200)]
Allow test program to compare input to a reference file.
Guus Sliepen [Sun, 2 Jul 2017 10:47:58 +0000 (12:47 +0200)]
Fix compiler warnings.
Guus Sliepen [Thu, 17 Dec 2015 17:07:19 +0000 (18:07 +0100)]
Fix buffer resizing logic in buffer_put_at().
When growing the buffer when it's not big enough for new data, the
current size is doubled repeatedly until it is big enough for the new
data. The required new size is stored in the variable "required",
however the doubling loop exited when the new size was at least
buf->used + len, which might be much smaller than "required" if an
out-of-order packet is received.
Guus Sliepen [Sun, 15 Nov 2015 19:35:30 +0000 (20:35 +0100)]
Only log debug messages in test program when UTCP_DEBUG is defined.
Guus Sliepen [Fri, 30 Oct 2015 22:42:35 +0000 (23:42 +0100)]
Add more debug messages.
Guus Sliepen [Fri, 30 Oct 2015 22:16:47 +0000 (23:16 +0100)]
Ensure utcp_close() works properly on a socket that is in the CLOSED state.
Guus Sliepen [Fri, 30 Oct 2015 22:16:24 +0000 (23:16 +0100)]
Log when dropping packets in the test program.
Guus Sliepen [Sun, 2 Jul 2017 10:13:24 +0000 (12:13 +0200)]
Define USEC_PER_SEC, use "sec" and "usec" in comments.
Guus Sliepen [Thu, 29 Oct 2015 15:36:39 +0000 (16:36 +0100)]
Add debug message when dropping a packet because all SACK entries are used.
Guus Sliepen [Thu, 29 Oct 2015 15:35:16 +0000 (16:35 +0100)]
Clarify description of sack_consume().
Guus Sliepen [Thu, 29 Oct 2015 15:33:45 +0000 (16:33 +0100)]
Make max() an inline function.
Guus Sliepen [Thu, 29 Oct 2015 15:31:17 +0000 (16:31 +0100)]
Don't use ?: without the middle argument.
Guus Sliepen [Thu, 29 Oct 2015 15:26:54 +0000 (16:26 +0100)]
Always check the return value of malloc().
Guus Sliepen [Mon, 19 Oct 2015 20:04:50 +0000 (22:04 +0200)]
Fix bugs in sack_consume() causing data corruption or abort()s.
Put in a lengthy comment with some ASCII-art to describe what we are
actually trying to do in this function.
Guus Sliepen [Mon, 19 Oct 2015 20:03:21 +0000 (22:03 +0200)]
Fix bug in retransmit().
The logic to check whether we actually have something to retransmit was
wrong, causing retransmit() to bail out early without setting or resetting
the timer. This also caused utcp_timeout() to return a negative value.
Guus Sliepen [Mon, 19 Oct 2015 19:18:14 +0000 (21:18 +0200)]
Ensure FIN packets start the retransmission timer as well.
Guus Sliepen [Mon, 19 Oct 2015 19:17:38 +0000 (21:17 +0200)]
Allow setting $DROPFROM without having to specify $DROPTO as well.
Guus Sliepen [Mon, 19 Oct 2015 19:17:06 +0000 (21:17 +0200)]
Simulate packet reordering.
With a configurable chance, delay a packet for a random amount of packets.
Guus Sliepen [Mon, 19 Oct 2015 18:46:27 +0000 (20:46 +0200)]
Fix a memory leak.
The receive buffer was never freed.
Guus Sliepen [Mon, 19 Oct 2015 18:45:31 +0000 (20:45 +0200)]
Make sure all of the packet header is set when retransmitting packets.
Hannes [Thu, 15 Oct 2015 18:35:04 +0000 (20:35 +0200)]
speed up utcp print_packet debug output and print in hex
Hannes [Sat, 17 Oct 2015 13:39:12 +0000 (15:39 +0200)]
handle overlapping packets
# Conflicts:
# utcp.c
Guus Sliepen [Sun, 18 Oct 2015 18:53:55 +0000 (20:53 +0200)]
Send ACKs also when receiving out-of-order data.
This is necessary to trigger the triplicate ACK detection on the sender.
Guus Sliepen [Sun, 18 Oct 2015 18:31:34 +0000 (20:31 +0200)]
Log when we start retransmission.
Guus Sliepen [Sun, 18 Oct 2015 18:31:09 +0000 (20:31 +0200)]
Get rid of an unused label.
Guus Sliepen [Sun, 18 Oct 2015 18:30:48 +0000 (20:30 +0200)]
Fix the logic for determining whether a packets has an acceptable ack seqno.
snd.last accurately tracks the last possible seqno that can be acked, so
use it. This fixes a case where retransmitted ACKs of a FIN were not handled
correctly.
Guus Sliepen [Sun, 18 Oct 2015 18:28:58 +0000 (20:28 +0200)]
Use the calculated RTO value to set the retransmission timer.
This significantly cuts down the time it takes to transfer data when there
is packet loss, because retransmission kicks in much earlier.
Guus Sliepen [Sun, 18 Oct 2015 18:24:50 +0000 (20:24 +0200)]
Measure RTT and calculate RTO.
Opportunistically measure RTT using only a single timer, without requiring
timestamps to be added to packets. Use the method described in RFC 6298 to
smoothly update the value of RTO.
Guus Sliepen [Sun, 18 Oct 2015 18:21:06 +0000 (20:21 +0200)]
Turn magic numbers into #defines.
Guus Sliepen [Sun, 18 Oct 2015 18:19:25 +0000 (20:19 +0200)]
Remove accidentily left #warning.
Guus Sliepen [Sun, 18 Oct 2015 18:18:49 +0000 (20:18 +0200)]
Minor changes in the test program.
- Add one to the timeout in milliseconds, to prevent roundoff errors from
causing us to busy-loop unnecessarily.
- Log what we are polling for and what the timeout is.
Guus Sliepen [Sun, 18 Oct 2015 18:17:13 +0000 (20:17 +0200)]
Improve documentation of retransmission timeout handling.
Guus Sliepen [Sun, 18 Oct 2015 18:15:52 +0000 (20:15 +0200)]
Document difference between snd.nxt and snd.last.
Guus Sliepen [Sun, 18 Oct 2015 11:54:14 +0000 (13:54 +0200)]
Fix a memory leak on invalid invocation of utcp_init().
Guus Sliepen [Sun, 18 Oct 2015 11:53:20 +0000 (13:53 +0200)]
Add a receive buffer.
The receive buffer kicks in the moment we get a packet which is out of order.
We store the packet in the buffer, and keep track of up to 4 ranges of bytes
of received data. When retransmission fills the first gap, we send all the
buffered data (up to the second gap if applicable) to the application.
4 byte ranges seems to be a good value for up to moderate (20%) packet loss.
This algorithm greatly reduces the amount of useless packets being sent.
A future improvement is sending the SACK information in the ACK packets,
so the congestion window can be kept large while avoiding packets being
resent unnecessarily.
Guus Sliepen [Sun, 18 Oct 2015 11:45:16 +0000 (13:45 +0200)]
Fix check for return value of malloc(), allow initially zero length buffer.
Guus Sliepen [Sun, 18 Oct 2015 11:44:43 +0000 (13:44 +0200)]
Allow putting data in a buffer at an arbitrary offset.
Guus Sliepen [Sun, 18 Oct 2015 11:43:53 +0000 (13:43 +0200)]
Fix check for return value of malloc().
Guus Sliepen [Sun, 18 Oct 2015 11:42:36 +0000 (13:42 +0200)]
When debugging, set initial segment seqno to 0.
Guus Sliepen [Sun, 18 Oct 2015 11:41:50 +0000 (13:41 +0200)]
Show total bytes sent/received in test program.
Guus Sliepen [Sun, 11 Oct 2015 21:39:23 +0000 (23:39 +0200)]
Reset the snd.nxt pointer when starting packet retransmission.
When a packet was lost, and the send buffer contains more than two packets,
this only retransmitted the first packet from the send buffer, then when it
got acked it would continue with the tail of the buffer. Then it would have
to wait for another timeout to send the next packet from the start of the
send buffer. If the application is continuously sending data, then the send
buffer would never become empty and the problem would persist.
Guus Sliepen [Sun, 11 Oct 2015 21:35:49 +0000 (23:35 +0200)]
Fix a segfault when debugging is enabled.
Guus Sliepen [Sun, 11 Oct 2015 21:35:14 +0000 (23:35 +0200)]
Log timestamps during the test.
Guus Sliepen [Sun, 11 Oct 2015 21:35:02 +0000 (23:35 +0200)]
Allow dropping a selected range of packets during tests.
Guus Sliepen [Sun, 11 Oct 2015 15:11:13 +0000 (17:11 +0200)]
Add scripts testing filetransfer.
- txttest transfers a file into one direction.
- bidirtest transfers a file both ways simultaneously.
Guus Sliepen [Sun, 11 Oct 2015 15:02:37 +0000 (17:02 +0200)]
Handle direction argument of utcp_shutdown().
For TCP, only shutting down the send direction makes sense, however to
be compatible to the BSD sockets API, keep the direction argument, and
when someone tries to shut down the receive direction, just disable the
receive callback.
Note that on most operating systems, SHUT_RD actually doesn't do
anything at all, it won't prevent reads from returning data.
Also be a bit more strict, return EINVAL or ENOTCONN when appropriate.
Guus Sliepen [Sun, 11 Oct 2015 15:00:17 +0000 (17:00 +0200)]
Define UTCP_SHUT_RD/WR/RDWR.
Don't rely on <sys/socket.h> for the definitions of SHUT_RD/WR/RDWR, add
our own. They should be compatible.
Guus Sliepen [Sun, 11 Oct 2015 14:31:59 +0000 (16:31 +0200)]
Add a function to check for active connections.
If a connection sends data in one way, then the receiver will have shut
down data in the other way, and when the sender is finished he will also
shut down his direction, so the connection looks closed to the sender,
but the receiver might actually still miss the final packets. So UTCP
should keep running until the receiver has received a FINACK and is in the
TIME_WAIT state.
We consider UTCP to be active when there is at least one connection not in
the CLOSED or TIME_WAIT state.
The test program now uses this condition, which allows a transfer of a file
to complete without missing the last few bytes.
Guus Sliepen [Sun, 11 Oct 2015 14:25:31 +0000 (16:25 +0200)]
Allow changing the accept callbacks.
This is used in the test, in order to stop accepting new connections after
the first one.
Guus Sliepen [Sun, 11 Oct 2015 14:21:22 +0000 (16:21 +0200)]
Clarify read/write direction in test program.
Guus Sliepen [Sun, 11 Oct 2015 11:32:55 +0000 (13:32 +0200)]
Use '== -1' to check for errors from functions.
As made obvious by commit
123f53f, the type of ssize_t cannot be trusted
on Windows to actually be signed, so don't use '< 0', as the compiler
will optimize the test away. POSIX also specifies only that -1 signals
an error condition, not any other negative value.
Luckily, comparing an unsigned int to -1 still works as intended.
Guus Sliepen [Wed, 10 Dec 2014 10:11:09 +0000 (11:11 +0100)]
Handle retransmissions in CLOSE_WAIT, CLOSING and LAST_ACK states.
Guus Sliepen [Wed, 10 Dec 2014 10:09:59 +0000 (11:09 +0100)]
Add fin_wanted() function that checks whether a FIN bit should be set on a packet.
Guus Sliepen [Wed, 10 Dec 2014 09:48:02 +0000 (10:48 +0100)]
Call abort() only when debugging is enabled.
Guus Sliepen [Mon, 8 Dec 2014 15:37:24 +0000 (16:37 +0100)]
Guard against NULL pointer dereferencing.
Guus Sliepen [Mon, 8 Dec 2014 15:18:30 +0000 (16:18 +0100)]
Prevent FIN bit from being sent too early.
Due to a logic bug in ack(), the FIN bit could be set on a too early packet,
if utcp_shutdown() was called with a full send buffer.
Guus Sliepen [Mon, 8 Dec 2014 15:17:22 +0000 (16:17 +0100)]
Properly handle arbitrary size files being piped into the test program.
Guus Sliepen [Mon, 8 Dec 2014 15:16:34 +0000 (16:16 +0100)]
utcp_get_sndbuf_free() should return 0 if utcp_send() would fail.
Guus Sliepen [Fri, 5 Dec 2014 21:14:31 +0000 (22:14 +0100)]
Remove unconditional debug messages.
Guus Sliepen [Fri, 5 Dec 2014 21:12:35 +0000 (22:12 +0100)]
Recover from dropped packets after receiving a triplicate ACK.
When this happens, reset the nxt pointer so we start retransmitting from the last acknowledged
packet, at the same speed as ACKs are coming in.
Guus Sliepen [Fri, 5 Dec 2014 21:10:37 +0000 (22:10 +0100)]
Send ACKs without a payload upon receiving an out-of-order packet.
This is necessary so the peer can detect "triplicate ACKs", which signal dropped packets, and at the
same time keeps the TCP self-clocking active.
Guus Sliepen [Fri, 5 Dec 2014 21:08:21 +0000 (22:08 +0100)]
Change utcp_timeout() to return a struct timeval.
This is what MeshLink uses internally as well, and prevents confusion over which units the old int
return value had.
Guus Sliepen [Wed, 3 Dec 2014 12:42:27 +0000 (13:42 +0100)]
Don't call abort() in retransmit().
The retransmission timer can sometimes get called when in one of the
closing states. This is not implemented yet, but it's better to just
ignore those cases for now than to abort().
Guus Sliepen [Tue, 2 Dec 2014 16:14:13 +0000 (17:14 +0100)]
Disable callbacks when closing a connection.
When an application calls utcp_close() on a previously established
connection, the utcp_connection is kept around to handle FIN(ACK)
packets. However, the peer could still send some data, which should not
trigger the receive callback.
Guus Sliepen [Tue, 2 Dec 2014 14:46:06 +0000 (15:46 +0100)]
Remove debugging messages.
Guus Sliepen [Tue, 2 Dec 2014 11:26:57 +0000 (12:26 +0100)]
Fix and refactor send buffer code.
Make generic buffer handling functions and use those. A problem was
found when resizing a buffer; if new data to be put into the buffer was
more than twice as large as the current buffer size, the code would not
reallocate the buffer large enough.
Guus Sliepen [Fri, 31 Oct 2014 16:42:06 +0000 (17:42 +0100)]
Fix free_connection() moving the wrong memory.
Guus Sliepen [Thu, 30 Oct 2014 13:55:07 +0000 (14:55 +0100)]
Only call the poll callback when state is ESTABLISHED or CLOSE_WAIT.
Guus Sliepen [Mon, 27 Oct 2014 08:10:10 +0000 (09:10 +0100)]
Fix retransmit().
Guus Sliepen [Mon, 27 Oct 2014 08:06:52 +0000 (09:06 +0100)]
Don't put a VLA in a struct, C99 does not allow it.
Guus Sliepen [Sat, 25 Oct 2014 23:05:41 +0000 (01:05 +0200)]
Add some missing definitions for Windows.
Guus Sliepen [Wed, 1 Oct 2014 17:18:40 +0000 (19:18 +0200)]
Add a poll callback to UTCP connections.
The callback is called whenever the send buffer of a connection is more
than half empty when utcp_timeout() is called. An argument is passed to
the callee informing him of the maximum number of bytes that will be
accepted when calling utcp_send().
Guus Sliepen [Sat, 13 Sep 2014 15:10:52 +0000 (17:10 +0200)]
Set priv field in utcp_connect().
Guus Sliepen [Tue, 26 Aug 2014 12:34:17 +0000 (14:34 +0200)]
Implement slow start.
Guus Sliepen [Tue, 26 Aug 2014 12:33:19 +0000 (14:33 +0200)]
Various small fixes, clarifications.
Guus Sliepen [Thu, 21 Aug 2014 14:42:12 +0000 (16:42 +0200)]
Fix memory and resource leaks.
Guus Sliepen [Thu, 21 Aug 2014 14:19:09 +0000 (16:19 +0200)]
Set FIN bit in ack().
Guus Sliepen [Sun, 17 Aug 2014 19:54:20 +0000 (21:54 +0200)]
Start implementation of congestion avoidance.
We try to implement RFC 2001.
Guus Sliepen [Sun, 17 Aug 2014 19:53:22 +0000 (21:53 +0200)]
Improve Makefile.
Guus Sliepen [Sun, 17 Aug 2014 19:52:58 +0000 (21:52 +0200)]
Allow debug messages to be compiled out.
Guus Sliepen [Sat, 16 Aug 2014 16:31:06 +0000 (18:31 +0200)]
Add socket option functions names similar to setsockopt()/ioctl() ones.
Guus Sliepen [Sat, 16 Aug 2014 15:48:53 +0000 (17:48 +0200)]
Add a .gitignore file.
Guus Sliepen [Sat, 16 Aug 2014 15:48:50 +0000 (17:48 +0200)]
Move private struct declarations e.a. to utcp_priv.h.
Guus Sliepen [Sat, 16 Aug 2014 15:48:48 +0000 (17:48 +0200)]
Add utcp_set_mtu().
Guus Sliepen [Sat, 16 Aug 2014 15:48:45 +0000 (17:48 +0200)]
Handle FIN_WAIT_1 state when retransmitting.
Guus Sliepen [Sat, 16 Aug 2014 15:48:21 +0000 (17:48 +0200)]
Increase sndbuf when necessary.
Guus Sliepen [Sun, 10 Aug 2014 18:41:32 +0000 (20:41 +0200)]
Redo receive logic.
Guus Sliepen [Sun, 10 Aug 2014 12:19:06 +0000 (14:19 +0200)]
Update README.
Guus Sliepen [Sat, 9 Aug 2014 17:15:22 +0000 (19:15 +0200)]
Allow variable packet loss rates to be set in the test program.
Guus Sliepen [Sat, 9 Aug 2014 17:15:00 +0000 (19:15 +0200)]
Print both incoming and outgoing packets.
Guus Sliepen [Sat, 9 Aug 2014 17:14:38 +0000 (19:14 +0200)]
Update snd.una when receiving an ACK in the SYN_RECEIVED state.
Guus Sliepen [Sat, 9 Aug 2014 16:37:10 +0000 (18:37 +0200)]
Start implementing timeout handling.
- Initial connection timeout (1 minute by default)
- Retransmission of SYN, SYNACK and normal data packets