j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Small fixes to allow correct compilation under FreeBSD (tested with 4.3)

Browse source
This commit is contained in:
Guus Sliepen 2001-05-28 08:21:43 +00:00
parent 4e959ee405
commit 65247c063b
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.108 2001/05/25 11:54:28 guus Exp $
$Id: net.c,v 1.35.4.109 2001/05/28 08:21:43 guus Exp $
*/
#include "config.h"
@ -26,8 +26,10 @@
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
#ifndef HAVE_FREEBSD
#include <netinet/ip.h>
#include <netinet/tcp.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -383,6 +385,7 @@ cp
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
#ifndef HAVE_FREEBSD
setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
@ -397,6 +400,7 @@ cp
return -1;
}
}
#endif
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
@ -511,11 +515,12 @@ cp
option = 1;
setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
#ifndef HAVE_FREEBSD
setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option));
#endif
/* Connect */
a.sin_family = AF_INET;

8
src/route.c
View file

@ -17,12 +17,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: route.c,v 1.1.2.8 2001/05/25 11:54:28 guus Exp $
$Id: route.c,v 1.1.2.9 2001/05/28 08:21:43 guus Exp $
*/
#include "config.h"
#include <netinet/in.h>
#ifdef HAVE_FREEBSD
#include <sys/param.h>
#else
#include <netinet/in.h>
#endif
#include <utils.h>
#include <xalloc.h>
#include <syslog.h>