l2tp: add L2TPv3 IP encapsulation socket
Subsystems (2)
RFC PATCH 5/8 l2tp: add L2TPv3 IP encapsulation socket
Add L2TP over IP support.
This patch adds a new L2TPIP socket family and modifies the core to handle the case where there is no UDP header in the L2TP packet. Since L2TP/UDP and L2TP/IP packets differ in layout, the datapath packet handling code needs changes.
We can't use raw sockets for this because the semantics of raw sockets don't lend themselves to the socket-per-tunnel model - we need to differentiate sockets between the same IP peers by L2TP tunnel ids.
net/l2tp/l2tp_core.c +77 -43
@@ -39,16 +39,19 @@#include <linux/inetdevice.h> #include <linux/skbuff.h> #include <linux/init.h> +#include <linux/in.h> #include <linux/ip.h> #include <linux/udp.h> #include <linux/hash.h> #include <linux/sort.h> #include <linux/proc_fs.h> +#include <linux/l2tp.h> #include <net/net_namespace.h> #include <net/dst.h> #include <net/ip.h> #include <net/udp.h> #include <net/xfrm.h> +#include <net/protocol.h> #include <asm/byteorder.h> #include <asm/atomic.h>
@@ -411,9 +414,9 @@ out:* session-id have already been parsed and ptr points to the data * after the session-id. */ -static void l2tp_recv_common (struct l2tp_session *session,struct sk_buff *skb, -unsigned char *ptr,unsigned char *optr,u16 hdrflags, -int length,int (*payload_hook)(struct sk_buff *skb)) +void l2tp_recv_common (struct l2tp_session *session,struct sk_buff *skb, +unsigned char *ptr,unsigned char *optr,u16 hdrflags, +int length,int (*payload_hook)(struct sk_buff *skb)) {struct l2tp_tunnel *tunnel = session->tunnel;int offset;
@@ -427,16 +430,18 @@ static void l2tp_recv_common(struct l2tpif (session->ref) (*session->ref)(session); -/* Parse and check optional cookie */ -if (session->peer_cookie_len >0 ) { -if (memcmp (ptr, &session->peer_cookie[0 ], session->peer_cookie_len)) { -PRINTK (tunnel->debug,L2TP_MSG_DATA ,KERN_INFO , -"%s: cookie mismatch (%u/%u). Discarding.\n" , - tunnel->name, tunnel->tunnel_id, session->session_id); - session->stats.rx_cookie_discards++; - goto discard; +if (tunnel->version ==L2TP_HDR_VER_3 ) { +/* Parse and check optional cookie */ +if (session->peer_cookie_len >0 ) { +if (memcmp (ptr, &session->peer_cookie[0 ], session->peer_cookie_len)) { +PRINTK (tunnel->debug,L2TP_MSG_DATA ,KERN_INFO , +"%s: cookie mismatch (%u/%u). Discarding.\n" , + tunnel->name, tunnel->tunnel_id, session->session_id); + session->stats.rx_cookie_discards++; + goto discard; + } + ptr += session->peer_cookie_len; } - ptr += session->peer_cookie_len; }/* Handle the optional sequence numbers. Sequence numbers are
@@ -610,6 +615,7 @@ discard:l2tp_session_dec_refcount (session); } +EXPORT_SYMBOL (l2tp_recv_common);/* Internal UDP receive frame. Do the real work of receiving an L2TP data frame * here. The skb is not on a list when we get here.
@@ -787,15 +793,21 @@ static int l2tp_build_l2tpv2_header(strustatic int l2tp_build_l2tpv3_header (struct l2tp_session *session,void *buf) { +struct l2tp_tunnel *tunnel = session->tunnel;char *bufp = buf;char *optr = bufp; -u16 flags =L2TP_HDR_VER_3 ; -/* Setup L2TP header. */ - *((__be16 *) bufp) =htons (flags); - bufp +=2 ; - *((__be16 *) bufp) =0 ; - bufp +=2 ; +/* Setup L2TP header. The header differs slightly for UDP and +* IP encapsulations. For UDP, there is 4 bytes of flags. +*/ +if (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) { +u16 flags =L2TP_HDR_VER_3 ; + *((__be16 *) bufp) =htons (flags); + bufp +=2 ; + *((__be16 *) bufp) =0 ; + bufp +=2 ; + } + *((__be32 *) bufp) =htonl (session->peer_session_id); bufp +=4 ;if (session->cookie_len) {
@@ -840,10 +852,11 @@ int l2tp_xmit_core(struct l2tp_session *if (session->debug &L2TP_MSG_DATA ) {int i; -unsigned char *datap = skb->data +sizeof (struct udphdr ); +int uhlen = (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) ?sizeof (struct udphdr ) :0 ; +unsigned char *datap = skb->data + uhlen;printk (KERN_DEBUG "%s: xmit:" , session->name); -for (i =0 ; i < (len -sizeof (struct udphdr )); i++) { +for (i =0 ; i < (len - uhlen); i++) {printk (" %02X" , *datap++);if (i ==31 ) {printk (" ..." );
@@ -894,20 +907,22 @@ static inline void l2tp_skb_set_owner_w(int l2tp_xmit_skb (struct l2tp_session *session,struct sk_buff *skb,int hdr_len) {int data_len = skb->len; -struct sock *sk = session->tunnel->sock; +struct l2tp_tunnel *tunnel = session->tunnel; +struct sock *sk = tunnel->sock;struct udphdr *uh;struct inet_sock *inet;__wsum csum =0 ;int old_headroom;int new_headroom;int headroom; +int uhlen = (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) ?sizeof (struct udphdr ) :0 ;/* Check that there's enough headroom in the skb to insert IP, * UDP and L2TP headers. If not enough, expand it to * make room. Adjust truesize. */ headroom =NET_SKB_PAD +sizeof (struct iphdr ) + -sizeof (struct udphdr ) + hdr_len; + uhlen + hdr_len; old_headroom =skb_headroom (skb);if (skb_cow_head (skb, headroom)) goto abort;
@@ -919,19 +934,27 @@ int l2tp_xmit_skb(struct l2tp_session *s/* Setup L2TP header */ session->build_header (session,__skb_push (skb, hdr_len)); -/* Setup UDP header */ - inet =inet_sk (sk); -__skb_push (skb,sizeof (*uh)); -skb_reset_transport_header (skb); - uh =udp_hdr (skb); - uh->source = inet->sport; - uh->dest = inet->dport; - uh->len =htons (sizeof (struct udphdr ) + hdr_len + data_len); - uh->check =0 ; - -/* *BROKEN* Calculate UDP checksum if configured to do so */ -if (sk->sk_no_check !=UDP_CSUM_NOXMIT ) - csum =udp_csum_outgoing (sk, skb); +switch (tunnel->encap) { +case L2TP_ENCAPTYPE_UDP : +/* Setup UDP header */ + inet =inet_sk (sk); +__skb_push (skb,sizeof (*uh)); +skb_reset_transport_header (skb); + uh =udp_hdr (skb); + uh->source = inet->sport; + uh->dest = inet->dport; + uh->len =htons (uhlen + hdr_len + data_len); + uh->check =0 ; + +/* *BROKEN* Calculate UDP checksum if configured to do so */ +if (sk->sk_no_check !=UDP_CSUM_NOXMIT ) + csum =udp_csum_outgoing (sk, skb); + +break ; + +case L2TP_ENCAPTYPE_IP : +break ; + }memset (&(IPCB (skb)->opt),0 ,sizeof (IPCB (skb)->opt)); IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
@@ -972,9 +995,15 @@ void l2tp_tunnel_destruct(struct sock *s/* Close all sessions */ l2tp_tunnel_closeall (tunnel); -/* No longer an encapsulation socket. See net/ipv4/udp.c */ - (udp_sk (sk))->encap_type =0 ; - (udp_sk (sk))->encap_rcv =NULL ; +switch (tunnel->encap) { +case L2TP_ENCAPTYPE_UDP : +/* No longer an encapsulation socket. See net/ipv4/udp.c */ + (udp_sk (sk))->encap_type =0 ; + (udp_sk (sk))->encap_rcv =NULL ; +break ; +case L2TP_ENCAPTYPE_IP : +break ; + }/* Remove hooks into tunnel socket */ tunnel->sock =NULL ;
@@ -1127,12 +1156,15 @@ int l2tp_tunnel_create(int fd, int versisprintf (&tunnel->name[0 ],"tunl %u" , tunnel_id);rwlock_init (&tunnel->hlist_lock); -if (cfg) +if (cfg->debug) tunnel->debug = cfg->debug; -/* Mark socket as an encapsulation socket. See net/ipv4/udp.c */ -udp_sk (sk)->encap_type =UDP_ENCAP_L2TPINUDP ; -udp_sk (sk)->encap_rcv = l2tp_udp_encap_recv; + tunnel->encap = cfg->encap; +if (tunnel->encap ==L2TP_ENCAPTYPE_UDP ) { +/* Mark socket as an encapsulation socket. See net/ipv4/udp.c */ +udp_sk (sk)->encap_type =UDP_ENCAP_L2TPINUDP ; +udp_sk (sk)->encap_rcv = l2tp_udp_encap_recv; + } sk->sk_user_data = tunnel;
@@ -1213,7 +1245,9 @@ void l2tp_session_set_header_len(structif (session->send_seq) session->header_len +=4 ; }else { - session->header_len =8 + session->cookie_len + session->l2specific_len + session->offset; + session->header_len =4 + session->cookie_len + session->l2specific_len + session->offset; +if (session->tunnel->encap ==L2TP_ENCAPTYPE_UDP ) + session->header_len +=4 ; } }
net/l2tp/l2tp_core.h +10 -0
@@ -48,6 +48,11 @@ enum l2tp_l2spec_type { L2TP_L2SPECTYPE_DEFAULT, }; +enum l2tp_encap_type { +L2TP_ENCAPTYPE_UDP , +L2TP_ENCAPTYPE_IP , +}; +struct sk_buff ;struct l2tp_stats {
@@ -82,6 +87,7 @@ struct l2tp_session_cfg {* control of LNS. */ int debug;/* bitmask of debug message * categories */ +u16 vlan_id;/* VLAN pseudowire only */ u16 offset;/* offset to payload */ u16 l2specific_len;/* Layer 2 specific length */ u16 l2specific_type;/* Layer 2 specific type */
@@ -93,6 +99,7 @@ struct l2tp_session_cfg {* (in jiffies) */ int mtu;int mru; +char *ifname; };struct l2tp_session {
@@ -157,6 +164,7 @@ struct l2tp_session {struct l2tp_tunnel_cfg {int debug;/* bitmask of debug message * categories */ +enum l2tp_encap_type encap; };struct l2tp_tunnel {
@@ -172,6 +180,7 @@ struct l2tp_tunnel {char name[20 ];/* for logging */ int debug;/* bitmask of debug message * categories */ +enum l2tp_encap_type encap;struct l2tp_stats stats;struct list_head list;/* Keep a list of all tunnels */
@@ -224,6 +233,7 @@ extern int l2tp_tunnel_create(int fd, inextern struct l2tp_session *l2tp_session_create (int priv_size,struct l2tp_tunnel *tunnel,u32 session_id,u32 peer_session_id,struct l2tp_session_cfg *cfg);extern void l2tp_tunnel_free (struct l2tp_tunnel *tunnel);extern void l2tp_session_free (struct l2tp_session *session); +extern void l2tp_recv_common (struct l2tp_session *session,struct sk_buff *skb,unsigned char *ptr,unsigned char *optr,u16 hdrflags,int length,int (*payload_hook)(struct sk_buff *skb));extern int l2tp_udp_recv_core (struct l2tp_tunnel *tunnel,struct sk_buff *skb,int (*payload_hook)(struct sk_buff *skb));extern int l2tp_udp_encap_recv (struct sock *sk,struct sk_buff *skb);
net/l2tp/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-$(CONFIG_L2TP) += l2tp_core.o # Build l2tp as modules if L2TP is M obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_PPPOL2TP)) += l2tp_ppp.o - +obj-$(subst y,$(CONFIG_L2TP),$(CONFIG_L2TP_IP)) += l2tp_ip.o
net/l2tp/l2tp_ip.c new file +622 -0
622 lines not on this page · raw message
include/linux/l2tp.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* L2TP-over-IP socket for L2TPv3. +* +* Author: James Chapman <[email protected]> +*/ + +#ifndef _LINUX_L2TP_H_ +#define _LINUX_L2TP_H_ + +#include <linux/types.h> +#ifdef __KERNEL__ +#include <linux/socket.h> +#include <linux/in.h> +#endif + +#define IPPROTO_L2TP 115 + +/** +* struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets +* @l2tp_family: address family number AF_L2TPIP. +* @l2tp_addr: protocol specific address information +* @l2tp_conn_id: connection id of tunnel +*/ +struct sockaddr_l2tpip { +/* The first fields must match struct sockaddr_in */ +sa_family_t l2tp_family;/* AF_INET */ +__be16 l2tp_unused;/* INET port number (unused) */ +struct in_addr l2tp_addr;/* Internet address */ + +__u32 l2tp_conn_id;/* Connection ID of tunnel */ + +/* Pad to size of `struct sockaddr'. */ +unsigned char __pad[sizeof (struct sockaddr ) -sizeof (sa_family_t) - +sizeof (__be16) -sizeof (struct in_addr ) - +sizeof (__u32)]; +}; + +#endif
net/l2tp/Kconfig +18 -0
@@ -51,3 +51,21 @@ config L2TP_V3 If you are connecting to L2TPv3 equipment, or you want to tunnel raw ethernet frames using L2TP, say Y here. If unsure, say N. + +config L2TP_IP + tristate "L2TP IP encapsulation for L2TPv3" + depends on L2TP_V3 + help + Support for L2TP-over-IP socket family. + + The L2TPv3 protocol defines two possible encapsulations for + L2TP frames, namely UDP and plain IP (without UDP). This + driver provides a new L2TPIP socket family with which + userspace L2TPv3 daemons may create L2TP/IP tunnel sockets + when UDP encapsulation is not required. When L2TP is carried + in IP packets, it used IP protocol number 115, so this port + must be enabled in firewalls. + + To compile this driver as a module, choose M here. The module + will be called l2tp_ip. +