adapt to <clicknet/*.h> change

tbarbette · May 22, 2002 · e888b5c · e888b5c
1 parent 240d8cb
commit e888b5c
Show file tree

Hide file tree

Showing 163 changed files with 421 additions and 350 deletions.
diff --git a/DISTFILES b/DISTFILES
@@ -111,6 +111,7 @@ etc/diagrams/samp05_other.mp
 
 etc/libclick
 etc/libclick/Makefile.in
+etc/libclick/lc-ChangeLog
 etc/libclick/lc-Makefile.in
 etc/libclick/lc-libsrc-Makefile.in
 etc/libclick/lc-configure.in
@@ -165,7 +166,6 @@ include/click/etheraddress.hh
 include/click/ewma.cc
 include/click/ewma.hh
 include/click/ewma64.hh
-include/click/fddi.h
 include/click/gaprate.hh
 include/click/glue.hh
 include/click/handlercall.hh
@@ -186,7 +186,6 @@ include/click/package.hh
 include/click/packet.hh
 include/click/packet_anno.hh
 include/click/perfctr-i586.hh
-include/click/rfc1483.h
 include/click/router.hh
 include/click/routerthread.hh
 include/click/skbmgr.hh
@@ -208,6 +207,17 @@ include/click/standard/drivermanager.hh
 include/click/standard/errorelement.hh
 include/click/standard/scheduleinfo.hh
 
+include/clicknet
+include/clicknet/ether.h
+include/clicknet/fddi.h
+include/clicknet/icmp.h
+include/clicknet/icmp6.h
+include/clicknet/ip.h
+include/clicknet/ip6.h
+include/clicknet/tcp.h
+include/clicknet/udp.h
+include/clicknet/rfc1483.h
+
 lib
 lib/archive.cc
 lib/atomic.cc

diff --git a/Makefile.in b/Makefile.in
@@ -27,6 +27,7 @@ EXTRA_PROVIDES =
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 includedir = @includedir@/click
+netincludedir = @includedir@/clicknet
 toolincludedir = @includedir@/clicktool
 bindir = @bindir@
 datadir = @datadir@/click
@@ -71,6 +72,8 @@ install-include: stamp-h
 	$(INSTALL_DATA_IF_CHANGED) $(top_builddir)/include/click/*.h $(includedir)
 	$(mkinstalldirs) $(includedir)/standard
 	$(INSTALL_DATA_IF_CHANGED) $(srcdir)/include/click/standard/*.hh $(includedir)/standard
+	$(mkinstalldirs) $(netincludedir)
+	$(INSTALL_DATA_IF_CHANGED) $(srcdir)/include/clicknet/*.h $(netincludedir)
 	$(mkinstalldirs) $(toolincludedir)
 	$(INSTALL_DATA_IF_CHANGED) $(srcdir)/tools/lib/*.hh $(toolincludedir)
 

diff --git a/NEWS b/NEWS
@@ -67,34 +67,40 @@ Version 1.2.4   21.May.2002
 
 * Internals
 
-** The signatures for the Element::configure() and
-   Element::live_reconfigure() methods have changed. Formerly, these
-   methods took a "const Vector<String> &conf". Now, they take a
-   "Vector<String> &conf", and the methods may alter the "conf" argument
+** The signatures for the `Element::configure()' and
+   `Element::live_reconfigure()' methods have changed. Formerly, these
+   methods took a `const Vector<String> &conf'. Now, they take a
+   `Vector<String> &conf', and the methods may alter the `conf' argument
    however they'd like. The old signatures still work for backward
    compatibility, but they are deprecated, and will be removed in a future
    release.
 
-** Deprecated Element::uninitialize() in favor of a new method,
-   "Element::cleanup(CleanupStage stage)". The "stage" argument, an
+** Deprecated `Element::uninitialize()' in favor of a new method,
+   `Element::cleanup(CleanupStage stage)'. The `stage' argument, an
    enumerated value, says how far the element was initialized: not at all
    (CLEANUP_NO_ROUTER), configure() failed (CLEANUP_CONFIGURE_FAILED),
    configure() succeeded but initialize() was not called
    (CLEANUP_CONFIGURED), initialize() failed (CLEANUP_INITIALIZE_FAILED),
    initialize() succeeded but the router as a whole failed
    (CLEANUP_INITIALIZED), and the router initialized successfully,
-   including this element (CLEANUP_ROUTER_INITIALIZED). So uninitialize()
-   corresponded to "stage >= CLEANUP_INITIALIZED". Element::uninitialize()
-   works for now, but it will be removed in a future release.
+   including this element (CLEANUP_ROUTER_INITIALIZED). So `uninitialize()'
+   corresponded to `stage >= CLEANUP_INITIALIZED'.
+   `Element::uninitialize()' works for now, but it will be removed in a
+   future release.
 
-** The signature for the Element::configuration() method has also changed.
-   It no longer takes a "bool *" argument.
+** The signature for the `Element::configuration()' method has also changed.
+   It no longer takes a `bool *' argument.
 
 ** Add cp_va_parse_remove_keywords() function, which removes keywords from
    an argument list.
 
-** Renamed IPAddress::mask_more_specific() method to
-   IPAddress::mask_as_specific(), to emphasize that it allows equality.
+** Moved network-header-structure #include files to include/clicknet. For
+   instance, `#include <click/click_ip.h>' should now be written `#include
+   <clicknet/ip.h>'. The old names still work, but will be removed in a
+   future release.
+
+** Renamed `IPAddress::mask_more_specific()' method to
+   `IPAddress::mask_as_specific()', to emphasize that it allows equality.
 
 ** Changed click_ip6 header structure.
 
@@ -103,7 +109,7 @@ Version 1.2.4   21.May.2002
 
 ** Better handling of out-of-memory events.
 
-** Improved Packet::uniqueify() implementation: it now copies only the
+** Improved `Packet::uniqueify()' implementation: it now copies only the
    packet data, not both header and data.
 
 ** Click identifiers can no longer end with a slash.

diff --git a/elements/analysis/anonipaddr.cc b/elements/analysis/anonipaddr.cc
@@ -20,8 +20,8 @@
 #include <click/standard/scheduleinfo.hh>
 #include <click/confparse.hh>
 #include <click/error.hh>
-#include <click/click_ip.h>
-#include <click/click_udp.h>
+#include <clicknet/ip.h>
+#include <clicknet/udp.h>
 #include <click/llrpc.h>
 #include <click/integers.hh>	// for first_bit_set
 #ifdef CLICK_USERLEVEL

diff --git a/elements/analysis/fromdagdump.cc b/elements/analysis/fromdagdump.cc
@@ -25,7 +25,7 @@
 #include <click/glue.hh>
 #include <click/handlercall.hh>
 #include <click/packet_anno.hh>
-#include <click/rfc1483.h>
+#include <clicknet/rfc1483.h>
 #include <click/userutils.hh>
 #include "elements/userlevel/fakepcap.hh"
 #include <unistd.h>

diff --git a/elements/analysis/fromipsumdump.cc b/elements/analysis/fromipsumdump.cc
@@ -24,9 +24,9 @@
 #include <click/standard/scheduleinfo.hh>
 #include <click/error.hh>
 #include <click/glue.hh>
-#include <click/click_ip.h>
-#include <click/click_udp.h>
-#include <click/click_tcp.h>
+#include <clicknet/ip.h>
+#include <clicknet/udp.h>
+#include <clicknet/tcp.h>
 #include <click/packet_anno.hh>
 #include <click/userutils.hh>
 #include <unistd.h>

diff --git a/elements/analysis/fromnetflowsumdump.cc b/elements/analysis/fromnetflowsumdump.cc
@@ -25,9 +25,9 @@
 #include <click/error.hh>
 #include <click/glue.hh>
 #include <click/packet_anno.hh>
-#include <click/click_ip.h>
-#include <click/click_udp.h>
-#include <click/click_tcp.h>
+#include <clicknet/ip.h>
+#include <clicknet/udp.h>
+#include <clicknet/tcp.h>
 #include <click/userutils.hh>
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/elements/analysis/toipsumdump.cc b/elements/analysis/toipsumdump.cc
@@ -23,9 +23,9 @@
 #include <click/confparse.hh>
 #include <click/error.hh>
 #include <click/packet_anno.hh>
-#include <click/click_ip.h>
-#include <click/click_udp.h>
-#include <click/click_tcp.h>
+#include <clicknet/ip.h>
+#include <clicknet/udp.h>
+#include <clicknet/tcp.h>
 #include <unistd.h>
 #include <time.h>
 #include <sys/time.h>

diff --git a/elements/app/ftpportmapper.cc b/elements/app/ftpportmapper.cc
@@ -17,8 +17,8 @@
 
 #include <click/config.h>
 #include "ftpportmapper.hh"
-#include <click/click_ip.h>
-#include <click/click_tcp.h>
+#include <clicknet/ip.h>
+#include <clicknet/tcp.h>
 #include <click/router.hh>
 #include <click/elemfilter.hh>
 #include <click/confparse.hh>

diff --git a/elements/bsdmodule/fastudpsrc.cc b/elements/bsdmodule/fastudpsrc.cc
@@ -15,7 +15,7 @@
  */
 
 #include <click/config.h>
