svn commit: r396340 - in head/net/xorp: . files
Hiroki Sato
hrs at FreeBSD.org
Mon Sep 7 19:04:38 UTC 2015
Author: hrs
Date: Mon Sep 7 19:04:23 2015
New Revision: 396340
URL: https://svnweb.freebsd.org/changeset/ports/396340
Log:
- Use USE_GITHUB.
- Add USE_LDCONFIG when SHARED is enabled.
- Use OPTIONS_SUB.
- Use {opt}_FOO wherever possible.
- Normalize patch files.
- Take maintainership.
Modified:
head/net/xorp/Makefile
head/net/xorp/distinfo
head/net/xorp/files/patch-SConstruct
head/net/xorp/files/patch-bgp__bgp_trie.cc
head/net/xorp/files/patch-bgp__harness__coord.hh
head/net/xorp/files/patch-bgp__path_attribute.cc
head/net/xorp/files/patch-cli__cli_client.cc
head/net/xorp/files/patch-cli__xrl_cli_node.hh
head/net/xorp/files/patch-contrib__olsr__face.hh
head/net/xorp/files/patch-contrib__olsr__face_manager.cc
head/net/xorp/files/patch-contrib__olsr__message.hh
head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc
head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh
head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc
head/net/xorp/files/patch-contrib__olsr__twohop.hh
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.hh
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.hh
head/net/xorp/files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh
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.hh
head/net/xorp/files/patch-fea__fibconfig.hh
head/net/xorp/files/patch-fea__firewall_manager.hh
head/net/xorp/files/patch-fea__ifconfig.hh
head/net/xorp/files/patch-fea__mfea_mrouter.hh
head/net/xorp/files/patch-fea__tools__show_interfaces.hh
head/net/xorp/files/patch-fea__xrl_mfea_node.hh
head/net/xorp/files/patch-libproto__packet.cc
head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc
head/net/xorp/files/patch-pim__pim_mrt_task.cc
head/net/xorp/files/patch-policy__backend__iv_exec.cc
head/net/xorp/files/patch-policy__backend__lex.yy_policy_backend_parser.cc
head/net/xorp/files/patch-policy__backend__single_varrw.cc
head/net/xorp/files/patch-policy__configuration.cc
head/net/xorp/files/patch-policy__configuration.hh
head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc
head/net/xorp/files/patch-rib__vifmanager.hh
head/net/xorp/files/patch-rip__packets.hh
head/net/xorp/files/patch-rtrmgr__cli.cc
head/net/xorp/files/patch-rtrmgr__lex.boot.cc
head/net/xorp/files/patch-rtrmgr__lex.opcmd.cc
head/net/xorp/files/patch-rtrmgr__lex.tplt.cc
head/net/xorp/files/patch-rtrmgr__module_command.hh
head/net/xorp/files/patch-rtrmgr__module_manager.hh
head/net/xorp/files/patch-rtrmgr__op_commands.hh
head/net/xorp/files/patch-rtrmgr__template_commands.hh
head/net/xorp/files/patch-rtrmgr__template_tree_node.cc
head/net/xorp/files/patch-rtrmgr__template_tree_node.hh
head/net/xorp/files/patch-rtrmgr__userdb.hh
head/net/xorp/files/patch-rtrmgr__xorpsh_main.cc
head/net/xorp/files/patch-rtrmgr__xorpsh_main.hh
head/net/xorp/files/patch-site_scons__config__allconfig.py
head/net/xorp/files/patch-vrrp__vrrp.cc
head/net/xorp/files/patch-xrl__scripts__Xif__parse.py
head/net/xorp/pkg-plist
Modified: head/net/xorp/Makefile
==============================================================================
--- head/net/xorp/Makefile Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/Makefile Mon Sep 7 19:04:23 2015 (r396340)
@@ -3,12 +3,11 @@
PORTNAME= xorp
PORTVERSION= 1.8.5
-DISTVERSIONSUFFIX= -src
+DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= net
-MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/
-MAINTAINER= ports at FreeBSD.org
-COMMENT= The eXtensible Open Router Platform
+MAINTAINER= hrs at FreeBSD.org
+COMMENT= EXtensible Open Router Platform
LICENSE= GPLv2
@@ -17,61 +16,41 @@ LIB_DEPENDS= libboost_regex.so:${PORTSDI
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)
-
-MAKE_ARGS= prefix=${PREFIX} enable_boost=1
+TCP_RPC_MAKE_ARGS= transport=tcp
+TCP_RPC_MAKE_ARGS_OFF= transport=local
.include <bsd.port.pre.mk>
-.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"
@@ -79,6 +58,7 @@ post-patch:
.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 <bsd.port.post.mk>
Modified: head/net/xorp/distinfo
==============================================================================
--- head/net/xorp/distinfo Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/distinfo Mon Sep 7 19:04:23 2015 (r396340)
@@ -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
Modified: head/net/xorp/files/patch-SConstruct
==============================================================================
--- head/net/xorp/files/patch-SConstruct Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-SConstruct Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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.
@@ -20,8 +20,25 @@
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.
Modified: head/net/xorp/files/patch-bgp__bgp_trie.cc
==============================================================================
--- head/net/xorp/files/patch-bgp__bgp_trie.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-bgp__bgp_trie.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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<A>::erase(const IPNet& net)
net.str().c_str(),
found->attributes()->str().c_str());
XLOG_INFO("Pathmap dump follows: \n");
Modified: head/net/xorp/files/patch-bgp__harness__coord.hh
==============================================================================
--- head/net/xorp/files/patch-bgp__harness__coord.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-bgp__harness__coord.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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;
Modified: head/net/xorp/files/patch-bgp__path_attribute.cc
==============================================================================
--- head/net/xorp/files/patch-bgp__path_attribute.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-bgp__path_attribute.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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();
Modified: head/net/xorp/files/patch-cli__cli_client.cc
==============================================================================
--- head/net/xorp/files/patch-cli__cli_client.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-cli__cli_client.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
//
@@ -9,7 +9,7 @@
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.)
//
@@ -18,7 +18,7 @@
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
//
Modified: head/net/xorp/files/patch-cli__xrl_cli_node.hh
==============================================================================
--- head/net/xorp/files/patch-cli__xrl_cli_node.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-cli__xrl_cli_node.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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);
@@ -10,7 +10,7 @@
private:
/**
* Called when Finder connection is established.
-@@ -241,7 +244,7 @@
+@@ -241,7 +244,7 @@ private:
CliNode& cli_node() const { return (_cli_node); }
Modified: head/net/xorp/files/patch-contrib__olsr__face.hh
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__face.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__face.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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();
Modified: head/net/xorp/files/patch-contrib__olsr__face_manager.cc
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__face_manager.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__face_manager.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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.
Modified: head/net/xorp/files/patch-contrib__olsr__message.hh
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__message.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__message.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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');
}
Modified: head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__policy_varrw.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,5 +1,5 @@
---- ./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"
Modified: head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__policy_varrw.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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,
Modified: head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__tools__print_databases.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
@@ -10,7 +10,7 @@
{
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.");
@@ -21,7 +21,7 @@
}
void
-@@ -309,7 +310,8 @@
+@@ -309,7 +310,8 @@ private:
};
void
@@ -31,7 +31,7 @@
{
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.");
@@ -42,7 +42,7 @@
}
void
-@@ -476,7 +478,8 @@
+@@ -476,7 +478,8 @@ private:
};
void
@@ -52,7 +52,7 @@
{
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.");
@@ -63,7 +63,7 @@
}
void
-@@ -649,7 +652,8 @@
+@@ -649,7 +652,8 @@ private:
};
void
@@ -73,7 +73,7 @@
{
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.");
@@ -84,7 +84,7 @@
}
void
-@@ -803,7 +807,8 @@
+@@ -803,7 +807,8 @@ private:
};
void
@@ -94,7 +94,7 @@
{
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.");
@@ -105,7 +105,7 @@
}
void
-@@ -979,7 +984,8 @@
+@@ -979,7 +984,8 @@ private:
};
void
@@ -115,7 +115,7 @@
{
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.");
@@ -126,7 +126,7 @@
}
void
-@@ -1126,7 +1132,8 @@
+@@ -1126,7 +1132,8 @@ private:
};
void
@@ -136,7 +136,7 @@
{
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.");
@@ -147,7 +147,7 @@
}
void
-@@ -1271,7 +1278,8 @@
+@@ -1271,7 +1278,8 @@ private:
};
void
@@ -157,7 +157,7 @@
{
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.");
Modified: head/net/xorp/files/patch-contrib__olsr__twohop.hh
==============================================================================
--- head/net/xorp/files/patch-contrib__olsr__twohop.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-contrib__olsr__twohop.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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;
}
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
//
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__control_socket__routing_socket.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,5 +1,5 @@
---- ./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 @@
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
//
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__control_socket__windows_rtm_pipe.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,5 +1,5 @@
---- ./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"
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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:
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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)
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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); }
Modified: head/net/xorp/files/patch-fea__fibconfig.hh
==============================================================================
--- head/net/xorp/files/patch-fea__fibconfig.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__fibconfig.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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; }
Modified: head/net/xorp/files/patch-fea__firewall_manager.hh
==============================================================================
--- head/net/xorp/files/patch-fea__firewall_manager.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__firewall_manager.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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);
@@ -9,7 +9,7 @@
private:
/**
* Update the firewall entries by pushing them into the underlying system.
-@@ -364,7 +366,7 @@
+@@ -364,7 +366,7 @@ private:
*/
void generate_token();
Modified: head/net/xorp/files/patch-fea__ifconfig.hh
==============================================================================
--- head/net/xorp/files/patch-fea__ifconfig.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__ifconfig.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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);
@@ -9,7 +9,7 @@
private:
/**
* Restore the interface configuration.
-@@ -455,7 +457,7 @@
+@@ -455,7 +457,7 @@ private:
const IfTree& old_system_config,
string& error_msg);
Modified: head/net/xorp/files/patch-fea__mfea_mrouter.hh
==============================================================================
--- head/net/xorp/files/patch-fea__mfea_mrouter.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__mfea_mrouter.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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;
Modified: head/net/xorp/files/patch-fea__tools__show_interfaces.hh
==============================================================================
--- head/net/xorp/files/patch-fea__tools__show_interfaces.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__tools__show_interfaces.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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;
@@ -9,7 +9,7 @@
protected:
//
// IfMgrHintObserver methods
-@@ -132,7 +134,7 @@
+@@ -132,7 +134,7 @@ private:
*/
int ifmgr_shutdown();
Modified: head/net/xorp/files/patch-fea__xrl_mfea_node.hh
==============================================================================
--- head/net/xorp/files/patch-fea__xrl_mfea_node.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-fea__xrl_mfea_node.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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);
@@ -9,7 +9,7 @@
private:
/**
* Called when Finder connection is established.
-@@ -570,7 +572,7 @@
+@@ -570,7 +572,7 @@ private:
int family() const { return (MfeaNode::family()); }
Modified: head/net/xorp/files/patch-libproto__packet.cc
==============================================================================
--- head/net/xorp/files/patch-libproto__packet.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-libproto__packet.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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() {
Modified: head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc
==============================================================================
--- head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-libxipc__xrl_pf_stcp.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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)
@@ -9,7 +9,7 @@
{
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)
@@ -18,7 +18,7 @@
{
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;
Modified: head/net/xorp/files/patch-pim__pim_mrt_task.cc
==============================================================================
--- head/net/xorp/files/patch-pim__pim_mrt_task.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-pim__pim_mrt_task.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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<PimMreTask *>::reverse_iterator iter;
iter = pim_mre_task_list().rbegin();
@@ -10,7 +10,7 @@
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<PimMreTask *>::reverse_iterator iter;
iter = pim_mre_task_list().rbegin();
@@ -20,7 +20,7 @@
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<PimMreTask *>::reverse_iterator iter;
iter = pim_mre_task_list().rbegin();
@@ -30,7 +30,7 @@
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<PimMreTask *>::reverse_iterator iter;
iter = pim_mre_task_list().rbegin();
Modified: head/net/xorp/files/patch-policy__backend__iv_exec.cc
==============================================================================
--- head/net/xorp/files/patch-policy__backend__iv_exec.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__backend__iv_exec.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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)
Modified: 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 Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__backend__lex.yy_policy_backend_parser.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
Modified: head/net/xorp/files/patch-policy__backend__single_varrw.cc
==============================================================================
--- head/net/xorp/files/patch-policy__backend__single_varrw.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__backend__single_varrw.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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)
Modified: head/net/xorp/files/patch-policy__configuration.cc
==============================================================================
--- head/net/xorp/files/patch-policy__configuration.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__configuration.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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);
Modified: head/net/xorp/files/patch-policy__configuration.hh
==============================================================================
--- head/net/xorp/files/patch-policy__configuration.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__configuration.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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<string, string> RESOURCES;
// XXX we go reverse in order to make peer specific policies override global
// ones. Global is "" so it's always smallest (first).
Modified: head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc
==============================================================================
--- head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-policy__lex.yy_policy_parser.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
Modified: head/net/xorp/files/patch-rib__vifmanager.hh
==============================================================================
--- head/net/xorp/files/patch-rib__vifmanager.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rib__vifmanager.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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();
@@ -10,7 +10,7 @@
protected:
//
// IfMgrHintObserver methods
-@@ -163,8 +166,8 @@
+@@ -163,8 +166,8 @@ private:
*/
int ifmgr_shutdown();
Modified: head/net/xorp/files/patch-rip__packets.hh
==============================================================================
--- head/net/xorp/files/patch-rip__packets.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rip__packets.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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
Modified: head/net/xorp/files/patch-rtrmgr__cli.cc
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__cli.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__cli.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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<str
path = token_vector2line(command_global_name);
XLOG_ASSERT(path.substr(0, 4) == "help");
if (path.size() == 4) {
@@ -9,7 +9,7 @@
} else {
XLOG_ASSERT(path.substr(0, 5) == "help ");
trimmed_path = path.substr(5, path.size() - 5);
-@@ -1062,7 +1062,7 @@
+@@ -1062,7 +1062,7 @@ RouterCLI::configure_mode_help(const vec
path = token_vector2line(command_global_name);
XLOG_ASSERT(path.substr(0, 4) == "help");
if (path.size() == 4) {
Modified: head/net/xorp/files/patch-rtrmgr__lex.boot.cc
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__lex.boot.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__lex.boot.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./rtrmgr/lex.boot.cc.orig 2010-07-19 21:10:33.000000000 +0000
-+++ ./rtrmgr/lex.boot.cc 2014-02-26 21:17:13.000000000 +0000
-@@ -9552,6 +9552,7 @@
+--- rtrmgr/lex.boot.cc.orig 2012-01-11 17:56:10 UTC
++++ rtrmgr/lex.boot.cc
+@@ -9552,6 +9552,7 @@ static void yy_flex_strncpy YY_PROTO(( c
static int yy_flex_strlen YY_PROTO(( yyconst char * ));
#endif
@@ -8,7 +8,7 @@
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput YY_PROTO(( void ));
-@@ -10483,6 +10484,7 @@
+@@ -10483,6 +10484,7 @@ register char *yy_bp;
#endif /* ifndef YY_NO_UNPUT */
@@ -16,7 +16,7 @@
#ifdef __cplusplus
static int yyinput()
#else
-@@ -10554,7 +10556,7 @@
+@@ -10554,7 +10556,7 @@ static int input()
return c;
}
Modified: head/net/xorp/files/patch-rtrmgr__lex.opcmd.cc
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__lex.opcmd.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__lex.opcmd.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./rtrmgr/lex.opcmd.cc.orig 2010-07-19 21:10:33.000000000 +0000
-+++ ./rtrmgr/lex.opcmd.cc 2014-02-26 21:17:13.000000000 +0000
-@@ -518,6 +518,7 @@
+--- rtrmgr/lex.opcmd.cc.orig 2012-01-11 17:56:10 UTC
++++ rtrmgr/lex.opcmd.cc
+@@ -518,6 +518,7 @@ static void yy_flex_strncpy YY_PROTO(( c
static int yy_flex_strlen YY_PROTO(( yyconst char * ));
#endif
@@ -8,7 +8,7 @@
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput YY_PROTO(( void ));
-@@ -1322,6 +1323,7 @@
+@@ -1322,6 +1323,7 @@ register char *yy_bp;
#endif /* ifndef YY_NO_UNPUT */
@@ -16,7 +16,7 @@
#ifdef __cplusplus
static int yyinput()
#else
-@@ -1393,7 +1395,7 @@
+@@ -1393,7 +1395,7 @@ static int input()
return c;
}
Modified: head/net/xorp/files/patch-rtrmgr__lex.tplt.cc
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__lex.tplt.cc Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__lex.tplt.cc Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./rtrmgr/lex.tplt.cc.orig 2010-07-19 21:10:33.000000000 +0000
-+++ ./rtrmgr/lex.tplt.cc 2014-02-26 21:17:13.000000000 +0000
-@@ -8667,6 +8667,7 @@
+--- rtrmgr/lex.tplt.cc.orig 2012-01-11 17:56:10 UTC
++++ rtrmgr/lex.tplt.cc
+@@ -8667,6 +8667,7 @@ static void yy_flex_strncpy YY_PROTO(( c
static int yy_flex_strlen YY_PROTO(( yyconst char * ));
#endif
@@ -8,7 +8,7 @@
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput YY_PROTO(( void ));
-@@ -9708,6 +9709,7 @@
+@@ -9708,6 +9709,7 @@ register char *yy_bp;
#endif /* ifndef YY_NO_UNPUT */
@@ -16,7 +16,7 @@
#ifdef __cplusplus
static int yyinput()
#else
-@@ -9779,7 +9781,7 @@
+@@ -9779,7 +9781,7 @@ static int input()
return c;
}
Modified: head/net/xorp/files/patch-rtrmgr__module_command.hh
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__module_command.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__module_command.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./rtrmgr/module_command.hh.orig 2010-07-19 21:10:33.000000000 +0000
-+++ ./rtrmgr/module_command.hh 2014-02-26 21:17:13.000000000 +0000
-@@ -87,6 +87,7 @@
+--- rtrmgr/module_command.hh.orig 2012-01-11 17:56:10 UTC
++++ rtrmgr/module_command.hh
+@@ -87,6 +87,7 @@ private:
Action* _status_method;
Action* _startup_method;
Action* _shutdown_method;
Modified: head/net/xorp/files/patch-rtrmgr__module_manager.hh
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__module_manager.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__module_manager.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./rtrmgr/module_manager.hh.orig 2011-09-20 00:33:28.000000000 +0000
-+++ ./rtrmgr/module_manager.hh 2014-02-26 21:17:13.000000000 +0000
-@@ -144,7 +144,9 @@
+--- rtrmgr/module_manager.hh.orig 2012-01-11 17:56:10 UTC
++++ rtrmgr/module_manager.hh
+@@ -144,7 +144,9 @@ private:
string _expath; // The expanded absolute path to the program
bool _do_exec; // false indicates we're running in test mode,
// when we may not actually start any processes
Modified: head/net/xorp/files/patch-rtrmgr__op_commands.hh
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__op_commands.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__op_commands.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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<string> _path_segments;
Modified: head/net/xorp/files/patch-rtrmgr__template_commands.hh
==============================================================================
--- head/net/xorp/files/patch-rtrmgr__template_commands.hh Mon Sep 7 19:00:57 2015 (r396339)
+++ head/net/xorp/files/patch-rtrmgr__template_commands.hh Mon Sep 7 19:04:23 2015 (r396340)
@@ -1,6 +1,6 @@
---- ./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;
@@ -9,7 +9,7 @@
private:
#ifdef DEBUG_XRLDB
bool check_xrl_is_valid(const list<string>& action,
-@@ -92,7 +94,7 @@
+@@ -92,7 +94,7 @@ private:
string _request;
list<string> _split_response;
string _response;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list