netgraph7: Welcome ng_l2tp.
authorNuno Antunes <nuno.antunes@gmail.com>
Fri, 17 Sep 2010 22:28:25 +0000 (23:28 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:31 +0000 (14:10 +0000)
etc/mtree/BSD.include.dist
include/Makefile
lib/libnetgraph7/debug.c
sys/conf/files
sys/netgraph7/Makefile
sys/netgraph7/l2tp/Makefile [new file with mode: 0644]
sys/netgraph7/l2tp/ng_l2tp.c [moved from sys/netgraph7/ng_l2tp.c with 99% similarity]
sys/netgraph7/l2tp/ng_l2tp.h [moved from sys/netgraph7/ng_l2tp.h with 100% similarity]

index da32131..d6aa67b 100644 (file)
         ..
         ksocket
         ..
+        l2tp
+        ..
         pptpgre
         ..
         socket
index fb4cc0f..538007b 100644 (file)
@@ -70,7 +70,7 @@ LSUBDIRS=     bus/cam bus/cam/scsi \
        netgraph7/UI netgraph7/async netgraph7/atmllc netgraph7/bpf \
        netgraph7/bridge netgraph7/cisco netgraph7/deflate netgraph7/echo \
        netgraph7/etf netgraph7/ether netgraph7/frame_relay netgraph7/hole \
-       netgraph7/iface netgraph7/ksocket netgraph7/pptpgre \
+       netgraph7/iface netgraph7/ksocket netgraph7/l2tp netgraph7/pptpgre \
        netgraph7/socket netgraph7/tee netgraph7/vjc \
        bus/cam bus/usb bus/pccard bus/pci bus/isa bus/ppbus bus/smbus \
        netproto/atm netproto/ipsec netproto/ipx \
index 72b7d15..0a73ac6 100644 (file)
@@ -82,8 +82,8 @@
 #include <netgraph7/ip_input/ng_ip_input.h>
 */
 #include <netgraph7/ksocket/ng_ksocket.h>
-/*
 #include <netgraph7/l2tp/ng_l2tp.h>
+/*
 #include <netgraph7/lmi/ng_lmi.h>
 #include <netgraph7/mppc/ng_mppc.h>
 #include <netgraph7/one2many/ng_one2many.h>
index 1b01a62..925b5d8 100644 (file)
@@ -1323,7 +1323,7 @@ netgraph7/iface/ng_iface.c        optional netgraph7_iface
 netgraph7/ng_ip_input.c                optional netgraph7_ip_input
 netgraph7/ng_ipfw.c            optional netgraph7_ipfw
 netgraph7/ksocket/ng_ksocket.c optional netgraph7_ksocket
-netgraph7/ng_l2tp.c            optional netgraph7_l2tp
+netgraph7/l2tp/ng_l2tp.c       optional netgraph7_l2tp
 netgraph7/ng_lmi.c             optional netgraph7_lmi
 netgraph7/ng_mppc.c            optional netgraph7_mppc_compression
 netgraph7/ng_mppc.c            optional netgraph7_mppc_encryption
index ed9c471..b30e56a 100644 (file)
@@ -16,6 +16,7 @@ SUBDIR=       UI \
        hole \
        iface \
        ksocket \
+       l2tp \
        netgraph \
        pptpgre \
        socket \
@@ -23,7 +24,6 @@ SUBDIR=       UI \
        vjc
 #      eiface \
 #      fec \
-#      l2tp \
 #      lmi \
 #      netgraph \
 #      one2many \
diff --git a/sys/netgraph7/l2tp/Makefile b/sys/netgraph7/l2tp/Makefile
new file mode 100644 (file)
index 0000000..131fe16
--- /dev/null
@@ -0,0 +1,7 @@
+# $FreeBSD: src/sys/modules/netgraph/l2tp/Makefile,v 1.1.2.1 2002/08/20 23:48:15 archie Exp $
+# $DragonFly: src/sys/netgraph/l2tp/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+
+KMOD=          ng_l2tp
+SRCS=          ng_l2tp.c
+
+.include <bsd.kmod.mk>
similarity index 99%
rename from sys/netgraph7/ng_l2tp.c
rename to sys/netgraph7/l2tp/ng_l2tp.c
index 58d05d2..2a091f0 100644 (file)
@@ -57,9 +57,9 @@
 #include <sys/errno.h>
 #include <sys/libkern.h>
 
-#include "ng_message.h"
-#include "netgraph.h"
-#include "ng_parse.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
+#include <netgraph7/ng_parse.h>
 #include "ng_l2tp.h"
 
 #ifdef NG_SEPARATE_MALLOC