Index: head/net/xorp/Makefile =================================================================== --- head/net/xorp/Makefile (revision 396339) +++ head/net/xorp/Makefile (revision 396340) @@ -1,84 +1,64 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= xorp PORTVERSION= 1.8.5 -DISTVERSIONSUFFIX= -src +DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= net -MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org -COMMENT= The eXtensible Open Router Platform +MAINTAINER= hrs@FreeBSD.org +COMMENT= EXtensible Open Router Platform LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libpcap.so:${PORTSDIR}/net/libpcap CONFLICTS_INSTALL= xorp-devel-* -EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions -s /^xorp/${DISTNAME}/ -GROUPS= xorp USES= tar:bzip2 ncurses scons shebangfix compiler:env python:2,build +USE_GITHUB= yes USE_OPENSSL= yes USE_RC_SUBR= xorp +GH_ACCOUNT= greearb +GH_PROJECT= ${PORTNAME}.ct SHEBANG_FILES= xrl/scripts/clnt-gen xrl/scripts/tgt-gen python_OLD_CMD= .*python +WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}/${PORTNAME} +MAKE_ARGS= prefix=${PREFIX} enable_boost=1 SUB_FILES= pkg-message -XORP_SAMPLECONF= rtrmgr/config/multicast4.boot - +GROUPS= xorp BROKEN_sparc64= Does not compile on sparc64 OPTIONS_DEFINE= OPTIMIZE ORIGIN SHARED STRIP TCP_RPC OPTIONS_DEFAULT= OPTIMIZE ORIGIN SHARED STRIP +OPTIONS_SUB= yes OPTIMIZE_DESC= Build with optimization +OPTIMIZE_MAKE_ARGS= optimize=highest +OPTIMIZE_MAKE_ARGS_OFF= optimize=no ORIGIN_DESC= Use ORIGIN with shared libraries +ORIGIN_MAKE_ARGS= origin=true +ORIGIN_MAKE_ARGS_OFF= origin=false SHARED_DESC= Build with shared libraries +SHARED_MAKE_ARGS= shared=true +SHARED_MAKE_ARGS_OFF= shared=false +SHARED_USE_ON= LDCONFIG=${PREFIX}/lib/xorp/lib +STRIP_MAKE_ARGS= strip=true +STRIP_MAKE_ARGS_OFF= strip=false TCP_RPC_DESC= Use TCP as RPC transport (defaults to AF_LOCAL) +TCP_RPC_MAKE_ARGS= transport=tcp +TCP_RPC_MAKE_ARGS_OFF= transport=local -MAKE_ARGS= prefix=${PREFIX} enable_boost=1 - .include -.if ${PORT_OPTIONS:MOPTIMIZE} -MAKE_ARGS+= optimize=highest -.else -MAKE_ARGS+= optimize=no -.endif - -.if ${PORT_OPTIONS:MSHARED} -MAKE_ARGS+= shared=true -PLIST_SUB+= XORP_SHLIB="" -USE_LDCONFIG= ${PREFIX}/lib/xorp/lib -. if ${PORT_OPTIONS:MORIGIN} -MAKE_ARGS+= origin=true -. else -MAKE_ARGS+= origin=false -. endif -.else -MAKE_ARGS+= shared=false -PLIST_SUB+= XORP_SHLIB="@comment " -.endif - -.if ${PORT_OPTIONS:MSTRIP} -MAKE_ARGS+= strip=true -.else -MAKE_ARGS+= strip=false -.endif - -.if ${PORT_OPTIONS:MTCP_RPC} -MAKE_ARGS+= transport=tcp -.else -MAKE_ARGS+= transport=local -.endif - post-patch: ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct .if ${COMPILER_TYPE} == "clang" ${REINPLACE_CMD} 's,-Werror,& -Wno-unused-function,' ${WRKSRC}/SConstruct .endif post-install: - ${CP} -p ${WRKSRC}/${XORP_SAMPLECONF} ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample + ${INSTALL_DATA} ${WRKSRC}/rtrmgr/config/multicast4.boot \ + ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample .include Index: head/net/xorp/distinfo =================================================================== --- head/net/xorp/distinfo (revision 396339) +++ head/net/xorp/distinfo (revision 396340) @@ -1,2 +1,2 @@ -SHA256 (xorp-1.8.5-src.tar.bz2) = 4aa414e248f0ef3903a4ae8fd1862d8dd713a69f6bbc926d81dd693a88ef8e72 -SIZE (xorp-1.8.5-src.tar.bz2) = 3104442 +SHA256 (greearb-xorp.ct-xorp-1.8.5_GH0.tar.bz2) = b535d22255707b52f3d49747162e1a9cddca6abc437f7340e868cea0227d2b9e +SIZE (greearb-xorp.ct-xorp-1.8.5_GH0.tar.bz2) = 18563149 Index: head/net/xorp/files/patch-SConstruct =================================================================== --- head/net/xorp/files/patch-SConstruct (revision 396339) +++ head/net/xorp/files/patch-SConstruct (revision 396340) @@ -1,27 +1,44 @@ ---- ./SConstruct.orig 2012-01-11 17:46:45.000000000 +0000 -+++ ./SConstruct 2014-02-26 21:17:13.000000000 +0000 -@@ -162,22 +162,13 @@ +--- SConstruct.orig 2012-01-11 17:56:10 UTC ++++ SConstruct +@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0): # XXX TODO: Make initial CPPPATH/LIBPATH derive from # autodetected host system *or* command line. -#env = Environment( -# TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen', -# 'TOOL_SUBST'], -# ENV = os.environ, -# BUILDDIR = builddir, -# CPPPATH=['/usr/local/include', '$BUILDDIR'], -# LIBPATH=['usr/lib', '/usr/local/lib'], -# variables = vars) - env = Environment( TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen', 'TOOL_SUBST'], ENV = os.environ, BUILDDIR = builddir, - CPPPATH=['$BUILDDIR'], - LIBPATH=['usr/lib'], -+ CPPPATH=['%%LOCALBASE%%/include', '$BUILDDIR'], -+ LIBPATH=['usr/lib', '%%LOCALBASE%%/lib'], ++ CPPPATH=['/usr/local/include', '$BUILDDIR'], ++ LIBPATH=['usr/lib', '/usr/local/lib'], variables = vars) prefix = env['prefix'] +@@ -858,13 +849,13 @@ if ((build != "i386-pc-mingw32") and + host_cpu == "i386" or + host_cpu == "x86_64")): + env.AppendUnique(CFLAGS = [ +- '-Werror', ++ '-Werror -Wno-unused-function', + ]) + env.AppendUnique(CXXFLAGS = [ +- '-Werror', ++ '-Werror -Wno-unused-function', + ]) + else: +- print "WARNING: Detected funky platform, will not enable -Werror compile option: ", host_cpu ++ print "WARNING: Detected funky platform, will not enable -Werror -Wno-unused-function compile option: ", host_cpu + + + # NOTE: gcc specific flags. Index: head/net/xorp/files/patch-bgp__bgp_trie.cc =================================================================== --- head/net/xorp/files/patch-bgp__bgp_trie.cc (revision 396339) +++ head/net/xorp/files/patch-bgp__bgp_trie.cc (revision 396340) @@ -1,11 +1,11 @@ ---- ./bgp/bgp_trie.cc.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./bgp/bgp_trie.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -115,7 +115,7 @@ +--- bgp/bgp_trie.cc.orig 2012-01-11 17:56:10 UTC ++++ bgp/bgp_trie.cc +@@ -115,7 +115,7 @@ BgpTrie::erase(const IPNet& net) net.str().c_str(), found->attributes()->str().c_str()); XLOG_INFO("Pathmap dump follows: \n"); - for (pmi == _pathmap.begin(); pmi != _pathmap.end(); pmi++) { + for (pmi = _pathmap.begin(); pmi != _pathmap.end(); pmi++) { XLOG_INFO("%s\n\n", pmi->second->str().c_str()); } XLOG_FATAL("Exiting\n"); Index: head/net/xorp/files/patch-bgp__harness__coord.hh =================================================================== --- head/net/xorp/files/patch-bgp__harness__coord.hh (revision 396339) +++ head/net/xorp/files/patch-bgp__harness__coord.hh (revision 396340) @@ -1,12 +1,12 @@ ---- ./bgp/harness/coord.hh.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./bgp/harness/coord.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -42,7 +42,9 @@ +--- bgp/harness/coord.hh.orig 2012-01-11 17:56:10 UTC ++++ bgp/harness/coord.hh +@@ -42,7 +42,9 @@ public: private: bool _done; +public: EventLoop& _eventloop; +private: Command& _command; }; Index: head/net/xorp/files/patch-bgp__path_attribute.cc =================================================================== --- head/net/xorp/files/patch-bgp__path_attribute.cc (revision 396339) +++ head/net/xorp/files/patch-bgp__path_attribute.cc (revision 396340) @@ -1,16 +1,16 @@ ---- ./bgp/path_attribute.cc.orig 2011-03-16 21:15:59.000000000 +0000 -+++ ./bgp/path_attribute.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -830,8 +830,11 @@ +--- bgp/path_attribute.cc.orig 2012-01-11 17:56:10 UTC ++++ bgp/path_attribute.cc +@@ -830,8 +830,11 @@ PathAttribute * ClusterListAttribute::clone() const { ClusterListAttribute *ca = new ClusterListAttribute(); - list::const_reverse_iterator i = cluster_list().rbegin(); - for(; i != cluster_list().rend(); i++) + // list::const_reverse_iterator i = cluster_list().rbegin(); + list::const_iterator i = cluster_list().end(); + if (! cluster_list().empty()) + // for(; i != cluster_list().rend(); i++) + for(; i-- != cluster_list().begin(); ) ca->prepend_cluster_id(*i); return ca; } Index: head/net/xorp/files/patch-cli__cli_client.cc =================================================================== --- head/net/xorp/files/patch-cli__cli_client.cc (revision 396339) +++ head/net/xorp/files/patch-cli__cli_client.cc (revision 396340) @@ -1,29 +1,29 @@ ---- ./cli/cli_client.cc.orig 2011-07-25 17:45:38.000000000 +0000 -+++ ./cli/cli_client.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -832,7 +832,7 @@ +--- cli/cli_client.cc.orig 2012-01-11 17:56:10 UTC ++++ cli/cli_client.cc +@@ -832,7 +832,7 @@ CliClient::process_char_page_mode(uint8_ // // Print help // - if ((val == 'h')) { + if (val == 'h') { if (! is_help_mode()) { set_help_mode(true); _is_page_buffer_mode = &_is_help_buffer_mode; -@@ -958,7 +958,7 @@ +@@ -958,7 +958,7 @@ CliClient::process_char_page_mode(uint8_ // Display the output all at once instead of oen screen at a time. // (Same as specifying the "| no-more" command.) // - if ((val == 'N')) { + if (val == 'N') { while (page_buffer_last_line_n() < page_buffer_lines_n()) { set_page_buffer_mode(false); cli_print(page_buffer_line(page_buffer_last_line_n())); -@@ -1021,7 +1021,7 @@ +@@ -1021,7 +1021,7 @@ CliClient::process_char_page_mode(uint8_ // // Redraw the output of the screen // - if ((val == CHAR_TO_CTRL('l'))) { + if (val == CHAR_TO_CTRL('l')) { redisplay_screen_label: size_t i, start_window_line = 0; set_page_buffer_mode(false); Index: head/net/xorp/files/patch-cli__xrl_cli_node.hh =================================================================== --- head/net/xorp/files/patch-cli__xrl_cli_node.hh (revision 396339) +++ head/net/xorp/files/patch-cli__xrl_cli_node.hh (revision 396340) @@ -1,21 +1,21 @@ ---- ./cli/xrl_cli_node.hh.orig 2011-03-16 21:27:45.000000000 +0000 -+++ ./cli/xrl_cli_node.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -224,6 +224,9 @@ +--- cli/xrl_cli_node.hh.orig 2012-01-11 17:56:10 UTC ++++ cli/xrl_cli_node.hh +@@ -224,6 +224,9 @@ protected: const string *cli_term_name, const uint32_t *cli_session_id, const string *command_output); + + EventLoop& _eventloop; + private: /** * Called when Finder connection is established. -@@ -241,7 +244,7 @@ +@@ -241,7 +244,7 @@ private: CliNode& cli_node() const { return (_cli_node); } - EventLoop& _eventloop; + // EventLoop& _eventloop; CliNode& _cli_node; XrlCliProcessorV0p1Client _xrl_cli_processor_client; Index: head/net/xorp/files/patch-contrib__olsr__face.hh =================================================================== --- head/net/xorp/files/patch-contrib__olsr__face.hh (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__face.hh (revision 396340) @@ -1,14 +1,14 @@ ---- ./contrib/olsr/face.hh.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./contrib/olsr/face.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -291,8 +291,10 @@ +--- contrib/olsr/face.hh.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/face.hh +@@ -291,8 +291,10 @@ class Face { */ void originate_hello(); - private: Olsr& _olsr; + + private: + // Olsr& _olsr; FaceManager& _fm; Neighborhood* _nh; MessageDecoder& _md; Index: head/net/xorp/files/patch-contrib__olsr__face_manager.cc =================================================================== --- head/net/xorp/files/patch-contrib__olsr__face_manager.cc (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__face_manager.cc (revision 396340) @@ -1,16 +1,16 @@ ---- ./contrib/olsr/face_manager.cc.orig 2011-07-25 17:55:36.000000000 +0000 -+++ ./contrib/olsr/face_manager.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -239,8 +239,11 @@ +--- contrib/olsr/face_manager.cc.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/face_manager.cc +@@ -239,8 +239,11 @@ FaceManager::receive(const string& inter // Walk the list of message handler functions in reverse, // looking for one which is willing to consume this message. - vector::reverse_iterator jj; - for (jj = _handlers.rbegin(); jj != _handlers.rend(); jj++) { + // vector::reverse_iterator jj; + vector::iterator jj; + if (! _handlers.empty()) + // for (jj = _handlers.rbegin(); jj != _handlers.rend(); jj++) { + for (jj = _handlers.end(); jj-- != _handlers.begin(); ) { try { is_consumed = (*jj)->dispatch(msg, src, face->local_addr()); if (is_consumed) Index: head/net/xorp/files/patch-contrib__olsr__message.hh =================================================================== --- head/net/xorp/files/patch-contrib__olsr__message.hh (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__message.hh (revision 396340) @@ -1,13 +1,13 @@ ---- ./contrib/olsr/message.hh.orig 2012-01-11 17:46:45.000000000 +0000 -+++ ./contrib/olsr/message.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -668,8 +668,8 @@ +--- contrib/olsr/message.hh.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/message.hh +@@ -668,8 +668,8 @@ public: return (str += '\n'); } -private: - size_t _opaque_data_offset; +// private: +// size_t _opaque_data_offset; }; /** Index: head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc =================================================================== --- head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc (revision 396340) @@ -1,11 +1,11 @@ ---- ./contrib/olsr/policy_varrw.cc.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./contrib/olsr/policy_varrw.cc 2014-02-26 21:17:13.000000000 +0000 +--- contrib/olsr/policy_varrw.cc.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/policy_varrw.cc @@ -39,7 +39,7 @@ #include "policy_varrw.hh" OlsrVarRW::OlsrVarRW(IPv4Net& network, IPv4& nexthop, uint32_t& metric, - IPv4& originator, IPv4& main_addr, uint32_t vtype, + IPv4& originator, IPv4& main_addr, uint32_t& vtype, PolicyTags& policytags) : _network(network), _nexthop(nexthop), _metric(metric), _originator(originator), _main_addr(main_addr), _vtype(vtype), Index: head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh =================================================================== --- head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./contrib/olsr/policy_varrw.hh.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./contrib/olsr/policy_varrw.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -45,7 +45,7 @@ +--- contrib/olsr/policy_varrw.hh.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/policy_varrw.hh +@@ -45,7 +45,7 @@ class OlsrVarRW : public SingleVarRW { }; OlsrVarRW(IPv4Net& network, IPv4& nexthop, uint32_t& metric, - IPv4& originator, IPv4& main_addr, uint32_t vtype, + IPv4& originator, IPv4& main_addr, uint32_t& vtype, PolicyTags& policytags); // SingleVarRW inteface: Index: head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc =================================================================== --- head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc (revision 396340) @@ -1,170 +1,170 @@ ---- ./contrib/olsr/tools/print_databases.cc.orig 2011-03-16 21:16:01.000000000 +0000 -+++ ./contrib/olsr/tools/print_databases.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -161,7 +161,8 @@ +--- contrib/olsr/tools/print_databases.cc.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/tools/print_databases.cc +@@ -161,7 +161,8 @@ private: }; void -GetExternals::get(int argc, char *argv[]) +// GetExternals::get(int argc, char *argv[]) +GetExternals::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -172,8 +173,8 @@ +@@ -172,8 +173,8 @@ GetExternals::get(int argc, char *argv[] if (! success) XLOG_WARNING("Failed to get external route list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -309,7 +310,8 @@ +@@ -309,7 +310,8 @@ private: }; void -GetInterfaces::get(int argc, char *argv[]) +// GetInterfaces::get(int argc, char *argv[]) +GetInterfaces::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -320,8 +322,8 @@ +@@ -320,8 +322,8 @@ GetInterfaces::get(int argc, char *argv[ if (! success) XLOG_WARNING("Failed to get interface list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -476,7 +478,8 @@ +@@ -476,7 +478,8 @@ private: }; void -GetLinks::get(int argc, char *argv[]) +// GetLinks::get(int argc, char *argv[]) +GetLinks::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -487,8 +490,8 @@ +@@ -487,8 +490,8 @@ GetLinks::get(int argc, char *argv[]) if (! success) XLOG_WARNING("Failed to get link list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -649,7 +652,8 @@ +@@ -649,7 +652,8 @@ private: }; void -GetMids::get(int argc, char *argv[]) +// GetMids::get(int argc, char *argv[]) +GetMids::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -660,8 +664,8 @@ +@@ -660,8 +664,8 @@ GetMids::get(int argc, char *argv[]) if (! success) XLOG_WARNING("Failed to get MID list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -803,7 +807,8 @@ +@@ -803,7 +807,8 @@ private: }; void -GetNeighbors::get(int argc, char *argv[]) +// GetNeighbors::get(int argc, char *argv[]) +GetNeighbors::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -814,8 +819,8 @@ +@@ -814,8 +819,8 @@ GetNeighbors::get(int argc, char *argv[] if (! success) XLOG_WARNING("Failed to get neighbor list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -979,7 +984,8 @@ +@@ -979,7 +984,8 @@ private: }; void -GetTopology::get(int argc, char *argv[]) +// GetTopology::get(int argc, char *argv[]) +GetTopology::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -990,8 +996,8 @@ +@@ -990,8 +996,8 @@ GetTopology::get(int argc, char *argv[]) if (! success) XLOG_WARNING("Failed to get topology list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -1126,7 +1132,8 @@ +@@ -1126,7 +1132,8 @@ private: }; void -GetTwohopLinks::get(int argc, char *argv[]) +// GetTwohopLinks::get(int argc, char *argv[]) +GetTwohopLinks::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -1137,8 +1144,8 @@ +@@ -1137,8 +1144,8 @@ GetTwohopLinks::get(int argc, char *argv if (! success) XLOG_WARNING("Failed to get neighbor list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void -@@ -1271,7 +1278,8 @@ +@@ -1271,7 +1278,8 @@ private: }; void -GetTwohopNeighbors::get(int argc, char *argv[]) +// GetTwohopNeighbors::get(int argc, char *argv[]) +GetTwohopNeighbors::get(int, char *[]) { XrlOlsr4V0p1Client cl(&this->_xr); -@@ -1283,8 +1291,8 @@ +@@ -1283,8 +1291,8 @@ GetTwohopNeighbors::get(int argc, char * if (! success) XLOG_WARNING("Failed to get two-hop neighbor list."); - UNUSED(argc); - UNUSED(argv); + // UNUSED(argc); + // UNUSED(argv); } void Index: head/net/xorp/files/patch-contrib__olsr__twohop.hh =================================================================== --- head/net/xorp/files/patch-contrib__olsr__twohop.hh (revision 396339) +++ head/net/xorp/files/patch-contrib__olsr__twohop.hh (revision 396340) @@ -1,14 +1,14 @@ ---- ./contrib/olsr/twohop.hh.orig 2011-03-16 21:27:46.000000000 +0000 -+++ ./contrib/olsr/twohop.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -140,8 +140,10 @@ +--- contrib/olsr/twohop.hh.orig 2012-01-11 17:56:10 UTC ++++ contrib/olsr/twohop.hh +@@ -140,8 +140,10 @@ class TwoHopNeighbor { return _twohop_links; } - private: EventLoop& _ev; + + private: + // EventLoop& _ev; Neighborhood* _parent; /** Index: head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.cc =================================================================== --- head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.cc (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.cc (revision 396340) @@ -1,14 +1,14 @@ ---- ./fea/data_plane/control_socket/routing_socket.cc.orig 2011-03-16 21:27:46.000000000 +0000 -+++ ./fea/data_plane/control_socket/routing_socket.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -240,9 +240,10 @@ +--- fea/data_plane/control_socket/routing_socket.cc.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/control_socket/routing_socket.cc +@@ -240,9 +240,10 @@ RoutingSocket::io_event(XorpFd fd, IoEve // Observe routing sockets activity // -struct RoutingSocketPlumber { +class RoutingSocketPlumber { typedef RoutingSocket::ObserverList ObserverList; +public: static void plumb(RoutingSocket& r, RoutingSocketObserver* o) { Index: head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.hh =================================================================== --- head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.hh (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./fea/data_plane/control_socket/routing_socket.hh.orig 2011-03-16 21:27:46.000000000 +0000 -+++ ./fea/data_plane/control_socket/routing_socket.hh 2014-02-26 21:17:13.000000000 +0000 +--- fea/data_plane/control_socket/routing_socket.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/control_socket/routing_socket.hh @@ -31,7 +31,7 @@ class RoutingSocketObserver; -struct RoutingSocketPlumber; +// struct RoutingSocketPlumber; /** * RoutingSocket class opens a routing socket and forwards data arriving Index: head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.cc =================================================================== --- head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.cc (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.cc (revision 396340) @@ -1,14 +1,14 @@ ---- ./fea/data_plane/control_socket/windows_rtm_pipe.cc.orig 2011-03-16 21:16:01.000000000 +0000 -+++ ./fea/data_plane/control_socket/windows_rtm_pipe.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -288,9 +288,10 @@ +--- fea/data_plane/control_socket/windows_rtm_pipe.cc.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/control_socket/windows_rtm_pipe.cc +@@ -288,9 +288,10 @@ WinRtmPipe::io_event(XorpFd fd, IoEventT // Observe routing sockets activity // -struct WinRtmPipePlumber { +class WinRtmPipePlumber { typedef WinRtmPipe::ObserverList ObserverList; +public: static void plumb(WinRtmPipe& r, WinRtmPipeObserver* o) { Index: head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.hh =================================================================== --- head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.hh (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./fea/data_plane/control_socket/windows_rtm_pipe.hh.orig 2011-03-16 21:16:01.000000000 +0000 -+++ ./fea/data_plane/control_socket/windows_rtm_pipe.hh 2014-02-26 21:17:13.000000000 +0000 +--- fea/data_plane/control_socket/windows_rtm_pipe.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/control_socket/windows_rtm_pipe.hh @@ -29,7 +29,7 @@ #include "libxorp/exceptions.hh" class WinRtmPipeObserver; -struct WinRtmPipePlumber; +// struct WinRtmPipePlumber; /** * WinRtmPipe class opens a routing socket and forwards data arriving Index: head/net/xorp/files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh =================================================================== --- head/net/xorp/files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh (revision 396340) @@ -1,21 +1,21 @@ ---- ./fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh.orig 2011-03-16 21:16:02.000000000 +0000 -+++ ./fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -73,15 +73,15 @@ +--- fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh +@@ -73,15 +73,15 @@ public: private: class RtmV2Observer : public WinRtmPipeObserver { public: - RtmV2Observer(WinRtmPipe& rs, int af, + RtmV2Observer(WinRtmPipe& rs, /* int af, */ FibConfigTableObserverRtmV2& rtmo) - : WinRtmPipeObserver(rs), _af(af), _rtmo(rtmo) {} + : WinRtmPipeObserver(rs), /* _af(af), */ _rtmo(rtmo) {} virtual ~RtmV2Observer() {} void routing_socket_data(const vector& buffer) { _rtmo.receive_data(buffer); } private: - int _af; + // int _af; FibConfigTableObserverRtmV2& _rtmo; }; Index: head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.cc =================================================================== --- head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.cc (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.cc (revision 396340) @@ -1,15 +1,15 @@ ---- ./fea/data_plane/managers/fea_data_plane_manager_linux.cc.orig 2011-03-16 21:27:48.000000000 +0000 -+++ ./fea/data_plane/managers/fea_data_plane_manager_linux.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -71,8 +71,10 @@ +--- fea/data_plane/managers/fea_data_plane_manager_linux.cc.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/managers/fea_data_plane_manager_linux.cc +@@ -71,8 +71,10 @@ extern "C" void destroy(FeaDataPlaneMana FeaDataPlaneManagerLinux::FeaDataPlaneManagerLinux(FeaNode& fea_node) - : FeaDataPlaneManager(fea_node, "Linux"), - _ifconfig_get_ioctl(NULL) + : FeaDataPlaneManager(fea_node, "Linux") +#if defined(HAVE_PROC_LINUX) && defined(HAVE_IOCTL_SIOCGIFCONF) and !defined(HAVE_NETLINK_SOCKETS) + , _ifconfig_get_ioctl(NULL) +#endif { } Index: head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.hh =================================================================== --- head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.hh (revision 396339) +++ head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.hh (revision 396340) @@ -1,14 +1,14 @@ ---- ./fea/data_plane/managers/fea_data_plane_manager_linux.hh.orig 2011-03-16 21:27:48.000000000 +0000 -+++ ./fea/data_plane/managers/fea_data_plane_manager_linux.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -118,10 +118,10 @@ +--- fea/data_plane/managers/fea_data_plane_manager_linux.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/data_plane/managers/fea_data_plane_manager_linux.hh +@@ -118,10 +118,10 @@ public: * @return the @ref IfConfigGetIoctl plugin. */ IfConfigGetIoctl* ifconfig_get_ioctl() { return (_ifconfig_get_ioctl); } -#endif private: IfConfigGetIoctl* _ifconfig_get_ioctl; +#endif }; #endif // __FEA_DATA_PLANE_MANAGERS_FEA_DATA_PLANE_MANAGER_LINUX_HH__ Index: head/net/xorp/files/patch-fea__fibconfig.hh =================================================================== --- head/net/xorp/files/patch-fea__fibconfig.hh (revision 396339) +++ head/net/xorp/files/patch-fea__fibconfig.hh (revision 396340) @@ -1,18 +1,18 @@ ---- ./fea/fibconfig.hh.orig 2012-01-11 17:46:45.000000000 +0000 -+++ ./fea/fibconfig.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -736,12 +736,14 @@ +--- fea/fibconfig.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/fibconfig.hh +@@ -736,12 +736,14 @@ public: */ Trie6& trie6() { return _trie6; } + FeaNode& _fea_node; + protected: Trie4 _trie4; // IPv4 trie (used for testing purpose) Trie6 _trie6; // IPv6 trie (used for testing purpose) private: - FeaNode& _fea_node; + // FeaNode& _fea_node; EventLoop& _eventloop; #ifndef XORP_DISABLE_PROFILE Profile& _profile; Index: head/net/xorp/files/patch-fea__firewall_manager.hh =================================================================== --- head/net/xorp/files/patch-fea__firewall_manager.hh (revision 396339) +++ head/net/xorp/files/patch-fea__firewall_manager.hh (revision 396340) @@ -1,20 +1,20 @@ ---- ./fea/firewall_manager.hh.orig 2011-03-16 21:27:49.000000000 +0000 -+++ ./fea/firewall_manager.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -313,6 +313,8 @@ +--- fea/firewall_manager.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/firewall_manager.hh +@@ -313,6 +313,8 @@ public: */ void delete_browse_state(uint32_t token); + FeaNode& _fea_node; + private: /** * Update the firewall entries by pushing them into the underlying system. -@@ -364,7 +366,7 @@ +@@ -364,7 +366,7 @@ private: */ void generate_token(); - FeaNode& _fea_node; + // FeaNode& _fea_node; EventLoop& _eventloop; const IfTree& _iftree; Index: head/net/xorp/files/patch-fea__ifconfig.hh =================================================================== --- head/net/xorp/files/patch-fea__ifconfig.hh (revision 396339) +++ head/net/xorp/files/patch-fea__ifconfig.hh (revision 396340) @@ -1,20 +1,20 @@ ---- ./fea/ifconfig.hh.orig 2011-03-16 21:27:49.000000000 +0000 -+++ ./fea/ifconfig.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -442,6 +442,8 @@ +--- fea/ifconfig.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/ifconfig.hh +@@ -442,6 +442,8 @@ public: */ void report_updates(IfTree& iftree); + FeaNode& _fea_node; + private: /** * Restore the interface configuration. -@@ -455,7 +457,7 @@ +@@ -455,7 +457,7 @@ private: const IfTree& old_system_config, string& error_msg); - FeaNode& _fea_node; + // FeaNode& _fea_node; EventLoop& _eventloop; NexthopPortMapper& _nexthop_port_mapper; IfConfigTransactionManager* _itm; // The interface transaction manager Index: head/net/xorp/files/patch-fea__mfea_mrouter.hh =================================================================== --- head/net/xorp/files/patch-fea__mfea_mrouter.hh (revision 396339) +++ head/net/xorp/files/patch-fea__mfea_mrouter.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./fea/mfea_mrouter.hh.orig 2011-03-16 21:27:49.000000000 +0000 -+++ ./fea/mfea_mrouter.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -437,6 +437,8 @@ +--- fea/mfea_mrouter.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/mfea_mrouter.hh +@@ -437,6 +437,8 @@ private: // Original state from the underlying system before the MFEA was started // bool _multicast_forwarding_enabled; + +public: const FibConfig& _fibconfig; }; Index: head/net/xorp/files/patch-fea__tools__show_interfaces.hh =================================================================== --- head/net/xorp/files/patch-fea__tools__show_interfaces.hh (revision 396339) +++ head/net/xorp/files/patch-fea__tools__show_interfaces.hh (revision 396340) @@ -1,20 +1,20 @@ ---- ./fea/tools/show_interfaces.hh.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./fea/tools/show_interfaces.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -79,6 +79,8 @@ +--- fea/tools/show_interfaces.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/tools/show_interfaces.hh +@@ -79,6 +79,8 @@ public: */ void print_interfaces(const string& print_iface_name) const; + EventLoop& _eventloop; + protected: // // IfMgrHintObserver methods -@@ -132,7 +134,7 @@ +@@ -132,7 +134,7 @@ private: */ int ifmgr_shutdown(); - EventLoop& _eventloop; + // EventLoop& _eventloop; IfMgrXrlMirror _ifmgr; Index: head/net/xorp/files/patch-fea__xrl_mfea_node.hh =================================================================== --- head/net/xorp/files/patch-fea__xrl_mfea_node.hh (revision 396339) +++ head/net/xorp/files/patch-fea__xrl_mfea_node.hh (revision 396340) @@ -1,20 +1,20 @@ ---- ./fea/xrl_mfea_node.hh.orig 2011-03-16 21:27:49.000000000 +0000 -+++ ./fea/xrl_mfea_node.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -504,6 +504,8 @@ +--- fea/xrl_mfea_node.hh.orig 2012-01-11 17:56:10 UTC ++++ fea/xrl_mfea_node.hh +@@ -504,6 +504,8 @@ protected: // Input values, const bool& enable); + EventLoop& _eventloop; + private: /** * Called when Finder connection is established. -@@ -570,7 +572,7 @@ +@@ -570,7 +572,7 @@ private: int family() const { return (MfeaNode::family()); } - EventLoop& _eventloop; + // EventLoop& _eventloop; const string _finder_target; XrlMfeaClientV0p1Client _xrl_mfea_client_client; Index: head/net/xorp/files/patch-libproto__packet.cc =================================================================== --- head/net/xorp/files/patch-libproto__packet.cc (revision 396339) +++ head/net/xorp/files/patch-libproto__packet.cc (revision 396340) @@ -1,11 +1,11 @@ ---- ./libproto/packet.cc.orig 2011-03-16 21:27:50.000000000 +0000 -+++ ./libproto/packet.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -233,7 +233,7 @@ +--- libproto/packet.cc.orig 2012-01-11 17:56:10 UTC ++++ libproto/packet.cc +@@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum() } ArpHeader::ArpHeader() { - memset(this, 0, sizeof(this)); + memset(this, 0, sizeof(*this)); ah_hw_len = 6; ah_proto_len = 4; } Index: head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc =================================================================== --- head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc (revision 396339) +++ head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc (revision 396340) @@ -1,29 +1,29 @@ ---- ./libxipc/xrl_pf_stcp.cc.orig 2011-09-08 17:46:00.000000000 +0000 -+++ ./libxipc/xrl_pf_stcp.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -584,7 +584,7 @@ +--- libxipc/xrl_pf_stcp.cc.orig 2012-01-11 17:56:10 UTC ++++ libxipc/xrl_pf_stcp.cc +@@ -584,7 +584,7 @@ public: uint32_t sn, const Xrl& x, const Callback& cb) - : _p(p), _sn(sn), _b(_buffer), _cb(cb), _keepalive(false) + : _p(p), _sn(sn), _b(_buffer), _cb(cb) //, _keepalive(false) { size_t header_bytes = STCPPacketHeader::header_size(); size_t xrl_bytes = x.packed_bytes(); -@@ -607,7 +607,7 @@ +@@ -607,7 +607,7 @@ public: } RequestState(XrlPFSTCPSender* p, uint32_t sn) - : _p(p), _sn(sn), _b(_buffer), _keepalive(true) + : _p(p), _sn(sn), _b(_buffer) //, _keepalive(true) { size_t header_bytes = STCPPacketHeader::header_size(); -@@ -650,7 +650,7 @@ +@@ -650,7 +650,7 @@ private: uint8_t _buffer[256]; // XXX important performance parameter uint32_t _size; Callback _cb; - bool _keepalive; + // bool _keepalive; }; Index: head/net/xorp/files/patch-pim__pim_mrt_task.cc =================================================================== --- head/net/xorp/files/patch-pim__pim_mrt_task.cc (revision 396339) +++ head/net/xorp/files/patch-pim__pim_mrt_task.cc (revision 396340) @@ -1,42 +1,42 @@ ---- ./pim/pim_mrt_task.cc.orig 2011-09-20 00:33:28.000000000 +0000 -+++ ./pim/pim_mrt_task.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -166,7 +166,8 @@ +--- pim/pim_mrt_task.cc.orig 2012-01-11 17:56:10 UTC ++++ pim/pim_mrt_task.cc +@@ -166,7 +166,8 @@ PimMrt::add_task_delete_mrib_entries(con // list::reverse_iterator iter; iter = pim_mre_task_list().rbegin(); - if (iter != pim_mre_task_list().rend()) { +// if (iter != pim_mre_task_list().rend()) { + if (pim_mre_task_list().end() != pim_mre_task_list().begin()) { pim_mre_task = *iter; if (pim_mre_task->input_state() == PimMreTrackState::INPUT_STATE_IN_REMOVE_MISC) { -@@ -1159,7 +1160,8 @@ +@@ -1159,7 +1160,8 @@ PimMrt::add_task_add_pim_mre(PimMre *pim // list::reverse_iterator iter; iter = pim_mre_task_list().rbegin(); - if (iter != pim_mre_task_list().rend()) { +// if (iter != pim_mre_task_list().rend()) { + if (pim_mre_task_list().end() != pim_mre_task_list().begin()) { pim_mre_task = *iter; if (pim_mre_task->input_state() == input_state) { pim_mre_task->add_pim_mre(pim_mre); -@@ -1224,7 +1226,8 @@ +@@ -1224,7 +1226,8 @@ PimMrt::add_task_delete_pim_mre(PimMre * // list::reverse_iterator iter; iter = pim_mre_task_list().rbegin(); - if (iter != pim_mre_task_list().rend()) { +// if (iter != pim_mre_task_list().rend()) { + if (pim_mre_task_list().end() != pim_mre_task_list().begin()) { pim_mre_task = *iter; if (pim_mre_task->input_state() == input_state) { pim_mre_task->add_pim_mre(pim_mre); // XXX -@@ -1266,7 +1269,8 @@ +@@ -1266,7 +1269,8 @@ PimMrt::add_task_delete_pim_mfc(PimMfc * // list::reverse_iterator iter; iter = pim_mre_task_list().rbegin(); - if (iter != pim_mre_task_list().rend()) { +// if (iter != pim_mre_task_list().rend()) { + if (pim_mre_task_list().end() != pim_mre_task_list().begin()) { pim_mre_task = *iter; if (pim_mre_task->input_state() == PimMreTrackState::INPUT_STATE_IN_REMOVE_PIM_MFC) { Index: head/net/xorp/files/patch-policy__backend__iv_exec.cc =================================================================== --- head/net/xorp/files/patch-policy__backend__iv_exec.cc (revision 396339) +++ head/net/xorp/files/patch-policy__backend__iv_exec.cc (revision 396340) @@ -1,15 +1,15 @@ ---- ./policy/backend/iv_exec.cc.orig 2011-03-16 21:27:54.000000000 +0000 -+++ ./policy/backend/iv_exec.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -275,7 +275,11 @@ +--- policy/backend/iv_exec.cc.orig 2012-01-11 17:56:10 UTC ++++ policy/backend/iv_exec.cc +@@ -275,7 +275,11 @@ void IvExec::visit(Store& s) { if (_stackptr < _stack) - xorp_throw(RuntimeError, "Stack empty on assign of " + s.var()); + // xorp_throw(RuntimeError, "Stack empty on assign of " + s.var()); + { char *tmpstr; + asprintf(&tmpstr, "Stack empty on assign of %d", s.var()); + xorp_throw(RuntimeError, tmpstr); + } const Element* arg = *_stackptr; _stackptr--; Index: head/net/xorp/files/patch-policy__backend__lex.yy_policy_backend_parser.cc =================================================================== --- head/net/xorp/files/patch-policy__backend__lex.yy_policy_backend_parser.cc (revision 396339) +++ head/net/xorp/files/patch-policy__backend__lex.yy_policy_backend_parser.cc (revision 396340) @@ -1,11 +1,11 @@ ---- ./policy/backend/lex.yy_policy_backend_parser.cc.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./policy/backend/lex.yy_policy_backend_parser.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -617,6 +617,8 @@ +--- policy/backend/lex.yy_policy_backend_parser.cc.orig 2012-01-11 17:56:10 UTC ++++ policy/backend/lex.yy_policy_backend_parser.cc +@@ -617,6 +617,8 @@ static void yy_flex_strncpy (char *,yyco static int yy_flex_strlen (yyconst char * ); #endif +#define YY_NO_INPUT + #ifndef YY_NO_INPUT #ifdef __cplusplus Index: head/net/xorp/files/patch-policy__backend__single_varrw.cc =================================================================== --- head/net/xorp/files/patch-policy__backend__single_varrw.cc (revision 396339) +++ head/net/xorp/files/patch-policy__backend__single_varrw.cc (revision 396340) @@ -1,15 +1,15 @@ ---- ./policy/backend/single_varrw.cc.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./policy/backend/single_varrw.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -70,7 +70,11 @@ +--- policy/backend/single_varrw.cc.orig 2012-01-11 17:56:10 UTC ++++ policy/backend/single_varrw.cc +@@ -70,7 +70,11 @@ SingleVarRW::read(const Id& id) // out of luck... if(!e) - xorp_throw(SingleVarRWErr, "Unable to read variable " + id); + // xorp_throw(SingleVarRWErr, "Unable to read variable " + id); + { char *tmpstr; + asprintf(&tmpstr, "Unable to read variable %d", id); + xorp_throw(SingleVarRWErr, tmpstr); + } } return *e; Index: head/net/xorp/files/patch-policy__configuration.cc =================================================================== --- head/net/xorp/files/patch-policy__configuration.cc (revision 396339) +++ head/net/xorp/files/patch-policy__configuration.cc (revision 396340) @@ -1,13 +1,13 @@ ---- ./policy/configuration.cc.orig 2011-03-16 21:27:54.000000000 +0000 -+++ ./policy/configuration.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -766,7 +766,9 @@ +--- policy/configuration.cc.orig 2012-01-11 17:56:10 UTC ++++ policy/configuration.cc +@@ -766,7 +766,9 @@ IEMap::link_code(const string& proto, Co POLICY* p = find_policy(proto); XLOG_ASSERT(p); - for (POLICY::reverse_iterator i = p->rbegin(); i != p->rend(); ++i) { +// for (POLICY::reverse_iterator i = p->rbegin(); i != p->rend(); ++i) { + if (! p->empty()) + for (POLICY::iterator i = p->end(); --i != p->begin(); ) { PolicyList* pl = i->second; pl->link_code(code); Index: head/net/xorp/files/patch-policy__configuration.hh =================================================================== --- head/net/xorp/files/patch-policy__configuration.hh (revision 396339) +++ head/net/xorp/files/patch-policy__configuration.hh (revision 396340) @@ -1,22 +1,22 @@ ---- ./policy/configuration.hh.orig 2011-03-16 21:27:54.000000000 +0000 -+++ ./policy/configuration.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -43,11 +43,19 @@ +--- policy/configuration.hh.orig 2012-01-11 17:56:10 UTC ++++ policy/configuration.hh +@@ -43,11 +43,19 @@ typedef map RESOURCES; // XXX we go reverse in order to make peer specific policies override global // ones. Global is "" so it's always smallest (first). +/* #define FOR_ALL_POLICIES(n) \ for (PROTOCOL::reverse_iterator i = _protocols.rbegin(); \ i != _protocols.rend(); ++i) \ for (POLICY::reverse_iterator n = i->second->rbegin(); \ n != i->second->rend(); ++n) +*/ +#define FOR_ALL_POLICIES(n) \ + if (! _protocols.empty()) \ + for (PROTOCOL::iterator i = _protocols.end(); \ + i-- != _protocols.begin(); ) \ + for (POLICY::iterator n = i->second->end(); \ + (! i->second->empty()) & (n-- != i->second->begin()); ) class IEMap { public: Index: head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc =================================================================== --- head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc (revision 396339) +++ head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc (revision 396340) @@ -1,10 +1,10 @@ ---- ./policy/lex.yy_policy_parser.cc.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./policy/lex.yy_policy_parser.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -2982,6 +2982,7 @@ +--- policy/lex.yy_policy_parser.cc.orig 2012-01-11 17:56:10 UTC ++++ policy/lex.yy_policy_parser.cc +@@ -2982,6 +2982,7 @@ static void yy_flex_strncpy (char *,yyco static int yy_flex_strlen (yyconst char * ); #endif +#define YY_NO_INPUT #ifndef YY_NO_INPUT #ifdef __cplusplus Index: head/net/xorp/files/patch-rib__vifmanager.hh =================================================================== --- head/net/xorp/files/patch-rib__vifmanager.hh (revision 396339) +++ head/net/xorp/files/patch-rib__vifmanager.hh (revision 396340) @@ -1,23 +1,23 @@ ---- ./rib/vifmanager.hh.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./rib/vifmanager.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -110,6 +110,9 @@ +--- rib/vifmanager.hh.orig 2012-01-11 17:56:10 UTC ++++ rib/vifmanager.hh +@@ -110,6 +110,9 @@ public: */ int final_stop(); + XrlRouter& _xrl_router; + EventLoop& _eventloop; + protected: // // IfMgrHintObserver methods -@@ -163,8 +166,8 @@ +@@ -163,8 +166,8 @@ private: */ int ifmgr_shutdown(); - XrlRouter& _xrl_router; - EventLoop& _eventloop; + // XrlRouter& _xrl_router; + // EventLoop& _eventloop; RibManager* _rib_manager; IfMgrXrlMirror _ifmgr; Index: head/net/xorp/files/patch-rip__packets.hh =================================================================== --- head/net/xorp/files/patch-rip__packets.hh (revision 396339) +++ head/net/xorp/files/patch-rip__packets.hh (revision 396340) @@ -1,10 +1,10 @@ ---- ./rip/packets.hh.orig 2011-03-16 21:16:12.000000000 +0000 -+++ ./rip/packets.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -586,6 +586,7 @@ +--- rip/packets.hh.orig 2012-01-11 17:56:10 UTC ++++ rip/packets.hh +@@ -586,6 +586,7 @@ private: const uint8_t* _key_id; // Key number used const uint8_t* _auth_bytes; // Auth data length at end of packet const uint8_t* _seqno; // Monotonically increasing seqno +public: const uint8_t* _mbz; // Must-be-zero }; Index: head/net/xorp/files/patch-rtrmgr__cli.cc =================================================================== --- head/net/xorp/files/patch-rtrmgr__cli.cc (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__cli.cc (revision 396340) @@ -1,20 +1,20 @@ ---- ./rtrmgr/cli.cc.orig 2011-03-16 21:16:13.000000000 +0000 -+++ ./rtrmgr/cli.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -741,7 +741,7 @@ +--- rtrmgr/cli.cc.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/cli.cc +@@ -741,7 +741,7 @@ RouterCLI::op_mode_help(const vector::RefPtr _terminate_cb; // The cb when module terminated }; Index: head/net/xorp/files/patch-rtrmgr__op_commands.hh =================================================================== --- head/net/xorp/files/patch-rtrmgr__op_commands.hh (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__op_commands.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./rtrmgr/op_commands.hh.orig 2011-03-16 21:27:56.000000000 +0000 -+++ ./rtrmgr/op_commands.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -215,7 +215,7 @@ +--- rtrmgr/op_commands.hh.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/op_commands.hh +@@ -215,7 +215,7 @@ private: // Below here is temporary storage for use in parsing list _path_segments; - OpCommand* _current_command; + // OpCommand* _current_command; const TemplateTree* _template_tree; SlaveConfigTree* _slave_config_tree; SlaveModuleManager& _mmgr; Index: head/net/xorp/files/patch-rtrmgr__template_commands.hh =================================================================== --- head/net/xorp/files/patch-rtrmgr__template_commands.hh (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__template_commands.hh (revision 396340) @@ -1,20 +1,20 @@ ---- ./rtrmgr/template_commands.hh.orig 2011-03-16 21:16:14.000000000 +0000 -+++ ./rtrmgr/template_commands.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -78,6 +78,8 @@ +--- rtrmgr/template_commands.hh.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/template_commands.hh +@@ -78,6 +78,8 @@ public: string related_module() const; string affected_module() const; + const XRLdb* _xrldb; + private: #ifdef DEBUG_XRLDB bool check_xrl_is_valid(const list& action, -@@ -92,7 +94,7 @@ +@@ -92,7 +94,7 @@ private: string _request; list _split_response; string _response; - const XRLdb* _xrldb; + // const XRLdb* _xrldb; }; class ProgramAction : public Action { Index: head/net/xorp/files/patch-rtrmgr__template_tree_node.cc =================================================================== --- head/net/xorp/files/patch-rtrmgr__template_tree_node.cc (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__template_tree_node.cc (revision 396340) @@ -1,17 +1,17 @@ ---- ./rtrmgr/template_tree_node.cc.orig 2011-03-16 21:16:14.000000000 +0000 -+++ ./rtrmgr/template_tree_node.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -543,9 +543,12 @@ +--- rtrmgr/template_tree_node.cc.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/template_tree_node.cc +@@ -543,9 +543,12 @@ TemplateTreeNode::create_variable_map(co { map varmap; const TemplateTreeNode* ttn = this; - list::const_reverse_iterator iter; + // list::const_reverse_iterator iter; + list::const_iterator iter; - for (iter = segments.rbegin(); iter != segments.rend(); ++iter) { +// for (iter = segments.rbegin(); iter != segments.rend(); ++iter) { + if (! segments.empty()) + for (iter = segments.end(); iter-- != segments.begin(); ) { if (ttn->name_is_variable()) varmap[ttn->segname()] = *iter; ttn = ttn->parent(); Index: head/net/xorp/files/patch-rtrmgr__template_tree_node.hh =================================================================== --- head/net/xorp/files/patch-rtrmgr__template_tree_node.hh (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__template_tree_node.hh (revision 396340) @@ -1,19 +1,19 @@ ---- ./rtrmgr/template_tree_node.hh.orig 2011-03-16 21:16:14.000000000 +0000 -+++ ./rtrmgr/template_tree_node.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -189,13 +189,15 @@ +--- rtrmgr/template_tree_node.hh.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/template_tree_node.hh +@@ -189,13 +189,15 @@ protected: TemplateTreeNode* _parent; list _children; + TemplateTree& _template_tree; + private: bool split_up_varname(const string& varname, list& var_parts) const; TemplateTreeNode* find_parent_varname_node(const list& var_parts); TemplateTreeNode* find_child_varname_node(const list& var_parts); - TemplateTree& _template_tree; + // TemplateTree& _template_tree; string _module_name; string _default_target_name; Index: head/net/xorp/files/patch-rtrmgr__userdb.hh =================================================================== --- head/net/xorp/files/patch-rtrmgr__userdb.hh (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__userdb.hh (revision 396340) @@ -1,10 +1,10 @@ ---- ./rtrmgr/userdb.hh.orig 2011-03-16 21:16:14.000000000 +0000 -+++ ./rtrmgr/userdb.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -98,6 +98,7 @@ +--- rtrmgr/userdb.hh.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/userdb.hh +@@ -98,6 +98,7 @@ public: private: map _users; +public: bool _verbose; // Set to true if output is verbose }; Index: head/net/xorp/files/patch-rtrmgr__xorpsh_main.cc =================================================================== --- head/net/xorp/files/patch-rtrmgr__xorpsh_main.cc (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__xorpsh_main.cc (revision 396340) @@ -1,20 +1,20 @@ ---- ./rtrmgr/xorpsh_main.cc.orig 2012-01-11 17:46:45.000000000 +0000 -+++ ./rtrmgr/xorpsh_main.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -146,7 +146,7 @@ +--- rtrmgr/xorpsh_main.cc.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/xorpsh_main.cc +@@ -146,7 +146,7 @@ XorpShell::XorpShell(EventLoop& eventloo _verbose(verbose), _ipc_name(IPCname), _got_config(false), - _got_modules(false), + // _got_modules(false), _mode(MODE_INITIALIZING), _xorpsh_interface(&_xrl_router, *this) { -@@ -667,7 +667,7 @@ +@@ -667,7 +667,7 @@ XorpShell::config_changed(uid_t user_id, _router_cli->notify_user(response, /* urgent */ true); // XXX it's not clear we can continue if this happens } - response == ""; + // response == ""; if (!_ct->apply_deletions(user_id, deletions, /* this is not a provisional change */ false, response)) { Index: head/net/xorp/files/patch-rtrmgr__xorpsh_main.hh =================================================================== --- head/net/xorp/files/patch-rtrmgr__xorpsh_main.hh (revision 396339) +++ head/net/xorp/files/patch-rtrmgr__xorpsh_main.hh (revision 396340) @@ -1,11 +1,11 @@ ---- ./rtrmgr/xorpsh_main.hh.orig 2011-03-16 21:16:14.000000000 +0000 -+++ ./rtrmgr/xorpsh_main.hh 2014-02-26 21:17:13.000000000 +0000 -@@ -151,7 +151,7 @@ +--- rtrmgr/xorpsh_main.hh.orig 2012-01-11 17:56:10 UTC ++++ rtrmgr/xorpsh_main.hh +@@ -151,7 +151,7 @@ private: string _authfile; string _authtoken; bool _got_config; - bool _got_modules; + // bool _got_modules; string _configuration; bool _xrl_generic_done; // XRL startup/shutdown flag Index: head/net/xorp/files/patch-site_scons__config__allconfig.py =================================================================== --- head/net/xorp/files/patch-site_scons__config__allconfig.py (revision 396339) +++ head/net/xorp/files/patch-site_scons__config__allconfig.py (revision 396340) @@ -1,26 +1,26 @@ ---- ./site_scons/config/allconfig.py.orig 2012-01-11 17:46:46.000000000 +0000 -+++ ./site_scons/config/allconfig.py 2014-02-26 21:17:13.000000000 +0000 -@@ -21,6 +21,7 @@ +--- site_scons/config/allconfig.py.orig 2012-01-11 17:56:10 UTC ++++ site_scons/config/allconfig.py +@@ -21,6 +21,7 @@ import sys import os import string from SCons.Script.SConscript import SConsEnvironment +import fnmatch; # TODO SCons support for headerfilename needs to be fixed at source-- # that would let us use confdefs.h for the include file header -@@ -226,10 +227,12 @@ +@@ -226,10 +227,12 @@ def DoAllConfig(env, conf, host_os): if has_af_inet and has_sock_raw: conf.Define('HAVE_IP_RAW_SOCKETS') # TODO: This needs to be properly detected. - # TODO: This used to check for bsd and linux in an error prone - # way. Now, do negative checks, but this could break Solaris + # : + # TODO: This used to check for openbsd and linux in an error prone + # way. Now, do negative checks, but this could break Solaris and other OS # (or not..no idea if it supports raw or not). - if not (env.has_key('mingw') and env['mingw']): + if not ((env.has_key('mingw') and env['mingw']) or + fnmatch.fnmatch(host_os, 'freebsd*')): conf.Define('IPV4_RAW_OUTPUT_IS_RAW') conf.Define('IPV4_RAW_INPUT_IS_RAW') Index: head/net/xorp/files/patch-vrrp__vrrp.cc =================================================================== --- head/net/xorp/files/patch-vrrp__vrrp.cc (revision 396339) +++ head/net/xorp/files/patch-vrrp__vrrp.cc (revision 396340) @@ -1,29 +1,29 @@ ---- ./vrrp/vrrp.cc.orig 2011-03-16 21:27:57.000000000 +0000 -+++ ./vrrp/vrrp.cc 2014-02-26 21:17:13.000000000 +0000 -@@ -36,7 +36,7 @@ +--- vrrp/vrrp.cc.orig 2012-01-11 17:56:10 UTC ++++ vrrp/vrrp.cc +@@ -36,7 +36,7 @@ namespace { template void -out_of_range(const string& msg, const T& x) +out_of_range_(const string& msg, const T& x) { ostringstream oss; -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ Vrrp::Vrrp(VrrpVif& vif, EventLoop& e, u //, _arpd(_vif) { if (_vrid < 1 || _vrid > 255) - out_of_range("VRID out of range", _vrid); + out_of_range_("VRID out of range", _vrid); char tmp[sizeof "ff:ff:ff:ff:ff:ff"]; -@@ -94,7 +94,7 @@ +@@ -94,7 +94,7 @@ void Vrrp::set_priority(uint32_t priority) { if (priority == PRIORITY_LEAVE || priority >= PRIORITY_OWN) - out_of_range("priority out of range", priority); + out_of_range_("priority out of range", priority); _priority = priority; Index: head/net/xorp/files/patch-xrl__scripts__Xif__parse.py =================================================================== --- head/net/xorp/files/patch-xrl__scripts__Xif__parse.py (revision 396339) +++ head/net/xorp/files/patch-xrl__scripts__Xif__parse.py (revision 396340) @@ -1,14 +1,14 @@ ---- ./xrl/scripts/Xif/parse.py.orig 2010-07-19 21:10:33.000000000 +0000 -+++ ./xrl/scripts/Xif/parse.py 2014-02-26 21:17:13.000000000 +0000 -@@ -71,8 +71,10 @@ +--- xrl/scripts/Xif/parse.py.orig 2012-01-11 17:56:10 UTC ++++ xrl/scripts/Xif/parse.py +@@ -71,8 +71,10 @@ def parse_cpp_hash(line): pop_file() pop_file() push_file(file, line) + elif (flag == "3") or (flag == "4"): + print "Pre-processor #line flag (%s)" % flag else: - print "Invalid pre-processor #line flag (%d)\n", flag + print "Invalid pre-processor #line flag (%s)" % flag sys.exit(1) return 1 Index: head/net/xorp/pkg-plist =================================================================== --- head/net/xorp/pkg-plist (revision 396339) +++ head/net/xorp/pkg-plist (revision 396340) @@ -1,194 +1,194 @@ etc/xorp.conf.sample lib/xorp/bin/bgp_print_peers lib/xorp/bin/bgp_print_routes lib/xorp/bin/cli_generic lib/xorp/bin/cli_send_processor_xrl lib/xorp/bin/fea_show_interfaces lib/xorp/bin/olsr_print_databases lib/xorp/bin/olsr_clear_database lib/xorp/bin/ospf_clear_database lib/xorp/bin/ospf_print_lsas lib/xorp/bin/ospf_print_neighbours lib/xorp/bin/rib_show_distances lib/xorp/bin/rib_show_routes lib/xorp/bin/rip_show_peer_stats lib/xorp/bin/rip_show_stats -%%XORP_SHLIB%%lib/xorp/lib/libxif_bgp.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_cli_manager.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_cli_processor.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_common.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_coord.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_datain.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_fib.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_fib_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_firewall.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr_mirror.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_ifmgr_replicator.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawlink.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawlink_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt4.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt4_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt6.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fea_rawpkt6_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fib2mrib.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_finder.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_event_notifier.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_finder_event_observer.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_fti.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_mfea.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_mfea_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_mld6igmp.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_mld6igmp_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_ospfv2.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_ospfv3.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_pim.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_policy.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_backend.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_redist4.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_policy_redist6.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_profile.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_profile_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_redist4.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_redist6.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_redist_transaction4.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_redist_transaction6.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_rib.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_rib_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_rip.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_ripng.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_rtrmgr.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_rtrmgr_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_socket4.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_socket4_user.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_socket6.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_socket6_user.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_static_routes.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_vrrp.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_cli.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_comm.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_core.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_control_socket.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_data_plane_managers.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_fibconfig.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_firewall.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_ifconfig.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fea_io.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_fib2mrib.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_finder.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_ipc.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_mld6igmp.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_mrt.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_ospf.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_pim.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy_backend.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_policy_common.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_proto.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_rib.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_rip.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_rip_xrl.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_ripng.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_ripng_xrl.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_static_routes.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_tecla.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_vrrp.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_bgp.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_cli.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_coord.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_fea.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_fea_ifmgr_mirror.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_fib2mrib.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_finder.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_finder_client.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_mfea.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_mld6igmp.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_ospfv2.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_ospfv3.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_pim.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_policy.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_profiler.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_rib.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_ribclient.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_rip.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_ripng.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_rtrmgr.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_show_distances.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_show_routes.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_static_routes.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_vrrp.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_xorpsh.so -%%XORP_SHLIB%%lib/xorp/lib/libxst_olsr4.so -%%XORP_SHLIB%%lib/xorp/lib/libolsrxrl.so -%%XORP_SHLIB%%lib/xorp/lib/libxif_olsr4.so -%%XORP_SHLIB%%lib/xorp/lib/libxorp_bgp.so -%%XORP_SHLIB%%lib/xorp/lib/libolsr.so +%%SHARED%%lib/xorp/lib/libxif_bgp.so +%%SHARED%%lib/xorp/lib/libxif_cli_manager.so +%%SHARED%%lib/xorp/lib/libxif_cli_processor.so +%%SHARED%%lib/xorp/lib/libxif_common.so +%%SHARED%%lib/xorp/lib/libxif_coord.so +%%SHARED%%lib/xorp/lib/libxif_datain.so +%%SHARED%%lib/xorp/lib/libxif_fea_fib.so +%%SHARED%%lib/xorp/lib/libxif_fea_fib_client.so +%%SHARED%%lib/xorp/lib/libxif_fea_firewall.so +%%SHARED%%lib/xorp/lib/libxif_fea_ifmgr.so +%%SHARED%%lib/xorp/lib/libxif_fea_ifmgr_mirror.so +%%SHARED%%lib/xorp/lib/libxif_fea_ifmgr_replicator.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawlink.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawlink_client.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawpkt4.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawpkt4_client.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawpkt6.so +%%SHARED%%lib/xorp/lib/libxif_fea_rawpkt6_client.so +%%SHARED%%lib/xorp/lib/libxif_fib2mrib.so +%%SHARED%%lib/xorp/lib/libxif_finder.so +%%SHARED%%lib/xorp/lib/libxif_finder_client.so +%%SHARED%%lib/xorp/lib/libxif_finder_event_notifier.so +%%SHARED%%lib/xorp/lib/libxif_finder_event_observer.so +%%SHARED%%lib/xorp/lib/libxif_fti.so +%%SHARED%%lib/xorp/lib/libxif_mfea.so +%%SHARED%%lib/xorp/lib/libxif_mfea_client.so +%%SHARED%%lib/xorp/lib/libxif_mld6igmp.so +%%SHARED%%lib/xorp/lib/libxif_mld6igmp_client.so +%%SHARED%%lib/xorp/lib/libxif_ospfv2.so +%%SHARED%%lib/xorp/lib/libxif_ospfv3.so +%%SHARED%%lib/xorp/lib/libxif_pim.so +%%SHARED%%lib/xorp/lib/libxif_policy.so +%%SHARED%%lib/xorp/lib/libxif_policy_backend.so +%%SHARED%%lib/xorp/lib/libxif_policy_redist4.so +%%SHARED%%lib/xorp/lib/libxif_policy_redist6.so +%%SHARED%%lib/xorp/lib/libxif_profile.so +%%SHARED%%lib/xorp/lib/libxif_profile_client.so +%%SHARED%%lib/xorp/lib/libxif_redist4.so +%%SHARED%%lib/xorp/lib/libxif_redist6.so +%%SHARED%%lib/xorp/lib/libxif_redist_transaction4.so +%%SHARED%%lib/xorp/lib/libxif_redist_transaction6.so +%%SHARED%%lib/xorp/lib/libxif_rib.so +%%SHARED%%lib/xorp/lib/libxif_rib_client.so +%%SHARED%%lib/xorp/lib/libxif_rip.so +%%SHARED%%lib/xorp/lib/libxif_ripng.so +%%SHARED%%lib/xorp/lib/libxif_rtrmgr.so +%%SHARED%%lib/xorp/lib/libxif_rtrmgr_client.so +%%SHARED%%lib/xorp/lib/libxif_socket4.so +%%SHARED%%lib/xorp/lib/libxif_socket4_user.so +%%SHARED%%lib/xorp/lib/libxif_socket6.so +%%SHARED%%lib/xorp/lib/libxif_socket6_user.so +%%SHARED%%lib/xorp/lib/libxif_static_routes.so +%%SHARED%%lib/xorp/lib/libxif_vrrp.so +%%SHARED%%lib/xorp/lib/libxorp_cli.so +%%SHARED%%lib/xorp/lib/libxorp_comm.so +%%SHARED%%lib/xorp/lib/libxorp_core.so +%%SHARED%%lib/xorp/lib/libxorp_fea.so +%%SHARED%%lib/xorp/lib/libxorp_fea_client.so +%%SHARED%%lib/xorp/lib/libxorp_fea_control_socket.so +%%SHARED%%lib/xorp/lib/libxorp_fea_data_plane_managers.so +%%SHARED%%lib/xorp/lib/libxorp_fea_fibconfig.so +%%SHARED%%lib/xorp/lib/libxorp_fea_firewall.so +%%SHARED%%lib/xorp/lib/libxorp_fea_ifconfig.so +%%SHARED%%lib/xorp/lib/libxorp_fea_io.so +%%SHARED%%lib/xorp/lib/libxorp_fib2mrib.so +%%SHARED%%lib/xorp/lib/libxorp_finder.so +%%SHARED%%lib/xorp/lib/libxorp_ipc.so +%%SHARED%%lib/xorp/lib/libxorp_mld6igmp.so +%%SHARED%%lib/xorp/lib/libxorp_mrt.so +%%SHARED%%lib/xorp/lib/libxorp_ospf.so +%%SHARED%%lib/xorp/lib/libxorp_pim.so +%%SHARED%%lib/xorp/lib/libxorp_policy.so +%%SHARED%%lib/xorp/lib/libxorp_policy_backend.so +%%SHARED%%lib/xorp/lib/libxorp_policy_common.so +%%SHARED%%lib/xorp/lib/libxorp_proto.so +%%SHARED%%lib/xorp/lib/libxorp_rib.so +%%SHARED%%lib/xorp/lib/libxorp_rip.so +%%SHARED%%lib/xorp/lib/libxorp_rip_xrl.so +%%SHARED%%lib/xorp/lib/libxorp_ripng.so +%%SHARED%%lib/xorp/lib/libxorp_ripng_xrl.so +%%SHARED%%lib/xorp/lib/libxorp_static_routes.so +%%SHARED%%lib/xorp/lib/libxorp_tecla.so +%%SHARED%%lib/xorp/lib/libxorp_vrrp.so +%%SHARED%%lib/xorp/lib/libxst_bgp.so +%%SHARED%%lib/xorp/lib/libxst_cli.so +%%SHARED%%lib/xorp/lib/libxst_coord.so +%%SHARED%%lib/xorp/lib/libxst_fea.so +%%SHARED%%lib/xorp/lib/libxst_fea_ifmgr_mirror.so +%%SHARED%%lib/xorp/lib/libxst_fib2mrib.so +%%SHARED%%lib/xorp/lib/libxst_finder.so +%%SHARED%%lib/xorp/lib/libxst_finder_client.so +%%SHARED%%lib/xorp/lib/libxst_mfea.so +%%SHARED%%lib/xorp/lib/libxst_mld6igmp.so +%%SHARED%%lib/xorp/lib/libxst_ospfv2.so +%%SHARED%%lib/xorp/lib/libxst_ospfv3.so +%%SHARED%%lib/xorp/lib/libxst_pim.so +%%SHARED%%lib/xorp/lib/libxst_policy.so +%%SHARED%%lib/xorp/lib/libxst_profiler.so +%%SHARED%%lib/xorp/lib/libxst_rib.so +%%SHARED%%lib/xorp/lib/libxst_ribclient.so +%%SHARED%%lib/xorp/lib/libxst_rip.so +%%SHARED%%lib/xorp/lib/libxst_ripng.so +%%SHARED%%lib/xorp/lib/libxst_rtrmgr.so +%%SHARED%%lib/xorp/lib/libxst_show_distances.so +%%SHARED%%lib/xorp/lib/libxst_show_routes.so +%%SHARED%%lib/xorp/lib/libxst_static_routes.so +%%SHARED%%lib/xorp/lib/libxst_vrrp.so +%%SHARED%%lib/xorp/lib/libxst_xorpsh.so +%%SHARED%%lib/xorp/lib/libxst_olsr4.so +%%SHARED%%lib/xorp/lib/libolsrxrl.so +%%SHARED%%lib/xorp/lib/libxif_olsr4.so +%%SHARED%%lib/xorp/lib/libxorp_bgp.so +%%SHARED%%lib/xorp/lib/libolsr.so lib/xorp/sbin/xorp_bgp lib/xorp/sbin/xorp_fea lib/xorp/sbin/xorp_fea_dummy lib/xorp/sbin/xorp_fib2mrib lib/xorp/sbin/xorp_igmp lib/xorp/sbin/xorp_mld lib/xorp/sbin/xorp_olsr4 lib/xorp/sbin/xorp_ospfv2 lib/xorp/sbin/xorp_ospfv3 lib/xorp/sbin/xorp_pimsm4 lib/xorp/sbin/xorp_pimsm6 lib/xorp/sbin/xorp_policy lib/xorp/sbin/xorp_rib lib/xorp/sbin/xorp_rip lib/xorp/sbin/xorp_ripng lib/xorp/sbin/xorp_static_routes lib/xorp/sbin/xorp_vrrp sbin/call_xrl sbin/fea_xrl_shell_funcs.sh sbin/bgp_xrl_shell_funcs.sh sbin/rib_xrl_shell_funcs.sh sbin/xorp_profiler sbin/xorp_rtrmgr sbin/xorpsh -share/xorp/templates/bgp.cmds -share/xorp/templates/bgp.tp -share/xorp/templates/fea.cmds -share/xorp/templates/fea.tp -share/xorp/templates/fib2mrib.tp -share/xorp/templates/firewall.tp -share/xorp/templates/host.cmds -share/xorp/templates/igmp.cmds -share/xorp/templates/igmp.tp -share/xorp/templates/interfaces.tp -share/xorp/templates/mfea.cmds -share/xorp/templates/mfea4.tp -share/xorp/templates/mfea6.cmds -share/xorp/templates/mfea6.tp -share/xorp/templates/misc.cmds -share/xorp/templates/mld.cmds -share/xorp/templates/mld.tp -share/xorp/templates/olsr4.cmds -share/xorp/templates/olsr4.tp -share/xorp/templates/ospfv2.cmds -share/xorp/templates/ospfv2.tp -share/xorp/templates/ospfv3.cmds -share/xorp/templates/ospfv3.tp -share/xorp/templates/pim.cmds -share/xorp/templates/pim6.cmds -share/xorp/templates/pimsm4.tp -share/xorp/templates/pimsm6.tp -share/xorp/templates/plumbing.tp -share/xorp/templates/policy.cmds -share/xorp/templates/policy.tp -share/xorp/templates/protocols.tp -share/xorp/templates/rib.cmds -share/xorp/templates/rib.tp -share/xorp/templates/rip.cmds -share/xorp/templates/rip.tp -share/xorp/templates/ripng.cmds -share/xorp/templates/ripng.tp -share/xorp/templates/rtrmgr.tp -share/xorp/templates/static_routes.tp -share/xorp/templates/vrrp.cmds -share/xorp/templates/vrrp.tp -share/xorp/templates/xorpsh.cmds +%%DATADIR%%/templates/bgp.cmds +%%DATADIR%%/templates/bgp.tp +%%DATADIR%%/templates/fea.cmds +%%DATADIR%%/templates/fea.tp +%%DATADIR%%/templates/fib2mrib.tp +%%DATADIR%%/templates/firewall.tp +%%DATADIR%%/templates/host.cmds +%%DATADIR%%/templates/igmp.cmds +%%DATADIR%%/templates/igmp.tp +%%DATADIR%%/templates/interfaces.tp +%%DATADIR%%/templates/mfea.cmds +%%DATADIR%%/templates/mfea4.tp +%%DATADIR%%/templates/mfea6.cmds +%%DATADIR%%/templates/mfea6.tp +%%DATADIR%%/templates/misc.cmds +%%DATADIR%%/templates/mld.cmds +%%DATADIR%%/templates/mld.tp +%%DATADIR%%/templates/olsr4.cmds +%%DATADIR%%/templates/olsr4.tp +%%DATADIR%%/templates/ospfv2.cmds +%%DATADIR%%/templates/ospfv2.tp +%%DATADIR%%/templates/ospfv3.cmds +%%DATADIR%%/templates/ospfv3.tp +%%DATADIR%%/templates/pim.cmds +%%DATADIR%%/templates/pim6.cmds +%%DATADIR%%/templates/pimsm4.tp +%%DATADIR%%/templates/pimsm6.tp +%%DATADIR%%/templates/plumbing.tp +%%DATADIR%%/templates/policy.cmds +%%DATADIR%%/templates/policy.tp +%%DATADIR%%/templates/protocols.tp +%%DATADIR%%/templates/rib.cmds +%%DATADIR%%/templates/rib.tp +%%DATADIR%%/templates/rip.cmds +%%DATADIR%%/templates/rip.tp +%%DATADIR%%/templates/ripng.cmds +%%DATADIR%%/templates/ripng.tp +%%DATADIR%%/templates/rtrmgr.tp +%%DATADIR%%/templates/static_routes.tp +%%DATADIR%%/templates/vrrp.cmds +%%DATADIR%%/templates/vrrp.tp +%%DATADIR%%/templates/xorpsh.cmds