head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.2 pkgsrc-2011Q2-base:1.2 pkgsrc-2010Q4:1.1.0.30 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.28 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.26 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.24 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.22 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.20 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.18 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.16 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.14 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.12 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.10 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.8 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.6 pkgsrc-2008Q1:1.1.0.4 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.2 pkgsrc-2007Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2011.03.19.19.59.47; author spz; state dead; branches; next 1.1; 1.1 date 2007.12.31.09.15.15; author spz; state Exp; branches; next ; desc @@ 1.2 log @remove obsolete irrtoolset-nox11 @ text @$NetBSD: patch-dk,v 1.1 2007/12/31 09:15:15 spz Exp $ --- src/RtConfig/f_junos.cc.orig 2006-10-01 13:23:32.000000000 +0200 +++ src/RtConfig/f_junos.cc @@@@ -811,6 +811,9 @@@@ int JunosConfig::print(NormalExpression Debug(Channel(DBG_JUNOS) << "# ne: " << *ne << "\n"); + if (ne->is_any() != NEITHER) + cerr << "Warning: filter matches ANY/NOT ANY" << endl; + if (ne->isEmpty()) return last; @@@@ -916,11 +919,13 @@@@ bool JunosConfig::printNeighbor(int impo setMEDtoIGP = false; } +#ifdef notdef if (afi_activate) { cout << " family " << (AddressFamily &) *filter_afi << " { "<< endl; cout << " any;" << endl; cout << " } " << endl; } +#endif cout << " }\n" << " }\n" @@@@ -1019,7 +1024,9 @@@@ void JunosConfig::importP(ASt asno, MPPr return; } +#ifdef notdef int preAclID = prefixMgr.lastID(); +#endif // get matching import attributes AutNumSelector itr(autnum, "import", NULL, peerAS, peer_addr, addr); @@@@ -1074,7 +1081,7 @@@@ void JunosConfig::importP(ASt asno, MPPr ItemAFI *peer_afi = new ItemAFI(peer_addr->get_afi()); - printNeighbor(IMPORT, asno, peerAS, peer_addr->get_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list); + printNeighbor(IMPORT, asno, peerAS, peer_addr->get_ip_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list); } void JunosConfig::static2bgp(ASt asno, MPPrefix *addr) { @ 1.1 log @sneaking in an update for a quite leafy package :) - remove patches/patch-bv since if you use gmake it's for a generated file, even if the original tar contains it (and the diff grows rather large due to differing yacc versions) - add irrd-cache-usage-patch by Hagen Boehm - add JunOS @@RtConfig import patch by Stan Barber - add IPv6 ACL list numbers patch by Timo Koehler @ text @d1 1 a1 1 $NetBSD$ @