Add fix for kernel mode by Sergey Fionov, resolves bug 441828 by nE0sIghT. Cherry-pick a patch from upstream to avoid type-punning.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

5 files changed, 448 insertions, 1 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 7c3bd4ed7a57..b345b67a4359 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.33 2012/12/26 00:53:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.34 2012/12/26 04:14:30 floppym Exp $
+
+*xl2tpd-1.3.1-r2 (26 Dec 2012)
+
+  26 Dec 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/xl2tpd-1.3.1-kernelmode.patch,
+  +files/xl2tpd-1.3.1-no-type-punning-b119c0da.patch, +xl2tpd-1.3.1-r2.ebuild,
+  metadata.xml:
+  Add fix for kernel mode by Sergey Fionov, resolves bug 441828 by nE0sIghT.
+  Cherry-pick a patch from upstream to avoid type-punning.
 
   26 Dec 2012; Mike Gilbert <floppym@gentoo.org> -xl2tpd-1.3.1.ebuild,
   xl2tpd-1.3.1-r1.ebuild:
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.3.1-kernelmode.patch b/net-dialup/xl2tpd/files/xl2tpd-1.3.1-kernelmode.patch
new file mode 100644
index 000000000000..5ce9b1244c76
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.3.1-kernelmode.patch
@@ -0,0 +1,361 @@
+https://bugs.gentoo.org/show_bug.cgi?id=441828
+
+Based on Fedora patch
+http://pkgs.fedoraproject.org/cgit/xl2tpd.git/plain/xl2tpd-1.3.1-kernelmode.patch
+
+Which is based on a patch by Sergey Fionov (sigwall)
+https://github.com/sigwall/overlay/blob/master/net-dialup/xl2tpd/files/xl2tpd-1.3.0-kernel.patch
+
+diff --git a/call.c b/call.c
+index d1b1858..b672f91 100644
+--- a/call.c
++++ b/call.c
+@@ -680,6 +680,8 @@ struct call *get_call (int tunnel, int call,  struct in_addr addr, int port,
+         st->peer.sin_port = port;
+ 	st->refme  = refme;
+ 	st->refhim = refhim;
++        st->udp_fd = -1;
++        st->pppox_fd = -1;
+         bcopy (&addr, &st->peer.sin_addr, sizeof (addr));
+         st->next = tunnels.head;
+         tunnels.head = st;
+diff --git a/control.c b/control.c
+index 6a41143..8937f2e 100644
+--- a/control.c
++++ b/control.c
+@@ -596,6 +596,9 @@ int control_finish (struct tunnel *t, struct call *c)
+         if (gconfig.debug_state)
+             l2tp_log (LOG_DEBUG, "%s: sending SCCCN\n", __FUNCTION__);
+         control_xmit (buf);
++
++        connect_pppol2tp(t);
++
+         /* Schedule a HELLO */
+         tv.tv_sec = HELLO_DELAY;
+         tv.tv_usec = 0;
+@@ -608,6 +611,7 @@ int control_finish (struct tunnel *t, struct call *c)
+ 		  "Connection established to %s, %d.  Local: %d, Remote: %d (ref=%u/%u).\n",
+ 		  IPADDY (t->peer.sin_addr),
+ 		  ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim);
++
+         if (t->lac)
+         {
+             /* This is part of a LAC, so we want to go ahead
+@@ -635,6 +639,9 @@ int control_finish (struct tunnel *t, struct call *c)
+ 		  IPADDY (t->peer.sin_addr),
+ 		  ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim,
+ 		  t->lns->entname);
++
++        connect_pppol2tp(t);
++
+         /* Schedule a HELLO */
+         tv.tv_sec = HELLO_DELAY;
+         tv.tv_usec = 0;
+diff --git a/l2tp.h b/l2tp.h
+index ac22f3f..0062095 100644
+--- a/l2tp.h
++++ b/l2tp.h
+@@ -167,6 +167,8 @@ struct tunnel
+     int ourrws;                 /* Receive Window Size */
+     int rxspeed;		/* Receive bps */
+     int txspeed;		/* Transmit bps */
++    int udp_fd;			/* UDP fd */
++    int pppox_fd;			/* PPPOX tunnel fd */
+     struct call *self;
+     struct lns *lns;            /* LNS that owns us */
+     struct lac *lac;            /* LAC that owns us */
+@@ -220,6 +222,7 @@ extern void control_xmit (void *);
+ extern int ppd;
+ extern int switch_io;           /* jz */
+ extern int control_fd;
++extern int connect_pppol2tp(struct tunnel *t);
+ extern int start_pppd (struct call *c, struct ppp_opts *);
+ extern void magic_lac_dial (void *);
+ extern int get_entropy (unsigned char *, int);
+diff --git a/network.c b/network.c
+index 82aedd7..8a3fec2 100644
+--- a/network.c
++++ b/network.c
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
++#include <sys/wait.h>
+ #ifndef LINUX
+ # include <sys/uio.h>
+ #endif
+@@ -36,7 +37,6 @@ int server_socket;              /* Server socket */
+ int kernel_support;             /* Kernel Support there or not? */
+ #endif
+ 
+-
+ int init_network (void)
+ {
+     long arg;
+@@ -45,6 +45,7 @@ int init_network (void)
+     server.sin_family = AF_INET;
+     server.sin_addr.s_addr = gconfig.listenaddr; 
+     server.sin_port = htons (gconfig.port);
++    int flags;
+     if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
+     {
+         l2tp_log (LOG_CRIT, "%s: Unable to allocate socket. Terminating.\n",
+@@ -52,6 +53,10 @@ int init_network (void)
+         return -EINVAL;
+     };
+ 
++    flags = 1;
++    setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
++    setsockopt(server_socket, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags));
++
+     if (bind (server_socket, (struct sockaddr *) &server, sizeof (server)))
+     {
+         close (server_socket);
+@@ -94,7 +99,7 @@ int init_network (void)
+         int kernel_fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
+         if (kernel_fd < 0)
+         {
+-            l2tp_log (LOG_INFO, "L2TP kernel support not detected.\n");
++            l2tp_log (LOG_INFO, "L2TP kernel support not detected (try modprobing l2tp_ppp and pppol2tp)\n");
+             kernel_support = 0;
+         }
+         else
+@@ -321,6 +326,11 @@ int build_fdset (fd_set *readfds)
+ 
+ 	while (tun)
+ 	{
++		if (tun->udp_fd > -1) {
++			if (tun->udp_fd > max)
++				max = tun->udp_fd;
++			FD_SET (tun->udp_fd, readfds);
++		}
+ 		call = tun->call_head;
+ 		while (call)
+ 		{
+@@ -390,6 +400,8 @@ void network_thread ()
+     struct iovec iov;
+     char cbuf[256];
+     unsigned int refme, refhim;
++    int * currentfd;
++    int server_socket_processed;
+ 
+     /* This one buffer can be recycled for everything except control packets */
+     buf = new_buf (MAX_RECV_SIZE);
+@@ -428,7 +440,21 @@ void network_thread ()
+         {
+             do_control ();
+         }
+-        if (FD_ISSET (server_socket, &readfds))
++        server_socket_processed = 0;
++        currentfd = NULL;
++        st = tunnels.head;
++        while (st || !server_socket_processed) {
++            if (st && (st->udp_fd == -1)) {
++                st=st->next;
++                continue;
++            }
++            if (st) {
++                currentfd = &st->udp_fd;
++            } else {
++                currentfd = &server_socket;
++                server_socket_processed = 1;
++            }
++            if (FD_ISSET (*currentfd, &readfds))
+         {
+             /*
+              * Okay, now we're ready for reading and processing new data.
+@@ -456,12 +482,19 @@ void network_thread ()
+ 	    msgh.msg_flags = 0;
+ 	    
+ 	    /* Receive one packet. */
+-	    recvsize = recvmsg(server_socket, &msgh, 0);
++	    recvsize = recvmsg(*currentfd, &msgh, 0);
+ 
+             if (recvsize < MIN_PAYLOAD_HDR_LEN)
+             {
+                 if (recvsize < 0)
+                 {
++                    if (errno == ECONNREFUSED) {
++                        close(*currentfd);
++                    }
++                    if ((errno == ECONNREFUSED) ||
++                        (errno == EBADF)) {
++                        *currentfd = -1;
++                    }
+                     if (errno != EAGAIN)
+                         l2tp_log (LOG_WARNING,
+                              "%s: recvfrom returned error %d (%s)\n",
+@@ -566,6 +599,8 @@ void network_thread ()
+ 		}
+ 	    };
+ 	}
++	if (st) st=st->next;
++	}
+ 
+ 	/*
+ 	 * finished obvious sources, look for data from PPP connections.
+@@ -638,3 +673,82 @@ void network_thread ()
+     }
+ 
+ }
++
++int connect_pppol2tp(struct tunnel *t) {
++#ifdef USE_KERNEL
++        if (kernel_support) {
++            int ufd = -1, fd2 = -1;
++            int flags;
++            struct sockaddr_pppol2tp sax;
++
++            struct sockaddr_in server;
++            server.sin_family = AF_INET;
++            server.sin_addr.s_addr = gconfig.listenaddr;
++            server.sin_port = htons (gconfig.port);
++            if ((ufd = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
++            {
++                l2tp_log (LOG_CRIT, "%s: Unable to allocate UDP socket. Terminating.\n",
++                    __FUNCTION__);
++                return -EINVAL;
++            };
++
++            flags=1;
++            setsockopt(ufd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
++            setsockopt(ufd, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags));
++
++            if (bind (ufd, (struct sockaddr *) &server, sizeof (server)))
++            {
++                close (ufd);
++                l2tp_log (LOG_CRIT, "%s: Unable to bind UDP socket: %s. Terminating.\n",
++                     __FUNCTION__, strerror(errno), errno);
++                return -EINVAL;
++            };
++            server = t->peer;
++            flags = fcntl(ufd, F_GETFL);
++            if (flags == -1 || fcntl(ufd, F_SETFL, flags | O_NONBLOCK) == -1) {
++                l2tp_log (LOG_WARNING, "%s: Unable to set UDP socket nonblock.\n",
++                     __FUNCTION__);
++                return -EINVAL;
++            }
++            if (connect (ufd, (struct sockaddr *) &server, sizeof(server)) < 0) {
++                l2tp_log (LOG_CRIT, "%s: Unable to connect UDP peer. Terminating.\n",
++                 __FUNCTION__);
++                return -EINVAL;
++            }
++
++            t->udp_fd=ufd;
++
++            fd2 = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
++            if (fd2 < 0) {
++                l2tp_log (LOG_WARNING, "%s: Unable to allocate PPPoL2TP socket.\n",
++                     __FUNCTION__);
++                return -EINVAL;
++            }
++            flags = fcntl(fd2, F_GETFL);
++            if (flags == -1 || fcntl(fd2, F_SETFL, flags | O_NONBLOCK) == -1) {
++                l2tp_log (LOG_WARNING, "%s: Unable to set PPPoL2TP socket nonblock.\n",
++                     __FUNCTION__);
++                return -EINVAL;
++            }
++            sax.sa_family = AF_PPPOX;
++            sax.sa_protocol = PX_PROTO_OL2TP;
++            sax.pppol2tp.pid = 0;
++            sax.pppol2tp.fd = t->udp_fd;
++            sax.pppol2tp.addr.sin_addr.s_addr = t->peer.sin_addr.s_addr;
++            sax.pppol2tp.addr.sin_port = t->peer.sin_port;
++            sax.pppol2tp.addr.sin_family = AF_INET;
++            sax.pppol2tp.s_tunnel  = t->ourtid;
++            sax.pppol2tp.s_session = 0;
++            sax.pppol2tp.d_tunnel  = t->tid;
++            sax.pppol2tp.d_session = 0;
++            if ((connect(fd2, (struct sockaddr *)&sax, sizeof(sax))) < 0) {
++                l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket. %d %s\n",
++                     __FUNCTION__, errno, strerror(errno));
++                close(fd2);
++                return -EINVAL;
++            }
++            t->pppox_fd = fd2;
++        }
++#endif
++    return 0;
++}
+diff --git a/xl2tpd.c b/xl2tpd.c
+index e98c948..8d7d117 100644
+--- a/xl2tpd.c
++++ b/xl2tpd.c
+@@ -278,7 +278,11 @@ void death_handler (int signal)
+     struct tunnel *st, *st2;
+     int sec;
+     l2tp_log (LOG_CRIT, "%s: Fatal signal %d received\n", __FUNCTION__, signal);
++#ifdef USE_KERNEL
++        if (kernel_support || signal != SIGTERM) {
++#else
+         if (signal != SIGTERM) {
++#endif
+                 st = tunnels.head;
+                 while (st)
+                 {
+@@ -349,7 +353,7 @@ int start_pppd (struct call *c, struct ppp_opts *opts)
+     int flags;
+ #endif
+     int pos = 1;
+-    int fd2;
++    int fd2 = -1;
+ #ifdef DEBUG_PPPD
+     int x;
+ #endif
+@@ -397,7 +401,7 @@ int start_pppd (struct call *c, struct ppp_opts *opts)
+        sax.sa_family = AF_PPPOX;
+        sax.sa_protocol = PX_PROTO_OL2TP;
+        sax.pppol2tp.pid = 0;
+-       sax.pppol2tp.fd = server_socket;
++       sax.pppol2tp.fd = c->container->udp_fd;
+        sax.pppol2tp.addr.sin_addr.s_addr = c->container->peer.sin_addr.s_addr;
+        sax.pppol2tp.addr.sin_port = c->container->peer.sin_port;
+        sax.pppol2tp.addr.sin_family = AF_INET;
+@@ -408,6 +412,7 @@ int start_pppd (struct call *c, struct ppp_opts *opts)
+        if (connect(fd2, (struct sockaddr *)&sax, sizeof(sax)) < 0) {
+            l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket.\n",
+                 __FUNCTION__);
++           close(fd2);
+            return -EINVAL;
+        }
+        stropt[pos++] = strdup ("plugin");
+@@ -484,7 +489,7 @@ int start_pppd (struct call *c, struct ppp_opts *opts)
+         dup2 (fd2, 0);
+         dup2 (fd2, 1);
+ 	close(fd2);
+-
++       }
+         /* close all the calls pty fds */
+         st = tunnels.head;
+         while (st)
+@@ -492,12 +497,17 @@ int start_pppd (struct call *c, struct ppp_opts *opts)
+             sc = st->call_head;
+             while (sc)
+             {
+-                close (sc->fd);
++#ifdef USE_KERNEL
++                if (kernel_support) {
++                    close(st->udp_fd); /* tunnel UDP fd */
++                    close(st->pppox_fd); /* tunnel PPPoX fd */
++                } else
++#endif
++                    close (sc->fd); /* call pty fd */
+                 sc = sc->next;
+             }
+             st = st->next;
+         }
+-       }
+ 
+         /* close the UDP socket fd */
+         close (server_socket);
+@@ -615,6 +625,10 @@ void destroy_tunnel (struct tunnel *t)
+        the memory pointed to by t->chal_us.vector at some other place */
+     if (t->chal_them.vector)
+         free (t->chal_them.vector);
++    if (t->pppox_fd > -1 )
++        close (t->pppox_fd);
++    if (t->udp_fd > -1 )
++        close (t->udp_fd);
+     free (t);
+     free (me);
+ }
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.3.1-no-type-punning-b119c0da.patch b/net-dialup/xl2tpd/files/xl2tpd-1.3.1-no-type-punning-b119c0da.patch
new file mode 100644
index 000000000000..681d9a6f94c4
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.3.1-no-type-punning-b119c0da.patch
@@ -0,0 +1,23 @@
+commit b119c0daf006dcf9d960e5a98902d619cdfdf485
+Author: Ted Phelps <phelps@gnusto.com>
+Date:   Thu Dec 20 17:53:54 2012 +1100
+
+    Avoid type punning: it makes gcc grumpy.
+    
+    Compilers don't like it when we write to memory as one type and read from it
+    as another.  Use memcpy instead of typecast games to avoid doing that.
+
+diff --git a/md5.c b/md5.c
+index 175edcc..cb056da 100644
+--- a/md5.c
++++ b/md5.c
+@@ -161,8 +161,7 @@ void MD5Final (unsigned char digest[16], struct MD5Context *ctx)
+     byteReverse (ctx->in, 14);
+ 
+     /* Append length in bits and transform */
+-    ((uint32 *) ctx->in)[14] = ctx->bits[0];
+-    ((uint32 *) ctx->in)[15] = ctx->bits[1];
++    memcpy(ctx->in + 14 * sizeof(uint32), ctx->bits, sizeof(ctx->bits));
+ 
+     MD5Transform (ctx->buf, (uint32 *) ctx->in);
+     byteReverse ((unsigned char *) ctx->buf, 4);
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 3751bcc34a95..a2f3cd4a2e06 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription>The Layer 2 Tunneling Protocol (L2TP) daemon mantained by Xelerance Corporation.</longdescription>
 	<use>
 		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
+		<flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..3ff8807dd0ce
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild,v 1.1 2012/12/26 04:14:30 floppym Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs vcs-snapshot
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
+SRC_URI="https://github.com/xelerance/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry +kernel"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+DEPEND+=" kernel? ( >=sys-kernel/linux-headers-2.6.23 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-CFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-no-type-punning-b119c0da.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-kernelmode.patch"
+	sed -i Makefile -e 's| -O2||g' || die "sed Makefile"
+	# The below patch is questionable. Why wasn't it submitted upstream? If it
+	# ever breaks, it will just be removed. -darkside 20120914
+	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
+	# Remove bundled headers
+	rm -r linux || die
+}
+
+src_compile() {
+	tc-export CC
+	export OSFLAGS="-DLINUX"
+	use kernel && OSFLAGS+=" -DUSE_KERNEL"
+	emake
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+
+	dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
+
+	dodir /etc/xl2tpd
+	cp doc/l2tp-secrets.sample "${ED}/etc/xl2tpd/l2tp-secrets" || die
+	cp doc/l2tpd.conf.sample "${ED}/etc/xl2tpd/xl2tpd.conf" || die
+	fperms 0600 /etc/xl2tpd/l2tp-secrets
+	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+}