head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.24
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.20
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.18
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.16
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.14
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.12
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.10
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.14
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.12
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.10
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.8
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.6
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.4
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.2
	pkgsrc-2005Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.05.22.12.17.52;	author spz;	state dead;
branches;
next	1.1;

1.1
date	2005.08.26.08.41.46;	author spz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@new version, new patches: upstream adopted a bunch of ours, but gcc found
new things to bitch about
@
text
@$NetBSD: patch-ca,v 1.1 2005/08/26 08:41:46 spz Exp $

--- src/RtConfig/f_junos.hh.orig	2002-04-09 13:48:46.000000000 +0200
+++ src/RtConfig/f_junos.hh
@@@@ -57,9 +57,12 @@@@
 #include "config.h"
 #include "util/List.hh"
 #include "normalform/FilterOfASPath.hh"
+#include "irr/irr.hh"
+#include "irr/autnum.hh"
+
+#include <sstream>
 
 class FilterOfCommunity;
-class ostream;
 class RangeList;
 class regexp;
 class PolicyAction;
@@@@ -78,12 +81,13 @@@@ public:
       distributeListNo = -1;
       routeMapID = 1;
    }
-   void importP(ASt as, IPAddr* addr, ASt peerAS, IPAddr* peerAddr);
-   void exportP(ASt as, IPAddr* addr, ASt peerAS, IPAddr* peerAddr);
+   void importP(ASt as, MPPrefix* addr, ASt peerAS, MPPrefix* peerAddr);
+   void exportP(ASt as, MPPrefix* addr, ASt peerAS, MPPrefix* peerAddr);
    void exportGroup(ASt as, char *pset);
    void importGroup(ASt as, char *pset);
-   void static2bgp(ASt as, IPAddr* addr);
+   void static2bgp(ASt as, MPPrefix* addr);
    void networks(ASt as);
+   void IPv6networks(ASt as);
 
 public:
    // options
@@@@ -106,19 +110,26 @@@@ private:
    bool reSplittable;
 
 private:
+   ListOf2Ints *printRoutes(SetOfIPv6Prefix& nets);
    ListOf2Ints *printRoutes(SetOfPrefix& nets);
    ListOf2Ints *printCommunities(FilterOfCommunity& cm);
    ListOf2Ints *printASPaths(FilterOfASPath& path);
 
-   inline void  printCommunity(ostream &os, unsigned int i);
-   int          printCommunityList(ostream &os, ItemList *args);
-   int          printCommunitySet(ostream &os, CommunitySet *set, bool exact);
-   void         printActions(ostream &os, PolicyActionList *action);
+   inline void  printCommunity(std::ostream &os, unsigned int i);
+   int          printCommunityList(std::ostream &os, ItemList *args);
+   int          printCommunitySet(std::ostream &os, CommunitySet *set, bool exact);
+   void         printActions(std::ostream &os, PolicyActionList *action, ItemAFI *afi);
    void         printMartians();
-   int          print(NormalExpression *ne, PolicyActionList *actn, int import_flag);
+   int          print(NormalExpression *ne, PolicyActionList *actn, int import_flag, ItemAFI *afi);
    int          printDeclarations(NormalExpression *ne, PolicyActionList *actn, int import_flag);
-   bool         printNeighbor(int import, ASt asno, char *neighbor, 
-			      bool peerGroup);
+   bool         printNeighbor(int import, ASt asno, ASt peerAS, char *neighbor, 
+			      bool peerGroup, ItemAFI *peer_afi, ItemAFI *filter_afi);
+   void printAccessList(SetOfIPv6Prefix& nets) {
+      bool save = useAclCaches;
+      useAclCaches = false;
+      printRoutes(nets);
+      useAclCaches = save;
+   }
    void printAccessList(SetOfPrefix& nets) {
       bool save = useAclCaches;
       useAclCaches = false;
@@@@ -131,13 +142,14 @@@@ private:
       printASPaths(path);
       useAclCaches = save;
    }
-   void printREASno(ostream& out, const RangeList &no);
-   int printRE_(ostream& os, const regexp& r, bool &hasBOL, bool &hasEOL);
-   int printRE(ostream& os, const regexp& r);
+   void printREASno(std::ostream& out, const RangeList &no);
+   int printRE_(std::ostream& os, const regexp& r, bool &hasBOL, bool &hasEOL);
+   int printRE(std::ostream& os, const regexp& r);
 };
 
 extern AccessListManager<regexp_nf>         aspathMgr;
 extern AccessListManager<SetOfPrefix>       prefixMgr;
+extern AccessListManager<SetOfIPv6Prefix>   ipv6prefixMgr;
 extern AccessListManager<SetOfPrefix>       pktFilterMgr;
 extern AccessListManager<FilterOfCommunity> communityMgr;
 
@


1.1
log
@make configure-option --enable-debug compile
make RtConfig -config junos work
fix a bug regarding Cisco export filters in RtConfig
@
text
@d1 1
a1 1
$NetBSD$
@