fix IPCP length test to allow Terminate-Request (4 bytes)

diff --git a/Changes b/Changes
index 75c50bf..bbb16bd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+* Mon Mar 27 2006 Brendan O'Dea <bod@optus.net> 2.1.17
+- Fix IPCP length test to allow Terminate-Request (4 bytes).
+

 * Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16
 - Send configured magic-no in LCP EchoReq when LCP is opened.
 - Correct addition of single IP to pool (Jonathan Yarden).
 * Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16
 - Send configured magic-no in LCP EchoReq when LCP is opened.
 - Correct addition of single IP to pool (Jonathan Yarden).

diff --git a/l2tpns.h b/l2tpns.h
index 0bc90ab..0fa5ac4 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.109 2005-12-20 04:57:16 bodea Exp $
+// $Id: l2tpns.h,v 1.110 2006-03-27 03:01:08 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.1.16"
+#define VERSION        "2.1.17"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535

diff --git a/l2tpns.spec b/l2tpns.spec
index ec4d17c..8a56285 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -1,6 +1,6 @@
 Summary: A high-speed clustered L2TP LNS
 Name: l2tpns
 Summary: A high-speed clustered L2TP LNS
 Name: l2tpns

-Version: 2.1.16
+Version: 2.1.17

 Release: 1
 License: GPL
 Group: System Environment/Daemons
 Release: 1
 License: GPL
 Group: System Environment/Daemons


@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog

-* Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16-1
-- 2.1.16 release, see /usr/share/doc/l2tpns-2.1.16/Changes
+* Mon Mar 27 2006 Brendan O'Dea <bod@optus.net> 2.1.17-1
+- 2.1.17 release, see /usr/share/doc/l2tpns-2.1.17/Changes

diff --git a/ppp.c b/ppp.c
index 4fe4f6a..3584fe4 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
 // L2TPNS PPP Stuff
 

-char const *cvs_id_ppp = "$Id: ppp.c,v 1.96 2006-02-17 15:05:14 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.97 2006-03-27 03:01:08 bodea Exp $";

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -967,7 +967,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        CSTAT(processipcp);
 
        LOG_HEX(5, "IPCP", p, l);
        CSTAT(processipcp);
 
        LOG_HEX(5, "IPCP", p, l);

-       if (l < 5)
+       if (l < 4)

        {
                LOG(1, s, t, "Short IPCP %d bytes\n", l);
                STAT(tunnel_rx_errors);
        {
                LOG(1, s, t, "Short IPCP %d bytes\n", l);
                STAT(tunnel_rx_errors);