fishHEADmaster

1 files changed, 56 insertions, 0 deletions

diff --git a/package/network/services/ppp/patches/.svn/text-base/430-pppol2tpv3-struct.patch.svn-base b/package/network/services/ppp/patches/.svn/text-base/430-pppol2tpv3-struct.patch.svn-base
new file mode 100644
index 0000000..204aa4e
--- /dev/null
+++ b/package/network/services/ppp/patches/.svn/text-base/430-pppol2tpv3-struct.patch.svn-base
@@ -0,0 +1,56 @@
+pppol2tp: Provide struct pppol2tpv3_addr to align with Linux
+
+The struct pppol2tpv3_addr is referenced in the current Linux kernel sources
+but not provided by the shipped kernel headers, add it.
+
+Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
+
+--- a/include/linux/if_pppol2tp.h
++++ b/include/linux/if_pppol2tp.h
+@@ -32,6 +32,46 @@ struct pppol2tp_addr
+ 	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
+ };
+ 
++/* Structure used to connect() the socket to a particular tunnel UDP
++ * socket over IPv6.
++ */
++struct pppol2tpin6_addr
++{
++	pid_t	pid;		/* pid that owns the fd.
++					 * 0 => current */
++	int	fd;			/* FD of UDP socket to use */
++
++	__u16 s_tunnel, s_session;	/* For matching incoming packets */
++	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
++
++	struct sockaddr_in6 addr;	/* IP address and port to send to */
++};
++
++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
++ * bits. So we need a different sockaddr structure.
++ */
++struct pppol2tpv3_addr {
++	pid_t	pid;			/* pid that owns the fd.
++					 * 0 => current */
++	int	fd;			/* FD of UDP or IP socket to use */
++
++	struct sockaddr_in addr;	/* IP address and port to send to */
++
++	__u32 s_tunnel, s_session;	/* For matching incoming packets */
++	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
++};
++
++struct pppol2tpv3in6_addr {
++	pid_t	pid;		/* pid that owns the fd.
++					 * 0 => current */
++	int	fd;			/* FD of UDP or IP socket to use */
++
++	__u32 s_tunnel, s_session;	/* For matching incoming packets */
++	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
++
++	struct sockaddr_in6 addr;	/* IP address and port to send to */
++};
++
+ /* Socket options:
+  * DEBUG	- bitmask of debug message categories
+  * SENDSEQ	- 0 => don't send packets with sequence numbers