izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix object sizing for PMTUD setsockopt() and recvmsg().

Browse Source 
Also cleans up other setsockopt() calls, and buffer sizing/handling
for recvmsg().

These are minor errors and no actual misbehavior was observed.
Discovered while working Windows Subsystem for Linux compatibility
issues.
This commit is contained in:
John Hood
2016-08-16 00:12:33 -04:00
parent 4ad131a55d
commit c599987ff8
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/network.cc
+8 -10
View File
@@ -157,24 +157,22 @@ Connection::Socket::Socket( int family )
/* Disable path MTU discovery */ /* Disable path MTU discovery */
#ifdef HAVE_IP_MTU_DISCOVER #ifdef HAVE_IP_MTU_DISCOVER
char flag = IP_PMTUDISC_DONT; int flag = IP_PMTUDISC_DONT;
socklen_t optlen = sizeof( flag ); if ( setsockopt( _fd, IPPROTO_IP, IP_MTU_DISCOVER, &flag, sizeof flag ) < 0 ) {
if ( setsockopt( _fd, IPPROTO_IP, IP_MTU_DISCOVER, &flag, optlen ) < 0 ) {
throw NetworkException( "setsockopt", errno ); throw NetworkException( "setsockopt", errno );
} }
#endif #endif
// int dscp = 0x92; /* OS X does not have IPTOS_DSCP_AF42 constant */ // int dscp = 0x92; /* OS X does not have IPTOS_DSCP_AF42 constant */
int dscp = 0x02; /* ECN-capable transport only */ int dscp = 0x02; /* ECN-capable transport only */
if ( setsockopt( _fd, IPPROTO_IP, IP_TOS, &dscp, sizeof (dscp)) < 0 ) { if ( setsockopt( _fd, IPPROTO_IP, IP_TOS, &dscp, sizeof dscp ) < 0 ) {
// perror( "setsockopt( IP_TOS )" ); // perror( "setsockopt( IP_TOS )" );
} }
/* request explicit congestion notification on received datagrams */ /* request explicit congestion notification on received datagrams */
#ifdef HAVE_IP_RECVTOS #ifdef HAVE_IP_RECVTOS
int tosflag = true; int tosflag = true;
socklen_t tosoptlen = sizeof( tosflag ); if ( setsockopt( _fd, IPPROTO_IP, IP_RECVTOS, &tosflag, sizeof tosflag ) < 0 ) {
if ( setsockopt( _fd, IPPROTO_IP, IP_RECVTOS, &tosflag, tosoptlen ) < 0 ) {
/* FreeBSD disallows this option on IPv6 sockets. */ /* FreeBSD disallows this option on IPv6 sockets. */
if ( family == IPPROTO_IP ) { if ( family == IPPROTO_IP ) {
perror( "setsockopt( IP_RECVTOS )" ); perror( "setsockopt( IP_RECVTOS )" );
@@ -474,18 +472,18 @@ string Connection::recv_one( int sock_to_recv, bool nonblocking )
char msg_control[ Session::RECEIVE_MTU ]; char msg_control[ Session::RECEIVE_MTU ];
/* receive source address */ /* receive source address */
header.msg_name = &packet_remote_addr.sa; header.msg_name = &packet_remote_addr;
header.msg_namelen = sizeof( packet_remote_addr ); header.msg_namelen = sizeof packet_remote_addr;
/* receive payload */ /* receive payload */
msg_iovec.iov_base = msg_payload; msg_iovec.iov_base = msg_payload;
msg_iovec.iov_len = Session::RECEIVE_MTU; msg_iovec.iov_len = sizeof msg_payload;
header.msg_iov = &msg_iovec; header.msg_iov = &msg_iovec;
header.msg_iovlen = 1; header.msg_iovlen = 1;
/* receive explicit congestion notification */ /* receive explicit congestion notification */
header.msg_control = msg_control; header.msg_control = msg_control;
header.msg_controllen = Session::RECEIVE_MTU; header.msg_controllen = sizeof msg_control;
/* receive flags */ /* receive flags */
header.msg_flags = 0; header.msg_flags = 0;