From: fendo Date: Thu, 28 Mar 2013 09:29:32 +0000 (+0100) Subject: Merge branch 'master' into samesversion X-Git-Tag: 2.2.1-2sames3.8~3 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/58d994f8f4aa2a6465dc9a2f13e7ba8ddf412ec7?ds=sidebyside;hp=-c Merge branch 'master' into samesversion --- 58d994f8f4aa2a6465dc9a2f13e7ba8ddf412ec7 diff --combined ppp.c index c8e128e,bd70e4d..cb8512f --- a/ppp.c +++ b/ppp.c @@@ -5,9 -5,6 +5,9 @@@ #include #include #include +#include +#include + #include "l2tpns.h" #include "constants.h" #include "plugin.h" @@@ -15,7 -12,9 +15,7 @@@ #include "tbf.h" #include "cluster.h" -#ifdef LAC #include "l2tplac.h" -#endif #include "pppoe.h" extern tunnelt *tunnel; @@@ -106,11 -105,13 +106,11 @@@ void processpap(sessionidt s, tunnelid LOG(3, s, t, "PAP login %s/%s\n", user, pass); } -#ifdef LAC if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, user)) { // Creating a tunnel/session has been started return; } -#endif if (session[s].ip || !(r = radiusnew(s))) { @@@ -263,6 -264,7 +263,6 @@@ void processchap(sessionidt s, tunnelid packet.username = calloc(l + 1, 1); memcpy(packet.username, p, l); -#ifdef LAC if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, packet.username)) { free(packet.username); @@@ -270,6 -272,7 +270,6 @@@ // Creating a tunnel/session has been started return; } -#endif run_plugins(PLUGIN_PRE_AUTH, &packet); if (!packet.continue_auth) @@@ -2241,7 -2244,7 +2241,7 @@@ void processipv6in(sessionidt s, tunnel 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",