Djam/ppp
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/ppp.git synced 2025-02-23 14:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pppol2tpv3.patch

Browse source
This commit is contained in:
alexander barakin aka sash-kan 2012-09-03 19:27:27 +04:00
parent 997a50653c
commit af09ab627a
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ppp-2.4.5-pppol2tpv3.patch
View file

@ -1,9 +1,23 @@
--- ppp-2.4.5/include/linux/if_pppol2tp.h.pppol2tpv3 2009-11-16 22:26:07.000000000 +0000 --- ppp-2.4.5/include/linux/if_pppol2tp.h.pppol2tpv3 2009-11-17 01:26:07.000000000 +0300
+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-12-04 02:01:22.000000000 +0000 +++ ppp-2.4.5/include/linux/if_pppol2tp.h 2012-09-03 19:24:54.203084593 +0400
@@ -32,6 +32,20 @@ @@ -32,6 +32,45 @@ struct pppol2tp_addr
__u16 d_tunnel, d_session; /* For sending outgoing packets */ __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 {
+ __kernel_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 +/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure. + * bits. So we need a different sockaddr structure.
+ */ + */
@ -17,6 +31,17 @@
+ __u32 s_tunnel, s_session; /* For matching incoming packets */ + __u32 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */ + __u32 d_tunnel, d_session; /* For sending outgoing packets */
+}; +};
+
+struct pppol2tpv3in6_addr {
+ __kernel_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: /* Socket options:
* DEBUG - bitmask of debug message categories * DEBUG - bitmask of debug message categories