Attachment #140416 for bug #186982

View | Details | Raw Unified | Return to bug 186982
Collapse All | Expand All




# $FreeBSD: head/net/xorp/Makefile 341435 2014-01-27 17:35:26Z bapt $

PORTNAME=	xorp
PORTVERSION=	1.8.5
PORTREVISION=	0
CATEGORIES=	net
MASTER_SITES=	http://www.xorp.org/releases/${PORTVERSION}/
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
		http://www5.xorp.org/releases/${PORTVERSION}/	\
		http://www3.xorp.org/releases/${PORTVERSION}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	The eXtensible Open Router Platform

LICENSE=	GPLv2

BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
# Uses libcurses, libcrypto, librt from base system.
LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
		libpcap.so:${PORTSDIR}/net/libpcap

CONFLICTS_INSTALL=	xorp-devel-*

BROKEN=		Does not build
DEPRECATED=	Broken for more than 6 month
EXPIRATION_DATE=	2014-02-27

USE_GMAKE=	yes
USE_OPENSSL=	yes

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=		--prefix=${PREFIX}/${PORTNAME}			\
			--with-comment='FreeBSD port: ${PKGNAME}'	\
			--with-openssl=${OPENSSLBASE}

CXXFLAGS+=	-Wno-uninitialized
NOMAN=		defined

USE_BZIP2=	yes
USE_PYTHON_BUILD=	2
USE_SCONS=	yes
MAKE_JOBS_SAFE=	defined

WRKSRC=		${WRKDIR}/xorp
OPTIONS=								\
	    OPTIMIZE	 "Build with optimization" On			\
	    ORIGIN	 "Use ORIGIN with shared libraries" On		\
	    SHARED	 "Build with shared libraries" On		\
	    STRIP	 "Strip binaries before installing" On		\
	    TCP_RPC	 "Use TCP as RPC transport (defaults to AF_LOCAL)" Off

.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>

.if ${OSVERSION} < 700000
IGNORE=		unsupported on FreeBSD versions prior to 7.0
.endif

USE_RC_SUBR=	xorp.sh
XORP_SAMPLECONF=	rtrmgr/config/multicast4.boot
SUB_FILES=	pkg-message
CONFIGURE_ARGS+=	--disable-ipv6
.endif

SCONS_ARGS+=	prefix=${PREFIX} enable_boost=1

.if defined(WITHOUT_OPTIMIZE)
SCONS_ARGS+=	optimize=no
	--with-path-to-net-snmpd-config=${LOCALBASE}/bin/net-snmp-config \
	--enable-shared
PLIST_SUB+=		XORP_SNMP=""
USE_LDCONFIG=		${PREFIX}/mibs
.else
SCONS_ARGS+=	optimize=highest
.endif

.if defined(WITHOUT_SHARED)
SCONS_ARGS+=	shared=false
PLIST_SUB+=	XORP_SHLIB="@comment "
.else
SCONS_ARGS+=	shared=true
PLIST_SUB+=	XORP_SHLIB=""
USE_LDCONFIG=	${PREFIX}/lib/xorp/lib
. if defined (WITHOUT_ORIGIN)
SCONS_ARGS+=	origin=false
. else
SCONS_ARGS+=	origin=true
. endif
.endif

.if defined(WITHOUT_STRIP)
SCONS_ARGS+=	strip=false
.else
SCONS_ARGS+=	strip=true
.endif

.if defined(WITH_TCP_RPC)
SCONS_ARGS+=	transport=tcp
.else
SCONS_ARGS+=	transport=local
.endif

# XXX is this still true?
.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on sparc64
.endif

post-stage:
	${CP} -p ${WRKSRC}/${XORP_SAMPLECONF} ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample
.include <bsd.port.pre.mk>

pre-everything::
.if !defined(PREFIX) || ${PREFIX} == "/usr/local"
	@${ECHO_MSG} "XORP does not currently follow the hier(7) filesystem layout."
	@${ECHO_MSG} "It will therefore install all its directories relative to ${PREFIX}."
	@${ECHO_MSG} "If you do not want this, hit ^C now and set PREFIX in the"
	@${ECHO_MSG} "build environment to something other than ${PREFIX}."
	@${ECHO_MSG}
	@${ECHO_MSG} "If you plan to build with SNMP support, please ensure that"
	@${ECHO_MSG} "the net-mgmt/net-snmp port is already installed under ${LOCALBASE}"
	@${ECHO_MSG} "before doing this."
.endif

.ifmake install
post-install:
	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (xorp-1.6.tar.gz) = d3faff56f5e58cf43fa300e14d6b5702ea9e75147f3d2d2aae44da8bda3f8f82	1	SHA256 (xorp-1.8.5-src.tar.bz2) = 4aa414e248f0ef3903a4ae8fd1862d8dd713a69f6bbc926d81dd693a88ef8e72
2	SIZE (xorp-1.6.tar.gz) = 7895108	2	SIZE (xorp-1.8.5-src.tar.bz2) = 3104442




--- SConstruct.orig	2011-03-22 22:08:58.000000000 +0100
+++ SConstruct	2011-03-25 11:14:54.359000184 +0100
@@ -160,22 +160,13 @@
 
 # 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=['/usr/local/include', '$BUILDDIR'],
+		  LIBPATH=['usr/lib', '/usr/local/lib'],
 		  variables = vars)
 
 prefix = env['prefix']

Line 0 Link Here

(-)./files/patch-bgp__bgp_trie.cc (+11 lines)
	1	--- bgp/bgp_trie.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ bgp/bgp_trie.cc 2014-02-07 17:24:59.000000000 +0100
	3	@@ -115,7 +115,7 @@
	4	net.str().c_str(),
	5	found->attributes()->str().c_str());
	6	XLOG_INFO("Pathmap dump follows: \n");
	7	- for (pmi == _pathmap.begin(); pmi != _pathmap.end(); pmi++) {
	8	+ for (pmi = _pathmap.begin(); pmi != _pathmap.end(); pmi++) {
	9	XLOG_INFO("%s\n\n", pmi->second->str().c_str());
	10	}
	11	XLOG_FATAL("Exiting\n");

Line 0 Link Here

(-)./files/patch-bgp__harness__coord.hh (+12 lines)
	1	--- bgp/harness/coord.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ bgp/harness/coord.hh 2014-02-07 17:56:28.000000000 +0100
	3	@@ -42,7 +42,9 @@
	4
	5	private:
	6	bool _done;
	7	+public:
	8	EventLoop& _eventloop;
	9	+private:
	10	Command& _command;
	11	};
	12




--- bgp/path_attribute.cc.orig	2011-03-16 22:15:59.000000000 +0100
+++ bgp/path_attribute.cc	2014-02-07 17:44:17.000000000 +0100
@@ -830,8 +830,11 @@
 ClusterListAttribute::clone() const
 {
     ClusterListAttribute *ca = new ClusterListAttribute();
-    list<IPv4>::const_reverse_iterator i = cluster_list().rbegin();
-    for(; i != cluster_list().rend(); i++)
+    // list<IPv4>::const_reverse_iterator i = cluster_list().rbegin();
+    list<IPv4>::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;
 }




--- cli/cli_client.cc.orig	2011-03-22 22:08:58.000000000 +0100
+++ cli/cli_client.cc	2014-02-04 20:15:39.000000000 +0100
@@ -832,7 +832,7 @@
     //
     // 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 @@
     // 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 @@
     //
     // 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);




--- cli/xrl_cli_node.hh.orig	2011-03-16 22:27:45.000000000 +0100
+++ cli/xrl_cli_node.hh	2014-02-04 23:37:29.000000000 +0100
@@ -224,6 +224,9 @@
 				     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 @@
 
     CliNode&	cli_node() const { return (_cli_node); }
 
-    EventLoop&		_eventloop;
+    // EventLoop&		_eventloop;
     CliNode&		_cli_node;
 
     XrlCliProcessorV0p1Client _xrl_cli_processor_client;




--- contrib/olsr/face.hh.orig	2010-07-19 23:10:33.000000000 +0200
+++ contrib/olsr/face.hh	2014-02-07 15:40:51.000000000 +0100
@@ -291,8 +291,10 @@
      */
     void originate_hello();
 
-  private:
     Olsr&		_olsr;
+
+  private:
+    // Olsr&		_olsr;
     FaceManager&	_fm;
     Neighborhood*	_nh;
     MessageDecoder&	_md;




--- contrib/olsr/face_manager.cc.orig	2011-07-25 19:55:36.000000000 +0200
+++ contrib/olsr/face_manager.cc	2014-02-07 16:00:05.000000000 +0100
@@ -239,8 +239,11 @@
 
 	// Walk the list of message handler functions in reverse,
 	// looking for one which is willing to consume this message.
-	vector<MessageReceiveCB>::reverse_iterator jj;
-	for (jj = _handlers.rbegin(); jj != _handlers.rend(); jj++) {
+	// vector<MessageReceiveCB>::reverse_iterator jj;
+	vector<MessageReceiveCB>::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)

Line 0 Link Here

