Merge branch 'master' into samesversion
authorfendo <fendo@bi12info.com>
Thu, 28 Mar 2013 09:29:32 +0000 (10:29 +0100)
committerfendo <fendo@bi12info.com>
Thu, 28 Mar 2013 09:29:32 +0000 (10:29 +0100)
ppp.c

diff --git a/ppp.c b/ppp.c
index c8e128e..cb8512f 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -2241,7 +2241,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                return;
 
        // no spoof
-       if (ipv4 != session[s].ip && memcmp(&config->ipv6_prefix, &ip, 8) && sessionbyipv6(ip) != s)
+       if ((ipv4 != session[s].ip || memcmp(&config->ipv6_prefix, &ip, 8)) && sessionbyipv6(ip) != s)
        {
                char str[INET6_ADDRSTRLEN];
                LOG(5, s, t, "Dropping packet with spoofed IP %s\n",