From: bodea Date: Tue, 20 Dec 2005 04:57:16 +0000 (+0000) Subject: send configured magic-no in LCP EchoReq when LCP is opened X-Git-Tag: release_2_1_16~8 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/b2bd9655946aa73a31b5e5d9baf417cd38938cd8 send configured magic-no in LCP EchoReq when LCP is opened --- diff --git a/Changes b/Changes index 41d7d35..48ceaa1 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +* Tue Dec 20 2005 Brendan O'Dea 2.1.16 +- Send configured magic-no in LCP EchoReq when LCP is opened. + * Mon Dec 19 2005 Brendan O'Dea 2.1.15 - Drop backtrace. - Reduce logging of LCP EchoReply packets. diff --git a/l2tpns.c b/l2tpns.c index 5fe05c9..6287c3e 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -4,7 +4,7 @@ // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // vim: sw=8 ts=8 -char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.153 2005/12/19 06:08:42 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.154 2005/12/20 04:57:16 bodea Exp $"; #include #include @@ -2918,7 +2918,7 @@ static void regular_cleanups(double period) *q = EchoReq; *(uint8_t *)(q + 1) = (time_now % 255); // ID *(uint16_t *)(q + 2) = htons(8); // Length - *(uint32_t *)(q + 4) = 0; // Magic Number (not supported) + *(uint32_t *)(q + 4) = session[s].ppp.lcp == Opened ? htonl(session[s].magic) : 0; // Magic Number LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n", (int)(time_now - session[s].last_packet)); diff --git a/l2tpns.h b/l2tpns.h index 93b525f..0c2cd30 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -1,5 +1,5 @@ // L2TPNS Global Stuff -// $Id: l2tpns.h,v 1.108 2005/12/19 06:08:43 bodea Exp $ +// $Id: l2tpns.h,v 1.109 2005/12/20 04:57:16 bodea Exp $ #ifndef __L2TPNS_H__ #define __L2TPNS_H__ @@ -14,7 +14,7 @@ #include #include -#define VERSION "2.1.15" +#define VERSION "2.1.16" // Limits #define MAXTUNNEL 500 // could be up to 65535 diff --git a/l2tpns.spec b/l2tpns.spec index 95cd90f..905fa1e 100644 --- a/l2tpns.spec +++ b/l2tpns.spec @@ -1,6 +1,6 @@ Summary: A high-speed clustered L2TP LNS Name: l2tpns -Version: 2.1.15 +Version: 2.1.16 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 -* Mon Dec 19 2005 Brendan O'Dea 2.1.15-1 -- 2.1.15 release, see /usr/share/doc/l2tpns-2.1.15/Changes +* Tue Dec 20 2005 Brendan O'Dea 2.1.16-1 +- 2.1.16 release, see /usr/share/doc/l2tpns-2.1.16/Changes