(-)./files/patch-contrib__olsr__message.hh (+13 lines)
	1	--- contrib/olsr/message.hh.orig 2012-01-11 18:46:45.000000000 +0100
	2	+++ contrib/olsr/message.hh 2014-02-07 16:29:50.000000000 +0100
	3	@@ -668,8 +668,8 @@
	4	return (str += '\n');
	5	}
	6
	7	-private:
	8	- size_t _opaque_data_offset;
	9	+// private:
	10	+// size_t _opaque_data_offset;
	11	};
	12
	13	/**

Line 0 Link Here

(-)./files/patch-contrib__olsr__policy_varrw.cc (+11 lines)
	1	--- contrib/olsr/policy_varrw.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ contrib/olsr/policy_varrw.cc 2014-02-07 16:57:40.000000000 +0100
	3	@@ -39,7 +39,7 @@
	4	#include "policy_varrw.hh"
	5
	6	OlsrVarRW::OlsrVarRW(IPv4Net& network, IPv4& nexthop, uint32_t& metric,
	7	- IPv4& originator, IPv4& main_addr, uint32_t vtype,
	8	+ IPv4& originator, IPv4& main_addr, uint32_t& vtype,
	9	PolicyTags& policytags)
	10	: _network(network), _nexthop(nexthop), _metric(metric),
	11	_originator(originator), _main_addr(main_addr), _vtype(vtype),

Line 0 Link Here

(-)./files/patch-contrib__olsr__policy_varrw.hh (+11 lines)
	1	--- contrib/olsr/policy_varrw.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ contrib/olsr/policy_varrw.hh 2014-02-07 16:59:38.000000000 +0100
	3	@@ -45,7 +45,7 @@
	4	};
	5
	6	OlsrVarRW(IPv4Net& network, IPv4& nexthop, uint32_t& metric,
	7	- IPv4& originator, IPv4& main_addr, uint32_t vtype,
	8	+ IPv4& originator, IPv4& main_addr, uint32_t& vtype,
	9	PolicyTags& policytags);
	10
	11	// SingleVarRW inteface:




--- contrib/olsr/tools/print_databases.cc.orig	2011-03-16 22:16:01.000000000 +0100
+++ contrib/olsr/tools/print_databases.cc	2014-02-07 15:15:48.000000000 +0100
@@ -161,7 +161,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get external route list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -309,7 +310,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get interface list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -476,7 +478,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get link list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -649,7 +652,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get MID list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -803,7 +807,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get neighbor list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -979,7 +984,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get topology list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -1126,7 +1132,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get neighbor list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void
@@ -1271,7 +1278,8 @@
 };
 
 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 @@
     if (! success)
 	XLOG_WARNING("Failed to get two-hop neighbor list.");
 
-    UNUSED(argc);
-    UNUSED(argv);
+    // UNUSED(argc);
+    // UNUSED(argv);
 }
 
 void

Line 0 Link Here

(-)./files/patch-contrib__olsr__twohop.hh (+14 lines)
	1	--- contrib/olsr/twohop.hh.orig 2011-03-16 22:27:46.000000000 +0100
	2	+++ contrib/olsr/twohop.hh 2014-02-07 17:09:13.000000000 +0100
	3	@@ -140,8 +140,10 @@
	4	return _twohop_links;
	5	}
	6
	7	- private:
	8	EventLoop& _ev;
	9	+
	10	+ private:
	11	+ // EventLoop& _ev;
	12	Neighborhood* _parent;
	13
	14	/**




--- fea/data_plane/control_socket/routing_socket.cc.orig	2011-03-16 22:27:46.000000000 +0100
+++ fea/data_plane/control_socket/routing_socket.cc	2014-02-05 14:11:37.000000000 +0100
@@ -240,9 +240,10 @@
 // Observe routing sockets activity
 //
 
-struct RoutingSocketPlumber {
+class RoutingSocketPlumber {
     typedef RoutingSocket::ObserverList ObserverList;
 
+public:
     static void
     plumb(RoutingSocket& r, RoutingSocketObserver* o)
     {

Line 0 Link Here

(-)./files/patch-fea__data_plane__control_socket__routing_socket.hh (+11 lines)
	1	--- fea/data_plane/control_socket/routing_socket.hh.orig 2011-03-16 22:27:46.000000000 +0100
	2	+++ fea/data_plane/control_socket/routing_socket.hh 2014-02-05 13:20:10.000000000 +0100
	3	@@ -31,7 +31,7 @@
	4
	5
	6	class RoutingSocketObserver;
	7	-struct RoutingSocketPlumber;
	8	+// struct RoutingSocketPlumber;
	9
	10	/**
	11	* RoutingSocket class opens a routing socket and forwards data arriving




--- fea/data_plane/control_socket/windows_rtm_pipe.cc.orig	2011-03-16 22:16:01.000000000 +0100
+++ fea/data_plane/control_socket/windows_rtm_pipe.cc	2014-02-05 14:59:02.000000000 +0100
@@ -288,9 +288,10 @@
 // Observe routing sockets activity
 //
 
-struct WinRtmPipePlumber {
+class WinRtmPipePlumber {
     typedef WinRtmPipe::ObserverList ObserverList;
 
+public:
     static void
     plumb(WinRtmPipe& r, WinRtmPipeObserver* o)
     {

Line 0 Link Here

(-)./files/patch-fea__data_plane__control_socket__windows_rtm_pipe.hh (+11 lines)
	1	--- fea/data_plane/control_socket/windows_rtm_pipe.hh.orig 2011-03-16 22:16:01.000000000 +0100
	2	+++ fea/data_plane/control_socket/windows_rtm_pipe.hh 2014-02-05 13:38:25.000000000 +0100
	3	@@ -29,7 +29,7 @@
	4	#include "libxorp/exceptions.hh"
	5
	6	class WinRtmPipeObserver;
	7	-struct WinRtmPipePlumber;
	8	+// struct WinRtmPipePlumber;
	9
	10	/**
	11	* WinRtmPipe class opens a routing socket and forwards data arriving




--- fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh.orig	2011-03-16 22:16:02.000000000 +0100
+++ fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh	2014-02-05 13:46:16.000000000 +0100
@@ -73,15 +73,15 @@
 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<uint8_t>& buffer) {
 	    _rtmo.receive_data(buffer);
 	}
     private:
-	int _af;
+	// int _af;
     	FibConfigTableObserverRtmV2& _rtmo;
     };
 




--- fea/data_plane/managers/fea_data_plane_manager_linux.cc.orig	2011-03-16 22:27:48.000000000 +0100
+++ fea/data_plane/managers/fea_data_plane_manager_linux.cc	2014-02-05 15:21:50.000000000 +0100
@@ -71,8 +71,10 @@
 
 
 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
 {
 }
 




--- fea/data_plane/managers/fea_data_plane_manager_linux.hh.orig	2011-03-16 22:27:48.000000000 +0100
+++ fea/data_plane/managers/fea_data_plane_manager_linux.hh	2014-02-05 15:06:24.000000000 +0100
@@ -118,10 +118,10 @@
      * @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__




--- fea/fibconfig.hh.orig	2012-01-11 18:46:45.000000000 +0100
+++ fea/fibconfig.hh	2014-02-05 15:49:04.000000000 +0100
@@ -736,12 +736,14 @@
      */
     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;




--- fea/firewall_manager.hh.orig	2011-03-16 22:27:49.000000000 +0100
+++ fea/firewall_manager.hh	2014-02-05 17:18:17.000000000 +0100
@@ -313,6 +313,8 @@
      */
     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 @@
      */
     void generate_token();
 
-    FeaNode&				_fea_node;
+    // FeaNode&				_fea_node;
     EventLoop&				_eventloop;
     const IfTree&			_iftree;
 




--- fea/ifconfig.hh.orig	2011-03-16 22:27:49.000000000 +0100
+++ fea/ifconfig.hh	2014-02-05 16:07:56.000000000 +0100
@@ -442,6 +442,8 @@
      */
     void report_updates(IfTree& iftree);
 
+    FeaNode&			_fea_node;
+
 private:
     /**
      * Restore the interface configuration.
@@ -455,7 +457,7 @@
 		       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

Line 0 Link Here

(-)./files/patch-fea__mfea_mrouter.hh (+11 lines)
	1	--- fea/mfea_mrouter.hh.orig 2011-03-16 22:27:49.000000000 +0100
	2	+++ fea/mfea_mrouter.hh 2014-02-05 16:57:00.000000000 +0100
	3	@@ -437,6 +437,8 @@
	4	// Original state from the underlying system before the MFEA was started
	5	//
	6	bool _multicast_forwarding_enabled;
	7	+
	8	+public:
	9	const FibConfig& _fibconfig;
	10	};
	11




--- fea/tools/show_interfaces.hh.orig	2010-07-19 23:10:33.000000000 +0200
+++ fea/tools/show_interfaces.hh	2014-02-05 15:34:37.000000000 +0100
@@ -79,6 +79,8 @@
      */
     void print_interfaces(const string& print_iface_name) const;
 
+    EventLoop&		_eventloop;
+
 protected:
     //
     // IfMgrHintObserver methods
@@ -132,7 +134,7 @@
      */
     int ifmgr_shutdown();
 
-    EventLoop&		_eventloop;
+    // EventLoop&		_eventloop;
 
     IfMgrXrlMirror	_ifmgr;
 




--- fea/xrl_mfea_node.hh.orig	2011-03-16 22:27:49.000000000 +0100
+++ fea/xrl_mfea_node.hh	2014-02-06 20:13:08.000000000 +0100
@@ -504,6 +504,8 @@
 	// Input values,
 	const bool&	enable);
 
+    EventLoop&			_eventloop;
+
 private:
     /**
      * Called when Finder connection is established.
@@ -570,7 +572,7 @@
     
     int family() const { return (MfeaNode::family()); }
 
-    EventLoop&			_eventloop;
+    // EventLoop&			_eventloop;
     const string		_finder_target;
 
     XrlMfeaClientV0p1Client	_xrl_mfea_client_client;

Line 0 Link Here

(-)./files/patch-libproto__packet.cc (+11 lines)
	1	--- libproto/packet.cc.orig 2011-03-22 22:08:59.000000000 +0100
	2	+++ libproto/packet.cc 2014-02-04 20:02:26.000000000 +0100
	3	@@ -233,7 +233,7 @@
	4	}
	5
	6	ArpHeader::ArpHeader() {
	7	- memset(this, 0, sizeof(this));
	8	+ memset(this, 0, sizeof(*this));
	9	ah_hw_len = 6;
	10	ah_proto_len = 4;
	11	}




--- libxipc/xrl_pf_stcp.cc.orig	2011-03-22 22:08:59.000000000 +0100
+++ libxipc/xrl_pf_stcp.cc	2014-02-04 19:11:08.000000000 +0100
@@ -548,7 +548,7 @@
 		 bool		  batch,
 		 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();
@@ -572,7 +572,7 @@
     }
 
     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();
 
@@ -621,7 +621,7 @@
     uint8_t		_buffer[256];	// XXX important performance parameter
     uint32_t		_size;
     Callback		_cb;
-    bool		_keepalive;
+    // bool		_keepalive;
 };
 
 




--- libxorp/utility.h.orig	2012-10-01 17:45:19.000000000 +0800
+++ libxorp/utility.h	2012-10-01 17:47:34.000000000 +0800
@@ -31,7 +31,7 @@
  * Compile time assertion.
  */
 #ifndef static_assert
-#define static_assert(a) switch (a) case 0: case (a):
+#define static_assert(a) ((void)sizeof(int[(a) ? 1 : -1]))
 #endif /* static_assert */
 
 /*
@@ -42,7 +42,7 @@
 #ifdef UNUSED
 # undef UNUSED
 #endif /* UNUSED */
-#define UNUSED(var)	static_assert(sizeof(var) != 0)
+#define UNUSED(var)	((void)var)
 
 #ifdef __cplusplus
 #define cstring(s) (s).str().c_str()




--- mibs/bgp4_mib_1657_bgp4pathattrtable.cc.orig	2009-01-05 18:31:00.000000000 +0000
+++ mibs/bgp4_mib_1657_bgp4pathattrtable.cc	2011-12-27 03:17:03.000000000 +0000
@@ -139,7 +139,7 @@
 	    DEBUGMSGTL((BgpMib::the_instance().name(),
 		"updating local bgp4PathAttrTable...\n"));
 	    DEBUGMSGTL((BgpMib::the_instance().name(),
-		"local table size: %d\n", CONTAINER_SIZE(cb.container)));
+		"local table size: %zd\n", CONTAINER_SIZE(cb.container)));
 	    bgp_mib.send_get_v4_route_list_start("bgp", net, true, false,
 			     callback(get_v4_route_list_start_done));
 	    break;
