netgraph7: welcome ng_hub.
authorNuno Antunes <nuno.antunes@gmail.com>
Fri, 9 Dec 2011 22:19:07 +0000 (22:19 +0000)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:36 +0000 (14:10 +0000)
etc/mtree/BSD.include.dist
include/Makefile
lib/libnetgraph7/debug.c
sys/conf/files
sys/conf/options
sys/netgraph7/Makefile
sys/netgraph7/hub/Makefile [new file with mode: 0644]
sys/netgraph7/hub/ng_hub.c [moved from sys/netgraph7/ng_hub.c with 97% similarity]
sys/netgraph7/hub/ng_hub.h [moved from sys/netgraph7/ng_hub.h with 100% similarity]

index a2c977a..65d4b90 100644 (file)
         ..
         hole
         ..
+        hub
+        ..
         iface
         ..
         ksocket
index afd000f..7f0a41a 100644 (file)
@@ -70,6 +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/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 \
index d531adf..9934d3a 100644 (file)
@@ -74,9 +74,7 @@
 */
 #include <netgraph7/frame_relay/ng_frame_relay.h>
 #include <netgraph7/hole/ng_hole.h>
-/*
 #include <netgraph7/hub/ng_hub.h>
-*/
 #include <netgraph7/iface/ng_iface.h>
 /*
 #include <netgraph7/ip_input/ng_ip_input.h>
@@ -149,9 +147,7 @@ static const struct ng_cookie cookies[] = {
        COOKIE(FRAMERELAY),
        COOKIE(GENERIC),
        COOKIE(HOLE),
-/*
        COOKIE(HUB),
-*/
        COOKIE(IFACE),
 /*
        COOKIE(IP_INPUT),
index 6bb2eb4..77150b5 100644 (file)
@@ -1318,6 +1318,7 @@ netgraph7/frame_relay/ng_frame_relay.c                    optional netgraph7_frame_relay
 netgraph7/ng_gif.c             optional netgraph7_gif
 netgraph7/ng_gif_demux.c       optional netgraph7_gif_demux
 netgraph7/hole/ng_hole.c       optional netgraph7_hole
+netgraph7/hub/ng_hub.c         optional netgraph7_hub
 netgraph7/iface/ng_iface.c     optional netgraph7_iface
 netgraph7/ng_ip_input.c                optional netgraph7_ip_input
 netgraph7/ng_ipfw.c            optional netgraph7_ipfw
index b9da8bb..00af819 100644 (file)
@@ -354,6 +354,7 @@ NETGRAPH7_FRAME_RELAY       opt_netgraph.h
 NETGRAPH7_GIF          opt_netgraph.h
 NETGRAPH7_GIF_DEMUX    opt_netgraph.h
 NETGRAPH7_HOLE         opt_netgraph.h
+NETGRAPH7_HUB          opt_netgraph.h
 NETGRAPH7_IFACE                opt_netgraph.h
 NETGRAPH7_IP_INPUT     opt_netgraph.h
 NETGRAPH7_IPFW         opt_netgraph.h
index 984cc7c..95a528c 100644 (file)
@@ -14,6 +14,7 @@ SUBDIR=       UI \
        ether \
        frame_relay \
        hole \
+       hub \
        iface \
        ksocket \
        l2tp \
diff --git a/sys/netgraph7/hub/Makefile b/sys/netgraph7/hub/Makefile
new file mode 100644 (file)
index 0000000..71c5351
--- /dev/null
@@ -0,0 +1,4 @@
+KMOD=          ng_hub
+SRCS=          ng_hub.c
+
+.include <bsd.kmod.mk>
similarity index 97%
rename from sys/netgraph7/ng_hub.c
rename to sys/netgraph7/hub/ng_hub.c
index 694ea3b..254f442 100644 (file)
@@ -33,9 +33,9 @@
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 
-#include "ng_message.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
 #include "ng_hub.h"
-#include "netgraph.h"
 
 static ng_constructor_t        ng_hub_constructor;
 static ng_rcvdata_t    ng_hub_rcvdata;