/*
net_socket.c -- Handle various kinds of sockets.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2014 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2009 Florian Forster <octo@verplant.org>
#endif
int addressfamily = AF_UNSPEC;
+int mintimeout = 0;
int maxtimeout = 900;
int seconds_till_retry = 5;
int udp_rcvbuf = 0;
option = IPTOS_LOWDELAY;
setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option));
#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS) && defined(IPTOS_LOWDELAY)
+ option = IPTOS_LOWDELAY;
+ setsockopt(c->socket, IPPROTO_IPV6, IPV6_TCLASS, (void *)&option, sizeof(option));
+#endif
}
static bool bind_to_interface(int sd) {
option = 1;
setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
}
-#else
-#warning No way to disable IPv4 fragmentation
#endif
#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
option = 1;
setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
}
-#else
-#warning No way to disable IPv6 fragmentation
#endif
if (!bind_to_interface(nfd)) {
void retry_outgoing(outgoing_t *outgoing) {
outgoing->timeout += 5;
+ if(outgoing->timeout < mintimeout)
+ outgoing->timeout = mintimeout;
+
if(outgoing->timeout > maxtimeout)
outgoing->timeout = maxtimeout;
freeaddrinfo(proxyai);
}
+ now = time(NULL);
+
if(result == -1) {
if(sockinprogress(sockerrno)) {
+ c->last_ping_time = now;
c->status.connecting = true;
return;
}