tinc devel - Jan 2006 - [PATCH] tcp options fix

Attached is a patch that corrects two problems with TCP options:

* The options on accepted sockets don't inherit from the listen  
socket, at least on Linux and OS X.
* OS X doesn't have SOL_TCP defined, so Nagle was not getting  
disabled. IPPROTO_TCP should always be the same thing.

This patch makes my ping times across a TCP VPN go from ~180 ms to  
~85ms.

Something still doesn't seem right, though. When I do a ping, I see  
five packets. I would have expected three (ping, pong + ack if there  
wasn't one, ack). Why the double send each way?

23:00:44.063609 IP 192.168.1.105.49588 > 216.136.66.56.655: P  
689862950:689862956(6) ack 679331700 win 65535 <nop,nop,timestamp  
1983522451 179617421>
23:00:44.064206 IP 192.168.1.105.49588 > 216.136.66.56.655: P 6:104 
(98) ack 1 win 65535 <nop,nop,timestamp 1983522451 179617421>
23:00:44.142247 IP 216.136.66.56.655 > 192.168.1.105.49588: P 1:7(6)  
ack 104 win 7504 <nop,nop,timestamp 179623247 1983522451>
23:00:44.143676 IP 216.136.66.56.655 > 192.168.1.105.49588: P 7:105 
(98) ack 104 win 7504 <nop,nop,timestamp 179623247 1983522451>
23:00:44.236028 IP 192.168.1.105.49588 > 216.136.66.56.655: . ack 105  
win 65535 <nop,nop,timestamp 1983522451 179623247>

Regards,
Scott

On Jan 10, 2006, at 11:08 PM, Scott Lamb wrote:
> Attached is a patch that corrects two problems with TCP options:
Oops. This time with the patch.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: tinc-tcp.patch
Type: application/octet-stream
Size: 3375 bytes
Desc: not available
Url :
http://brouwer.uvt.nl/pipermail/tinc-devel/attachments/20060110/9e42f9bc/tinc-tcp.obj
-------------- next part --------------

And the other problem I noticed - the extra packet each way - seems  
to be that send_tcppacket does two writes - one through send_request,  
one directly through send_meta. I see a comment "/* Evil hack. */" in
there. Is this what it's referring to?

Regards,
Scott