X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/ddffeb1ceb781cfb17ca83e846de835ffd4bda54..ec4f5a95de78fd6dea23e8a20ace3144e4e3eea6:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 9db5bc3..527175c 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -56,6 +56,7 @@
 #ifdef LAC
 #include "l2tplac.h"
 #endif
+#include "pppoe.h"
 
 #ifdef LAC
 char * Vendor_name = "Linux L2TPNS";
@@ -186,7 +187,12 @@ config_descriptt config_values[] = {
 	CONFIG("bind_address_remotelns", bind_address_remotelns, IPv4),
 	CONFIG("bind_portremotelns", bind_portremotelns, SHORT),
 #endif
-	{ NULL, 0, 0, 0 },
+	CONFIG("pppoe_if_to_bind", pppoe_if_to_bind, STRING),
+	CONFIG("pppoe_service_name", pppoe_service_name, STRING),
+	CONFIG("pppoe_ac_name", pppoe_ac_name, STRING),
+	CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
+	CONFIG("disable_no_spoof", disable_no_spoof, BOOL),
+	{ NULL, 0, 0, 0 }
 };
 
 static char *plugin_functions[] = {
@@ -1195,6 +1201,12 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
 		return;
 	}
 
+	if (t == TUNNEL_ID_PPPOE)
+	{
+		pppoe_sess_send(buf, l, t);
+		return;
+	}
+
 	if (!tunnel[t].ip)
 	{
 		LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
@@ -1614,17 +1626,15 @@ void processipout(uint8_t *buf, int len)
 		else
 		{
 			// Send it as one frame (NO MPPP Frame)
-			uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
-			if (!p) return;
-			tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+			uint8_t *p = opt_makeppp(buf, len, s, t, PPPIP, 0, 0, 0);
+			tunnelsend(p, len + (buf-p), t); // send it...
 			update_session_out_stat(s, sp, len);
 		}
 	}
 	else
 	{
-		uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
-		if (!p) return;
-		tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+		uint8_t *p = opt_makeppp(buf, len, s, t, PPPIP, 0, 0, 0);
+		tunnelsend(p, len + (buf-p), t); // send it...
 		update_session_out_stat(s, sp, len);
 	}
 
@@ -1809,10 +1819,10 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
 {
 	uint16_t l = (m ? 0x8008 : 0x0008);
-	c->buf16[c->length/2 + 0] = htons(l);
-	c->buf16[c->length/2 + 1] = htons(0);
-	c->buf16[c->length/2 + 2] = htons(avp);
-	c->buf16[c->length/2 + 3] = htons(val);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	*(uint16_t *) (c->buf + c->length + 6) = htons(val);
 	c->length += 8;
 }
 
@@ -1820,10 +1830,10 @@ static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
 static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
 {
 	uint16_t l = (m ? 0x800A : 0x000A);
-	c->buf16[c->length/2 + 0] = htons(l);
-	c->buf16[c->length/2 + 1] = htons(0);
-	c->buf16[c->length/2 + 2] = htons(avp);
-	*(uint32_t *) &c->buf[c->length + 6] = htonl(val);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	*(uint32_t *) (c->buf + c->length + 6) = htonl(val);
 	c->length += 10;
 }
 
@@ -1831,10 +1841,10 @@ static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
 static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
 {
 	uint16_t l = ((m ? 0x8000 : 0) + strlen(val) + 6);
-	c->buf16[c->length/2 + 0] = htons(l);
-	c->buf16[c->length/2 + 1] = htons(0);
-	c->buf16[c->length/2 + 2] = htons(avp);
-	memcpy(&c->buf[c->length + 6], val, strlen(val));
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	memcpy(c->buf + c->length + 6, val, strlen(val));
 	c->length += 6 + strlen(val);
 }
 
@@ -1842,10 +1852,10 @@ static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
 static void controlb(controlt * c, uint16_t avp, uint8_t *val, unsigned int len, uint8_t m)
 {
 	uint16_t l = ((m ? 0x8000 : 0) + len + 6);
-	c->buf16[c->length/2 + 0] = htons(l);
-	c->buf16[c->length/2 + 1] = htons(0);
-	c->buf16[c->length/2 + 2] = htons(avp);
-	memcpy(&c->buf[c->length + 6], val, len);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	memcpy(c->buf + c->length + 6, val, len);
 	c->length += 6 + len;
 }
 
@@ -1862,7 +1872,8 @@ static controlt *controlnew(uint16_t mtype)
 	}
 	assert(c);
 	c->next = 0;
-	c->buf16[0] = htons(0xC802); // flags/ver
+	c->buf[0] = 0xC8; // flags
+	c->buf[1] = 0x02; // ver
 	c->length = 12;
 	control16(c, 0, mtype, 1);
 	return c;
