Re: [PATCH 00/12] l2tp: Introduce L2TPv3 support

Re: [PATCH 00/12] l2tp: Introduce L2TPv3 support

[James Chapman]

David Miller wrote:
> > Doesn't even build:
> >
> > net/l2tp/l2tp_ip.c:600: error: ‘compat_udp_setsockopt’ undeclared here (not in a function)
> > net/l2tp/l2tp_ip.c:601: error: ‘compat_udp_getsockopt’ undeclared here (not in a function)
> >
> > You can't do this like this, as the header providing these
> > declarations is private to net/ipv4/

Oops, no-one built this with CONFIG_COMPAT when testing. Will fix.

> > Respin your entire patch set once you've resolved this and
> > also please fix these fundamental whitespace errors emitted
> > by git when I apply your patches:

scripts/checkpatch.pl didn't pick these up. Is there a recommended way
to find these in the future? I'm using stg to manage these patches.

> > Applying: l2tp: Relocate pppol2tp driver to new net/l2tp directory
> > Applying: l2tp: Split pppol2tp driver into separate l2tp and ppp parts
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:118: new blank line at EOF.
> > +
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:133: new blank line at EOF.
> > +
> > warning: 2 lines add whitespace errors.
> > Applying: ppp: Add ppp_dev_name() exported function
> > Applying: l2tp: Add ppp device name to L2TP ppp session data
> > Applying: l2tp: Add L2TPv3 protocol support
> > Applying: l2tp: Update PPP-over-L2TP driver to work over L2TPv3
> > Applying: l2tp: Add L2TPv3 IP encapsulation (no UDP) support
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:61: new blank line at EOF.
> > +
> > warning: 1 line adds whitespace errors.
> > Applying: netlink: Export genl_lock() API for use by modules
> > Applying: l2tp: Add netlink control API for L2TP
> > Applying: l2tp: Add L2TP ethernet pseudowire support
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:25: space before tab in indent.
> >      used as a control protocol and for data encapsulation to set
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:26: space before tab in indent.
> >      up Pseudowires for transporting layer 2 Packet Data Units
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:27: space before tab in indent.
> >      across an IP network [RFC3931].
> > /home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:12: new blank line at EOF.
> > +
> > warning: 4 lines add whitespace errors.
> > Applying: l2tp: Add support for static unmanaged L2TPv3 tunnels
> > Applying: l2tp: Update documentation
> >
> > Thanks.

I'm out the office this week. I'll fix the above (unless others beat me
to it) and resend as soon as I'm back.

--
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development

Re: [PATCH 00/12] l2tp: Introduce L2TPv3 support

[David Miller]

From: James Chapman <james@jchapman.plus.com>
Date: Tue, 23 Mar 2010 10:19:03 +0000

> scripts/checkpatch.pl didn't pick these up. Is there a recommended way
> to find these in the future? I'm using stg to manage these patches.

GIT warns about them when you try to apply them.

I check patches using a dry run with a script that looks
something like:

#!/bin/sh
set -x
git apply --check --whitespace=error-all $1

Re: [PATCH 00/12] l2tp: Introduce L2TPv3 support

[David Miller]

Doesn't even build:

net/l2tp/l2tp_ip.c:600: error: ‘compat_udp_setsockopt’ undeclared here (not in a function)
net/l2tp/l2tp_ip.c:601: error: ‘compat_udp_getsockopt’ undeclared here (not in a function)

You can't do this like this, as the header providing these
declarations is private to net/ipv4/

Respin your entire patch set once you've resolved this and
also please fix these fundamental whitespace errors emitted
by git when I apply your patches:

Applying: l2tp: Relocate pppol2tp driver to new net/l2tp directory
Applying: l2tp: Split pppol2tp driver into separate l2tp and ppp parts
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:118: new blank line at EOF.
+
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:133: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Applying: ppp: Add ppp_dev_name() exported function
Applying: l2tp: Add ppp device name to L2TP ppp session data
Applying: l2tp: Add L2TPv3 protocol support
Applying: l2tp: Update PPP-over-L2TP driver to work over L2TPv3
Applying: l2tp: Add L2TPv3 IP encapsulation (no UDP) support
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:61: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: netlink: Export genl_lock() API for use by modules
Applying: l2tp: Add netlink control API for L2TP
Applying: l2tp: Add L2TP ethernet pseudowire support
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:25: space before tab in indent.
   	  used as a control protocol and for data encapsulation to set
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:26: space before tab in indent.
   	  up Pseudowires for transporting layer 2 Packet Data Units
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:27: space before tab in indent.
   	  across an IP network [RFC3931].
/home/davem/src/GIT/net-next-2.6/.git/rebase-apply/patch:12: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
Applying: l2tp: Add support for static unmanaged L2TPv3 tunnels
Applying: l2tp: Update documentation

Thanks.

