Attachment #24848 for bug #42391

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




# New ports collection makefile for:	IRRToolSet
# Date created:				Aug 27 2002
# Whom:	      				R. Kevin Oberman <oberman@es.net>
#
# $FreeBSD: ports/net/ratoolset/Makefile,v 1.17 2002/09/02 00:09:31 trevor Exp $
#
# $FreeBSD$

PORTNAME=	irrtoolset
PORTVERSION=	4.7.2
CATEGORIES=	net tk82
MASTER_SITES=	ftp://ftp.ripe.net/tools/IRRToolSet/
DISTNAME=	IRRToolSet-4.7.2

MAINTAINER=	oberman@es.net

LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83

USE_BISON=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	Yes
CONFIGURE_ENV=	TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.3:${PREFIX}/include/tk8.3" \
		TCL_TK_LIBRARY_DIR=${PREFIX}/lib \
		TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \
		TK_LIBRARY=${PREFIX}/lib/tk8.3 \
		LD_TCL_TK_LIBS="-ltk83 -ltcl83"

MAN1=		CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \
		roe.1 rpslcheck.1 prtraceroute.1
MAN3=		librpsl.3

post-patch:
	@${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \
		${WRKSRC}/src/irr/birdwhoisc.cc

ALL_TARGET=	depend all


Line 1 Link Here

(-)irrtoolset/distinfo (-1 / +1 lines)
1	MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38	1	MD5 (IRRToolSet-4.7.2.tar.gz) = 8d4c9421247a2e3eba78c4d6506c84a8




--- src/misc/net.hh.orig	Wed Jan 28 17:40:42 1998
+++ src/misc/net.hh	Sat Nov 27 18:11:23 1999
@@ -86,12 +86,12 @@
 int bind    (...);
 int listen  (...);
 int accept  (...);
-int recvfrom(...);
+ssize_t recvfrom(...);
 int gethostname (...);
 int setsockopt  (...);
 int select (...);
-int sendto (...);
-int send   (...);
+ssize_t sendto (...);
+ssize_t send   (...);
 int gettimeofday (...);
 }
 
@@ -132,7 +132,7 @@
 class Timer {
     struct timeval tv;
     struct timezone tz;
-    init_time () {
+    void init_time () {
 	bzero ((char *) &tv, sizeof (struct timeval));
 	::gettimeofday (&tv, &tz);
     }
@@ -256,7 +256,7 @@
 	return ptr;
     }
     u_long getInaddr () { return hexaddr; }
-    print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
+    void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
 
     Error error;
 };
@@ -331,7 +331,7 @@
 	    error.warn("listen");
 	return error();
     }
-    accept () {
+    int accept () {
 	//u_long addrlen;
 	int addrlen = sizeof (struct sockaddr);
 	bzero ((char *) &socknew, sizeof (socknew));




--- src/dbase/Route.hh.orig	Sat Nov 27 18:08:21 1999
+++ src/dbase/Route.hh	Sat Nov 27 18:08:41 1999
@@ -92,7 +92,7 @@
       clear();
    }
 
-   clear () {
+   void clear () {
       pix = NULL;
       _dontcare = 0;
    }
@@ -248,7 +248,7 @@
       pref = 0;
    }
 
-   set (Pix asn, int p) {
+   void set (Pix asn, int p) {
       asno = asn;
       pref = p;
    }




--- src/dbase/Node.h.orig	Sat Nov 27 18:11:57 1999
+++ src/dbase/Node.h	Sat Nov 27 18:16:21 1999
@@ -101,7 +101,7 @@
   protected:
    virtual void print(ostream &os) = 0;
   public:
-   virtual operator== (Node &b) = 0;
+   virtual int operator== (Node &b) = 0;
    virtual void InOrderPrint() = 0;
    virtual void PostOrderPrint() { InOrderPrint(); }
    virtual ~Node() {};
@@ -144,7 +144,7 @@
    virtual void print(ostream &os) = 0;
 
   public:
-   virtual Execute(Route &r) = 0;
+   virtual void Execute(Route &r) = 0;
    virtual ActionNode *FindFirst(Node_t _type) = 0;
    int operator< (ActionNode &b);
    friend ostream &operator<<(ostream &os, ActionNode *an) {
@@ -172,7 +172,7 @@
       type = T_ANDNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ANDNode 
 	 && left  == ((ANDNode&) b).left
 	 && right == ((ANDNode&) b).right;
@@ -200,7 +200,7 @@
       type = T_ORNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ORNode 
 	 && left  == ((ORNode&) b).left
 	 && right == ((ORNode&) b).right;
@@ -227,7 +227,7 @@
       type = T_NotNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NotNode 
 	 && left  == ((NotNode&) b).left;
    }
@@ -256,7 +256,7 @@
       type = T_AssignNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_AssignNode 
 	 && val == ((AssignNode&) b).val
 	 && left  == ((AssignNode&) b).left;
@@ -281,7 +281,7 @@
       type = T_ANYNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ANYNode;
    }
 
@@ -305,7 +305,7 @@
       type = T_ASNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ASNode 
 	 && val == ((ASNode&) b).val;
    }