@@ -1888,10 +1899,10 @@ static void controlnull(tunnelidt t)
 // add a control message to a tunnel, and send if within window
 static void controladd(controlt *c, sessionidt far, tunnelidt t)
 {
-	c->buf16[1] = htons(c->length); // length
-	c->buf16[2] = htons(tunnel[t].far); // tunnel
-	c->buf16[3] = htons(far); // session
-	c->buf16[4] = htons(tunnel[t].ns); // sequence
+	*(uint16_t *) (c->buf + 2) = htons(c->length); // length
+	*(uint16_t *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
+	*(uint16_t *) (c->buf + 6) = htons(far); // session
+	*(uint16_t *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
 	tunnel[t].ns++;              // advance sequence
 	// link in message in to queue
 	if (tunnel[t].controlc)
@@ -2016,7 +2027,6 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
 		LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);
 		run_plugins(PLUGIN_KILL_SESSION, &data);
-		session[s].die = TIME + 150; // Clean up in 15 seconds
 	}
 
 	if (session[s].ip && !walled_garden && !session[s].die)
@@ -2041,6 +2051,9 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 			memcpy(&shut_acct[shut_acct_n++], &session[s], sizeof(session[s]));
 	}
 
+	if (!session[s].die)
+		session[s].die = TIME + 150; // Clean up in 15 seconds
+
 	if (session[s].ip)
 	{                          // IP allocated, clear and unroute
 		int r;
@@ -2134,20 +2147,28 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		throttle_session(s, 0, 0);
 
 	if (cdn_result)
-	{                            // Send CDN
-		controlt *c = controlnew(14); // sending CDN
-		if (cdn_error)
+	{
+		if (session[s].tunnel == TUNNEL_ID_PPPOE)
 		{
-			uint16_t buf[2];
-			buf[0] = htons(cdn_result);
-			buf[1] = htons(cdn_error);
-			controlb(c, 1, (uint8_t *)buf, 4, 1);
+			pppoe_shutdown_session(s);
 		}
 		else
-			control16(c, 1, cdn_result, 1);
+		{
+			// Send CDN
+			controlt *c = controlnew(14); // sending CDN
+			if (cdn_error)
+			{
+				uint16_t buf[2];
+				buf[0] = htons(cdn_result);
+				buf[1] = htons(cdn_error);
+				controlb(c, 1, (uint8_t *)buf, 4, 1);
+			}
+			else
+				control16(c, 1, cdn_result, 1);
 
-		control16(c, 14, s, 1);   // assigned session (our end)
-		controladd(c, session[s].far, session[s].tunnel); // send the message
+			control16(c, 14, s, 1);   // assigned session (our end)
+			controladd(c, session[s].far, session[s].tunnel); // send the message
+		}
 	}
 
 	// update filter refcounts
@@ -2414,6 +2435,12 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		STAT(tunnel_rx_errors);
 		return;
 	}
+	if (t == TUNNEL_ID_PPPOE)
+	{
+		LOG(1, s, t, "Received UDP packet with tunnel ID reserved for pppoe\n");
+		STAT(tunnel_rx_errors);
+		return;
+	}
 	if (*buf & 0x08)
 	{                          // ns/nr
 		ns = ntohs(*(uint16_t *) p);
@@ -3441,6 +3468,9 @@ static void regular_cleanups(double period)
 		if (t > config->cluster_highest_tunnelid)
 			t = 1;
 
+		if (t == TUNNEL_ID_PPPOE)
+			continue;
+
 		// check for expired tunnels
 		if (tunnel[t].die && tunnel[t].die <= TIME)
 		{
@@ -3473,10 +3503,13 @@ static void regular_cleanups(double period)
 		// Send hello
 		if (tunnel[t].state == TUNNELOPEN && !tunnel[t].controlc && (time_now - tunnel[t].lastrec) > 60)
 		{
-			controlt *c = controlnew(6); // sending HELLO
-			controladd(c, 0, t); // send the message
-			LOG(3, 0, t, "Sending HELLO message\n");
-			t_actions++;
+			if (!config->disable_sending_hello)
+			{
+				controlt *c = controlnew(6); // sending HELLO
+				controladd(c, 0, t); // send the message
+				LOG(3, 0, t, "Sending HELLO message\n");
+				t_actions++;
+			}
 		}
 
 		// Check for tunnel changes requested from the CLI
@@ -3664,7 +3697,8 @@ static void regular_cleanups(double period)
 
 			LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
 					(int)(time_now - session[s].last_packet));
-			tunnelsend(b, 24, session[s].tunnel); // send it
+
+			tunnelsend(b, (q - b) + 8, session[s].tunnel); // send it
 			sess_local[s].last_echo = time_now;
 			s_actions++;
 		}
@@ -3916,11 +3950,11 @@ static int still_busy(void)
 #endif
 
 #ifdef LAC
-// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink, udplac
-#define BASE_FDS	8
+// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink, udplac, pppoedisc, pppoesess
+#define BASE_FDS	10
 #else
-// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink
-#define BASE_FDS	7
+// the base set of fds polled: cli, cluster, tun, udp, control, dae, netlink, pppoedisc, pppoesess
+#define BASE_FDS	9
 #endif
 
 // additional polled fds
@@ -3935,8 +3969,9 @@ static void mainloop(void)
 {
 	int i;
 	uint8_t buf[65536];
-	uint8_t *p = buf + 8; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD)
-	int size_bufp = sizeof(buf) - 8;
+	uint8_t *p = buf + 32; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD)
+						// and the forwarded pppoe session
+	int size_bufp = sizeof(buf) - 32;
 	clockt next_cluster_ping = 0;	// send initial ping immediately
 	struct epoll_event events[BASE_FDS + RADIUS_FDS + EXTRA_FDS];
 	int maxevent = sizeof(events)/sizeof(*events);
