netgraph7: Welcome ng_pptpgre.
authorNuno Antunes <nuno.antunes@gmail.com>
Thu, 16 Sep 2010 23:40:37 +0000 (00:40 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:29 +0000 (14:10 +0000)
etc/mtree/BSD.include.dist
include/Makefile
lib/libnetgraph7/debug.c
sys/conf/files
sys/netgraph7/Makefile
sys/netgraph7/pptpgre/Makefile [new file with mode: 0644]
sys/netgraph7/pptpgre/ng_pptpgre.c [moved from sys/netgraph7/ng_pptpgre.c with 99% similarity]
sys/netgraph7/pptpgre/ng_pptpgre.h [moved from sys/netgraph7/ng_pptpgre.h with 100% similarity]

index 647e2c2..1f80b8c 100644 (file)
         ..
         ksocket
         ..
+        pptpgre
+        ..
         socket
         ..
         tee
index 00011eb..872e849 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/ether netgraph7/hole \
-       netgraph7/iface netgraph7/ksocket \
+       netgraph7/iface netgraph7/ksocket 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 c38d95e..52b6052 100644 (file)
@@ -89,7 +89,9 @@
 #include <netgraph7/one2many/ng_one2many.h>
 #include <netgraph7/ppp/ng_ppp.h>
 #include <netgraph7/pppoe/ng_pppoe.h>
+*/
 #include <netgraph7/pptpgre/ng_pptpgre.h>
+/*
 #include <netgraph7/rfc1490/ng_rfc1490.h>
 #include <netgraph7/socket/ng_socket.h>
 #include <netgraph7/source/ng_source.h>
@@ -164,7 +166,9 @@ static const struct ng_cookie cookies[] = {
        COOKIE(ONE2MANY),
        COOKIE(PPP),
        COOKIE(PPPOE),
+*/
        COOKIE(PPTPGRE),
+/*
        COOKIE(RFC1490),
 */
        COOKIE(SOCKET),
index 43de66e..1f63cd2 100644 (file)
@@ -1331,7 +1331,7 @@ netgraph7/ng_one2many.c           optional netgraph7_one2many
 netgraph7/netgraph/ng_parse.c  optional netgraph7
 netgraph7/ng_ppp.c             optional netgraph7_ppp
 netgraph7/ng_pppoe.c           optional netgraph7_pppoe
-netgraph7/ng_pptpgre.c         optional netgraph7_pptpgre
+netgraph7/pptpgre/ng_pptpgre.c optional netgraph7_pptpgre
 netgraph7/ng_pred1.c           optional netgraph7_pred1
 netgraph7/ng_rfc1490.c         optional netgraph7_rfc1490
 netgraph7/socket/ng_socket.c   optional netgraph7_socket
index 3687a7c..d2eb192 100644 (file)
@@ -14,6 +14,7 @@ SUBDIR=       UI \
        iface \
        ksocket \
        netgraph \
+       pptpgre \
        socket \
        tee \
        vjc
@@ -28,7 +29,6 @@ SUBDIR=       UI \
 #      one2many \
 #      ppp \
 #      pppoe \
-#      pptpgre \
 #      rfc1490 \
 #      socket \
 #      sync_ar \
diff --git a/sys/netgraph7/pptpgre/Makefile b/sys/netgraph7/pptpgre/Makefile
new file mode 100644 (file)
index 0000000..8801d56
--- /dev/null
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/pptpgre/Makefile,v 1.1.4.3 2001/12/21 09:00:49 ru Exp $
+# $DragonFly: src/sys/netgraph/pptpgre/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $Whistle: Makefile,v 1.1 1999/11/29 23:14:33 archie Exp $
+
+KMOD=          ng_pptpgre
+SRCS=          ng_pptpgre.c
+
+.include <bsd.kmod.mk>
similarity index 99%
rename from sys/netgraph7/ng_pptpgre.c
rename to sys/netgraph7/pptpgre/ng_pptpgre.c
index 951562c..dde5c62 100644 (file)
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mutex.h>
 #include <sys/errno.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.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_pptpgre.h"
 
 /* GRE packet format, as used by PPTP */