diff options
| author | James Chapman <jchapman@katalix.com> | 2010-04-02 06:18:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-03 14:56:04 -0700 |
| commit | e0d4435f93905f517003cfa7328a36ea19788147 (patch) | |
| tree | cdf858e601d993405d3fd1f318446dddbf9e6fcb /include/linux/if_pppol2tp.h | |
| parent | f7faffa3ff8ef6ae712ef16312b8a2aa7a1c95fe (diff) | |
| download | linux-next-e0d4435f93905f517003cfa7328a36ea19788147.tar.gz | |
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
This patch makes changes to the L2TP PPP code for L2TPv3.
The existing code has some assumptions about the L2TP header which are
broken by L2TPv3. Also the sockaddr_pppol2tp structure of the original
code is too small to support the increased size of the L2TPv3 tunnel
and session id, so a new sockaddr_pppol2tpv3 structure is needed. In
the socket calls, the size of this structure is used to tell if the
operation is for L2TPv2 or L2TPv3.
Signed-off-by: James Chapman <jchapman@katalix.com>
Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_pppol2tp.h')
| -rw-r--r-- | include/linux/if_pppol2tp.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h index 1a1fb6e5d933..184bc5566207 100644 --- a/include/linux/if_pppol2tp.h +++ b/include/linux/if_pppol2tp.h @@ -35,6 +35,20 @@ struct pppol2tp_addr { __u16 d_tunnel, d_session; /* For sending outgoing packets */ }; +/* 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 */ +}; + /* Socket options: * DEBUG - bitmask of debug message categories * SENDSEQ - 0 => don't send packets with sequence numbers |