X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f22a9cebbe6a3a99c6c5bd5e9fd410274a8562b9..aa460d6523300457e7199d2a414933968e744fa5:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index af21f2f..25808d8 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.119 2005-08-10 11:25:56 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.123 2005-08-12 08:35:16 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -1584,6 +1584,7 @@ void sendipcp(sessionidt s, tunnelidt t)
 	uint8_t *q;
 
 	CSTAT(sendipcp);
+	LOG(3, s, t, "IPCP: send ConfigReq\n");
 
 	if (!session[s].unique_id)
 	{
@@ -1612,6 +1613,7 @@ void sendipv6cp(sessionidt s, tunnelidt t)
 	uint8_t *q;
 
 	CSTAT(sendipv6cp);
+	LOG(3, s, t, "IPV6CP: send ConfigReq\n");
 
 	q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
 	if (!q) return;
@@ -1829,7 +1831,6 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		uint16_t message = 0xFFFF;	// message type
 		uint8_t fatal = 0;
 		uint8_t mandatory = 0;
-		uint8_t authtype = 0;		// proxy auth type
 		uint16_t asession = 0;		// assigned session
 		uint32_t amagic = 0;		// magic number
 		uint8_t aflags = 0;		// flags from last LCF
@@ -2214,11 +2215,6 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 					{
 						uint16_t atype = ntohs(*(uint16_t *)b);
 						LOG(4, s, t, "   Proxy Auth Type %d (%s)\n", atype, ppp_auth_type(atype));
-						if (atype == 2)
-							authtype = AUTHCHAP;
-						else if (atype == 3)
-							authtype = AUTHPAP;
-
 						break;
 					}
 				case 30:    // Proxy Authentication Name
@@ -2251,10 +2247,6 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 						{
 							if (*p == 5 && p[1] == 6) // Magic-Number
 								amagic = ntohl(*(uint32_t *) (p + 2));
-							else if (*p == 3 && p[1] == 4 && *(uint16_t *) (p + 2) == htons(PPPPAP)) // Authentication-Protocol (PAP)
-								authtype = AUTHPAP;
-							else if (*p == 3 && p[1] == 5 && *(uint16_t *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol (CHAP)
-								authtype = AUTHCHAP;
 							else if (*p == 7) // Protocol-Field-Compression
 								aflags |= SESSIONPFC;
 							else if (*p == 8) // Address-and-Control-Field-Compression
@@ -2386,19 +2378,14 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 					if (amagic == 0) amagic = time_now;
 					session[s].magic = amagic; // set magic number
 					session[s].l2tp_flags = aflags; // set flags received
-					LOG(3, s, t, "Magic %X Flags %X\n", amagic, aflags);
 					controlnull(t); // ack
 
-					// proxy authentication type is not supported
-					if (!(config->radius_authtypes & authtype))
-						authtype = config->radius_authprefer;
-
 					// start LCP
-					sendlcp(s, t, authtype);
+					sendlcp(s, t, config->radius_authprefer);
 					sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].lcp.conf_sent = 1;
 					sess_local[s].lcp.nak_sent = 0;
-					sess_local[s].lcp_authtype = authtype;
+					sess_local[s].lcp_authtype = config->radius_authprefer;
 					session[s].ppp.lcp = RequestSent;
 
 					break;
@@ -2730,7 +2717,7 @@ static void regular_cleanups(double period)
 					LOG(3, s, session[s].tunnel, "No ACK for LCP ConfigReq... resending\n");
 					sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].lcp.conf_sent++;
-					sendlcp(s, t, sess_local[s].lcp_authtype);
+					sendlcp(s, session[s].tunnel, sess_local[s].lcp_authtype);
 					change_state(s, lcp, next_state);
 				}
 				else
@@ -2761,7 +2748,7 @@ static void regular_cleanups(double period)
 					LOG(3, s, session[s].tunnel, "No ACK for IPCP ConfigReq... resending\n");
 					sess_local[s].ipcp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].ipcp.conf_sent++;
-					sendipcp(s, t);
+					sendipcp(s, session[s].tunnel);
 					change_state(s, ipcp, next_state);
 				}
 				else
@@ -2792,7 +2779,7 @@ static void regular_cleanups(double period)
 					LOG(3, s, session[s].tunnel, "No ACK for IPV6CP ConfigReq... resending\n");
 					sess_local[s].ipv6cp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].ipv6cp.conf_sent++;
-					sendipv6cp(s, t);
+					sendipv6cp(s, session[s].tunnel);
 					change_state(s, ipv6cp, next_state);
 				}
 				else
@@ -2820,7 +2807,7 @@ static void regular_cleanups(double period)
 					LOG(3, s, session[s].tunnel, "No ACK for CCP ConfigReq... resending\n");
 					sess_local[s].ccp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].ccp.conf_sent++;
-					sendccp(s, t);
+					sendccp(s, session[s].tunnel);
 					change_state(s, ccp, next_state);
 				}
 				else