projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
65247c0
)
Make sure Solaris is happy too.
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 28 May 2001 08:56:57 +0000
(08:56 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 28 May 2001 08:56:57 +0000
(08:56 +0000)
src/net.c
patch
|
blob
|
history
src/tincd.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index
b0d3cd1
..
2c08dcf
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.1
09 2001/05/28 08:21:43
guus Exp $
+ $Id: net.c,v 1.35.4.1
10 2001/05/28 08:56:57
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-26,7
+26,7
@@
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#if
ndef HAVE_FREEBSD
+#if
def HAVE_LINUX
#include <netinet/ip.h>
#include <netinet/tcp.h>
#endif
#include <netinet/ip.h>
#include <netinet/tcp.h>
#endif
@@
-385,7
+385,7
@@
cp
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
option = 1;
setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#if
ndef HAVE_FREEBSD
+#if
def HAVE_LINUX
setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
@@
-515,7
+515,7
@@
cp
option = 1;
setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
option = 1;
setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#if
ndef HAVE_FREEBSD
+#if
def HAVE_LINUX
setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
diff --git
a/src/tincd.c
b/src/tincd.c
index
318f759
..
94f792c
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: tincd.c,v 1.10.4.4
5 2001/03/01 21:32:04
guus Exp $
+ $Id: tincd.c,v 1.10.4.4
6 2001/05/28 08:56:57
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-333,7
+333,11
@@
main(int argc, char **argv, char **envp)
return 1;
}
return 1;
}
- openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#ifdef HAVE_SOLARIS
+ openlog("tinc", LOG_CONS, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#else
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+#endif
g_argv = argv;
g_argv = argv;