summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-03-04 11:13:14 +0000
committerChristian Pointner <equinox@anytun.org>2009-03-04 11:13:14 +0000
commitf9363450a3fcb3f3460f4458a193988ca6695683 (patch)
tree99ca4880a28c6255159ae9177b46a81e02ce0796
parentupdated manpage and usage info (diff)
fixed build on FreeBSD
-rw-r--r--README6
-rw-r--r--src/Makefile2
-rwxr-xr-xsrc/configure2
-rw-r--r--src/plain_packet.c1
-rw-r--r--src/sig_handler.c (renamed from src/signal.c)2
-rw-r--r--src/sig_handler.h (renamed from src/signal.h)4
-rw-r--r--src/uanytun.c2
7 files changed, 10 insertions, 9 deletions
diff --git a/README b/README
index 9e4cdf4..a5bc7ee 100644
--- a/README
+++ b/README
@@ -19,8 +19,8 @@ using ssl crypto library:
libssl-dev
-OpenBSD
--------
+OpenBSD/FreeBSD
+---------------
using libgcrypt:
@@ -61,7 +61,7 @@ Notes:
- if using openssl pre 0.9.8 you have to disable passphrase
because openssl had no SHA256 implementation prior to this
version
- - on OpenBSD you have to use gmake instead of make
+ - on OpenBSD/FreeBSD you have to use gmake instead of make
Installing
diff --git a/src/Makefile b/src/Makefile
index 42f1aff..358c612 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ CRYPT_OBJ := key_derivation.o \
auth_algo.o
OBJ := log.o \
string_list.o \
- signal.o \
+ sig_handler.o \
options.o \
tun.o \
udp.o \
diff --git a/src/configure b/src/configure
index 2112aa8..9d13a5b 100755
--- a/src/configure
+++ b/src/configure
@@ -119,7 +119,7 @@ case $TARGET in
echo "loading BSD specific TUN Device"
CFLAGS=$CFLAGS' -I/usr/local/include'
LDFLAGS=$LDFLAGS' -L/usr/local/lib'
- if [ "$TARGET" == 'OpenBSD' ]; then
+ if [ "x$TARGET" = "xOpenBSD" ]; then
V4_MAPPED=0
fi
;;
diff --git a/src/plain_packet.c b/src/plain_packet.c
index 469f412..1d7ba2b 100644
--- a/src/plain_packet.c
+++ b/src/plain_packet.c
@@ -38,6 +38,7 @@
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
diff --git a/src/signal.c b/src/sig_handler.c
index 01ec5d5..6fd4b85 100644
--- a/src/signal.c
+++ b/src/sig_handler.c
@@ -35,8 +35,8 @@
#include "datatypes.h"
#include "log.h"
-#include "signal.h"
#include <signal.h>
+#include "sig_handler.h"
volatile sig_atomic_t signal_exit = 0;
diff --git a/src/signal.h b/src/sig_handler.h
index 70dc1e6..a7779be 100644
--- a/src/signal.h
+++ b/src/sig_handler.h
@@ -32,8 +32,8 @@
* along with uAnytun. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SIGNAL_H_
-#define _SIGNAL_H_
+#ifndef _SIG_HANDLER_H_
+#define _SIG_HANDLER_H_
#include <signal.h>
diff --git a/src/uanytun.c b/src/uanytun.c
index 83b16bb..396903d 100644
--- a/src/uanytun.c
+++ b/src/uanytun.c
@@ -40,7 +40,7 @@
#include <errno.h>
#include "log.h"
-#include "signal.h"
+#include "sig_handler.h"
#include "options.h"
#include "tun.h"