[PATCH 00/12] l2tp: Introduce L2TPv3 support

[James Chapman]

This patch series adds L2TPv3 support. It splits the existing pppol2tp
driver to separate its L2TP and PPP parts, then adds new L2TPv3
functionality. The patches implement a new socket family for L2TPv3 IP
encapsulation, expose virtual netdevices for each L2TPv3 ethernet
pseudowire and add a netlink interface.

The following drivers are provided:-

l2tp_core    - L2TP driver core. Always required.
l2tp_ppp     - L2TP PPP (PPPoL2TP). L2TPv2 and L2TPv3.
l2tp_eth     - L2TPv3 ethernet pseudowire.
l2tp_ip      - L2TPv3 IP encapsulation.
l2tp_netlink - L2TPv3 netlink API.

The combination of l2tp_core and l2tp_ppp provides
backwards-compatible L2TPv2 pppol2tp functionality. Userspace L2TPv2
applications using the existing pppol2tp driver should not need to
change.

The implementation is as I described in a previous posting to netdev,
archived at
http://marc.info/?l=linux-netdev&m=120845482320143&w=4. Unfortunately,
splitting the existing pppol2tp driver into l2tp_core and l2tp_ppp
makes the changes difficult to review. The split is needed to separate
PPP from L2TP, since in L2TPv3, protocols other than PPP can be
carried. I have organised the patches so that the split is done first,
with new features added in separate patches.

Relevant RFCs are:-
- http://www.ietf.org/rfc/rfc3931.txt (L2TPv3)
- http://www.ietf.org/rfc/rfc4719.txt (L2TPv3 ethernet pseudowire)

A patchset is available to iproute2 which adds a number of commands
for unmanaged L2TPv3 tunnels. This will be submitted separately.

TODO:-
- Add IP pseudowires. These carry only IP frames (no L2 header).
- Add VLAN pseudowires.
- Add L2TP tunnel switching.
- Add ATM pseudowires - RFC3355 and RFC4454.

Signed-off-by: James Chapman <jchapman@katalix.com>

---

Some changes have been made since I posted initial RFC versions a
while ago. The changes are to merge in kernel features that have been
added since the work started. There are also some bugfixes and new
support for unmanaged L2TPv3 tunnels.

James Chapman (12):
      l2tp: Relocate pppol2tp driver to new net/l2tp directory
      l2tp: Split pppol2tp patch into separate l2tp and ppp parts
      ppp: Add ppp_dev_name() exported function
      l2tp: Add ppp device name to L2TP ppp session data
      l2tp: Add L2TPv3 protocol support
      l2tp: Update PPP-over-L2TP driver to work over L2TPv3
      l2tp: Add L2TPv3 IP encapsulation (no UDP) support
      netlink: Export genl_lock() API for use by modules
      l2tp: Add netlink control API for L2TP
      l2tp: Add L2TP ethernet pseudowire support
      l2tp: Add support for static unmanaged L2TPv3 tunnels
      l2tp: Update documentation



 Documentation/networking/l2tp.txt |  233 +++
 drivers/net/Kconfig               |    7 
 drivers/net/Makefile              |    2 
 drivers/net/ppp_generic.c         |   19 
 drivers/net/pppol2tp.c            | 2680 -------------------------------------
 include/linux/genetlink.h         |    8 
 include/linux/if_pppol2tp.h       |   16 
 include/linux/if_pppox.h          |    9 
 include/linux/l2tp.h              |  164 ++
 include/linux/ppp_channel.h       |    3 
 net/Kconfig                       |    1 
 net/Makefile                      |    1 
 net/l2tp/Kconfig                  |   95 +
 net/l2tp/Makefile                 |   11 
 net/l2tp/l2tp_core.c              | 2015 ++++++++++++++++++++++++++++
 net/l2tp/l2tp_core.h              |  306 ++++
 net/l2tp/l2tp_eth.c               |  383 +++++
 net/l2tp/l2tp_ip.c                |  679 +++++++++
 net/l2tp/l2tp_netlink.c           |  844 ++++++++++++
 net/l2tp/l2tp_ppp.c               | 1602 ++++++++++++++++++++++
 net/netlink/genetlink.c           |    6 
 21 files changed, 6360 insertions(+), 2724 deletions(-)
 delete mode 100644 drivers/net/pppol2tp.c
 create mode 100644 include/linux/l2tp.h
 create mode 100644 net/l2tp/Kconfig
 create mode 100644 net/l2tp/Makefile
 create mode 100644 net/l2tp/l2tp_core.c
 create mode 100644 net/l2tp/l2tp_core.h
 create mode 100644 net/l2tp/l2tp_eth.c
 create mode 100644 net/l2tp/l2tp_ip.c
 create mode 100644 net/l2tp/l2tp_netlink.c
 create mode 100644 net/l2tp/l2tp_ppp.c