X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/caa9662496578822d24926b927365639c936c761..HEAD:/pppoe.c

diff --git a/pppoe.c b/pppoe.c
index 882e0c1..c6bc12d 100644
--- a/pppoe.c
+++ b/pppoe.c
@@ -22,6 +22,7 @@
 #include <arpa/inet.h>
 #include <linux/if_pppox.h>
 
+#include "dhcp6.h"
 #include "l2tpns.h"
 #include "cluster.h"
 #include "constants.h"
@@ -502,20 +503,27 @@ static void pppoe_recv_PADI(uint8_t *pack, int size)
 		return;
 
 	len = ntohs(hdr->length);
-	for (n = 0; n < len; n += sizeof(*tag) + ntohs(tag->tag_len)) {
+	for (n = 0; n < len; n += sizeof(*tag) + ntohs(tag->tag_len))
+	{
 		tag = (struct pppoe_tag *)(pack + ETH_HLEN + sizeof(*hdr) + n);
 		if (n + sizeof(*tag) + ntohs(tag->tag_len) > len)
 			return;
-		switch (ntohs(tag->tag_type)) {
+		switch (ntohs(tag->tag_type))
+		{
 			case TAG_END_OF_LIST:
 				break;
 			case TAG_SERVICE_NAME:
-				if (*config->pppoe_service_name && tag->tag_len)
+				if (config->pppoe_only_equal_svc_name && *config->pppoe_service_name && !tag->tag_len)
+				{
+					break;
+				}
+				else if (*config->pppoe_service_name && tag->tag_len)
 				{
 					if (ntohs(tag->tag_len) != strlen(config->pppoe_service_name))
 						break;
 					if (memcmp(tag->tag_data, config->pppoe_service_name, ntohs(tag->tag_len)))
 						break;
+					service_name_tag = tag;
 					service_match = 1;
 				}
 				else
@@ -763,6 +771,72 @@ uint8_t *pppoe_makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tu
 	return b;
 }
 
+// fill in a PPPOE message with a PPP frame,
+// returns start of PPP frame
+//(note: THIS ROUTINE WRITES TO p[-28]).
+uint8_t *opt_pppoe_makeppp(uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits)
+{
+	uint16_t type = mtype;
+	uint16_t hdrlen = l;
+	uint8_t *b = p;
+	struct pppoe_hdr *hdr;
+
+	if (t != TUNNEL_ID_PPPOE)
+		return NULL;
+
+	// Check whether this session is part of multilink
+	if (bid)
+	{
+		if (bundle[bid].num_of_links > 1)
+			type = PPPMP; // Change PPP message type to the PPPMP
+		else
+			bid = 0;
+	}
+
+	if (bid)
+	{
+		// Add the message type if this fragment has the begin bit set
+		if (mp_bits & MP_BEGIN)
+		{
+			b -= 2;
+			*(uint16_t *) b = htons(mtype); // Message type
+		}
+
+		// Set the sequence number and (B)egin (E)nd flags
+		if (session[s].mssf)
+		{
+			// Set the multilink bits
+			uint16_t bits_send = mp_bits;
+			b -= 2;
+			*(uint16_t *) b = htons((bundle[bid].seq_num_t & 0x0FFF)|bits_send);
+		}
+		else
+		{
+			b -= 4;
+			*(uint32_t *) b = htonl(bundle[bid].seq_num_t);
+			// Set the multilink bits
+			*b = mp_bits;
+		}
+
+		bundle[bid].seq_num_t++;
+	}
+
+	b -= 2;
+	*(uint16_t *) b = htons(type);
+
+	// Size ppp packet
+	hdrlen += (p - b);
+
+	// 14 bytes ethernet Header + 6 bytes header pppoe
+	b -= (ETH_HLEN + sizeof(*hdr));
+	setup_header(b, config->pppoe_hwaddr, session[s].src_hwaddr, CODE_SESS, s, ETH_P_PPP_SES);
+	hdr = (struct pppoe_hdr *)(b + ETH_HLEN);
+	// Store length on header pppoe
+	hdr->length = hdrlen;
+
+	return b;
+}
+
 // pppoe discovery recv data
 void process_pppoe_disc(uint8_t *pack, int size)
 {
@@ -836,7 +910,6 @@ void process_pppoe_disc(uint8_t *pack, int size)
 	}
 }
 
-#ifdef LAC
 // Forward from pppoe to l2tp remote LNS
 static void pppoe_forwardto_session_rmlns(uint8_t *pack, int size, sessionidt sess, uint16_t proto)
 {
@@ -970,7 +1043,6 @@ void pppoe_forwardto_session_pppoe(uint8_t *pack, int size, sessionidt sess, uin
 
 	tunnelsend(p, lpppoe, t); // send it....
 }
-#endif
 
 void process_pppoe_sess(uint8_t *pack, int size)
 {
@@ -1035,13 +1107,11 @@ void process_pppoe_sess(uint8_t *pack, int size)
 		lppp -= 2;
 	}
 
-#ifdef LAC
 	if (session[sid].forwardtosession)
 	{	// Must be forwaded to a remote lns tunnel l2tp
 		pppoe_forwardto_session_rmlns(pack, size, sid, proto);
 		return;
 	}
-#endif
 
 	if (proto == PPPPAP)
 	{