* [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers
@ 2007-04-23 12:56 James Chapman
0 siblings, 0 replies; 4+ messages in thread
From: James Chapman @ 2007-04-23 12:56 UTC (permalink / raw)
To: netdev
[L2TP]: Modify kernel headers for L2TP.
This patch adds L2TP definitions to existing PPP and socket headers.
Signed-off-by: James Chapman <jchapman@katalix.com>
---
Add struct sockaddr_pppol2tp to carry L2TP-specific address
information for the PPPoX (PPPoL2TP) socket. Unfortunately we can't
use the union inside struct sockaddr_pppox because the L2TP-specific
data is larger than the current size of the union and we must preserve
the size of struct sockaddr_pppox for binary compatibility.
Also add an ioctl to allow userspace to obtain L2TP counters and state
from the kernel.
Index: linux-2.6.21-rc7/include/linux/if_ppp.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/if_ppp.h
+++ linux-2.6.21-rc7/include/linux/if_ppp.h
@@ -110,6 +110,21 @@ struct ifpppcstatsreq {
struct ppp_comp_stats stats;
};
+/* For PPPIOCGL2TPSTATS */
+struct pppol2tp_ioc_stats {
+ __u16 tunnel_id; /* redundant */
+ __u16 session_id; /* if zero, get tunnel stats */
+ __u32 using_ipsec:1; /* valid only for session_id == 0 */
+ __u64 tx_packets;
+ __u64 tx_bytes;
+ __u64 tx_errors;
+ __u64 rx_packets;
+ __u64 rx_bytes;
+ __u64 rx_seq_discards;
+ __u64 rx_oos_packets;
+ __u64 rx_errors;
+};
+
#define ifr__name b.ifr_ifrn.ifrn_name
#define stats_ptr b.ifr_ifru.ifru_data
@@ -146,6 +161,7 @@ struct ifpppcstatsreq {
#define PPPIOCDISCONN _IO('t', 57) /* disconnect channel */
#define PPPIOCATTCHAN _IOW('t', 56, int) /* attach to ppp channel */
#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
+#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */
Index: linux-2.6.21-rc7/include/linux/if_pppox.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/if_pppox.h
+++ linux-2.6.21-rc7/include/linux/if_pppox.h
@@ -18,7 +18,19 @@
#include <asm/types.h>
+#ifdef __KERNEL__
#include <asm/byteorder.h>
+#else
+#include <endian.h>
+#include <byteswap.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN_BITFIELD
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define __BIG_ENDIAN_BITFIELD
+#else
+#error "Adjust your <endian.h> defines."
+#endif
+#endif
#ifdef __KERNEL__
#include <linux/if_ether.h>
@@ -27,6 +39,7 @@
#include <asm/semaphore.h>
#include <linux/ppp_channel.h>
#endif /* __KERNEL__ */
+#include <linux/if_pppol2tp.h>
/* For user-space programs to pick up these definitions
* which they wouldn't get otherwise without defining __KERNEL__
@@ -50,8 +63,9 @@ struct pppoe_addr{
* Protocols supported by AF_PPPOX
*/
#define PX_PROTO_OE 0 /* Currently just PPPoE */
-#define PX_MAX_PROTO 1
-
+#define PX_PROTO_OL2TP 1 /* Now L2TP also */
+#define PX_MAX_PROTO 2
+
struct sockaddr_pppox {
sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */
@@ -60,6 +74,16 @@ struct sockaddr_pppox {
}sa_addr;
}__attribute__ ((packed));
+/* The use of the above union isn't viable because the size of this
+ * struct must stay fixed over time -- applications use sizeof(struct
+ * sockaddr_pppox) to fill it. We use a protocol specific sockaddr
+ * type instead.
+ */
+struct sockaddr_pppol2tp {
+ sa_family_t sa_family; /* address family, AF_PPPOX */
+ unsigned int sa_protocol; /* protocol identifier */
+ struct pppol2tp_addr pppol2tp;
+}__attribute__ ((packed));
/*********************************************************************
*
Index: linux-2.6.21-rc7/include/linux/socket.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/socket.h
+++ linux-2.6.21-rc7/include/linux/socket.h
@@ -284,6 +284,7 @@ struct ucred {
#define SOL_DCCP 269
#define SOL_NETLINK 270
#define SOL_TIPC 271
+#define SOL_PPPOL2TP 272
/* IPX options */
#define IPX_TYPE 1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers
@ 2007-04-23 16:01 James Chapman
2007-04-23 16:21 ` Dale Farnsworth
2007-04-30 7:08 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: James Chapman @ 2007-04-23 16:01 UTC (permalink / raw)
To: netdev
[L2TP]: Modify kernel headers for L2TP.
This patch adds L2TP definitions to existing PPP and socket headers.
Signed-off-by: James Chapman <jchapman@katalix.com>
---
Add struct sockaddr_pppol2tp to carry L2TP-specific address
information for the PPPoX (PPPoL2TP) socket. Unfortunately we can't
use the union inside struct sockaddr_pppox because the L2TP-specific
data is larger than the current size of the union and we must preserve
the size of struct sockaddr_pppox for binary compatibility.
Also add an ioctl to allow userspace to obtain L2TP counters and state
from the kernel.
Index: linux-2.6.21-rc7/include/linux/if_ppp.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/if_ppp.h
+++ linux-2.6.21-rc7/include/linux/if_ppp.h
@@ -110,6 +110,21 @@ struct ifpppcstatsreq {
struct ppp_comp_stats stats;
};
+/* For PPPIOCGL2TPSTATS */
+struct pppol2tp_ioc_stats {
+ __u16 tunnel_id; /* redundant */
+ __u16 session_id; /* if zero, get tunnel stats */
+ __u32 using_ipsec:1; /* valid only for session_id == 0 */
+ __u64 tx_packets;
+ __u64 tx_bytes;
+ __u64 tx_errors;
+ __u64 rx_packets;
+ __u64 rx_bytes;
+ __u64 rx_seq_discards;
+ __u64 rx_oos_packets;
+ __u64 rx_errors;
+};
+
#define ifr__name b.ifr_ifrn.ifrn_name
#define stats_ptr b.ifr_ifru.ifru_data
@@ -146,6 +161,7 @@ struct ifpppcstatsreq {
#define PPPIOCDISCONN _IO('t', 57) /* disconnect channel */
#define PPPIOCATTCHAN _IOW('t', 56, int) /* attach to ppp channel */
#define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */
+#define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats)
#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0)
#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */
Index: linux-2.6.21-rc7/include/linux/if_pppox.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/if_pppox.h
+++ linux-2.6.21-rc7/include/linux/if_pppox.h
@@ -18,7 +18,19 @@
#include <asm/types.h>
+#ifdef __KERNEL__
#include <asm/byteorder.h>
+#else
+#include <endian.h>
+#include <byteswap.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN_BITFIELD
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define __BIG_ENDIAN_BITFIELD
+#else
+#error "Adjust your <endian.h> defines."
+#endif
+#endif
#ifdef __KERNEL__
#include <linux/if_ether.h>
@@ -27,6 +39,7 @@
#include <asm/semaphore.h>
#include <linux/ppp_channel.h>
#endif /* __KERNEL__ */
+#include <linux/if_pppol2tp.h>
/* For user-space programs to pick up these definitions
* which they wouldn't get otherwise without defining __KERNEL__
@@ -50,8 +63,9 @@ struct pppoe_addr{
* Protocols supported by AF_PPPOX
*/
#define PX_PROTO_OE 0 /* Currently just PPPoE */
-#define PX_MAX_PROTO 1
-
+#define PX_PROTO_OL2TP 1 /* Now L2TP also */
+#define PX_MAX_PROTO 2
+
struct sockaddr_pppox {
sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */
@@ -60,6 +74,16 @@ struct sockaddr_pppox {
}sa_addr;
}__attribute__ ((packed));
+/* The use of the above union isn't viable because the size of this
+ * struct must stay fixed over time -- applications use sizeof(struct
+ * sockaddr_pppox) to fill it. We use a protocol specific sockaddr
+ * type instead.
+ */
+struct sockaddr_pppol2tp {
+ sa_family_t sa_family; /* address family, AF_PPPOX */
+ unsigned int sa_protocol; /* protocol identifier */
+ struct pppol2tp_addr pppol2tp;
+}__attribute__ ((packed));
/*********************************************************************
*
Index: linux-2.6.21-rc7/include/linux/socket.h
===================================================================
--- linux-2.6.21-rc7.orig/include/linux/socket.h
+++ linux-2.6.21-rc7/include/linux/socket.h
@@ -284,6 +284,7 @@ struct ucred {
#define SOL_DCCP 269
#define SOL_NETLINK 270
#define SOL_TIPC 271
+#define SOL_PPPOL2TP 272
/* IPX options */
#define IPX_TYPE 1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers
2007-04-23 16:01 [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers James Chapman
@ 2007-04-23 16:21 ` Dale Farnsworth
2007-04-30 7:08 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Dale Farnsworth @ 2007-04-23 16:21 UTC (permalink / raw)
To: jchapman, netdev
James Chapman wrote:
> [L2TP]: Modify kernel headers for L2TP.
Since the Subject: line becomes the first line of the commit comments,
the above line is redundant.
> This patch adds L2TP definitions to existing PPP and socket headers.
>
> Signed-off-by: James Chapman <jchapman@katalix.com>
>
> ---
>
> Add struct sockaddr_pppol2tp to carry L2TP-specific address
> information for the PPPoX (PPPoL2TP) socket. Unfortunately we can't
> use the union inside struct sockaddr_pppox because the L2TP-specific
> data is larger than the current size of the union and we must preserve
> the size of struct sockaddr_pppox for binary compatibility.
>
> Also add an ioctl to allow userspace to obtain L2TP counters and state
> from the kernel.
In my opinion, the above info is sufficiently useful to be included
commit comments.
-Dale Farnsworth
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers
2007-04-23 16:01 [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers James Chapman
2007-04-23 16:21 ` Dale Farnsworth
@ 2007-04-30 7:08 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2007-04-30 7:08 UTC (permalink / raw)
To: jchapman; +Cc: netdev
From: James Chapman <jchapman@katalix.com>
Date: Mon, 23 Apr 2007 17:01:03 +0100
> Index: linux-2.6.21-rc7/include/linux/if_pppox.h
> ===================================================================
> --- linux-2.6.21-rc7.orig/include/linux/if_pppox.h
> +++ linux-2.6.21-rc7/include/linux/if_pppox.h
> @@ -18,7 +18,19 @@
>
>
> #include <asm/types.h>
> +#ifdef __KERNEL__
> #include <asm/byteorder.h>
> +#else
> +#include <endian.h>
> +#include <byteswap.h>
> +#if __BYTE_ORDER == __LITTLE_ENDIAN
> +#define __LITTLE_ENDIAN_BITFIELD
> +#elif __BYTE_ORDER == __BIG_ENDIAN
> +#define __BIG_ENDIAN_BITFIELD
> +#else
> +#error "Adjust your <endian.h> defines."
> +#endif
> +#endif
Please don't do this, doubly especially without a changelog comment
explaining why.
No other kernel header has to accomodate userland issues like this, so
please find another way that doesn't involve crapping up the in-kernel
header files.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-04-30 7:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-23 16:01 [PATCH 2/5 2.6.21-rc7] l2tp: pppol2tp changes to existing ppp kernel headers James Chapman
2007-04-23 16:21 ` Dale Farnsworth
2007-04-30 7:08 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2007-04-23 12:56 James Chapman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).