@@ -330,7 +330,7 @@
       type = T_ASMacroNode;
   }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ASMacroNode 
 	 && val == ((ASMacroNode&) b).val;
    }
@@ -355,7 +355,7 @@
       type = T_CommNode;
    }
 
-    virtual operator== (Node& b) {
+    virtual int operator== (Node& b) {
       return b.type == T_CommNode 
 	 && val == ((CommNode&) b).val;
    }
@@ -382,7 +382,7 @@
       cidr_root = NULL;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NetListNode 
 	 && nets == ((NetListNode&) b).nets;
    }
@@ -391,7 +391,7 @@
    virtual NormalExpression *Evaluate(int expand);
    virtual int match(Route &r, char dontcare);
    virtual int match_exact_or_more_specific(Route &r, char dontcare);
-   add(Pix pi) { nets.add(pi); }
+   void add(Pix pi) { nets.add(pi); }
 };
 
 ////////////////////////////// ASPathNode //////////////////////////////
@@ -412,7 +412,7 @@
       type = T_ASPathNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       ASSERT(0);
       return 0;
    }
@@ -438,7 +438,7 @@
       type = T_RegisterNode;
    }
 
-    virtual operator== (Node& b) {
+    virtual int operator== (Node& b) {
       return b.type == T_RegisterNode 
 	 && val == ((RegisterNode&) b).val;
    }
@@ -460,13 +460,13 @@
       type = T_PrefNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_PrefNode 
 	 && val == ((PrefNode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -492,13 +492,13 @@
       type = T_MEDNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_MEDNode 
 	 && val == ((MEDNode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -524,13 +524,13 @@
       type = T_DPANode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_DPANode 
 	 && val == ((DPANode&) b).val;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {
+   virtual void Execute(Route &r) {
    }
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
@@ -552,12 +552,12 @@
       type = T_NoopNode;
    }
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_NoopNode;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {}
+   virtual void Execute(Route &r) {}
    virtual ActionNode *FindFirst(Node_t _type) {
       if (type == _type)
 	 return this;
@@ -581,14 +581,14 @@
    }
    virtual ~ComposeNode();
 
-   virtual operator== (Node& b) {
+   virtual int operator== (Node& b) {
       return b.type == T_ComposeNode
 	 && left  == ((ComposeNode&) b).left
 	 && right == ((ComposeNode&) b).right;
    }
 
    virtual void InOrderPrint();
-   virtual Execute(Route &r) {}
+   virtual void Execute(Route &r) {}
    virtual ActionNode *FindFirst(Node_t _type) {
       ActionNode *r;
       if (type == _type)

Lines 1-11 Link Here

(-)irrtoolset/files/patch-ad (-11 lines)
1	--- src/misc/Error.hh.orig Sat Nov 27 18:17:24 1999
2	+++ src/misc/Error.hh Sat Nov 27 18:17:31 1999
3	@@ -378,7 +378,7 @@
4	reset();
5	}
6
7	- reset() {
8	+ void reset() {
9	errno = 0;
10	level_ = ErrorNone;
11	messages_.clear();

Lines 1-11 Link Here

(-)irrtoolset/files/patch-ae (-11 lines)
1	--- src/peval/xx_lexer.y.orig Sat Nov 27 18:18:56 1999
2	+++ src/peval/xx_lexer.y Sat Nov 27 18:19:07 1999
3	@@ -94,7 +94,7 @@
4	NULL, ERROR_TKN
5	};
6
7	-static inline strtoupper(char *c) {
8	+static inline void strtoupper(char *c) {
9	for (; *c; c++)
10	if (isascii(c) && isalpha(c))
11	c = toupper(c);

Lines 1-10 Link Here

(-)irrtoolset/files/patch-af (-10 lines)
1	--- src/misc/net.cc.orig Sat Nov 27 18:20:31 1999
2	+++ src/misc/net.cc Sat Nov 27 18:21:15 1999
3	@@ -215,6 +215,7 @@
4	init_server (p);
5	}
6
7	+int
8	TCP::init_server (int p) {
9	setLocalPort (p);
10	bind();

Lines 1-11 Link Here

(-)irrtoolset/files/patch-ag (-11 lines)
1	--- src/dbase/irr_lexer.y.orig Sat Nov 27 18:22:22 1999
2	+++ src/dbase/irr_lexer.y Sat Nov 27 18:22:44 1999
3	@@ -73,7 +73,7 @@
4
5	#include <cctype>
6
7	-static inline strtoupper(char *c) {
8	+static inline void strtoupper(char *c) {
9	for (; *c; c++)
10	if (isascii(c) && isalpha(c))
11	c = toupper(c);




--- src/dbase/irr_parser.y.orig	Sat Nov 27 18:23:53 1999
+++ src/dbase/irr_parser.y	Sat Nov 27 18:25:00 1999
@@ -90,7 +90,7 @@
 char *error_while_expecting = NULL;
 
 static regexp_symbol *re_symbol;
-static insert_or_update_filter_action(ListHead<Filter_Action> &l, 
+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, 
 			    ActionNode *action, FilterNode *filter);
 static ASPolicy *find_or_insert_peer_as(Pix peer);
 static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr);
@@ -635,7 +635,7 @@
    return(0);
 }
 
-static insert_or_update_filter_action(ListHead<Filter_Action> &l, 
+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, 
 				      ActionNode *action, FilterNode *filter) {
    Filter_Action *fap, *fap2;
 

Lines 1-11 Link Here

(-)irrtoolset/files/patch-ai (-11 lines)
1	--- src/roe/roe_config.hh.orig Sat Nov 27 18:35:37 1999
2	+++ src/roe/roe_config.hh Sat Nov 27 18:36:14 1999
3	@@ -42,7 +42,7 @@
4
5	class Configure {
6	public:
7	- const int size = 12;
8	+ static const int size = 12;
9
10	class DBUpdate {
11	public:




--- src/aoe/TclApp.cc.orig	Sat Nov 27 18:38:25 1999
+++ src/aoe/TclApp.cc	Sat Nov 27 18:43:51 1999
@@ -186,9 +186,9 @@
    // Call Tcl function to create a Tcl command
    if (Tcl_CreateCommand(ptInterp, 
 			 pcCommand->getName(), 
-			 TclCommand::command,
+			 &TclCommand::command,
 			 (ClientData)pcCommand,
-			 TclCommand::cleanUp) == NULL) return 0;
+			 &TclCommand::cleanUp) == NULL) return 0;
    return 1;
 }
 

Lines 1-11 Link Here

(-)irrtoolset/files/patch-ak (-11 lines)
1	--- src/aoe/TclLabel.cc.orig Sat Nov 27 18:45:09 1999
2	+++ src/aoe/TclLabel.cc Sat Nov 27 18:45:24 1999
3	@@ -47,7 +47,7 @@
4	#include "TclLabel.hh"
5	#include "TclApp.hh"
6
7	-TclLabel::clear(void)
8	+int TclLabel::clear(void)
9	{
10	TclApplication pcApp = (TclApplication )getExtraArgument();
11	return (pcApp->evalf("%s configure -text {}", getName()));

Lines 1-11 Link Here

(-)irrtoolset/files/patch-al (-11 lines)
1	--- src/prtraceroute/netraw.hh.orig Sat Nov 27 18:46:27 1999
2	+++ src/prtraceroute/netraw.hh Sat Nov 27 18:46:49 1999
3	@@ -121,7 +121,7 @@
4	rawIP (int protocol = IPPROTO_RAW);
5	rawIP (char *hostname, int protocol = IPPROTO_RAW);
6
7	- setIpaddresses (); // can be used for incoming packets.
8	+ void setIpaddresses (); // can be used for incoming packets.
9
10	int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);}
11	int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);}

Lines 1-11 Link Here

(-)irrtoolset/files/patch-am (-11 lines)
1	--- src/prtraceroute/prtraceroute.hh.orig Sat Nov 27 18:47:35 1999
2	+++ src/prtraceroute/prtraceroute.hh Sat Nov 27 18:47:45 1999
3	@@ -121,7 +121,7 @@
4	u_int flags;
5	void _add (ipAddr *ipaddr);
6
7	- _hop () {
8	+ void _hop () {
9	ipaddr = (ipAddr *) NULL;
10	autnum = NULL;
11	route = new Route();

Line 1 Link Here

(-)irrtoolset/pkg-comment (-1 / +1 lines)
1	A suite of policy analysis tools	1	A suite of routing policy tools to interact with the IRR





aoe		autonomous system object editor

pmatch		prints matching policies for destinations in aut-num objects

prpath		enumerates a list of patchs between ASes and destinations

prtraceroute	prints route and policy information packets take to a
		network	host

rpslcheck	sytax checks the aut-num policy for an AS. 	
		Registry




bin/rpslcheck
bin/peval
bin/pmatch
bin/prpath
bin/RtConfig
bin/CIDRAdvisor
bin/prcheck
bin/irrstat
bin/roe
bin/aoe
bin/relayd
bin/prtraceroute

Return to bug 42391

Lines 1-31 Link Here

(-)irrtoolset/Makefile (-18 / +22 lines)
1	# New ports collection makefile for: RAToolSet	1	# New ports collection makefile for: IRRToolSet
2	# Date created: May 4th 1997	2	# Date created: Aug 27 2002
3	# Whom: James FitzGibbon <jfitz@FreeBSD.org>	3	# Whom: R. Kevin Oberman <oberman@es.net>
4	#
5	# $FreeBSD: ports/net/ratoolset/Makefile,v 1.17 2002/09/02 00:09:31 trevor Exp $
6	#	4	#
		5	# $FreeBSD$
7		6
8	PORTNAME= ratoolset	7	PORTNAME= irrtoolset
9	PORTVERSION= 3.5.8	8	PORTVERSION= 4.7.2
10	CATEGORIES= net tk82	9	CATEGORIES= net tk82
11	MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/	10	MASTER_SITES= ftp://ftp.ripe.net/tools/IRRToolSet/
12	DISTNAME= RAToolSet-3.5.8	11	DISTNAME= IRRToolSet-4.7.2
13		12
14	MAINTAINER= oberman@es.net	13	MAINTAINER= oberman@es.net
15		14
16	LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82	15	LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
17		16
18	USE_BISON= yes	17	USE_BISON= yes
		18	USE_GMAKE= yes
19	GNU_CONFIGURE= Yes	19	GNU_CONFIGURE= Yes
20	CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.2:${PREFIX}/include/tk8.2" \	20	CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.3:${PREFIX}/include/tk8.3" \
21	TCL_TK_LIBRARY_DIR=${PREFIX}/lib \	21	TCL_TK_LIBRARY_DIR=${PREFIX}/lib \
22	TCL_LIBRARY=${PREFIX}/lib/tcl8.2 \	22	TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \
23	TK_LIBRARY=${PREFIX}/lib/tk8.2 \	23	TK_LIBRARY=${PREFIX}/lib/tk8.3 \
24	LD_TCL_TK_LIBS="-ltk82 -ltcl82"	24	LD_TCL_TK_LIBS="-ltk83 -ltcl83"
25		25
26	MAN1= CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \	26	MAN1= CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \
27	prcheck.1 roe.1	27	roe.1 rpslcheck.1 prtraceroute.1
28	MAN8= prtraceroute.8 relayd.8	28	MAN3= librpsl.3
		29
		30	post-patch:
		31	@${SED} -i.orig -e 's\|#include <malloc.h>\|/* #include <malloc.h> */\|' \
		32	${WRKSRC}/src/irr/birdwhoisc.cc
29		33
30	ALL_TARGET= depend all	34	ALL_TARGET= depend all
31		35

Lines 1-45 Link Here

(-)irrtoolset/files/patch-aa (-45 lines)
1	--- src/misc/net.hh.orig Wed Jan 28 17:40:42 1998
2	+++ src/misc/net.hh Sat Nov 27 18:11:23 1999
3	@@ -86,12 +86,12 @@
4	int bind (...);
5	int listen (...);
6	int accept (...);
7	-int recvfrom(...);
8	+ssize_t recvfrom(...);
9	int gethostname (...);
10	int setsockopt (...);
11	int select (...);
12	-int sendto (...);
13	-int send (...);
14	+ssize_t sendto (...);
15	+ssize_t send (...);
16	int gettimeofday (...);
17	}
18
19	@@ -132,7 +132,7 @@
20	class Timer {
21	struct timeval tv;
22	struct timezone tz;
23	- init_time () {
24	+ void init_time () {
25	bzero ((char *) &tv, sizeof (struct timeval));
26	::gettimeofday (&tv, &tz);
27	}
28	@@ -256,7 +256,7 @@
29	return ptr;
30	}
31	u_long getInaddr () { return hexaddr; }
32	- print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
33	+ void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); }
34
35	Error error;
36	};
37	@@ -331,7 +331,7 @@
38	error.warn("listen");
39	return error();
40	}
41	- accept () {
42	+ int accept () {
43	//u_long addrlen;
44	int addrlen = sizeof (struct sockaddr);
45	bzero ((char *) &socknew, sizeof (socknew));

Lines 1-20 Link Here

(-)irrtoolset/files/patch-ab (-20 lines)
1	--- src/dbase/Route.hh.orig Sat Nov 27 18:08:21 1999
2	+++ src/dbase/Route.hh Sat Nov 27 18:08:41 1999
3	@@ -92,7 +92,7 @@
4	clear();
5	}
6
7	- clear () {
8	+ void clear () {
9	pix = NULL;
10	_dontcare = 0;
11	}
12	@@ -248,7 +248,7 @@
13	pref = 0;
14	}
15
16	- set (Pix asn, int p) {
17	+ void set (Pix asn, int p) {
18	asno = asn;
19	pref = p;
20	}

Lines 1-208 Link Here

(-)irrtoolset/files/patch-ac (-208 lines)
1	--- src/dbase/Node.h.orig Sat Nov 27 18:11:57 1999
2	+++ src/dbase/Node.h Sat Nov 27 18:16:21 1999
3	@@ -101,7 +101,7 @@
4	protected:
5	virtual void print(ostream &os) = 0;
6	public:
7	- virtual operator== (Node &b) = 0;
8	+ virtual int operator== (Node &b) = 0;
9	virtual void InOrderPrint() = 0;
10	virtual void PostOrderPrint() { InOrderPrint(); }
11	virtual ~Node() {};
12	@@ -144,7 +144,7 @@
13	virtual void print(ostream &os) = 0;
14
15	public:
16	- virtual Execute(Route &r) = 0;
17	+ virtual void Execute(Route &r) = 0;
18	virtual ActionNode *FindFirst(Node_t _type) = 0;
19	int operator< (ActionNode &b);
20	friend ostream &operator<<(ostream &os, ActionNode *an) {
21	@@ -172,7 +172,7 @@
22	type = T_ANDNode;
23	}
24
25	- virtual operator== (Node& b) {
26	+ virtual int operator== (Node& b) {
27	return b.type == T_ANDNode
28	&& left == ((ANDNode&) b).left
29	&& right == ((ANDNode&) b).right;
30	@@ -200,7 +200,7 @@
31	type = T_ORNode;
32	}
33
34	- virtual operator== (Node& b) {
35	+ virtual int operator== (Node& b) {
36	return b.type == T_ORNode
37	&& left == ((ORNode&) b).left
38	&& right == ((ORNode&) b).right;
39	@@ -227,7 +227,7 @@
40	type = T_NotNode;
41	}
42
43	- virtual operator== (Node& b) {
44	+ virtual int operator== (Node& b) {
45	return b.type == T_NotNode
46	&& left == ((NotNode&) b).left;
47	}
48	@@ -256,7 +256,7 @@
49	type = T_AssignNode;
50	}
51
52	- virtual operator== (Node& b) {
53	+ virtual int operator== (Node& b) {
54	return b.type == T_AssignNode
55	&& val == ((AssignNode&) b).val
56	&& left == ((AssignNode&) b).left;
57	@@ -281,7 +281,7 @@
58	type = T_ANYNode;
59	}
60
61	- virtual operator== (Node& b) {
62	+ virtual int operator== (Node& b) {
63	return b.type == T_ANYNode;
64	}
65
66	@@ -305,7 +305,7 @@
67	type = T_ASNode;
68	}
69
70	- virtual operator== (Node& b) {
71	+ virtual int operator== (Node& b) {
72	return b.type == T_ASNode
73	&& val == ((ASNode&) b).val;
74	}
75	@@ -330,7 +330,7 @@
76	type = T_ASMacroNode;
77	}
78
79	- virtual operator== (Node& b) {
80	+ virtual int operator== (Node& b) {
81	return b.type == T_ASMacroNode
82	&& val == ((ASMacroNode&) b).val;
83	}
84	@@ -355,7 +355,7 @@
85	type = T_CommNode;
86	}
87
88	- virtual operator== (Node& b) {
89	+ virtual int operator== (Node& b) {
90	return b.type == T_CommNode
91	&& val == ((CommNode&) b).val;
92	}
93	@@ -382,7 +382,7 @@
94	cidr_root = NULL;
95	}
96
97	- virtual operator== (Node& b) {
98	+ virtual int operator== (Node& b) {
99	return b.type == T_NetListNode
100	&& nets == ((NetListNode&) b).nets;
101	}
102	@@ -391,7 +391,7 @@
103	virtual NormalExpression *Evaluate(int expand);
104	virtual int match(Route &r, char dontcare);
105	virtual int match_exact_or_more_specific(Route &r, char dontcare);
106	- add(Pix pi) { nets.add(pi); }
107	+ void add(Pix pi) { nets.add(pi); }
108	};
109
110	////////////////////////////// ASPathNode //////////////////////////////
111	@@ -412,7 +412,7 @@
112	type = T_ASPathNode;
113	}
114
115	- virtual operator== (Node& b) {
116	+ virtual int operator== (Node& b) {
117	ASSERT(0);
118	return 0;
119	}
120	@@ -438,7 +438,7 @@
121	type = T_RegisterNode;
122	}
123
124	- virtual operator== (Node& b) {
125	+ virtual int operator== (Node& b) {
126	return b.type == T_RegisterNode
127	&& val == ((RegisterNode&) b).val;
128	}
129	@@ -460,13 +460,13 @@
130	type = T_PrefNode;
131	}
132
133	- virtual operator== (Node& b) {
134	+ virtual int operator== (Node& b) {
135	return b.type == T_PrefNode
136	&& val == ((PrefNode&) b).val;
137	}
138
139	virtual void InOrderPrint();
140	- virtual Execute(Route &r) {
141	+ virtual void Execute(Route &r) {
142	}
143	virtual ActionNode *FindFirst(Node_t _type) {
144	if (type == _type)
145	@@ -492,13 +492,13 @@
146	type = T_MEDNode;
147	}
148
149	- virtual operator== (Node& b) {
150	+ virtual int operator== (Node& b) {
151	return b.type == T_MEDNode
152	&& val == ((MEDNode&) b).val;
153	}
154
155	virtual void InOrderPrint();
156	- virtual Execute(Route &r) {
157	+ virtual void Execute(Route &r) {
158	}
159	virtual ActionNode *FindFirst(Node_t _type) {
160	if (type == _type)
161	@@ -524,13 +524,13 @@
162	type = T_DPANode;
163	}
164
165	- virtual operator== (Node& b) {
166	+ virtual int operator== (Node& b) {
167	return b.type == T_DPANode
168	&& val == ((DPANode&) b).val;
169	}
170
171	virtual void InOrderPrint();
172	- virtual Execute(Route &r) {
173	+ virtual void Execute(Route &r) {
174	}
175	virtual ActionNode *FindFirst(Node_t _type) {
176	if (type == _type)
177	@@ -552,12 +552,12 @@
178	type = T_NoopNode;
179	}
180
181	- virtual operator== (Node& b) {
182	+ virtual int operator== (Node& b) {
183	return b.type == T_NoopNode;
184	}
185
186	virtual void InOrderPrint();
187	- virtual Execute(Route &r) {}
188	+ virtual void Execute(Route &r) {}
189	virtual ActionNode *FindFirst(Node_t _type) {
190	if (type == _type)
191	return this;
192	@@ -581,14 +581,14 @@
193	}
194	virtual ~ComposeNode();
195
196	- virtual operator== (Node& b) {
197	+ virtual int operator== (Node& b) {
198	return b.type == T_ComposeNode
199	&& left == ((ComposeNode&) b).left
200	&& right == ((ComposeNode&) b).right;
201	}
202
203	virtual void InOrderPrint();
204	- virtual Execute(Route &r) {}
205	+ virtual void Execute(Route &r) {}
206	virtual ActionNode *FindFirst(Node_t _type) {
207	ActionNode *r;
208	if (type == _type)

Lines 1-20 Link Here

(-)irrtoolset/files/patch-ah (-20 lines)
1	--- src/dbase/irr_parser.y.orig Sat Nov 27 18:23:53 1999
2	+++ src/dbase/irr_parser.y Sat Nov 27 18:25:00 1999
3	@@ -90,7 +90,7 @@
4	char *error_while_expecting = NULL;
5
6	static regexp_symbol *re_symbol;
7	-static insert_or_update_filter_action(ListHead<Filter_Action> &l,
8	+static void insert_or_update_filter_action(ListHead<Filter_Action> &l,
9	ActionNode action, FilterNode filter);
10	static ASPolicy *find_or_insert_peer_as(Pix peer);
11	static InterASPolicy find_or_insert_peering(ASPolicy p, Pix laddr, Pix raddr);
12	@@ -635,7 +635,7 @@
13	return(0);
14	}
15
16	-static insert_or_update_filter_action(ListHead<Filter_Action> &l,
17	+static void insert_or_update_filter_action(ListHead<Filter_Action> &l,
18	ActionNode action, FilterNode filter) {
19	Filter_Action fap, fap2;
20

Lines 1-14 Link Here

(-)irrtoolset/files/patch-aj (-14 lines)
1	--- src/aoe/TclApp.cc.orig Sat Nov 27 18:38:25 1999
2	+++ src/aoe/TclApp.cc Sat Nov 27 18:43:51 1999
3	@@ -186,9 +186,9 @@
4	// Call Tcl function to create a Tcl command
5	if (Tcl_CreateCommand(ptInterp,
6	pcCommand->getName(),
7	- TclCommand::command,
8	+ &TclCommand::command,
9	(ClientData)pcCommand,
10	- TclCommand::cleanUp) == NULL) return 0;
11	+ &TclCommand::cleanUp) == NULL) return 0;
12	return 1;
13	}
14

Lines 13-24 Link Here

(-)irrtoolset/pkg-descr (-4 / +1 lines)
13		13
14	aoe autonomous system object editor	14	aoe autonomous system object editor
15		15
16	pmatch prints matching policies for destinations in aut-num objects
17
18	prpath enumerates a list of patchs between ASes and destinations	16	prpath enumerates a list of patchs between ASes and destinations
19		17
20	prtraceroute prints route and policy information packets take to a	18	prtraceroute prints route and policy information packets take to a
21	network host	19	network host
22		20
23	prcheck syntax checks the aut-num objects in the Internet Routing	21	rpslcheck sytax checks the aut-num policy for an AS.
24	Registry

Lines 1-11 Link Here

(-)irrtoolset/pkg-plist (-4 / +1 lines)
		1	bin/rpslcheck
1	bin/peval	2	bin/peval
2	bin/pmatch
3	bin/prpath	3	bin/prpath
4	bin/RtConfig	4	bin/RtConfig
5	bin/CIDRAdvisor	5	bin/CIDRAdvisor
6	bin/prcheck
7	bin/irrstat
8	bin/roe	6	bin/roe
9	bin/aoe	7	bin/aoe
10	bin/relayd
11	bin/prtraceroute	8	bin/prtraceroute