@@ -156,12 +156,12 @@
 	    DEBUGMSGTL((BgpMib::the_instance().name(),
 		"removing old routes from bgp4PathAttrTable...\n"));
 	    DEBUGMSGTL((BgpMib::the_instance().name(),
-		"local table size: %d old_routes stack: %d\n", 
+		"local table size: %zd old_routes stack: %zd\n", 
 		CONTAINER_SIZE(cb.container), update.old_routes.size()));
 	    CONTAINER_FOR_EACH(cb.container, find_old_routes, NULL);
 	    while (update.old_routes.size()) {  
 		DEBUGMSGTL((BgpMib::the_instance().name(),
-		    "update.old_routes.size() = %d\n", 
+		    "update.old_routes.size() = %zd\n", 
 		    update.old_routes.size()));
 	        row = (bgp4PathAttrTable_context*) 
 		    CONTAINER_FIND(cb.container, &update.old_routes.top());	
@@ -745,7 +745,7 @@
 
     if (row->update_signature != (update.list_token)) {
         DEBUGMSGTL((BgpMib::the_instance().name(),
-	    "removing %#010x from table\n", row->bgp4PathAttrIpAddrPrefix));
+	    "removing %#010lx from table\n", row->bgp4PathAttrIpAddrPrefix));
 	update.old_routes.push(row->index); 
     }
 }

Lines 1-11 Link Here

(-)./files/patch-mibs-bgp4_mib_1657_bgppeertable.cc (-11 lines)
1	--- mibs/bgp4_mib_1657_bgppeertable.cc-orig 2011-12-27 00:37:40.000000000 +0000
2	+++ mibs/bgp4_mib_1657_bgppeertable.cc 2011-12-27 00:38:11.000000000 +0000
3	@@ -476,7 +476,7 @@
4
5	void free_context(void * context, struct netsnmp_iterator_info_s * /* iinfo */)
6	{
7	- DEBUGMSGTL((BgpMib::the_instance().name(),"freeing context %x\n", context));
8	+ DEBUGMSGTL((BgpMib::the_instance().name(),"freeing context %p\n", context));
9	if (NULL != context) free(context);
10	context = NULL;
11	}

Lines 1-11 Link Here

(-)./files/patch-mibs-xorpevents.cc (-11 lines)
1	--- mibs/xorpevents.cc-orig 2011-12-27 00:35:22.000000000 +0000
2	+++ mibs/xorpevents.cc 2011-12-27 00:36:01.000000000 +0000
3	@@ -55,7 +55,7 @@
4	{
5	SnmpEventLoop& e = SnmpEventLoop::the_instance();
6	DEBUGMSGTL((e._log_name, "run all xorp timers\n"));
7	- DEBUGMSGTL((e._log_name, "# of timers: %d\n", e.timer_list().size()));
8	+ DEBUGMSGTL((e._log_name, "# of timers: %zd\n", e.timer_list().size()));
9	e.timer_list().run();
10	SnmpEventLoop::AlarmMap::iterator p;
11	for (p = e._pending_alarms.begin(); p != e._pending_alarms.end(); ++p) {




--- pim/pim_mrt_task.cc.orig	2011-09-20 02:33:28.000000000 +0200
+++ pim/pim_mrt_task.cc	2014-02-06 18:34:33.000000000 +0100
@@ -166,7 +166,8 @@
     //
     list<PimMreTask *>::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 @@
     //
     list<PimMreTask *>::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 @@
     //
     list<PimMreTask *>::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 @@
     //
     list<PimMreTask *>::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) {




--- policy/backend/iv_exec.cc.orig	2011-03-16 22:27:54.000000000 +0100
+++ policy/backend/iv_exec.cc	2014-02-05 18:44:26.000000000 +0100
@@ -275,7 +275,11 @@
 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--;

Line 0 Link Here

(-)./files/patch-policy__backend__lex.yy_policy_backend_parser.cc (+11 lines)
	1	--- policy/backend/lex.yy_policy_backend_parser.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ policy/backend/lex.yy_policy_backend_parser.cc 2014-02-05 19:09:23.000000000 +0100
	3	@@ -617,6 +617,8 @@
	4	static int yy_flex_strlen (yyconst char * );
	5	#endif
	6
	7	+#define YY_NO_INPUT
	8	+
	9	#ifndef YY_NO_INPUT
	10
	11	#ifdef __cplusplus




--- policy/backend/single_varrw.cc.orig	2010-07-19 23:10:33.000000000 +0200
+++ policy/backend/single_varrw.cc	2014-02-05 18:56:49.000000000 +0100
@@ -70,7 +70,11 @@
 
 	// 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;

Line 0 Link Here

(-)./files/patch-policy__configuration.cc (+13 lines)
	1	--- policy/configuration.cc.orig 2011-03-16 22:27:54.000000000 +0100
	2	+++ policy/configuration.cc 2014-02-06 20:00:41.000000000 +0100
	3	@@ -766,7 +766,9 @@
	4	POLICY* p = find_policy(proto);
	5	XLOG_ASSERT(p);
	6
	7	- for (POLICY::reverse_iterator i = p->rbegin(); i != p->rend(); ++i) {
	8	+// for (POLICY::reverse_iterator i = p->rbegin(); i != p->rend(); ++i) {
	9	+ if (! p->empty())
	10	+ for (POLICY::iterator i = p->end(); --i != p->begin(); ) {
	11	PolicyList* pl = i->second;
	12
	13	pl->link_code(code);




--- policy/configuration.hh.orig	2011-03-16 22:27:54.000000000 +0100
+++ policy/configuration.hh	2014-02-12 11:14:04.000000000 +0100
@@ -43,11 +43,19 @@
 
 // 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:

Line 0 Link Here

(-)./files/patch-policy__lex.yy_policy_parser.cc (+10 lines)
	1	--- policy/lex.yy_policy_parser.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ policy/lex.yy_policy_parser.cc 2014-02-06 20:17:42.000000000 +0100
	3	@@ -2982,6 +2982,7 @@
	4	static int yy_flex_strlen (yyconst char * );
	5	#endif
	6
	7	+#define YY_NO_INPUT
	8	#ifndef YY_NO_INPUT
	9
	10	#ifdef __cplusplus




--- rib/vifmanager.hh.orig	2010-07-19 23:10:33.000000000 +0200
+++ rib/vifmanager.hh	2014-02-06 21:03:13.000000000 +0100
@@ -110,6 +110,9 @@
      */
     int		final_stop();
 
+    XrlRouter&		_xrl_router;
+    EventLoop&		_eventloop;
+
 protected:
     //
     // IfMgrHintObserver methods
@@ -163,8 +166,8 @@
      */
     int ifmgr_shutdown();
 
-    XrlRouter&		_xrl_router;
-    EventLoop&		_eventloop;
+    // XrlRouter&		_xrl_router;
+    // EventLoop&		_eventloop;
     RibManager*		_rib_manager;
 
     IfMgrXrlMirror	_ifmgr;

Line 0 Link Here

(-)./files/patch-rip__packets.hh (+10 lines)
	1	--- rip/packets.hh.orig 2011-03-16 22:16:12.000000000 +0100
	2	+++ rip/packets.hh 2014-02-07 18:07:00.000000000 +0100
	3	@@ -586,6 +586,7 @@
	4	const uint8_t* _key_id; // Key number used
	5	const uint8_t* _auth_bytes; // Auth data length at end of packet
	6	const uint8_t* _seqno; // Monotonically increasing seqno
	7	+public:
	8	const uint8_t* _mbz; // Must-be-zero
	9	};
	10




--- rtrmgr/cli.cc.orig	2011-03-16 22:16:13.000000000 +0100
+++ rtrmgr/cli.cc	2014-02-07 13:47:22.000000000 +0100
@@ -741,7 +741,7 @@
     path = token_vector2line(command_global_name);
     XLOG_ASSERT(path.substr(0, 4) == "help");
     if (path.size() == 4) {
-	trimmed_path == "";
+	trimmed_path = "";
     } else {
 	XLOG_ASSERT(path.substr(0, 5) == "help ");
 	trimmed_path = path.substr(5, path.size() - 5);
@@ -1062,7 +1062,7 @@
     path = token_vector2line(command_global_name);
     XLOG_ASSERT(path.substr(0, 4) == "help");
     if (path.size() == 4) {
-	trimmed_path == "";
+	trimmed_path = "";
     } else {
 	XLOG_ASSERT(path.substr(0, 5) == "help ");
 	trimmed_path = path.substr(5, path.size() - 5);




--- rtrmgr/lex.boot.cc.orig	2010-07-19 23:10:33.000000000 +0200
+++ rtrmgr/lex.boot.cc	2014-02-06 21:19:35.000000000 +0100
@@ -9552,6 +9552,7 @@
 static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
+#define YY_NO_INPUT
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput YY_PROTO(( void ));
@@ -10483,6 +10484,7 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -10554,7 +10556,7 @@
 
 	return c;
 	}
-
+#endif
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )




--- rtrmgr/lex.opcmd.cc.orig	2010-07-19 23:10:33.000000000 +0200
+++ rtrmgr/lex.opcmd.cc	2014-02-06 21:29:26.000000000 +0100
@@ -518,6 +518,7 @@
 static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
+#define YY_NO_INPUT
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput YY_PROTO(( void ));
@@ -1322,6 +1323,7 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1393,7 +1395,7 @@
 
 	return c;
 	}
-
+#endif
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )




--- rtrmgr/lex.tplt.cc.orig	2010-07-19 23:10:33.000000000 +0200
+++ rtrmgr/lex.tplt.cc	2014-02-06 21:33:41.000000000 +0100
@@ -8667,6 +8667,7 @@
 static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
+#define YY_NO_INPUT
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput YY_PROTO(( void ));
@@ -9708,6 +9709,7 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -9779,7 +9781,7 @@
 
 	return c;
 	}
-
+#endif
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )

Line 0 Link Here

(-)./files/patch-rtrmgr__module_command.hh (+10 lines)
	1	--- rtrmgr/module_command.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ rtrmgr/module_command.hh 2014-02-06 22:38:09.000000000 +0100
	3	@@ -87,6 +87,7 @@
	4	Action* _status_method;
	5	Action* _startup_method;
	6	Action* _shutdown_method;
	7	+public:
	8	bool _execute_done;
	9	bool _verbose; // Set to true if output is verbose
	10	};




--- rtrmgr/module_manager.hh.orig	2011-09-20 02:33:28.000000000 +0200
+++ rtrmgr/module_manager.hh	2014-02-06 22:48:01.000000000 +0100
@@ -144,7 +144,9 @@
     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
+public:
     bool	_verbose;	// Set to true if output is verbose
+private:
     XorpTimer	_shutdown_timer; // A timer used during shutdown
     XorpCallback0<void>::RefPtr _terminate_cb; // The cb when module terminated
 };

Line 0 Link Here

(-)./files/patch-rtrmgr__op_commands.hh (+11 lines)
	1	--- rtrmgr/op_commands.hh.orig 2011-03-16 22:27:56.000000000 +0100
	2	+++ rtrmgr/op_commands.hh 2014-02-06 22:52:04.000000000 +0100
	3	@@ -215,7 +215,7 @@
	4
	5	// Below here is temporary storage for use in parsing
	6	list<string> _path_segments;
	7	- OpCommand* _current_command;
	8	+ // OpCommand* _current_command;
	9	const TemplateTree* _template_tree;
	10	SlaveConfigTree* _slave_config_tree;
	11	SlaveModuleManager& _mmgr;




