From 3efd4f877afa6dbf12370e0be76921cd0b1037df Mon Sep 17 00:00:00 2001
From: bodea <bodea>
Date: Wed, 24 Aug 2005 23:44:08 +0000
Subject: [PATCH] drop level of "Unexpected CHAP message" log

---
 Changes     |  3 +++
 l2tpns.h    |  4 ++--
 l2tpns.spec |  6 +++---
 ppp.c       | 16 ++++++++--------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Changes b/Changes
index 1965e88..ddf7e3c 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+* Thu Aug 25 2005 Brendan O'Dea <bod@optus.net> 2.1.4
+- Drop level of "Unexpected CHAP message" log.
+
 * Wed Aug 17 2005 Brendan O'Dea <bod@optus.net> 2.1.3
 - Fail IPCP negotiation only on ConfigRej of IP-Address.
 
diff --git a/l2tpns.h b/l2tpns.h
index f740781..49c9a77 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.83 2005/08/17 03:56:27 bodea Exp $
+// $Id: l2tpns.h,v 1.84 2005/08/24 23:44:08 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.1.3"
+#define VERSION	"2.1.4"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
diff --git a/l2tpns.spec b/l2tpns.spec
index afe3393..19cdbdc 100644
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -1,6 +1,6 @@
 Summary: A high-speed clustered L2TP LNS
 Name: l2tpns
-Version: 2.1.3
+Version: 2.1.4
 Release: 1
 Copyright: GPL
 Group: System Environment/Daemons
@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
-* Wed Aug 17 2005 Brendan O'Dea <bod@optus.net> 2.1.3-1
-- 2.1.3 release, see /usr/share/doc/l2tpns-2.1.3/Changes
+* Thu Aug 25 2005 Brendan O'Dea <bod@optus.net> 2.1.4-1
+- 2.1.4 release, see /usr/share/doc/l2tpns-2.1.4/Changes
diff --git a/ppp.c b/ppp.c
index d2c0cc4..dead47f 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.74 2005/08/17 03:56:27 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.75 2005/08/24 23:44:08 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -147,13 +147,6 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	CSTAT(processchap);
 
 	LOG_HEX(5, "CHAP", p, l);
-	r = sess_local[s].radius;
-	if (!r)
-	{
-		LOG(1, s, t, "Unexpected CHAP message\n");
-		STAT(tunnel_rx_errors);
-		return;
-	}
 
 	if (l < 4)
 	{
@@ -180,6 +173,13 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		return;
 	}
 
+	r = sess_local[s].radius;
+	if (!r)
+	{
+		LOG(3, s, t, "Unexpected CHAP message\n");
+		return;
+	}
+
 	if (session[s].ppp.phase != Authenticate)
 	{
 	    	LOG(2, s, t, "CHAP ignored in %s phase\n", ppp_phase(session[s].ppp.phase));
-- 
2.20.1