welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Brendan O'Dea 2006-03-27 03:01:08 +00:00
parent b4ca67c68b
commit be9795fce9
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

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

4
l2tpns.h
View file

@ -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__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -14,7 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <libcli.h> #include <libcli.h>
#define VERSION "2.1.16" #define VERSION "2.1.17"
// Limits // Limits
#define MAXTUNNEL 500 // could be up to 65535 #define MAXTUNNEL 500 // could be up to 65535

6
l2tpns.spec
View file

@ -1,6 +1,6 @@
Summary: A high-speed clustered L2TP LNS Summary: A high-speed clustered L2TP LNS
Name: l2tpns Name: l2tpns
Version: 2.1.16 Version: 2.1.17
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Thu Feb 23 2006 Brendan O'Dea <bod@optus.net> 2.1.16-1 * Mon Mar 27 2006 Brendan O'Dea <bod@optus.net> 2.1.17-1
- 2.1.16 release, see /usr/share/doc/l2tpns-2.1.16/Changes - 2.1.17 release, see /usr/share/doc/l2tpns-2.1.17/Changes

4
ppp.c
View file

@ -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 <stdio.h>
#include <string.h> #include <string.h>
@ -967,7 +967,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
CSTAT(processipcp); CSTAT(processipcp);
LOG_HEX(5, "IPCP", p, l); LOG_HEX(5, "IPCP", p, l);
if (l < 5) if (l < 4)
{ {
LOG(1, s, t, "Short IPCP %d bytes\n", l); LOG(1, s, t, "Short IPCP %d bytes\n", l);
STAT(tunnel_rx_errors); STAT(tunnel_rx_errors);