--- rtrmgr/template_commands.hh.orig	2011-03-16 22:16:14.000000000 +0100
+++ rtrmgr/template_commands.hh	2014-02-06 23:35:47.000000000 +0100
@@ -78,6 +78,8 @@
     string related_module() const;
     string affected_module() const;
 
+    const XRLdb*	_xrldb;
+
 private:
 #ifdef DEBUG_XRLDB
     bool check_xrl_is_valid(const list<string>& action,
@@ -92,7 +94,7 @@
     string		_request;
     list<string>	_split_response;
     string		_response;
-    const XRLdb*	_xrldb;
+    // const XRLdb*	_xrldb;
 };
 
 class ProgramAction : public Action {




--- rtrmgr/template_tree_node.cc.orig	2011-03-16 22:16:14.000000000 +0100
+++ rtrmgr/template_tree_node.cc	2014-02-07 13:00:37.000000000 +0100
@@ -543,9 +543,12 @@
 {
     map<string,string> varmap;
     const TemplateTreeNode* ttn = this;
-    list<string>::const_reverse_iterator iter;
+    // list<string>::const_reverse_iterator iter;
+    list<string>::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();




--- rtrmgr/template_tree_node.hh.orig	2011-03-16 22:16:14.000000000 +0100
+++ rtrmgr/template_tree_node.hh	2014-02-07 13:04:29.000000000 +0100
@@ -189,13 +189,15 @@
     TemplateTreeNode*	_parent;
     list<TemplateTreeNode*> _children;
 
+    TemplateTree&	_template_tree;
+
 private:
     bool split_up_varname(const string& varname,
 			  list<string>& var_parts) const;
     TemplateTreeNode* find_parent_varname_node(const list<string>& var_parts);
     TemplateTreeNode* find_child_varname_node(const list<string>& var_parts);
 
-    TemplateTree&	_template_tree;
+    // TemplateTree&	_template_tree;
 
     string _module_name;
     string _default_target_name;

Line 0 Link Here

(-)./files/patch-rtrmgr__userdb.hh (+10 lines)
	1	--- rtrmgr/userdb.hh.orig 2011-03-16 22:16:14.000000000 +0100
	2	+++ rtrmgr/userdb.hh 2014-02-07 13:14:26.000000000 +0100
	3	@@ -98,6 +98,7 @@
	4
	5	private:
	6	map<uid_t, User*> _users;
	7	+public:
	8	bool _verbose; // Set to true if output is verbose
	9	};
	10




--- rtrmgr/xorpsh_main.cc.orig	2012-01-11 18:46:45.000000000 +0100
+++ rtrmgr/xorpsh_main.cc	2014-02-07 13:35:51.000000000 +0100
@@ -146,7 +146,7 @@
       _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 @@
 	_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)) {

Line 0 Link Here

(-)./files/patch-rtrmgr__xorpsh_main.hh (+11 lines)
	1	--- rtrmgr/xorpsh_main.hh.orig 2011-03-16 22:16:14.000000000 +0100
	2	+++ rtrmgr/xorpsh_main.hh 2014-02-07 13:34:19.000000000 +0100
	3	@@ -151,7 +151,7 @@
	4	string _authfile;
	5	string _authtoken;
	6	bool _got_config;
	7	- bool _got_modules;
	8	+ // bool _got_modules;
	9	string _configuration;
	10
	11	bool _xrl_generic_done; // XRL startup/shutdown flag




--- site_scons/config/allconfig.py.orig	2012-01-11 18:46:46.000000000 +0100
+++ site_scons/config/allconfig.py	2014-02-10 19:25:36.000000000 +0100
@@ -21,6 +21,7 @@
 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 @@
     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
+        # <http://www.xorp.org/bugzilla/show_bug.cgi?id=106#c1>:
+        # 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')
     




--- vrrp/vrrp.cc.orig	2011-03-16 22:27:57.000000000 +0100
+++ vrrp/vrrp.cc	2014-02-07 18:20:15.000000000 +0100
@@ -36,7 +36,7 @@
 
 template <class T>
 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 @@
       //, _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 @@
 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;
 




--- xrl/scripts/Xif/parse.py.orig	2011-03-22 22:08:59.000000000 +0100
+++ xrl/scripts/Xif/parse.py	2014-02-04 19:22:04.000000000 +0100
@@ -71,8 +71,10 @@
         pop_file()
         pop_file()
         push_file(file, line)
+    elif (flag == "3") | (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
 




Add the following lines to /etc/rc.conf to enable xorp:

defaultrouter="NO"
xorp_enable="YES"

A configuration file must be created at

%%PREFIX%%/etc/xorp.conf

before use.

Users who will be changing the xorp configuration via
%%PREFIX%%/sbin/xorpsh
must be members of the group xorp.




#!/bin/sh
#
# $FreeBSD: head/net/xorp/files/xorp.in 340872 2014-01-24 00:14:07Z mat $
#
# A sample XORP startup script.
#

# PROVIDE: xorp
# REQUIRE: netif routing mountcritlocal
# BEFORE:  NETWORKING

# Add the following lines to /etc/rc.conf to enable xorp:
#
# xorp_enable="YES"
# xorp_flags="<set as needed>"
# xorp_config_boot="%%PREFIX%%/etc/xorp.conf.sample"

. /etc/rc.subr

name="xorp"
rcvar=xorp_enable

load_rc_config $name

: ${xorp_enable="NO"}
: ${xorp_config_boot="%%PREFIX%%/etc/xorp.conf"}
: ${xorp_rtrmgr_pidfile="/var/run/xorp_rtrmgr.pid"}
: ${xorp_rtrmgr_logfile="/var/log/xorp_rtrmgr.log"}
: ${xorp_rtrmgr_poll_enable=true}
: ${xorp_rtrmgr_poll_timeout=90}
: ${xorp_hardkill_enable=false}

required_files=${xorp_config_boot}
command=%%PREFIX%%/bin/xorp_rtrmgr
command_args="-b ${xorp_config_boot}"
pidfile=${xorp_rtrmgr_pidfile}
sig_stop=INT

start_precmd="xorp_prestart"
start_cmd="xorp_start"
stop_postcmd="xorp_poststop"

xorp_prestart()
{
	touch ${xorp_rtrmgr_logfile}
	return 0
}

xorp_start() 
{
	pidfile=${xorp_rtrmgr_pidfile}

	echo -n 'Starting XORP router processes:'

	echo -n ' xorp_rtrmgr'
	if ! daemon </dev/null >>${xorp_rtrmgr_logfile} 2>&1 -c -p ${pidfile} \
	     ${command} ${command_args} ; then
		warn 'could not bring up xorp_rtrmgr.'
		return 1
	fi

	${xorp_rtrmgr_poll_enable} || return 0

	# If startup polling is enabled, then poll xorp_rtrmgr every
	# second to see if it died, or if it logged successful bringup.
	# XXX This may be racy on very fast machines, but without
	# daemonizing support from xorp_rtrmgr it's difficult not to race.

	pid=$(cat ${xorp_rtrmgr_pidfile})
	timeout=${xorp_rtrmgr_poll_timeout}
	tick=0
	fail=true

	until [ $tick = $timeout ];
	do
		sleep 1 ; kill -0 ${pid} || break
		if ( tail -5 ${xorp_rtrmgr_logfile} | \
		    grep 'No more tasks to run' > /dev/null 2>&1 ) ; then
			fail=false
			break
		fi
		tick=$((tick + 1))
	done

	if $fail ; then
		warn 'xorp_rtrmgr failed to start'
		return 1
	fi

	echo '.'
	return 0
}

xorp_poststop()
{
	rm -f ${xorp_rtrmgr_pidfile} >/dev/null 2>&1 || true

	${xorp_hardkill_enable} || return 0
	killall -9 -m xorp_\* || true

	return 0
}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#
# A sample XORP startup script.
#

# PROVIDE: xorp
# REQUIRE: netif routing mountcritlocal ldconfig
# BEFORE:  NETWORKING
# KEYWORD: shutdown

# Add the following line to /etc/rc.conf to enable xorp:
#
# xorp_enable="YES"
#
# Note: You have to create a config file before you can start xorp!
#       Set ${xorp_conf} to its location, the default is defined below.
#
# Besides the xorp_* variables which you'll find below with their
# default values, you can also define the following in rc.conf:
#
# xorp_rtprio=n
#
# This will run the xorp processes with realtime priority n, see rtprio(1).

. /etc/rc.subr

name=xorp
rcvar=xorp_enable

load_rc_config $name

: ${xorp_enable:=NO}
: ${xorp_conf=%%PREFIX%%/etc/xorp.conf}
: ${xorp_rtrmgr_pidfile=/var/run/xorp_rtrmgr.pid}
: ${xorp_rtrmgr_logfile=/var/log/xorp_rtrmgr.log}
: ${xorp_flags=-l ${xorp_rtrmgr_logfile}}
: ${xorp_hardkill_enable:=NO}

required_files=${xorp_conf}

command=%%PREFIX%%/sbin/xorp_rtrmgr
pidfile=${xorp_rtrmgr_pidfile}
logfile=${xorp_rtrmgr_logfile}
command_args="-d -c ${xorp_conf} -P ${pidfile}"
sig_stop=INT

start_precmd=xorp_prestart
stop_postcmd=xorp_poststop

xorp_prestart()
{
	[ -z ${logfile} ] || [ -f ${logfile} ] || touch ${logfile}

	# required for rtprio(1) until handled like nice(1) by rc.subr(8)
	if [ -n "$xorp_rtprio" ] && [ "$xorp_rtprio" -ge 0 ]
	then
		rc_flags="$xorp_rtprio $command $xorp_flags"
		command=/usr/sbin/rtprio
	fi

	return 0
}

xorp_poststop()
{
	rm -f ${pidfile} >/dev/null 2>&1 || true

	checkyesno xorp_hardkill_enable || return 0
	killall -9 -m xorp_\* || true

	return 0
}

run_rc_command "$1"





PATH=/bin:/usr/sbin

if [ -z "${XORP_GROUP}" ]; then
	XORP_GROUP=xorp
fi

case $2 in
	POST-DEINSTALL)
		if pw group show xorp 2>/dev/null 
		then
			echo "Deleting group xorp..."
			pw groupdel -n xorp 2>/dev/null
		else
			echo "Group xorp not found!"
		fi
	;;
esac





PATH=/bin:/usr/bin:/usr/sbin

if [ -z "${XORP_GROUP}" ]; then
	XORP_GROUP=xorp
fi

case $2 in
        POST-INSTALL)
		if pw group show xorp 2>/dev/null; then
			echo "You already have a group xorp, so I will use it.";
		else
			echo "Adding group xorp.";
			pw groupadd -n xorp 2>/dev/null;
		else \
			echo "Adding group \"${XORP_GROUP}\"."; \
			pw groupadd -n ${XORP_GROUP} 2>/dev/null; \
		fi
		echo ""
		echo "Add the following lines to /etc/rc.conf to enable xorp:"
		echo ""
		echo "defaultrouter=\"NO\""
		echo "xorp_enable=\"YES\""
		echo ""
		echo "A configuration file must be created at ${PREFIX}/etc/xorp.conf before use."
		echo ""
		echo "Users who will be changing the xorp configuration via xorpsh"
		echo "must be members of the group xorp."
		echo ""
	;;
