netgraph7: welcome ng_rfc1490.

DragonFlyBSD · Jan 10, 2012 · 55cc853 · 55cc853
1 parent 178c5ad
commit 55cc853
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 9 deletions.
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
@@ -250,6 +250,8 @@
         ..
         pptpgre
         ..
+        rfc1490
+        ..
         socket
         ..
         tee

diff --git a/include/Makefile b/include/Makefile
@@ -73,7 +73,8 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	netgraph7/hub \
 	netgraph7/iface netgraph7/ksocket netgraph7/l2tp netgraph7/lmi \
 	netgraph7/mppc netgraph7/one2many netgraph7/ppp netgraph7/pppoe \
-	netgraph7/pptpgre netgraph7/socket netgraph7/tee netgraph7/vjc \
+	netgraph7/pptpgre netgraph7/rfc1490 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 \
 	netproto/key netproto/natm netproto/ncp netproto/smb \

diff --git a/lib/libnetgraph7/debug.c b/lib/libnetgraph7/debug.c
@@ -87,8 +87,8 @@
 #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>
 #include <netgraph7/split/ng_split.h>
@@ -160,9 +160,7 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(PPP),
 	COOKIE(PPPOE),
 	COOKIE(PPTPGRE),
-/*
 	COOKIE(RFC1490),
-*/
 	COOKIE(SOCKET),
 /*
 	COOKIE(SOURCE),

diff --git a/sys/conf/files b/sys/conf/files
@@ -1334,7 +1334,7 @@ netgraph7/ppp/ng_ppp.c		optional netgraph7_ppp
 netgraph7/pppoe/ng_pppoe.c	optional netgraph7_pppoe
 netgraph7/pptpgre/ng_pptpgre.c	optional netgraph7_pptpgre
 netgraph7/ng_pred1.c		optional netgraph7_pred1
-netgraph7/ng_rfc1490.c		optional netgraph7_rfc1490
+netgraph7/rfc1490/ng_rfc1490.c	optional netgraph7_rfc1490
 netgraph7/socket/ng_socket.c	optional netgraph7_socket
 netgraph7/ng_split.c		optional netgraph7_split
 netgraph7/ng_sppp.c		optional netgraph7_sppp

diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
@@ -25,13 +25,13 @@ SUBDIR=	UI \
 	ppp \
 	pppoe \
 	pptpgre \
+	rfc1490 \
 	socket \
 	tee \
 	vjc
 #	eiface \
 #	fec \
 #	netgraph \
-#	rfc1490 \
 #	socket \
 #	sync_ar \
 #	sync_sr \

diff --git a/sys/netgraph7/rfc1490/Makefile b/sys/netgraph7/rfc1490/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/rfc1490/Makefile,v 1.1.4.3 2001/12/21 09:00:50 ru Exp $
+# $DragonFly: src/sys/netgraph/rfc1490/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $Whistle: Makefile,v 1.2 1999/01/19 19:39:22 archie Exp $
+
+KMOD=		ng_rfc1490
+SRCS= 		ng_rfc1490.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/netgraph7/ng_rfc1490.c → sys/netgraph7/rfc1490/ng_rfc1490.c b/sys/netgraph7/ng_rfc1490.c → sys/netgraph7/rfc1490/ng_rfc1490.c
@@ -61,9 +61,9 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.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_rfc1490.h"
 
 /*

diff --git a/sys/netgraph7/ng_rfc1490.h → sys/netgraph7/rfc1490/ng_rfc1490.h b/sys/netgraph7/ng_rfc1490.h → sys/netgraph7/rfc1490/ng_rfc1490.h