X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c450bdccc0e204223543b305c862e85db572411e..57a847d9a36386aefb1d61bdb40399d9e8f5b463:/radius.c

diff --git a/radius.c b/radius.c
index 61cbfd4..b886b32 100644
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.43 2005-10-11 02:27:40 foonly Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.49 2006-04-13 11:14:35 bodea Exp $";
 
 #include <time.h>
 #include <stdio.h>
@@ -158,7 +158,7 @@ void radiussend(uint16_t r, uint8_t state)
 		if (s)
 		{
 			if (state == RADIUSAUTH)
-				sessionshutdown(s, "RADIUS timeout.", 3, 0);
+				sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
 			else
 			{
 				LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
@@ -248,8 +248,8 @@ void radiussend(uint16_t r, uint8_t state)
 			p += p[1];
 		}
 	}
-	else if (state == RADIUSSTART || state == RADIUSSTOP || state == RADIUSINTERIM)
-	{			// accounting
+	else // accounting
+	{
 		*p = 40;	// accounting type
 		p[1] = 6;
 		*(uint32_t *) (p + 2) = htonl(state - RADIUSSTART + 1); // start=1, stop=2, interim=3
@@ -304,27 +304,48 @@ void radiussend(uint16_t r, uint8_t state)
 				p[1] = 6;
 				*(uint32_t *) (p + 2) = htonl(session[s].cout_wrap);
 				p += p[1];
+
+				if (state == RADIUSSTOP && radius[r].term_cause)
+				{
+				    	*p = 49; // acct-terminate-cause
+					p[1] = 6;
+					*(uint32_t *) (p + 2) = htonl(radius[r].term_cause);
+					p += p[1];
+
+					if (radius[r].term_msg)
+					{
+						*p = 26;				// vendor-specific
+						*(uint32_t *) (p + 2) = htonl(9);	// Cisco
+						p[6] = 1;				// Cisco-AVPair
+						p[7] = 2 + sprintf((char *) p + 8, "disc-cause-ext=%s", radius[r].term_msg);
+						p[1] = p[7] + 6;
+						p += p[1];
+					}
+				}
 			}
 
-			if (session[s].snoop_ip && session[s].snoop_port)
 			{
-				*p = 26;				// vendor-specific
-				*(uint32_t *) (p + 2) = htonl(9);	// Cisco
-				p[6] = 1;				// Cisco-AVPair
-				p[7] = 2 + sprintf((char *) p + 8, "intercept=%s:%d",
-					fmtaddr(session[s].snoop_ip, 0), session[s].snoop_port);
-
-				p[1] = p[7] + 6;
-				p += p[1];
+				struct param_radius_account acct = { &tunnel[session[s].tunnel], &session[s], &p };
+				run_plugins(PLUGIN_RADIUS_ACCOUNT, &acct);
 			}
 		}
 	}
 	if (s)
 	{
-		*p = 5; // NAS-Port
+		*p = 5;		// NAS-Port
 		p[1] = 6;
 		*(uint32_t *) (p + 2) = htonl(s);
 		p += p[1];
+
+	        *p = 6;		// Service-Type
+		p[1] = 6;
+		*(uint32_t *) (p + 2) = htonl(2); // Framed-User
+		p += p[1];
+		   
+	        *p = 7;		// Framed-Protocol
+		p[1] = 6;
+		*(uint32_t *) (p + 2) = htonl(1); // PPP
+		p += p[1];
 	}
 	if (s && session[s].ip)
 	{
@@ -333,6 +354,30 @@ void radiussend(uint16_t r, uint8_t state)
 		*(uint32_t *) (p + 2) = htonl(session[s].ip);
 		p += p[1];
 	}
+	if (s && session[s].route[0].ip)
+	{
+		int r;
+		for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
+		{
+		    	int width = 32;
+			if (session[s].route[r].mask)
+			{
+			    int mask = session[s].route[r].mask;
+			    while (!(mask & 1))
+			    {
+				width--;
+				mask >>= 1;
+			    }
+			}
+
+			*p = 22;	// Framed-Route
+			p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
+				fmtaddr(htonl(session[s].route[r].ip), 0),
+				width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+
+			p += p[1];
+		}
+	}
 	if (*session[s].called)
 	{
 		*p = 30;                // called
@@ -758,7 +803,7 @@ void radiusretry(uint16_t r)
 
 extern int daefd;
 
-void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
+void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local)
 {
 	int i, r_code, r_id, length, attribute_length;
 	uint8_t *packet, attribute;
@@ -967,7 +1012,7 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
 		LOG(3, s, t, "    DAE Disconnect %d (%s)\n", s, session[s].user);
 		r_code = DisconnectACK;
 
-		sessionshutdown(s, "Requested by PoD", 3, 0); // disconnect session
+		sessionshutdown(s, "Requested by PoD", CDN_ADMIN_DISC, TERM_ADMIN_RESET); // disconnect session
 		break;
 
 	case CoARequest: // Change of Authorization
@@ -1036,6 +1081,6 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
 	LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id);
 
 	// send DAE response
-	if (sendto(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen) < 0)
+	if (sendtofrom(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen, local) < 0)
 		LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno));
 }