esac




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
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
@dirrm share/xorp/templates
@dirrm share/xorp
%%XORP_SHLIB%%@dirrm lib/xorp/lib
@dirrm lib/xorp/bin
@dirrm lib/xorp/sbin
@dirrm lib/xorp

Return to bug 186982

Lines 2-102 Link Here

(-)./Makefile (-66 / +59 lines)
2	# $FreeBSD: head/net/xorp/Makefile 341435 2014-01-27 17:35:26Z bapt $	2	# $FreeBSD: head/net/xorp/Makefile 341435 2014-01-27 17:35:26Z bapt $
3		3
4	PORTNAME= xorp	4	PORTNAME= xorp
5	PORTVERSION= 1.6	5	PORTVERSION= 1.8.5
6	PORTREVISION= 1	6	PORTREVISION= 0
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/ \	8	MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/
9	http://www2.xorp.org/releases/${PORTVERSION}/ \	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
10	http://www5.xorp.org/releases/${PORTVERSION}/ \
11	http://www3.xorp.org/releases/${PORTVERSION}/
12		10
13	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
14	COMMENT= The eXtensible Open Router Platform	12	COMMENT= The eXtensible Open Router Platform
15		13
16	LICENSE= GPLv2	14	LICENSE= GPLv2
17		15
18	OPTIONS_DEFINE= ADVMCAST IPV6 SNMP OPTIMIZED_CFLAGS TEST DEBUG PROFILE	16	BUILD_DEPENDS= python:${PORTSDIR}/lang/python
19	OPTIONS_DEFAULT= ADVMCAST IPV6 SNMP OPTIMIZED_CFLAGS TEST PROFILE	17	# Uses libcurses, libcrypto, librt from base system.
		18	LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \
		19	libpcap.so:${PORTSDIR}/net/libpcap
20		20
21	ADVMCAST_DESC= Build with Advanced Multicast API	21	CONFLICTS_INSTALL= xorp-devel-*
22		22
23	BROKEN= Does not build
24	DEPRECATED= Broken for more than 6 month
25	EXPIRATION_DATE= 2014-02-27
26
27	USE_GMAKE= yes
28	USE_OPENSSL= yes
29
30	GNU_CONFIGURE= yes
31	CONFIGURE_ARGS= --prefix=${PREFIX}/${PORTNAME} \
32	--with-comment='FreeBSD port: ${PKGNAME}' \
33	--with-openssl=${OPENSSLBASE}
34
35	CXXFLAGS+= -Wno-uninitialized
36	NOMAN= defined	23	NOMAN= defined
37		24
38	XORP_GROUP= xorp	25	USE_BZIP2= yes
39	USE_RC_SUBR= xorp	26	USE_PYTHON_BUILD= 2
		27	USE_SCONS= yes
		28	MAKE_JOBS_SAFE= defined
		29
		30	WRKSRC= ${WRKDIR}/xorp
		31	OPTIONS= \
		32	OPTIMIZE "Build with optimization" On \
		33	ORIGIN "Use ORIGIN with shared libraries" On \
		34	SHARED "Build with shared libraries" On \
		35	STRIP "Strip binaries before installing" On \
		36	TCP_RPC "Use TCP as RPC transport (defaults to AF_LOCAL)" Off
40		37
41	NO_STAGE= yes	38	.include <bsd.port.pre.mk>
42	.include <bsd.port.options.mk>
43		39
44	.if ${PORT_OPTIONS:MADVMCAST}	40	.if ${OSVERSION} < 700000
45	CONFIGURE_ARGS+= --enable-advanced-mcast-api	41	IGNORE= unsupported on FreeBSD versions prior to 7.0
46	.endif	42	.endif
47		43
48	.if ${PORT_OPTIONS:MIPV6}	44	USE_RC_SUBR= xorp.sh
49	CONFIGURE_ARGS+= --enable-ipv6	45	XORP_SAMPLECONF= rtrmgr/config/multicast4.boot
50	.else	46	SUB_FILES= pkg-message
51	CONFIGURE_ARGS+= --disable-ipv6
52	.endif
53		47
54	.if ${PORT_OPTIONS:MSNMP}	48	SCONS_ARGS+= prefix=${PREFIX} enable_boost=1
55	BUILD_DEPENDS+= ${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net-mgmt/net-snmp	49
56	CONFIGURE_ARGS+= --with-snmp \	50	.if defined(WITHOUT_OPTIMIZE)
57	--with-path-to-snmpd=${LOCALBASE}/sbin \	51	SCONS_ARGS+= optimize=no
58	--with-path-to-net-snmpd-config=${LOCALBASE}/bin/net-snmp-config \
59	--enable-shared
60	PLIST_SUB+= XORP_SNMP=""
61	USE_LDCONFIG= ${PREFIX}/mibs
62	.else	52	.else
63	PLIST_SUB+= XORP_SNMP="@comment "	53	SCONS_ARGS+= optimize=highest
64	.endif	54	.endif
65		55
66	.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}	56	.if defined(WITHOUT_SHARED)
67	CONFIGURE_ARGS+= --enable-optimize --disable-debug	57	SCONS_ARGS+= shared=false
		58	PLIST_SUB+= XORP_SHLIB="@comment "
		59	.else
		60	SCONS_ARGS+= shared=true
		61	PLIST_SUB+= XORP_SHLIB=""
		62	USE_LDCONFIG= ${PREFIX}/lib/xorp/lib
		63	. if defined (WITHOUT_ORIGIN)
		64	SCONS_ARGS+= origin=false
		65	. else
		66	SCONS_ARGS+= origin=true
		67	. endif
68	.endif	68	.endif
69		69
70	.if ${PORT_OPTIONS:MTEST}	70	.if defined(WITHOUT_STRIP)
71	BUILD_DEPENDS+= ${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \	71	SCONS_ARGS+= strip=false
72	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash	72	.else
		73	SCONS_ARGS+= strip=true
73	.endif	74	.endif
74		75
75	.if ${PORT_OPTIONS:MDEBUG}	76	.if defined(WITH_TCP_RPC)
76	CONFIGURE_ARGS+= --enable-debug-msgs --enable-debug-fnames	77	SCONS_ARGS+= transport=tcp
		78	.else
		79	SCONS_ARGS+= transport=local
77	.endif	80	.endif
78		81
79	.if ${PORT_OPTIONS:MPROFILE}	82	# XXX is this still true?
80	CONFIGURE_ARGS+= --enable-profile	83	.if ${ARCH} == "sparc64"
		84	BROKEN= Does not compile on sparc64
81	.endif	85	.endif
82		86
83	NOT_FOR_ARCH= sparc64	87	post-stage:
84		88	${CP} -p ${WRKSRC}/${XORP_SAMPLECONF} ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample
85	.include <bsd.port.pre.mk>
86
87	pre-everything::
88	.if !defined(PREFIX) \|\| ${PREFIX} == "/usr/local"
89	@${ECHO_MSG} "XORP does not currently follow the hier(7) filesystem layout."
90	@${ECHO_MSG} "It will therefore install all its directories relative to ${PREFIX}."
91	@${ECHO_MSG} "If you do not want this, hit ^C now and set PREFIX in the"
92	@${ECHO_MSG} "build environment to something other than ${PREFIX}."
93	@${ECHO_MSG}
94	@${ECHO_MSG} "If you plan to build with SNMP support, please ensure that"
95	@${ECHO_MSG} "the net-mgmt/net-snmp port is already installed under ${LOCALBASE}"
96	@${ECHO_MSG} "before doing this."
97	.endif
98		89
		90	.ifmake install
99	post-install:	91	post-install:
100	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	92	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
		93	.endif
101		94
102	.include <bsd.port.post.mk>	95	.include <bsd.port.post.mk>

Line 0 Link Here

(-)./files/patch-SConstruct (+27 lines)
	1	--- SConstruct.orig 2011-03-22 22:08:58.000000000 +0100
	2	+++ SConstruct 2011-03-25 11:14:54.359000184 +0100
	3	@@ -160,22 +160,13 @@
	4
	5	# XXX TODO: Make initial CPPPATH/LIBPATH derive from
	6	# autodetected host system or command line.
	7	-#env = Environment(
	8	-# TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
	9	-# 'TOOL_SUBST'],
	10	-# ENV = os.environ,
	11	-# BUILDDIR = builddir,
	12	-# CPPPATH=['/usr/local/include', '$BUILDDIR'],
	13	-# LIBPATH=['usr/lib', '/usr/local/lib'],
	14	-# variables = vars)
	15	-
	16	env = Environment(
	17	TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
	18	'TOOL_SUBST'],
	19	ENV = os.environ,
	20	BUILDDIR = builddir,
	21	- CPPPATH=['$BUILDDIR'],
	22	- LIBPATH=['usr/lib'],
	23	+ CPPPATH=['/usr/local/include', '$BUILDDIR'],
	24	+ LIBPATH=['usr/lib', '/usr/local/lib'],
	25	variables = vars)
	26
	27	prefix = env['prefix']

Line 0 Link Here

(-)./files/patch-bgp__path_attribute.cc (+16 lines)
	1	--- bgp/path_attribute.cc.orig 2011-03-16 22:15:59.000000000 +0100
	2	+++ bgp/path_attribute.cc 2014-02-07 17:44:17.000000000 +0100
	3	@@ -830,8 +830,11 @@
	4	ClusterListAttribute::clone() const
	5	{
	6	ClusterListAttribute *ca = new ClusterListAttribute();
	7	- list<IPv4>::const_reverse_iterator i = cluster_list().rbegin();
	8	- for(; i != cluster_list().rend(); i++)
	9	+ // list<IPv4>::const_reverse_iterator i = cluster_list().rbegin();
	10	+ list<IPv4>::const_iterator i = cluster_list().end();
	11	+ if (! cluster_list().empty())
	12	+ // for(; i != cluster_list().rend(); i++)
	13	+ for(; i-- != cluster_list().begin(); )
	14	ca->prepend_cluster_id(*i);
	15	return ca;
	16	}

Line 0 Link Here

