From: Brendan O'Dea <bod@optus.net>
Date: Tue, 18 Apr 2006 06:00:46 +0000 (+0000)
Subject: interpret "local" direction correctly (as LAC) in disconnect AVPs
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~44
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/d3280234d18455d0cf553f3a41776db789a092b6?hp=7462628249a5e5735ed0f34b489e9a7f550a2152

interpret "local" direction correctly (as LAC) in disconnect AVPs
---

diff --git a/Changes b/Changes
index fb56a4c..1f6bbde 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 * Tue Apr 18 2006 Brendan O'Dea <bod@optus.net> 2.1.18
 - Don't shutdown on TerminateReq, wait for CDN.
+- Interpret "local" direction correctly (as LAC) in disconnect AVPs.
 
 * Thu Apr 13 2006 Brendan O'Dea <bod@optus.net> 2.1.17
 - Fix IPCP length test to allow Terminate-Request (4 bytes).
diff --git a/l2tpns.c b/l2tpns.c
index 598e3ab..600d753 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.160 2006-04-13 11:14:35 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.161 2006-04-18 06:00:46 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2381,12 +2381,12 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 							disc_reason = "Administrative disconnect";
 							break;
 						case 3: // lcp terminate
-							if (dir != 1) break; // 1=peer, 2=local
+							if (dir != 2) break; // 1=peer (LNS), 2=local (LAC)
 							disc_cause = TERM_USER_REQUEST;
 							disc_reason = "Normal disconnection";
 							break;
 						case 4: // compulsory encryption unavailable
-							if (dir != 2) break; // 1=refused by peer, 2=local
+							if (dir != 1) break; // 1=refused by peer, 2=local
 							disc_cause = TERM_USER_ERROR;
 							disc_reason = "Compulsory encryption refused";
 							break;