diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-17 13:19:18 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-24 12:12:14 +0200 |
| commit | 925aa14912329bafff38a9e5a3f675809ff97785 (patch) | |
| tree | cc088185f648730978ba6d3eeb72afb9d5420db9 | |
| parent | d6f027ef3474bbc93d06865b0031bb6aae4fc031 (diff) | |
After-master-merge simple fixes.
BSD lib/setkey.h and lib/sysio.h #include fixes.
OpenBSD's flex needs -o param without space.
V6ONLY for SK_IP fix.
| -rw-r--r-- | conf/Makefile | 2 | ||||
| -rw-r--r-- | sysdep/bsd/setkey.h | 2 | ||||
| -rw-r--r-- | sysdep/bsd/sysio.h | 2 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/conf/Makefile b/conf/Makefile index 76fd496a..c1a906e3 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -21,7 +21,7 @@ $(o)cf-parse.tab.c: $(o)cf-parse.y $(BISON) $(BISON_DEBUG) -dv -pcf_ -b $(@:.tab.c=) $< $(o)cf-lex.c: $(s)cf-lex.l - $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o $@ $< + $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o$@ $< $(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h diff --git a/sysdep/bsd/setkey.h b/sysdep/bsd/setkey.h index d0ec6620..3bcd8623 100644 --- a/sysdep/bsd/setkey.h +++ b/sysdep/bsd/setkey.h @@ -11,7 +11,7 @@ #include <netipsec/ipsec.h> #include "nest/bird.h" -#include "lib/unix.h" +#include "sysdep/unix/unix.h" /* diff --git a/sysdep/bsd/sysio.h b/sysdep/bsd/sysio.h index 6c20733f..57c45bcf 100644 --- a/sysdep/bsd/sysio.h +++ b/sysdep/bsd/sysio.h @@ -196,7 +196,7 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen) #if defined(__FreeBSD__) #define USE_MD5SIG_SETKEY -#include "lib/setkey.h" +#include "sysdep/bsd/setkey.h" #endif int diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 48f368a4..5ec728af 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -1253,8 +1253,9 @@ sk_setup(sock *s) if (sk_is_ipv6(s)) { - if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &y, sizeof(y)) < 0) - ERR("IPV6_V6ONLY"); + if (s->type != SK_IP) + if (setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &y, sizeof(y)) < 0) + ERR("IPV6_V6ONLY"); if (s->flags & SKF_LADDR_RX) if (sk_request_cmsg6_pktinfo(s) < 0) |