(-)./files/patch-cli__cli_client.cc (+29 lines)
	1	--- cli/cli_client.cc.orig 2011-03-22 22:08:58.000000000 +0100
	2	+++ cli/cli_client.cc 2014-02-04 20:15:39.000000000 +0100
	3	@@ -832,7 +832,7 @@
	4	//
	5	// Print help
	6	//
	7	- if ((val == 'h')) {
	8	+ if (val == 'h') {
	9	if (! is_help_mode()) {
	10	set_help_mode(true);
	11	_is_page_buffer_mode = &_is_help_buffer_mode;
	12	@@ -958,7 +958,7 @@
	13	// Display the output all at once instead of oen screen at a time.
	14	// (Same as specifying the "\| no-more" command.)
	15	//
	16	- if ((val == 'N')) {
	17	+ if (val == 'N') {
	18	while (page_buffer_last_line_n() < page_buffer_lines_n()) {
	19	set_page_buffer_mode(false);
	20	cli_print(page_buffer_line(page_buffer_last_line_n()));
	21	@@ -1021,7 +1021,7 @@
	22	//
	23	// Redraw the output of the screen
	24	//
	25	- if ((val == CHAR_TO_CTRL('l'))) {
	26	+ if (val == CHAR_TO_CTRL('l')) {
	27	redisplay_screen_label:
	28	size_t i, start_window_line = 0;
	29	set_page_buffer_mode(false);

Line 0 Link Here

(-)./files/patch-cli__xrl_cli_node.hh (+21 lines)
	1	--- cli/xrl_cli_node.hh.orig 2011-03-16 22:27:45.000000000 +0100
	2	+++ cli/xrl_cli_node.hh 2014-02-04 23:37:29.000000000 +0100
	3	@@ -224,6 +224,9 @@
	4	const string *cli_term_name,
	5	const uint32_t *cli_session_id,
	6	const string *command_output);
	7	+
	8	+ EventLoop& _eventloop;
	9	+
	10	private:
	11	/**
	12	* Called when Finder connection is established.
	13	@@ -241,7 +244,7 @@
	14
	15	CliNode& cli_node() const { return (_cli_node); }
	16
	17	- EventLoop& _eventloop;
	18	+ // EventLoop& _eventloop;
	19	CliNode& _cli_node;
	20
	21	XrlCliProcessorV0p1Client _xrl_cli_processor_client;

Line 0 Link Here

(-)./files/patch-contrib__olsr__face.hh (+14 lines)
	1	--- contrib/olsr/face.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ contrib/olsr/face.hh 2014-02-07 15:40:51.000000000 +0100
	3	@@ -291,8 +291,10 @@
	4	*/
	5	void originate_hello();
	6
	7	- private:
	8	Olsr& _olsr;
	9	+
	10	+ private:
	11	+ // Olsr& _olsr;
	12	FaceManager& _fm;
	13	Neighborhood* _nh;
	14	MessageDecoder& _md;

Line 0 Link Here

(-)./files/patch-contrib__olsr__face_manager.cc (+16 lines)
	1	--- contrib/olsr/face_manager.cc.orig 2011-07-25 19:55:36.000000000 +0200
	2	+++ contrib/olsr/face_manager.cc 2014-02-07 16:00:05.000000000 +0100
	3	@@ -239,8 +239,11 @@
	4
	5	// Walk the list of message handler functions in reverse,
	6	// looking for one which is willing to consume this message.
	7	- vector<MessageReceiveCB>::reverse_iterator jj;
	8	- for (jj = _handlers.rbegin(); jj != _handlers.rend(); jj++) {
	9	+ // vector<MessageReceiveCB>::reverse_iterator jj;
	10	+ vector<MessageReceiveCB>::iterator jj;
	11	+ if (! _handlers.empty())
	12	+ // for (jj = _handlers.rbegin(); jj != _handlers.rend(); jj++) {
	13	+ for (jj = _handlers.end(); jj-- != _handlers.begin(); ) {
	14	try {
	15	is_consumed = (*jj)->dispatch(msg, src, face->local_addr());
	16	if (is_consumed)

Line 0 Link Here

(-)./files/patch-contrib__olsr__tools__print_databases.cc (+170 lines)
		1	--- contrib/olsr/tools/print_databases.cc.orig 2011-03-16 22:16:01.000000000 +0100
		2	+++ contrib/olsr/tools/print_databases.cc 2014-02-07 15:15:48.000000000 +0100
		3	@@ -161,7 +161,8 @@
		4	};
		5
		6	void
		7	-GetExternals::get(int argc, char *argv[])
		8	+// GetExternals::get(int argc, char *argv[])
		9	+GetExternals::get(int, char *[])
		10	{
		11	XrlOlsr4V0p1Client cl(&this->_xr);
		12
		13	@@ -172,8 +173,8 @@
		14	if (! success)
		15	XLOG_WARNING("Failed to get external route list.");
		16
		17	- UNUSED(argc);
		18	- UNUSED(argv);
		19	+ // UNUSED(argc);
		20	+ // UNUSED(argv);
		21	}
		22
		23	void
		24	@@ -309,7 +310,8 @@
		25	};
		26
		27	void
		28	-GetInterfaces::get(int argc, char *argv[])
		29	+// GetInterfaces::get(int argc, char *argv[])
		30	+GetInterfaces::get(int, char *[])
		31	{
		32	XrlOlsr4V0p1Client cl(&this->_xr);
		33
		34	@@ -320,8 +322,8 @@
		35	if (! success)
		36	XLOG_WARNING("Failed to get interface list.");
		37
		38	- UNUSED(argc);
		39	- UNUSED(argv);
		40	+ // UNUSED(argc);
		41	+ // UNUSED(argv);
		42	}
		43
		44	void
		45	@@ -476,7 +478,8 @@
		46	};
		47
		48	void
		49	-GetLinks::get(int argc, char *argv[])
		50	+// GetLinks::get(int argc, char *argv[])
		51	+GetLinks::get(int, char *[])
		52	{
		53	XrlOlsr4V0p1Client cl(&this->_xr);
		54
		55	@@ -487,8 +490,8 @@
		56	if (! success)
		57	XLOG_WARNING("Failed to get link list.");
		58
		59	- UNUSED(argc);
		60	- UNUSED(argv);
		61	+ // UNUSED(argc);
		62	+ // UNUSED(argv);
		63	}
		64
65	void
66	@@ -649,7 +652,8 @@
67	};
68
69	void
70	-GetMids::get(int argc, char *argv[])
71	+// GetMids::get(int argc, char *argv[])
72	+GetMids::get(int, char *[])
73	{
74	XrlOlsr4V0p1Client cl(&this->_xr);
75
76	@@ -660,8 +664,8 @@
77	if (! success)
78	XLOG_WARNING("Failed to get MID list.");
79
80	- UNUSED(argc);
81	- UNUSED(argv);
82	+ // UNUSED(argc);
83	+ // UNUSED(argv);
84	}
85
86	void
87	@@ -803,7 +807,8 @@
88	};
89
90	void
91	-GetNeighbors::get(int argc, char *argv[])
92	+// GetNeighbors::get(int argc, char *argv[])
93	+GetNeighbors::get(int, char *[])
94	{
95	XrlOlsr4V0p1Client cl(&this->_xr);
96
97	@@ -814,8 +819,8 @@
98	if (! success)
99	XLOG_WARNING("Failed to get neighbor list.");
100
101	- UNUSED(argc);
102	- UNUSED(argv);
103	+ // UNUSED(argc);
104	+ // UNUSED(argv);
105	}
106
107	void
108	@@ -979,7 +984,8 @@
109	};
110
111	void
112	-GetTopology::get(int argc, char *argv[])
113	+// GetTopology::get(int argc, char *argv[])
114	+GetTopology::get(int, char *[])
115	{
116	XrlOlsr4V0p1Client cl(&this->_xr);
117
118	@@ -990,8 +996,8 @@
119	if (! success)
120	XLOG_WARNING("Failed to get topology list.");
121
122	- UNUSED(argc);
123	- UNUSED(argv);
124	+ // UNUSED(argc);
125	+ // UNUSED(argv);
126	}
127
128	void
129	@@ -1126,7 +1132,8 @@
130	};
131
132	void
133	-GetTwohopLinks::get(int argc, char *argv[])
134	+// GetTwohopLinks::get(int argc, char *argv[])
135	+GetTwohopLinks::get(int, char *[])
136	{
137	XrlOlsr4V0p1Client cl(&this->_xr);
138
139	@@ -1137,8 +1144,8 @@
140	if (! success)
141	XLOG_WARNING("Failed to get neighbor list.");
142
143	- UNUSED(argc);
144	- UNUSED(argv);
145	+ // UNUSED(argc);
146	+ // UNUSED(argv);
147	}
148
149	void
150	@@ -1271,7 +1278,8 @@
151	};
152
153	void
154	-GetTwohopNeighbors::get(int argc, char *argv[])
155	+// GetTwohopNeighbors::get(int argc, char *argv[])
156	+GetTwohopNeighbors::get(int, char *[])
157	{
158	XrlOlsr4V0p1Client cl(&this->_xr);
159
160	@@ -1283,8 +1291,8 @@
161	if (! success)
162	XLOG_WARNING("Failed to get two-hop neighbor list.");
163
164	- UNUSED(argc);
165	- UNUSED(argv);
166	+ // UNUSED(argc);
167	+ // UNUSED(argv);
168	}
169
170	void

Line 0 Link Here

(-)./files/patch-fea__data_plane__fibconfig__fibconfig_table_observer_rtmv2.hh (+21 lines)
	1	--- fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh.orig 2011-03-16 22:16:02.000000000 +0100
	2	+++ fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh 2014-02-05 13:46:16.000000000 +0100
	3	@@ -73,15 +73,15 @@
	4	private:
	5	class RtmV2Observer : public WinRtmPipeObserver {
	6	public:
	7	- RtmV2Observer(WinRtmPipe& rs, int af,
	8	+ RtmV2Observer(WinRtmPipe& rs, /* int af, */
	9	FibConfigTableObserverRtmV2& rtmo)
	10	- : WinRtmPipeObserver(rs), _af(af), _rtmo(rtmo) {}
	11	+ : WinRtmPipeObserver(rs), /* _af(af), */ _rtmo(rtmo) {}
	12	virtual ~RtmV2Observer() {}
	13	void routing_socket_data(const vector<uint8_t>& buffer) {
	14	_rtmo.receive_data(buffer);
	15	}
	16	private:
	17	- int _af;
	18	+ // int _af;
	19	FibConfigTableObserverRtmV2& _rtmo;
	20	};
	21

Line 0 Link Here

(-)./files/patch-fea__data_plane__managers__fea_data_plane_manager_linux.cc (+15 lines)
	1	--- fea/data_plane/managers/fea_data_plane_manager_linux.cc.orig 2011-03-16 22:27:48.000000000 +0100
	2	+++ fea/data_plane/managers/fea_data_plane_manager_linux.cc 2014-02-05 15:21:50.000000000 +0100
	3	@@ -71,8 +71,10 @@
	4
	5
	6	FeaDataPlaneManagerLinux::FeaDataPlaneManagerLinux(FeaNode& fea_node)
	7	- : FeaDataPlaneManager(fea_node, "Linux"),
	8	- _ifconfig_get_ioctl(NULL)
	9	+ : FeaDataPlaneManager(fea_node, "Linux")
	10	+#if defined(HAVE_PROC_LINUX) && defined(HAVE_IOCTL_SIOCGIFCONF) and !defined(HAVE_NETLINK_SOCKETS)
	11	+ , _ifconfig_get_ioctl(NULL)
	12	+#endif
	13	{
	14	}
	15

Line 0 Link Here

(-)./files/patch-fea__fibconfig.hh (+18 lines)
	1	--- fea/fibconfig.hh.orig 2012-01-11 18:46:45.000000000 +0100
	2	+++ fea/fibconfig.hh 2014-02-05 15:49:04.000000000 +0100
	3	@@ -736,12 +736,14 @@
	4	*/
	5	Trie6& trie6() { return _trie6; }
	6
	7	+ FeaNode& _fea_node;
	8	+
	9	protected:
	10	Trie4 _trie4; // IPv4 trie (used for testing purpose)
	11	Trie6 _trie6; // IPv6 trie (used for testing purpose)
	12
	13	private:
	14	- FeaNode& _fea_node;
	15	+ // FeaNode& _fea_node;
	16	EventLoop& _eventloop;
	17	#ifndef XORP_DISABLE_PROFILE
	18	Profile& _profile;

Line 0 Link Here

(-)./files/patch-fea__firewall_manager.hh (+20 lines)
	1	--- fea/firewall_manager.hh.orig 2011-03-16 22:27:49.000000000 +0100
	2	+++ fea/firewall_manager.hh 2014-02-05 17:18:17.000000000 +0100
	3	@@ -313,6 +313,8 @@
	4	*/
	5	void delete_browse_state(uint32_t token);
	6
	7	+ FeaNode& _fea_node;
	8	+
	9	private:
	10	/**
	11	* Update the firewall entries by pushing them into the underlying system.
	12	@@ -364,7 +366,7 @@
	13	*/
	14	void generate_token();
	15
	16	- FeaNode& _fea_node;
	17	+ // FeaNode& _fea_node;
	18	EventLoop& _eventloop;
	19	const IfTree& _iftree;
	20

Line 0 Link Here

(-)./files/patch-fea__ifconfig.hh (+20 lines)
	1	--- fea/ifconfig.hh.orig 2011-03-16 22:27:49.000000000 +0100
	2	+++ fea/ifconfig.hh 2014-02-05 16:07:56.000000000 +0100
	3	@@ -442,6 +442,8 @@
	4	*/
	5	void report_updates(IfTree& iftree);
	6
	7	+ FeaNode& _fea_node;
	8	+
	9	private:
	10	/**
	11	* Restore the interface configuration.
	12	@@ -455,7 +457,7 @@
	13	const IfTree& old_system_config,
	14	string& error_msg);
	15
	16	- FeaNode& _fea_node;
	17	+ // FeaNode& _fea_node;
	18	EventLoop& _eventloop;
	19	NexthopPortMapper& _nexthop_port_mapper;
	20	IfConfigTransactionManager* _itm; // The interface transaction manager

Line 0 Link Here

(-)./files/patch-fea__tools__show_interfaces.hh (+20 lines)
	1	--- fea/tools/show_interfaces.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ fea/tools/show_interfaces.hh 2014-02-05 15:34:37.000000000 +0100
	3	@@ -79,6 +79,8 @@
	4	*/
	5	void print_interfaces(const string& print_iface_name) const;
	6
	7	+ EventLoop& _eventloop;
	8	+
	9	protected:
	10	//
	11	// IfMgrHintObserver methods
	12	@@ -132,7 +134,7 @@
	13	*/
	14	int ifmgr_shutdown();
	15
	16	- EventLoop& _eventloop;
	17	+ // EventLoop& _eventloop;
	18
	19	IfMgrXrlMirror _ifmgr;
	20

Line 0 Link Here

(-)./files/patch-fea__xrl_mfea_node.hh (+20 lines)
	1	--- fea/xrl_mfea_node.hh.orig 2011-03-16 22:27:49.000000000 +0100
	2	+++ fea/xrl_mfea_node.hh 2014-02-06 20:13:08.000000000 +0100
	3	@@ -504,6 +504,8 @@
	4	// Input values,
	5	const bool& enable);
	6
	7	+ EventLoop& _eventloop;
	8	+
	9	private:
	10	/**
	11	* Called when Finder connection is established.
	12	@@ -570,7 +572,7 @@
	13
	14	int family() const { return (MfeaNode::family()); }
	15
	16	- EventLoop& _eventloop;
	17	+ // EventLoop& _eventloop;
	18	const string _finder_target;
	19
	20	XrlMfeaClientV0p1Client _xrl_mfea_client_client;

Line 0 Link Here

(-)./files/patch-libxipc__xrl_pf_stcp.cc (+29 lines)
	1	--- libxipc/xrl_pf_stcp.cc.orig 2011-03-22 22:08:59.000000000 +0100
	2	+++ libxipc/xrl_pf_stcp.cc 2014-02-04 19:11:08.000000000 +0100
	3	@@ -548,7 +548,7 @@
	4	bool batch,
	5	const Xrl& x,
	6	const Callback& cb)
	7	- : _p(p), _sn(sn), _b(_buffer), _cb(cb), _keepalive(false)
	8	+ : _p(p), _sn(sn), _b(_buffer), _cb(cb) //, _keepalive(false)
	9	{
	10	size_t header_bytes = STCPPacketHeader::header_size();
	11	size_t xrl_bytes = x.packed_bytes();
	12	@@ -572,7 +572,7 @@
	13	}
	14
	15	RequestState(XrlPFSTCPSender* p, uint32_t sn)
	16	- : _p(p), _sn(sn), _b(_buffer), _keepalive(true)
	17	+ : _p(p), _sn(sn), _b(_buffer) //, _keepalive(true)
	18	{
	19	size_t header_bytes = STCPPacketHeader::header_size();
	20
	21	@@ -621,7 +621,7 @@
	22	uint8_t _buffer[256]; // XXX important performance parameter
	23	uint32_t _size;
	24	Callback _cb;
	25	- bool _keepalive;
	26	+ // bool _keepalive;
	27	};
	28
	29

Lines 1-20 Link Here

(-)./files/patch-libxorp-utility.h (-20 lines)
1	--- libxorp/utility.h.orig 2012-10-01 17:45:19.000000000 +0800
2	+++ libxorp/utility.h 2012-10-01 17:47:34.000000000 +0800
3	@@ -31,7 +31,7 @@
4	* Compile time assertion.
5	*/
6	#ifndef static_assert
7	-#define static_assert(a) switch (a) case 0: case (a):
8	+#define static_assert(a) ((void)sizeof(int[(a) ? 1 : -1]))
9	#endif /* static_assert */
10
11	/*
12	@@ -42,7 +42,7 @@
13	#ifdef UNUSED
14	# undef UNUSED
15	#endif /* UNUSED */
16	-#define UNUSED(var) static_assert(sizeof(var) != 0)
17	+#define UNUSED(var) ((void)var)
18
19	#ifdef __cplusplus
20	#define cstring(s) (s).str().c_str()

Lines 1-35 Link Here

(-)./files/patch-mibs-bgp4_mib_1657_bgp4pathattrtable.cc (-35 lines)
1	--- mibs/bgp4_mib_1657_bgp4pathattrtable.cc.orig 2009-01-05 18:31:00.000000000 +0000
2	+++ mibs/bgp4_mib_1657_bgp4pathattrtable.cc 2011-12-27 03:17:03.000000000 +0000
3	@@ -139,7 +139,7 @@
4	DEBUGMSGTL((BgpMib::the_instance().name(),
5	"updating local bgp4PathAttrTable...\n"));
6	DEBUGMSGTL((BgpMib::the_instance().name(),
7	- "local table size: %d\n", CONTAINER_SIZE(cb.container)));
8	+ "local table size: %zd\n", CONTAINER_SIZE(cb.container)));
9	bgp_mib.send_get_v4_route_list_start("bgp", net, true, false,
10	callback(get_v4_route_list_start_done));
11	break;
12	@@ -156,12 +156,12 @@
13	DEBUGMSGTL((BgpMib::the_instance().name(),
14	"removing old routes from bgp4PathAttrTable...\n"));
15	DEBUGMSGTL((BgpMib::the_instance().name(),
16	- "local table size: %d old_routes stack: %d\n",
17	+ "local table size: %zd old_routes stack: %zd\n",
18	CONTAINER_SIZE(cb.container), update.old_routes.size()));
19	CONTAINER_FOR_EACH(cb.container, find_old_routes, NULL);
20	while (update.old_routes.size()) {
21	DEBUGMSGTL((BgpMib::the_instance().name(),
22	- "update.old_routes.size() = %d\n",
23	+ "update.old_routes.size() = %zd\n",
24	update.old_routes.size()));
25	row = (bgp4PathAttrTable_context*)
26	CONTAINER_FIND(cb.container, &update.old_routes.top());
27	@@ -745,7 +745,7 @@
28
29	if (row->update_signature != (update.list_token)) {
30	DEBUGMSGTL((BgpMib::the_instance().name(),
31	- "removing %#010x from table\n", row->bgp4PathAttrIpAddrPrefix));
32	+ "removing %#010lx from table\n", row->bgp4PathAttrIpAddrPrefix));
33	update.old_routes.push(row->index);
34	}
35	}

