Commit 767dce8c authored by Martin Banky's avatar Martin Banky Committed by Peter Korsgaard
Browse files

l2tp: convert to gentargets and change to xl2tp 



l2tp is no longer being developed, and xl2tpd is forked from l2tpd and is
maintained by Xelerance Corporation.

[Peter: remove invalid pppd dependency]
Signed-off-by: default avatarMartin Banky <Martin.Banky@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent fc13fc7b

CHANGES

+4 −2
Original line number Diff line number Diff line
@@ -11,9 +11,11 @@ 
	sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils, xz,

	zlib



	New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone

	New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone,

	xl2tp



	Removed packages: hotplug, libfloat, microcom, ng-spice-rework

	Removed packages: hotplug, l2tp, libfloat, microcom,

	ng-spice-rework



	Issues resolved (http://bugs.uclibc.org):

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ source "package/ipsec-tools/Config.in" 
source "package/iptables/Config.in"

source "package/iw/Config.in"

source "package/kismet/Config.in"

source "package/l2tp/Config.in"

source "package/xl2tp/Config.in"

if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

source "package/lighttpd/Config.in"

endif

package/l2tp/Config.in

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
config BR2_PACKAGE_L2TP

	bool "l2tp"

	help

	  Layer 2 Tunnelling Protocol (RFC2661).



	  http://sourceforge.net/projects/l2tpd/

package/l2tp/l2tp-no-gnu-extensions.patch

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
--- l2tpd-0.70-pre20031121.oorig/avpsend.c	2006-12-28 16:00:26.000000000 +0100

+++ l2tpd-0.70-pre20031121/avpsend.c	2006-12-28 16:21:06.000000000 +0100

@@ -98,19 +98,26 @@ int add_hostname_avp(struct buffer *buf,

 	int sz = 0;

 	if(t->lac && t->lac->hostname[0]) {

 		strncpy(n,t->lac->hostname, sizeof(n));

-		sz = strnlen(t->lac->hostname, sizeof(t->lac->hostname));

+		sz = strlen(t->lac->hostname);

+		if (sz > sizeof(t->lac->hostname))

+			sz = sizeof(t->lac->hostname);

 	}

 	else if(t->lns && t->lns->hostname[0]) {

 		strncpy(n,t->lns->hostname, sizeof(n));

-		sz = strnlen(t->lns->hostname, sizeof(t->lns->hostname));

+		sz = strlen(t->lns->hostname);

+		if (sz > sizeof(t->lns->hostname))

+			sz = sizeof(t->lns->hostname);

 	}

 	else {

 		if(gethostname(n, STRLEN)) {

 			strcpy(n,"eriwan");

 			sz = 6;

 		}

-		else

-			sz = strnlen(n, sizeof(n));

+		else {

+			sz = strlen(n);

+			if (sz > sizeof(n))

+				sz = sizeof(n);

+		}

 	}

 	if(add_avp(buf, HOSTNAME_AVP, n, sz, 1))

 		return 1;

package/l2tp/l2tp-sanity.patch

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
diff -rdup l2tpd-0.70-pre20031121.oorig/avp.c l2tpd-0.70-pre20031121/avp.c

--- l2tpd-0.70-pre20031121.oorig/avp.c	2006-12-28 16:00:26.000000000 +0100

+++ l2tpd-0.70-pre20031121/avp.c	2006-12-28 16:06:43.000000000 +0100

@@ -146,6 +146,7 @@ int validate_msgtype_avp(int attr,  stru

 	u_int8_t *p = data + sizeof(struct avp_hdr);

 	c->msgtype = get16(p);

 

+#ifdef SANITY

     if (t->sanity)

     {

         /*

@@ -293,6 +294,7 @@ int validate_msgtype_avp(int attr,  stru

             return -EINVAL;

         }

     }

+#endif

 	return 0;

 }

 

@@ -301,7 +303,7 @@ int validate_gen_avp(int attr,  struct t

 					 void *data, int datalen) {

 	(void)data; (void)datalen;

 	int i = 0, found = 0;

-

+#ifdef SANITY

     if(t->sanity) {

 		for(i = 0; i < 8; i++) {

 			if(c->msgtype == avps[attr].allowed_states[i])

@@ -310,6 +312,7 @@ int validate_gen_avp(int attr,  struct t

 		if(!found) 

 			return -EINVAL;

 	}

+#endif

 	return 0;

 }

 

diff -rdup l2tpd-0.70-pre20031121.oorig/l2tpd.c l2tpd-0.70-pre20031121/l2tpd.c

--- l2tpd-0.70-pre20031121.oorig/l2tpd.c	2006-12-28 16:00:26.000000000 +0100

+++ l2tpd-0.70-pre20031121/l2tpd.c	2006-12-28 16:04:15.000000000 +0100

@@ -748,7 +748,9 @@ struct tunnel *new_tunnel ()

     tmp->peer.sin_family = AF_INET;

     tmp->peer.sin_port = 0;

     bzero (&(tmp->peer.sin_addr), sizeof (tmp->peer.sin_addr));

+#ifdef SANITY

     tmp->sanity = -1;

+#endif

     tmp->qtid = -1;

     tmp->ourfc = ASYNC_FRAMING | SYNC_FRAMING;

     tmp->ourbc = 0;