fix for IOS address-family syntax

suggested by Daryl Collins <daryl@internode.com.au> (but revamped and expanded)

3 files changed, 36 insertions, 5 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 61171a3cd97..a771fa2738a 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/03/08 11:00:35 spz Exp $
+# $NetBSD: Makefile,v 1.19 2008/08/03 22:43:39 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index 6f8ac1ecaa3..adf50e40588 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/03/08 11:00:35 spz Exp $
+$NetBSD: distinfo,v 1.18 2008/08/03 22:43:39 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -31,7 +31,7 @@ SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56
 SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2
 SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720
 SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68
-SHA1 (patch-cs) = 3ee12f885b44b15b2de7d7e95fda830654482443
+SHA1 (patch-cs) = dbd30b057019ae78f753e0d81df8175452d0abda
 SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb
 SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861
 SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4
diff --git a/net/irrtoolset-nox11/patches/patch-cs b/net/irrtoolset-nox11/patches/patch-cs
index 124c3efae90..e62fb612327 100644
--- a/net/irrtoolset-nox11/patches/patch-cs
+++ b/net/irrtoolset-nox11/patches/patch-cs
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.2 2008/03/08 11:00:35 spz Exp $
+$NetBSD: patch-cs,v 1.3 2008/08/03 22:43:39 spz Exp $
 
 --- src/RtConfig/f_cisco.cc.orig	2007-01-23 01:45:16.000000000 +0100
 +++ src/RtConfig/f_cisco.cc
@@ -56,3 +56,34 @@ $NetBSD: patch-cs,v 1.2 2008/03/08 11:00:35 spz Exp $
  	 q = strchr(r, ')') + 1;
  	 *r = 0;
  	 r++;
+@@ -1246,8 +1246,28 @@ bool CiscoConfig::printNeighbor(int impo
+      cout << " neighbor "   << neighbor << " remote-as " << peerAS << "\n";
+ 
+    if (afi_activate && !peerGroup) {
+-     cout << " address-family " << (AddressFamily &) *filter_afi << endl;
+-     cout << indent <<" neighbor " << neighbor << " activate\n"; 
++     if (strcmp(filter_afi->name(),"ipv6") == 0) {
++       cout << " address-family " << "ipv4" << endl;
++       cout << indent <<" no neighbor " << neighbor << " activate\n"; 
++       cout << " address-family " << "ipv6 unicast" << endl;
++       cout << indent <<" neighbor " << neighbor << " activate\n"; 
++       cout << " address-family " << "ipv6 multicast" << endl;
++       cout << indent <<" neighbor " << neighbor << " activate\n"; 
++     } else if (strcmp(filter_afi->name(),"ipv6.unicast") == 0) {
++       cout << " address-family " << "ipv4" << endl;
++       cout << indent <<" no neighbor " << neighbor << " activate\n"; 
++       cout << " address-family " << "ipv6 unicast" << endl;
++       cout << indent <<" neighbor " << neighbor << " activate\n"; 
++     } else if (strcmp(filter_afi->name(),"ipv4.multicast") == 0) {
++       cout << " address-family " << "ipv4 multicast" << endl;
++       cout << indent <<" neighbor " << neighbor << " activate\n"; 
++     } else if (strcmp(filter_afi->name(),"ipv6.multicast") == 0) {
++       cout << " address-family " << "ipv4" << endl;
++       cout << indent <<" no neighbor " << neighbor << " activate\n"; 
++       cout << " address-family " << "ipv6 multicast" << endl;
++       cout << indent <<" neighbor " << neighbor << " activate\n"; 
++     }
++     // ought to handle afi any too, but that's not just done by naming it here
+    }
+ 
+    if (routeMapGenerated)