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

fix parsing of protocol rej

Browse source
This commit is contained in:
bodea 2005-08-29 03:21:14 +00:00
parent 3efd4f877a
commit e8a19e982b
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,5 +1,6 @@
* Thu Aug 25 2005 Brendan O'Dea <bod@optus.net> 2.1.4 * Mon Aug 29 2005 Brendan O'Dea <bod@optus.net> 2.1.4
- Drop level of "Unexpected CHAP message" log. - Drop level of "Unexpected CHAP message" log.
- Fix parsing of ProtocolRej (allow 1 or two byte protocols).
* Wed Aug 17 2005 Brendan O'Dea <bod@optus.net> 2.1.3 * Wed Aug 17 2005 Brendan O'Dea <bod@optus.net> 2.1.3
- Fail IPCP negotiation only on ConfigRej of IP-Address. - Fail IPCP negotiation only on ConfigRej of IP-Address.

2
l2tpns.spec
View file

@ -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 Aug 25 2005 Brendan O'Dea <bod@optus.net> 2.1.4-1 * Mon Aug 29 2005 Brendan O'Dea <bod@optus.net> 2.1.4-1
- 2.1.4 release, see /usr/share/doc/l2tpns-2.1.4/Changes - 2.1.4 release, see /usr/share/doc/l2tpns-2.1.4/Changes

20
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.75 2005/08/24 23:44:08 bodea Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.76 2005/08/29 03:21:14 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -813,16 +813,26 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
} }
else if (*p == ProtocolRej) else if (*p == ProtocolRej)
{ {
if (*(uint16_t *) (p+4) == htons(PPPIPV6CP)) uint16_t proto = 0;
if (l > 4)
{
proto = *(p+4);
if (l > 5 && !(proto & 1))
{
proto <<= 8;
proto |= *(p+5);
}
}
if (proto == PPPIPV6CP)
{ {
LOG(3, s, t, "IPv6 rejected\n"); LOG(3, s, t, "IPv6 rejected\n");
change_state(s, ipv6cp, Closed); change_state(s, ipv6cp, Closed);
} }
else else
{ {
LOG(1, s, t, "Unexpected LCP protocol reject 0x%X\n", LOG(3, s, t, "LCP protocol reject: 0x%04X\n", proto);
ntohs(*(uint16_t *) (p+4)));
STAT(tunnel_rx_errors);
} }
} }
else if (*p == EchoReq) else if (*p == EchoReq)