Also clamp MSS of TCP over IPv6 packets.

[oweals/tinc.git] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 054a66feb2f5a4a12420227b329364aa08655f14..e5011532629d818062464a244f43de84785f6f91 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -46,10 +46,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#ifdef WSAEMSGSIZE
-#define EMSGSIZE WSAEMSGSIZE
-#endif
-
 int keylifetime = 0;
 int keyexpires = 0;
 static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
@@ -449,14 +445,14 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
        }
 #endif
 
-       if((sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) {
-               if(errno == EMSGSIZE) {
+       if(sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa)) < 0 && !sockwouldblock(sockerrno)) {
+               if(sockmsgsize(sockerrno)) {
                        if(n->maxmtu >= origlen)
                                n->maxmtu = origlen - 1;
                        if(n->mtu >= origlen)
                                n->mtu = origlen - 1;
                } else
-                       logger(LOG_ERR, "Error sending packet to %s (%s): %s", n->name, n->hostname, strerror(errno));
+                       logger(LOG_ERR, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
        }
 
 end:
@@ -562,8 +558,8 @@ void handle_incoming_vpn_data(int sock) {
        pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
        if(pkt.len < 0) {
-               if(errno != EAGAIN && errno != EINTR)
-                       logger(LOG_ERR, "Receiving packet failed: %s", strerror(errno));
+               if(!sockwouldblock(sockerrno))
+                       logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
                return;
        }