Line 0 Link Here

(-)./files/patch-pim__pim_mrt_task.cc (+42 lines)
	1	--- pim/pim_mrt_task.cc.orig 2011-09-20 02:33:28.000000000 +0200
	2	+++ pim/pim_mrt_task.cc 2014-02-06 18:34:33.000000000 +0100
	3	@@ -166,7 +166,8 @@
	4	//
	5	list<PimMreTask *>::reverse_iterator iter;
	6	iter = pim_mre_task_list().rbegin();
	7	- if (iter != pim_mre_task_list().rend()) {
	8	+// if (iter != pim_mre_task_list().rend()) {
	9	+ if (pim_mre_task_list().end() != pim_mre_task_list().begin()) {
	10	pim_mre_task = *iter;
	11	if (pim_mre_task->input_state()
	12	== PimMreTrackState::INPUT_STATE_IN_REMOVE_MISC) {
	13	@@ -1159,7 +1160,8 @@
	14	//
	15	list<PimMreTask *>::reverse_iterator iter;
	16	iter = pim_mre_task_list().rbegin();
	17	- if (iter != pim_mre_task_list().rend()) {
	18	+// if (iter != pim_mre_task_list().rend()) {
	19	+ if (pim_mre_task_list().end() != pim_mre_task_list().begin()) {
	20	pim_mre_task = *iter;
	21	if (pim_mre_task->input_state() == input_state) {
	22	pim_mre_task->add_pim_mre(pim_mre);
	23	@@ -1224,7 +1226,8 @@
	24	//
	25	list<PimMreTask *>::reverse_iterator iter;
	26	iter = pim_mre_task_list().rbegin();
	27	- if (iter != pim_mre_task_list().rend()) {
	28	+// if (iter != pim_mre_task_list().rend()) {
	29	+ if (pim_mre_task_list().end() != pim_mre_task_list().begin()) {
	30	pim_mre_task = *iter;
	31	if (pim_mre_task->input_state() == input_state) {
	32	pim_mre_task->add_pim_mre(pim_mre); // XXX
	33	@@ -1266,7 +1269,8 @@
	34	//
	35	list<PimMreTask *>::reverse_iterator iter;
	36	iter = pim_mre_task_list().rbegin();
	37	- if (iter != pim_mre_task_list().rend()) {
	38	+// if (iter != pim_mre_task_list().rend()) {
	39	+ if (pim_mre_task_list().end() != pim_mre_task_list().begin()) {
	40	pim_mre_task = *iter;
	41	if (pim_mre_task->input_state()
	42	== PimMreTrackState::INPUT_STATE_IN_REMOVE_PIM_MFC) {

Line 0 Link Here

(-)./files/patch-policy__backend__iv_exec.cc (+15 lines)
	1	--- policy/backend/iv_exec.cc.orig 2011-03-16 22:27:54.000000000 +0100
	2	+++ policy/backend/iv_exec.cc 2014-02-05 18:44:26.000000000 +0100
	3	@@ -275,7 +275,11 @@
	4	IvExec::visit(Store& s)
	5	{
	6	if (_stackptr < _stack)
	7	- xorp_throw(RuntimeError, "Stack empty on assign of " + s.var());
	8	+ // xorp_throw(RuntimeError, "Stack empty on assign of " + s.var());
	9	+ { char *tmpstr;
	10	+ asprintf(&tmpstr, "Stack empty on assign of %d", s.var());
	11	+ xorp_throw(RuntimeError, tmpstr);
	12	+ }
	13
	14	const Element* arg = *_stackptr;
	15	_stackptr--;

Line 0 Link Here

(-)./files/patch-policy__backend__single_varrw.cc (+15 lines)
	1	--- policy/backend/single_varrw.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ policy/backend/single_varrw.cc 2014-02-05 18:56:49.000000000 +0100
	3	@@ -70,7 +70,11 @@
	4
	5	// out of luck...
	6	if(!e)
	7	- xorp_throw(SingleVarRWErr, "Unable to read variable " + id);
	8	+ // xorp_throw(SingleVarRWErr, "Unable to read variable " + id);
	9	+ { char *tmpstr;
	10	+ asprintf(&tmpstr, "Unable to read variable %d", id);
	11	+ xorp_throw(SingleVarRWErr, tmpstr);
	12	+ }
	13	}
	14
	15	return *e;

Line 0 Link Here

(-)./files/patch-policy__configuration.hh (+22 lines)
	1	--- policy/configuration.hh.orig 2011-03-16 22:27:54.000000000 +0100
	2	+++ policy/configuration.hh 2014-02-12 11:14:04.000000000 +0100
	3	@@ -43,11 +43,19 @@
	4
	5	// XXX we go reverse in order to make peer specific policies override global
	6	// ones. Global is "" so it's always smallest (first).
	7	+/*
	8	#define FOR_ALL_POLICIES(n) \
	9	for (PROTOCOL::reverse_iterator i = _protocols.rbegin(); \
	10	i != _protocols.rend(); ++i) \
	11	for (POLICY::reverse_iterator n = i->second->rbegin(); \
	12	n != i->second->rend(); ++n)
	13	+*/
	14	+#define FOR_ALL_POLICIES(n) \
	15	+ if (! _protocols.empty()) \
	16	+ for (PROTOCOL::iterator i = _protocols.end(); \
	17	+ i-- != _protocols.begin(); ) \
	18	+ for (POLICY::iterator n = i->second->end(); \
	19	+ (! i->second->empty()) & (n-- != i->second->begin()); )
	20
	21	class IEMap {
	22	public:

Line 0 Link Here

(-)./files/patch-rib__vifmanager.hh (+23 lines)
	1	--- rib/vifmanager.hh.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ rib/vifmanager.hh 2014-02-06 21:03:13.000000000 +0100
	3	@@ -110,6 +110,9 @@
	4	*/
	5	int final_stop();
	6
	7	+ XrlRouter& _xrl_router;
	8	+ EventLoop& _eventloop;
	9	+
	10	protected:
	11	//
	12	// IfMgrHintObserver methods
	13	@@ -163,8 +166,8 @@
	14	*/
	15	int ifmgr_shutdown();
	16
	17	- XrlRouter& _xrl_router;
	18	- EventLoop& _eventloop;
	19	+ // XrlRouter& _xrl_router;
	20	+ // EventLoop& _eventloop;
	21	RibManager* _rib_manager;
	22
	23	IfMgrXrlMirror _ifmgr;

Line 0 Link Here

(-)./files/patch-rtrmgr__cli.cc (+20 lines)
	1	--- rtrmgr/cli.cc.orig 2011-03-16 22:16:13.000000000 +0100
	2	+++ rtrmgr/cli.cc 2014-02-07 13:47:22.000000000 +0100
	3	@@ -741,7 +741,7 @@
	4	path = token_vector2line(command_global_name);
	5	XLOG_ASSERT(path.substr(0, 4) == "help");
	6	if (path.size() == 4) {
	7	- trimmed_path == "";
	8	+ trimmed_path = "";
	9	} else {
	10	XLOG_ASSERT(path.substr(0, 5) == "help ");
	11	trimmed_path = path.substr(5, path.size() - 5);
	12	@@ -1062,7 +1062,7 @@
	13	path = token_vector2line(command_global_name);
	14	XLOG_ASSERT(path.substr(0, 4) == "help");
	15	if (path.size() == 4) {
	16	- trimmed_path == "";
	17	+ trimmed_path = "";
	18	} else {
	19	XLOG_ASSERT(path.substr(0, 5) == "help ");
	20	trimmed_path = path.substr(5, path.size() - 5);

Line 0 Link Here

(-)./files/patch-rtrmgr__lex.boot.cc (+27 lines)
	1	--- rtrmgr/lex.boot.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ rtrmgr/lex.boot.cc 2014-02-06 21:19:35.000000000 +0100
	3	@@ -9552,6 +9552,7 @@
	4	static int yy_flex_strlen YY_PROTO(( yyconst char * ));
	5	#endif
	6
	7	+#define YY_NO_INPUT
	8	#ifndef YY_NO_INPUT
	9	#ifdef __cplusplus
	10	static int yyinput YY_PROTO(( void ));
	11	@@ -10483,6 +10484,7 @@
	12	#endif /* ifndef YY_NO_UNPUT */
	13
	14
	15	+#ifndef YY_NO_INPUT
	16	#ifdef __cplusplus
	17	static int yyinput()
	18	#else
	19	@@ -10554,7 +10556,7 @@
	20
	21	return c;
	22	}
	23	-
	24	+#endif
	25
	26	#ifdef YY_USE_PROTOS
	27	void yyrestart( FILE *input_file )

Line 0 Link Here

(-)./files/patch-rtrmgr__lex.opcmd.cc (+27 lines)
	1	--- rtrmgr/lex.opcmd.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ rtrmgr/lex.opcmd.cc 2014-02-06 21:29:26.000000000 +0100
	3	@@ -518,6 +518,7 @@
	4	static int yy_flex_strlen YY_PROTO(( yyconst char * ));
	5	#endif
	6
	7	+#define YY_NO_INPUT
	8	#ifndef YY_NO_INPUT
	9	#ifdef __cplusplus
	10	static int yyinput YY_PROTO(( void ));
	11	@@ -1322,6 +1323,7 @@
	12	#endif /* ifndef YY_NO_UNPUT */
	13
	14
	15	+#ifndef YY_NO_INPUT
	16	#ifdef __cplusplus
	17	static int yyinput()
	18	#else
	19	@@ -1393,7 +1395,7 @@
	20
	21	return c;
	22	}
	23	-
	24	+#endif
	25
	26	#ifdef YY_USE_PROTOS
	27	void yyrestart( FILE *input_file )

Line 0 Link Here

(-)./files/patch-rtrmgr__lex.tplt.cc (+27 lines)
	1	--- rtrmgr/lex.tplt.cc.orig 2010-07-19 23:10:33.000000000 +0200
	2	+++ rtrmgr/lex.tplt.cc 2014-02-06 21:33:41.000000000 +0100
	3	@@ -8667,6 +8667,7 @@
	4	static int yy_flex_strlen YY_PROTO(( yyconst char * ));
	5	#endif
	6
	7	+#define YY_NO_INPUT
	8	#ifndef YY_NO_INPUT
	9	#ifdef __cplusplus
	10	static int yyinput YY_PROTO(( void ));
	11	@@ -9708,6 +9709,7 @@
	12	#endif /* ifndef YY_NO_UNPUT */
	13
	14
	15	+#ifndef YY_NO_INPUT
	16	#ifdef __cplusplus
	17	static int yyinput()
	18	#else
	19	@@ -9779,7 +9781,7 @@
	20
	21	return c;
	22	}
	23	-
	24	+#endif
	25
	26	#ifdef YY_USE_PROTOS
	27	void yyrestart( FILE *input_file )

Line 0 Link Here

(-)./files/patch-rtrmgr__module_manager.hh (+12 lines)
	1	--- rtrmgr/module_manager.hh.orig 2011-09-20 02:33:28.000000000 +0200
	2	+++ rtrmgr/module_manager.hh 2014-02-06 22:48:01.000000000 +0100
	3	@@ -144,7 +144,9 @@
	4	string _expath; // The expanded absolute path to the program
	5	bool _do_exec; // false indicates we're running in test mode,
	6	// when we may not actually start any processes
	7	+public:
	8	bool _verbose; // Set to true if output is verbose
	9	+private:
	10	XorpTimer _shutdown_timer; // A timer used during shutdown
	11	XorpCallback0<void>::RefPtr _terminate_cb; // The cb when module terminated
	12	};

Line 0 Link Here

(-)./files/patch-rtrmgr__template_commands.hh (+20 lines)
	1	--- rtrmgr/template_commands.hh.orig 2011-03-16 22:16:14.000000000 +0100
	2	+++ rtrmgr/template_commands.hh 2014-02-06 23:35:47.000000000 +0100
	3	@@ -78,6 +78,8 @@
	4	string related_module() const;
	5	string affected_module() const;
	6
	7	+ const XRLdb* _xrldb;
	8	+
	9	private:
	10	#ifdef DEBUG_XRLDB
	11	bool check_xrl_is_valid(const list<string>& action,
	12	@@ -92,7 +94,7 @@
	13	string _request;
	14	list<string> _split_response;
	15	string _response;
	16	- const XRLdb* _xrldb;
	17	+ // const XRLdb* _xrldb;
	18	};
	19
	20	class ProgramAction : public Action {

Line 0 Link Here

(-)./files/patch-rtrmgr__template_tree_node.cc (+17 lines)
	1	--- rtrmgr/template_tree_node.cc.orig 2011-03-16 22:16:14.000000000 +0100
	2	+++ rtrmgr/template_tree_node.cc 2014-02-07 13:00:37.000000000 +0100
	3	@@ -543,9 +543,12 @@
	4	{
	5	map<string,string> varmap;
	6	const TemplateTreeNode* ttn = this;
	7	- list<string>::const_reverse_iterator iter;
	8	+ // list<string>::const_reverse_iterator iter;
	9	+ list<string>::const_iterator iter;
	10
	11	- for (iter = segments.rbegin(); iter != segments.rend(); ++iter) {
	12	+// for (iter = segments.rbegin(); iter != segments.rend(); ++iter) {
	13	+ if (! segments.empty())
	14	+ for (iter = segments.end(); iter-- != segments.begin(); ) {
	15	if (ttn->name_is_variable())
	16	varmap[ttn->segname()] = *iter;
	17	ttn = ttn->parent();