@@ -3948,11 +3983,11 @@ static void mainloop(void)
 	}
 
 #ifdef LAC
-	LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d , udplacfd=%d\n",
-		clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd, udplacfd);
+	LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d , udplacfd=%d, pppoefd=%d, pppoesessfd=%d\n",
+		clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd, udplacfd, pppoediscfd, pppoesessfd);
 #else
-	LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d\n",
-		clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd);
+	LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d, nlfd=%d, pppoefd=%d, pppoesessfd=%d\n",
+		clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd, nlfd, pppoediscfd, pppoesessfd);
 #endif
 
 	/* setup our fds to poll for input */
@@ -3999,6 +4034,14 @@ static void mainloop(void)
 		e.data.ptr = &d[i++];
 		epoll_ctl(epollfd, EPOLL_CTL_ADD, udplacfd, &e);
 #endif
+
+		d[i].type = FD_TYPE_PPPOEDISC;
+		e.data.ptr = &d[i++];
+		epoll_ctl(epollfd, EPOLL_CTL_ADD, pppoediscfd, &e);
+
+		d[i].type = FD_TYPE_PPPOESESS;
+		e.data.ptr = &d[i++];
+		epoll_ctl(epollfd, EPOLL_CTL_ADD, pppoesessfd, &e);
 	}
 
 #ifdef BGP
@@ -4065,6 +4108,8 @@ static void mainloop(void)
 			int udplac_ready = 0;
 			int udplac_pkts = 0;
 #endif
+			int pppoesess_ready = 0;
+			int pppoesess_pkts = 0;
 			int tun_ready = 0;
 			int cluster_ready = 0;
 			int udp_pkts = 0;
@@ -4105,28 +4150,36 @@ static void mainloop(void)
 #ifdef LAC
 				case FD_TYPE_UDPLAC:	udplac_ready++; break;
 #endif
+				case FD_TYPE_PPPOESESS:	pppoesess_ready++; break;
+
+				case FD_TYPE_PPPOEDISC: // pppoe discovery
+					s = read(pppoediscfd, p, size_bufp);
+					if (s > 0) process_pppoe_disc(p, s);
+					n--;
+					break;
+
 				case FD_TYPE_CONTROL: // nsctl commands
 					alen = sizeof(addr);