-#include <click/click_ip.h>
+#include <clicknet/ip.h>
 #include "fastudpsrc.hh"
 #include <click/confparse.hh>
 #include <click/error.hh>

diff --git a/elements/bsdmodule/fastudpsrc.hh b/elements/bsdmodule/fastudpsrc.hh
@@ -55,8 +55,8 @@
 #include <click/glue.hh>
 #include <click/gaprate.hh>
 #include <click/packet.hh>
-#include <click/click_ether.h>
-#include <click/click_udp.h>
+#include <clicknet/ether.h>
+#include <clicknet/udp.h>
 
 class FastUDPSource : public Element {
 

diff --git a/elements/ethernet/arpfaker.cc b/elements/ethernet/arpfaker.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "arpfaker.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ipaddress.hh>
 #include <click/confparse.hh>

diff --git a/elements/ethernet/arpquerier.cc b/elements/ethernet/arpquerier.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "arpquerier.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ipaddress.hh>
 #include <click/confparse.hh>

diff --git a/elements/ethernet/arpresponder.cc b/elements/ethernet/arpresponder.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "arpresponder.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ipaddress.hh>
 #include <click/confparse.hh>

diff --git a/elements/ethernet/ensureether.hh b/elements/ethernet/ensureether.hh
@@ -36,7 +36,7 @@ For IP packets you probably want to use ARPQuerier instead.
 EtherEncap */
 
 #include <click/element.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 class EnsureEther : public Element { public:
 

diff --git a/elements/ethernet/etherencap.hh b/elements/ethernet/etherencap.hh
@@ -40,7 +40,7 @@ Returns or sets the DST parameter.
 ARPQuerier, EnsureEther */
 
 #include <click/element.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 class EtherEncap : public Element { public:
 

diff --git a/elements/ethernet/ethermirror.cc b/elements/ethernet/ethermirror.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "ethermirror.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 EtherMirror::EtherMirror()
 {

diff --git a/elements/ethernet/hostetherfilter.cc b/elements/ethernet/hostetherfilter.cc
@@ -21,7 +21,7 @@
 #include <click/error.hh>
 #include <click/glue.hh>
 #include <click/etheraddress.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 HostEtherFilter::HostEtherFilter()
 {

diff --git a/elements/ethernet/ip6ndadvertiser.cc b/elements/ethernet/ip6ndadvertiser.cc
@@ -18,8 +18,8 @@
 
 #include <click/config.h>
 #include "ip6ndadvertiser.hh"
-#include <click/click_ether.h>
-#include <click/click_ip6.h>
+#include <clicknet/ether.h>
+#include <clicknet/ip6.h>
 #include <click/etheraddress.hh>
 #include <click/ip6address.hh>
 #include <click/confparse.hh>

diff --git a/elements/ethernet/ip6ndsolicitor.cc b/elements/ethernet/ip6ndsolicitor.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "ip6ndsolicitor.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ip6address.hh>
 #include <click/confparse.hh>

diff --git a/elements/etherswitch/etherswitch.cc b/elements/etherswitch/etherswitch.cc
@@ -18,7 +18,7 @@
 #include <click/config.h>
 #include "etherswitch.hh"
 
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/glue.hh>
 #include <click/bitvector.hh>

diff --git a/elements/grid/airoinfo.cc b/elements/grid/airoinfo.cc
@@ -21,7 +21,7 @@
 #include <click/confparse.hh>
 #include <click/error.hh>
 #include <click/router.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/glue.hh>
 #include <click/etheraddress.hh>
 #include "grid.hh"

diff --git a/elements/grid/checkgridheader.cc b/elements/grid/checkgridheader.cc
@@ -22,8 +22,8 @@
 #include "checkgridheader.hh"
 #include <click/glue.hh>
 #include "grid.hh"
-#include <click/click_ether.h>
-#include <click/click_ip.h>
+#include <clicknet/ether.h>
+#include <clicknet/ip.h>
 
 CheckGridHeader::CheckGridHeader()
   : _drops(0)

diff --git a/elements/grid/filterbyhops.cc b/elements/grid/filterbyhops.cc
@@ -21,7 +21,7 @@
 #include <click/confparse.hh>
 #include <click/error.hh>
 #include <click/router.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/glue.hh>
 #include "grid.hh"
 #include <math.h>

diff --git a/elements/grid/filterbyrange.cc b/elements/grid/filterbyrange.cc
@@ -21,7 +21,7 @@
 #include <click/confparse.hh>
 #include <click/error.hh>
 #include <click/router.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/glue.hh>
 
 FilterByRange::FilterByRange() : Element(1, 2), _locinfo(0)

diff --git a/elements/grid/fixdstloc.cc b/elements/grid/fixdstloc.cc
@@ -22,7 +22,7 @@
 #include <click/error.hh>
 #include "grid.hh"
 #include <click/router.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 FixDstLoc::FixDstLoc() : Element(1, 1), _loctab(0)
 {

diff --git a/elements/grid/fixsrcloc.cc b/elements/grid/fixsrcloc.cc
@@ -22,7 +22,7 @@
 #include <click/error.hh>
 #include "grid.hh"
 #include <click/router.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 FixSrcLoc::FixSrcLoc() : Element(1, 1), _locinfo(0)
 {

diff --git a/elements/grid/floodinglocquerier.cc b/elements/grid/floodinglocquerier.cc
@@ -18,7 +18,7 @@
 
 #include <click/config.h>
 #include "floodinglocquerier.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ipaddress.hh>
 #include <click/confparse.hh>

diff --git a/elements/grid/gridheaderinfo.cc b/elements/grid/gridheaderinfo.cc
@@ -19,7 +19,7 @@
 #include <click/confparse.hh>
 #include <click/router.hh>
 #include <click/error.hh>
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 
 
 /*

diff --git a/elements/grid/gridlogger.hh b/elements/grid/gridlogger.hh
@@ -5,9 +5,9 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <click/click_ether.h>
-#include <click/click_ip.h>
-#include <click/click_udp.h>
+#include <clicknet/ether.h>
+#include <clicknet/ip.h>
+#include <clicknet/udp.h>
 #include "grid.hh"
 #include "gridroutetable.hh"
 

diff --git a/elements/grid/gridprobehandler.cc b/elements/grid/gridprobehandler.cc
@@ -17,7 +17,7 @@
 
 #include <click/config.h>
 #include "gridprobehandler.hh"
-#include <click/click_ether.h>
+#include <clicknet/ether.h>
 #include <click/etheraddress.hh>
 #include <click/ipaddress.hh>
 #include <click/confparse.hh>