[Xorp-cvs] XORP cvs commit: xorp xorp/bgp xorp/bgp/harness xorp/bgp/tools xorp/cli xorp/cli/tools xorp/contrib xorp/contrib/olsr xorp/contrib/olsr/doxy xorp/contrib/olsr/regression xorp/contrib/olsr/tools xorp/docs xorp/docs/bgp xorp/docs/design_arch xorp/docs/fea ...
Bruce Simpson
bms at icir.org
Thu Apr 24 08:20:37 PDT 2008
CVSROOT: /usr/local/www/data/cvs
Module name: xorp
Changes by: bms at chum.icir.org 2008-04-24 15:20:37 UTC
XORP CVS repository
Modified files:
. Makefile.in MakefileRootCheck.in configure
configure.in
bgp Makefile.in
bgp/harness Makefile.in
bgp/tools Makefile.in
cli Makefile.in
cli/tools Makefile.in
contrib Makefile.am Makefile.in
docs Makefile.am Makefile.in
docs/bgp Makefile.in
docs/design_arch Makefile.in
docs/fea Makefile.in
docs/libxipc Makefile.in
docs/libxorp Makefile.in
docs/mfea Makefile.in
docs/mld6igmp Makefile.in
docs/multicast Makefile.in
docs/pim Makefile.in
docs/pim_testsuite Makefile.in
docs/rib Makefile.in
docs/rtrmgr Makefile.in
docs/slides Makefile.in
docs/slides/status_2004_02 Makefile.in
docs/snmp Makefile.in
docs/test_harness Makefile.in
docs/user_manual Makefile.in
docs/xorpdev_101 Makefile.in
etc Makefile.in
etc/templates Makefile.am Makefile.in policy.tp rib.cmds
fea Makefile.in MakefileRootCheck.in
fea/data_plane Makefile.in
fea/data_plane/control_socket Makefile.in
fea/data_plane/fibconfig Makefile.in
fea/data_plane/ifconfig Makefile.in
fea/data_plane/io Makefile.in
fea/data_plane/managers Makefile.in
fea/tools Makefile.in
fib2mrib Makefile.in
libcomm Makefile.in
libfeaclient Makefile.in
libproto Makefile.in
libxipc Jamfile Makefile.in
libxorp Makefile.in task.cc task.hh timer.cc
mibs configure
mld6igmp Makefile.in
mrt Makefile.in
ospf Jamfile Makefile.in
ospf/tools Makefile.in
pim Makefile.in
policy Makefile.in
policy/backend Makefile.in
policy/common Makefile.in
policy/test Makefile.in
rib Makefile.in
rib/tools Makefile.in
rip Makefile.in
rip/tools Makefile.in
rtrmgr Makefile.in
rtrmgr/config Makefile.in
static_routes Makefile.in
utils Makefile.in
utils/flower_malloc Makefile.in
xrl Makefile.in
xrl/interfaces Jamfile Makefile.am Makefile.in
xrl/targets Jamfile Makefile.am Makefile.in
xrl/tests Makefile.in
Added files:
contrib/olsr Doxyfile Jamfile Makefile.am Makefile.in NOTES
README TODO debug_io.cc debug_io.hh emulate_net.cc
emulate_net.hh exceptions.hh external.cc
external.hh face.cc face.hh face_manager.cc
face_manager.hh io.hh link.cc link.hh message.cc
message.hh neighbor.cc neighbor.hh neighborhood.cc
neighborhood.hh olsr.cc olsr.hh olsr_module.h
olsr_types.cc olsr_types.hh policy_varrw.cc
policy_varrw.hh profile_vars.cc profile_vars.hh
route_manager.cc route_manager.hh test_args.hh
test_common.hh test_faces.cc test_message.cc
test_olsr_types.cc test_routing1.py
test_simulator.cc topology.cc topology.hh trace.hh
twohop.cc twohop.hh vertex.hh xorp_olsr.cc
xorp_olsr4_wrapper.sh xrl_io.cc xrl_io.hh
xrl_port.cc xrl_port.hh xrl_queue.cc xrl_queue.hh
xrl_target.cc xrl_target.hh
contrib/olsr/doxy doxyfiles-footer.html doxyfiles-header.html
contrib/olsr/regression hello_empty_ok_ipv4.data
hello_multi_ok_ipv4.data
hello_single_ok_ipv4.data
hna_ok_ipv4.data mid_ok_ipv4.data
multi_msg_ok_ipv4.data tc_ok_ipv4.data
contrib/olsr/tools Jamfile Makefile.am Makefile.in
clear_database.cc print_databases.cc
docs/olsr Makefile.am Makefile.in olsr.tex olsr_manual.tex
preface.tex xorp_toc.sty
etc/templates olsr4.cmds olsr4.tp
xrl/interfaces olsr4.xif olsr4_xif.cc olsr4_xif.hh
xrl/targets olsr4.tgt olsr4.xrls olsr4_base.cc olsr4_base.hh
Log message:
Import OLSRv1 for XORP.
This is a from-scratch implementation of OLSRv1 (RFC 3626) in C++ for XORP:
* This work was kindly supported by CenGen, Inc.
* A protocol simulator and a reasonably complete set of regression
tests is provided.
* Policy route redistribution is supported. Routes from other XORP
protocols may be redistributed into OLSRv1-HNA; tested with OSPFv2.
* Currently the ETX link metric extension is NOT supported.
There are two conflicting goals here:
* XORP developers strongly prefer that new protocols be first placed
in contrib.
* Individuals using the OLSRv1 implementation in XORP need the ability
to run xorp_olsr without performing a full installation, for testing
purposes.
The following limitations mean that the import of this code cannot
be solely confined to the contrib directory:
* The Automake-based build system does not easily facilitate building
XRL client and target stubs outside of the XRL directories.
* This limitation is addressed in FTJam and Boost.BuildV2,
however the change of build system has not yet been accepted.
* The Router Manager does not currently accept additional arguments
for the XRL and template directory paths, therefore certain OLSR
specific files are installed even when OLSR is not built.
The compromise is to place the code drop itself in the contrib directory,
with the following files becoming part of the main tree, for now:
* The router manager template files:
etc/templates/olsr4.cmds
etc/templates/olsr4.tp
* The OLSR XRL interface:
xrl/interfaces/olsr4.xif
xrl/interfaces/olsr4_xif.cc
xrl/interfaces/olsr4_xif.hh
* The OLSR XRL target:
xrl/targets/olsr4.tgt
xrl/targets/olsr4.xrls
xrl/targets/olsr4_base.cc
xrl/targets/olsr4_base.hh
The user manual for OLSRv1 is built separately from the XORP user manual.
Like SNMP, it is an optional component, however all of the documentation
is built by default when TeX documentation is being built.
Some additional changes to the Autotools build system are needed in
order to build OLSRv1 as a component using that build system:
* Split AC_OUTPUT(..files..) into AC_CONFIG_FILES([..files..])
and AC_OUTPUT, as the first use has been deprecated since
autoconf 2.57.
* Remove the creation of stamp-h from AC_OUTPUT. The use of stamp-h
has been deprecated since autoconf 2.57.
See: http://osdir.com/ml/sysutils.automake.patches/2002-04/msg00062.html
* Refactor to use a new internal variable, CONTRIB_SUBDIRS, which is
propagated to SUBDIRS in contrib/Makefile.am.
* This variable controls which subdirectories in contrib will form
part of a "gmake" or "gmake check".
* However, the logic for substitution currently resides in the top-level
configure.in as a case..esac conditional.
* This is to defer the developer overhead of parceling off contrib
components into separate autoconf packages, when they largely share
the same build characteristics as the rest of the tree.
* The exception to this is snmp, which needs to be a separate libtool
package to ensure it is always built as a shared library, therefore
it remains in AC_CONFIG_SUBDIRS() with its own configure.in.
* The Makefile.in files throughout the XORP tree are regenerated as part
of this commit.
Obtained from: XORP/OLSR
Sponsored by: CenGen, Inc.
Revision Changes Path
1.56 +1 -0; commitid: 13b274810a46941a7; xorp/Makefile.in
1.18 +1 -0; commitid: 13b274810a46941a7; xorp/MakefileRootCheck.in
1.70 +1 -0; commitid: 13b274810a46941a7; xorp/bgp/Makefile.in
1.48 +1 -0; commitid: 13b274810a46941a7; xorp/bgp/harness/Makefile.in
1.38 +1 -0; commitid: 13b274810a46941a7; xorp/bgp/tools/Makefile.in
1.35 +1 -0; commitid: 13b274810a46941a7; xorp/cli/Makefile.in
1.14 +1 -0; commitid: 13b274810a46941a7; xorp/cli/tools/Makefile.in
1.278 +63 -31; commitid: 13b274810a46941a7; xorp/configure
1.215 +56 -9; commitid: 13b274810a46941a7; xorp/configure.in
1.3 +4 -1; commitid: 13b274810a46941a7; xorp/contrib/Makefile.am
1.14 +200 -37; commitid: 13b274810a46941a7; xorp/contrib/Makefile.in
1.1 +1327 -0 xorp/contrib/olsr/Doxyfile (new)
1.1 +104 -0 xorp/contrib/olsr/Jamfile (new)
1.1 +133 -0 xorp/contrib/olsr/Makefile.am (new)
1.1 +835 -0 xorp/contrib/olsr/Makefile.in (new)
1.1 +353 -0 xorp/contrib/olsr/NOTES (new)
1.1 +36 -0 xorp/contrib/olsr/README (new)
1.1 +119 -0 xorp/contrib/olsr/TODO (new)
1.1 +355 -0 xorp/contrib/olsr/debug_io.cc (new)
1.1 +210 -0 xorp/contrib/olsr/debug_io.hh (new)
1.1 +7 -0 xorp/contrib/olsr/doxy/doxyfiles-footer.html (new)
1.1 +14 -0 xorp/contrib/olsr/doxy/doxyfiles-header.html (new)
1.1 +286 -0 xorp/contrib/olsr/emulate_net.cc (new)
1.1 +170 -0 xorp/contrib/olsr/emulate_net.hh (new)
1.1 +158 -0 xorp/contrib/olsr/exceptions.hh (new)
1.1 +694 -0 xorp/contrib/olsr/external.cc (new)
1.1 +520 -0 xorp/contrib/olsr/external.hh (new)
1.1 +126 -0 xorp/contrib/olsr/face.cc (new)
1.1 +360 -0 xorp/contrib/olsr/face.hh (new)
1.1 +1346 -0 xorp/contrib/olsr/face_manager.cc (new)
1.1 +733 -0 xorp/contrib/olsr/face_manager.hh (new)
1.1 +340 -0 xorp/contrib/olsr/io.hh (new)
1.1 +161 -0 xorp/contrib/olsr/link.cc (new)
1.1 +274 -0 xorp/contrib/olsr/link.hh (new)
1.1 +892 -0 xorp/contrib/olsr/message.cc (new)
1.1 +826 -0 xorp/contrib/olsr/message.hh (new)
1.1 +330 -0 xorp/contrib/olsr/neighbor.cc (new)
1.1 +333 -0 xorp/contrib/olsr/neighbor.hh (new)
1.1 +2312 -0 xorp/contrib/olsr/neighborhood.cc (new)
1.1 +1255 -0 xorp/contrib/olsr/neighborhood.hh (new)
1.1 +350 -0 xorp/contrib/olsr/olsr.cc (new)
1.1 +588 -0 xorp/contrib/olsr/olsr.hh (new)
1.1 +26 -0 xorp/contrib/olsr/olsr_module.h (new)
1.1 +96 -0 xorp/contrib/olsr/olsr_types.cc (new)
1.1 +382 -0 xorp/contrib/olsr/olsr_types.hh (new)
1.1 +126 -0 xorp/contrib/olsr/policy_varrw.cc (new)
1.1 +67 -0 xorp/contrib/olsr/policy_varrw.hh (new)
1.1 +46 -0 xorp/contrib/olsr/profile_vars.cc (new)
1.1 +38 -0 xorp/contrib/olsr/profile_vars.hh (new)
1.1 +22 -0 xorp/contrib/olsr/regression/hello_empty_ok_ipv4.data (new)
1.1 +36 -0 xorp/contrib/olsr/regression/hello_multi_ok_ipv4.data (new)
1.1 +28 -0 xorp/contrib/olsr/regression/hello_single_ok_ipv4.data (new)
1.1 +21 -0 xorp/contrib/olsr/regression/hna_ok_ipv4.data (new)
1.1 +22 -0 xorp/contrib/olsr/regression/mid_ok_ipv4.data (new)
1.1 +34 -0 xorp/contrib/olsr/regression/multi_msg_ok_ipv4.data (new)
1.1 +21 -0 xorp/contrib/olsr/regression/tc_ok_ipv4.data (new)
1.1 +681 -0 xorp/contrib/olsr/route_manager.cc (new)
1.1 +456 -0 xorp/contrib/olsr/route_manager.hh (new)
1.1 +221 -0 xorp/contrib/olsr/test_args.hh (new)
1.1 +38 -0 xorp/contrib/olsr/test_common.hh (new)
1.1 +476 -0 xorp/contrib/olsr/test_faces.cc (new)
1.1 +760 -0 xorp/contrib/olsr/test_message.cc (new)
1.1 +205 -0 xorp/contrib/olsr/test_olsr_types.cc (new)
1.1 +1743 -0 xorp/contrib/olsr/test_routing1.py (new)
1.1 +2508 -0 xorp/contrib/olsr/test_simulator.cc (new)
1.1 +26 -0 xorp/contrib/olsr/tools/Jamfile (new)
1.1 +45 -0 xorp/contrib/olsr/tools/Makefile.am (new)
1.1 +614 -0 xorp/contrib/olsr/tools/Makefile.in (new)
1.1 +133 -0 xorp/contrib/olsr/tools/clear_database.cc (new)
1.1 +1485 -0 xorp/contrib/olsr/tools/print_databases.cc (new)
1.1 +1097 -0 xorp/contrib/olsr/topology.cc (new)
1.1 +621 -0 xorp/contrib/olsr/topology.hh (new)
1.1 +105 -0 xorp/contrib/olsr/trace.hh (new)
1.1 +141 -0 xorp/contrib/olsr/twohop.cc (new)
1.1 +334 -0 xorp/contrib/olsr/twohop.hh (new)
1.1 +303 -0 xorp/contrib/olsr/vertex.hh (new)
1.1 +84 -0 xorp/contrib/olsr/xorp_olsr.cc (new)
1.1 +44 -0 xorp/contrib/olsr/xorp_olsr4_wrapper.sh (new)
1.1 +1125 -0 xorp/contrib/olsr/xrl_io.cc (new)
1.1 +462 -0 xorp/contrib/olsr/xrl_io.hh (new)
1.1 +279 -0 xorp/contrib/olsr/xrl_port.cc (new)
1.1 +201 -0 xorp/contrib/olsr/xrl_port.hh (new)
1.1 +237 -0 xorp/contrib/olsr/xrl_queue.cc (new)
1.1 +116 -0 xorp/contrib/olsr/xrl_queue.hh (new)
1.1 +1226 -0 xorp/contrib/olsr/xrl_target.cc (new)
1.1 +884 -0 xorp/contrib/olsr/xrl_target.hh (new)
1.8 +2 -2; commitid: 13b274810a46941a7; xorp/docs/Makefile.am
1.32 +2 -1; commitid: 13b274810a46941a7; xorp/docs/Makefile.in
1.29 +1 -0; commitid: 13b274810a46941a7; xorp/docs/bgp/Makefile.in
1.29 +1 -0; commitid: 13b274810a46941a7; xorp/docs/design_arch/Makefile.in
1.29 +1 -0; commitid: 13b274810a46941a7; xorp/docs/fea/Makefile.in
1.30 +1 -0; commitid: 13b274810a46941a7; xorp/docs/libxipc/Makefile.in
1.29 +1 -0; commitid: 13b274810a46941a7; xorp/docs/libxorp/Makefile.in
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/mfea/Makefile.in
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/mld6igmp/Makefile.in
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/multicast/Makefile.in
1.1 +21 -0 xorp/docs/olsr/Makefile.am (new)
1.1 +517 -0 xorp/docs/olsr/Makefile.in (new)
1.1 +533 -0 xorp/docs/olsr/olsr.tex (new)
1.1 +110 -0 xorp/docs/olsr/olsr_manual.tex (new)
1.1 +87 -0 xorp/docs/olsr/preface.tex (new)
1.1 +633 -0 xorp/docs/olsr/xorp_toc.sty (new)
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/pim/Makefile.in
1.43 +1 -0; commitid: 13b274810a46941a7; xorp/docs/pim_testsuite/Makefile.in
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/rib/Makefile.in
1.31 +1 -0; commitid: 13b274810a46941a7; xorp/docs/rtrmgr/Makefile.in
1.16 +1 -0; commitid: 13b274810a46941a7; xorp/docs/slides/Makefile.in
1.16 +1 -0; commitid: 13b274810a46941a7; xorp/docs/slides/status_2004_02/Makefile.in
1.29 +1 -0; commitid: 13b274810a46941a7; xorp/docs/snmp/Makefile.in
1.28 +1 -0; commitid: 13b274810a46941a7; xorp/docs/test_harness/Makefile.in
1.24 +1 -0; commitid: 13b274810a46941a7; xorp/docs/user_manual/Makefile.in
1.16 +1 -0; commitid: 13b274810a46941a7; xorp/docs/xorpdev_101/Makefile.in
1.18 +1 -0; commitid: 13b274810a46941a7; xorp/etc/Makefile.in
1.21 +2 -1; commitid: 13b274810a46941a7; xorp/etc/templates/Makefile.am
1.38 +6 -5; commitid: 13b274810a46941a7; xorp/etc/templates/Makefile.in
1.1 +104 -0 xorp/etc/templates/olsr4.cmds (new)
1.1 +383 -0 xorp/etc/templates/olsr4.tp (new)
1.26 +2 -1; commitid: 13b274810a46941a7; xorp/etc/templates/policy.tp
1.12 +54 -1; commitid: 13b274810a46941a7; xorp/etc/templates/rib.cmds
1.125 +1 -0; commitid: 13b274810a46941a7; xorp/fea/Makefile.in
1.17 +1 -0; commitid: 13b274810a46941a7; xorp/fea/MakefileRootCheck.in
1.6 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/Makefile.in
1.5 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/control_socket/Makefile.in
1.6 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/fibconfig/Makefile.in
1.9 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/ifconfig/Makefile.in
1.7 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/io/Makefile.in
1.3 +1 -0; commitid: 13b274810a46941a7; xorp/fea/data_plane/managers/Makefile.in
1.14 +1 -0; commitid: 13b274810a46941a7; xorp/fea/tools/Makefile.in
1.21 +1 -0; commitid: 13b274810a46941a7; xorp/fib2mrib/Makefile.in
1.36 +1 -0; commitid: 13b274810a46941a7; xorp/libcomm/Makefile.in
1.26 +1 -0; commitid: 13b274810a46941a7; xorp/libfeaclient/Makefile.in
1.42 +1 -0; commitid: 13b274810a46941a7; xorp/libproto/Makefile.in
1.4 +2 -2; commitid: 13b274810a46941a7; xorp/libxipc/Jamfile
1.73 +1 -0; commitid: 13b274810a46941a7; xorp/libxipc/Makefile.in
1.73 +1 -0; commitid: 13b274810a46941a7; xorp/libxorp/Makefile.in
1.9 +14 -1; commitid: 13b274810a46941a7; xorp/libxorp/task.cc
1.11 +3 -1; commitid: 13b274810a46941a7; xorp/libxorp/task.hh
1.41 +9 -1; commitid: 13b274810a46941a7; xorp/libxorp/timer.cc
1.61 +1 -1; commitid: 13b274810a46941a7; xorp/mibs/configure
1.61 +1 -0; commitid: 13b274810a46941a7; xorp/mld6igmp/Makefile.in
1.34 +1 -0; commitid: 13b274810a46941a7; xorp/mrt/Makefile.in
1.6 +15 -6; commitid: 13b274810a46941a7; xorp/ospf/Jamfile
1.33 +1 -0; commitid: 13b274810a46941a7; xorp/ospf/Makefile.in
1.12 +1 -0; commitid: 13b274810a46941a7; xorp/ospf/tools/Makefile.in
1.64 +1 -0; commitid: 13b274810a46941a7; xorp/pim/Makefile.in
1.39 +1 -0; commitid: 13b274810a46941a7; xorp/policy/Makefile.in
1.19 +1 -0; commitid: 13b274810a46941a7; xorp/policy/backend/Makefile.in
1.18 +1 -0; commitid: 13b274810a46941a7; xorp/policy/common/Makefile.in
1.19 +1 -0; commitid: 13b274810a46941a7; xorp/policy/test/Makefile.in
1.64 +1 -0; commitid: 13b274810a46941a7; xorp/rib/Makefile.in
1.15 +1 -0; commitid: 13b274810a46941a7; xorp/rib/tools/Makefile.in
1.63 +1 -0; commitid: 13b274810a46941a7; xorp/rip/Makefile.in
1.16 +1 -0; commitid: 13b274810a46941a7; xorp/rip/tools/Makefile.in
1.79 +1 -0; commitid: 13b274810a46941a7; xorp/rtrmgr/Makefile.in
1.4 +1 -0; commitid: 13b274810a46941a7; xorp/rtrmgr/config/Makefile.in
1.22 +1 -0; commitid: 13b274810a46941a7; xorp/static_routes/Makefile.in
1.37 +1 -0; commitid: 13b274810a46941a7; xorp/utils/Makefile.in
1.17 +1 -0; commitid: 13b274810a46941a7; xorp/utils/flower_malloc/Makefile.in
1.26 +1 -0; commitid: 13b274810a46941a7; xorp/xrl/Makefile.in
1.6 +3 -1; commitid: 13b274810a46941a7; xorp/xrl/interfaces/Jamfile
1.38 +5 -1; commitid: 13b274810a46941a7; xorp/xrl/interfaces/Makefile.am
1.61 +29 -17; commitid: 13b274810a46941a7; xorp/xrl/interfaces/Makefile.in
1.1 +576 -0 xorp/xrl/interfaces/olsr4.xif (new)
1.1 +1930 -0 xorp/xrl/interfaces/olsr4_xif.cc (new)
1.1 +1155 -0 xorp/xrl/interfaces/olsr4_xif.hh (new)
1.5 +4 -1; commitid: 13b274810a46941a7; xorp/xrl/targets/Jamfile
1.70 +14 -1; commitid: 13b274810a46941a7; xorp/xrl/targets/Makefile.am
1.92 +45 -26; commitid: 13b274810a46941a7; xorp/xrl/targets/Makefile.in
1.1 +17 -0 xorp/xrl/targets/olsr4.tgt (new)
1.1 +696 -0 xorp/xrl/targets/olsr4.xrls (new)
1.1 +2813 -0 xorp/xrl/targets/olsr4_base.cc (new)
1.1 +1287 -0 xorp/xrl/targets/olsr4_base.hh (new)
1.33 +1 -0; commitid: 13b274810a46941a7; xorp/xrl/tests/Makefile.in
More information about the Xorp-cvs
mailing list