-					s = recvfromto(controlfd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
-					if (s > 0) processcontrol(buf, s, &addr, alen, &local);
+					s = recvfromto(controlfd, p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
+					if (s > 0) processcontrol(p, s, &addr, alen, &local);
 					n--;
 					break;
 
 				case FD_TYPE_DAE: // DAE requests
 					alen = sizeof(addr);
-					s = recvfromto(daefd, buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
-					if (s > 0) processdae(buf, s, &addr, alen, &local);
+					s = recvfromto(daefd, p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen, &local);
+					if (s > 0) processdae(p, s, &addr, alen, &local);
 					n--;
 					break;
 
 				case FD_TYPE_RADIUS: // RADIUS response
 					alen = sizeof(addr);
-					s = recvfrom(radfds[d->index], buf, sizeof(buf), MSG_WAITALL, (struct sockaddr *) &addr, &alen);
+					s = recvfrom(radfds[d->index], p, size_bufp, MSG_WAITALL, (struct sockaddr *) &addr, &alen);
 					if (s >= 0 && config->cluster_iam_master)
 					{
 						if (addr.sin_addr.s_addr == config->radiusserver[0] ||
 						    addr.sin_addr.s_addr == config->radiusserver[1])
-							processrad(buf, s, d->index);
+							processrad(p, s, d->index);
 						else
 							LOG(3, 0, 0, "Dropping RADIUS packet from unknown source %s\n",
 								fmtaddr(addr.sin_addr.s_addr, 0));
@@ -4144,8 +4197,8 @@ static void mainloop(void)
 
 				case FD_TYPE_NETLINK:
 				{
-					struct nlmsghdr *nh = (struct nlmsghdr *)buf;
-					s = netlink_recv(buf, sizeof(buf));
+					struct nlmsghdr *nh = (struct nlmsghdr *)p;
+					s = netlink_recv(p, size_bufp);
 					if (nh->nlmsg_type == NLMSG_ERROR)
 					{
 						struct nlmsgerr *errmsg = NLMSG_DATA(nh);
@@ -4183,9 +4236,9 @@ static void mainloop(void)
 				if (udp_ready)
 				{
 					alen = sizeof(addr);
-					if ((s = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
+					if ((s = recvfrom(udpfd, p, size_bufp, 0, (void *) &addr, &alen)) > 0)
 					{
-						processudp(buf, s, &addr);
+						processudp(p, s, &addr);
 						udp_pkts++;
 					}
 					else
@@ -4199,10 +4252,10 @@ static void mainloop(void)
 				if (udplac_ready)
 				{
 					alen = sizeof(addr);
-					if ((s = recvfrom(udplacfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
+					if ((s = recvfrom(udplacfd, p, size_bufp, 0, (void *) &addr, &alen)) > 0)
 					{
 						if (!config->disable_lac_func)
-							processudp(buf, s, &addr);
+							processudp(p, s, &addr);
 
 						udplac_pkts++;
 					}
@@ -4228,13 +4281,28 @@ static void mainloop(void)
 					}
 				}
 
+				// pppoe session
+				if (pppoesess_ready)
+				{
+					if ((s = read(pppoesessfd, p, size_bufp)) > 0)
+					{
+						process_pppoe_sess(p, s);
+						pppoesess_pkts++;
+					}
+					else
+					{
+						pppoesess_ready = 0;
+						n--;
+					}
+				}
+
 				// cluster
 				if (cluster_ready)
 				{
 					alen = sizeof(addr);
-					if ((s = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen)) > 0)
+					if ((s = recvfrom(cluster_sockfd, p, size_bufp, MSG_WAITALL, (void *) &addr, &alen)) > 0)
 					{
-						processcluster(buf, s, addr.sin_addr.s_addr);
+						processcluster(p, s, addr.sin_addr.s_addr);
 						cluster_pkts++;
 					}
 					else
@@ -4251,11 +4319,11 @@ static void mainloop(void)
 			if (c >= config->multi_read_count)
 			{
 #ifdef LAC
-				LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun %d cluster and %d rmlns packets\n",
-					config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts, udplac_pkts);
+				LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun %d cluster %d rmlns and %d pppoe packets\n",
+					config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts, udplac_pkts, pppoesess_pkts);
 #else
-				LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun and %d cluster packets\n",
-					config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts);
+				LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun %d cluster and %d pppoe packets\n",
+					config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts, pppoesess_pkts);
 #endif
 				STAT(multi_read_exceeded);
 				more++;
@@ -5059,6 +5127,11 @@ int main(int argc, char *argv[])
 	inittun();
 	LOG(1, 0, 0, "Set up on interface %s\n", config->tundevicename);
 
+	if (*config->pppoe_if_to_bind)
+	{
+		init_pppoe();
+		LOG(1, 0, 0, "Set up on pppoe interface %s\n", config->pppoe_if_to_bind);
+	}
 	initudp();
 	initrad();
 	initippool();
@@ -5300,6 +5373,9 @@ static void update_config()
 	if(!config->iftun_address)
 		config->iftun_address = config->bind_address;
 
+	if (!*config->pppoe_ac_name)
+		strncpy(config->pppoe_ac_name, DEFAULT_PPPOE_AC_NAME, sizeof(config->pppoe_ac_name) - 1);
+
 	// re-initialise the random number source
 	initrandom(config->random_device);
 
@@ -5478,8 +5554,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
 
 			if (ip == session[i].ip)
 			{
-				sessionkill(i, "Duplicate IP address");
-				cluster_listinvert_session(s, i);
+				sessionshutdown(i, "Duplicate IP address", CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
 				continue;
 			}
 
@@ -5500,7 +5575,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
 
 			// Drop the new session in case of duplicate sessionss, not the old one.
 			if (!strcasecmp(user, session[i].user))
-				sessionkill(i, "Duplicate session for users");
+				sessionshutdown(i, "Duplicate session for users", CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
 		}
 	}
 
@@ -6036,7 +6111,7 @@ static tunnelidt new_tunnel()
 	tunnelidt i;
 	for (i = 1; i < MAXTUNNEL; i++)
 	{
-		if (tunnel[i].state == TUNNELFREE)
+		if ((tunnel[i].state == TUNNELFREE) && (i != TUNNEL_ID_PPPOE))
 		{
 			LOG(4, 0, i, "Assigning tunnel ID %u\n", i);
 			if (i > config->cluster_highest_tunnelid)