summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 11:54:38 -0700
committerSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 11:54:38 -0700
commit7ac850bac7b1cc60d2b4518cfad2da533affee72 (patch)
treeb63daa7880d1cc5290647281aca549783a10ff3f
parent9348acd0de2c4586d4ed8016a74edb77b097411c (diff)
parent8c48241fb647a46ae1b1f456d46d81e2001c5382 (diff)
downloadvyatta-cfg-quagga-7ac850bac7b1cc60d2b4518cfad2da533affee72.tar.gz
vyatta-cfg-quagga-7ac850bac7b1cc60d2b4518cfad2da533affee72.zip
Merge branch 'daisy' of http://git.vyatta.com/vyatta-cfg-quagga
Conflicts: debian/changelog
-rw-r--r--.frlog1
-rw-r--r--debian/changelog36
-rw-r--r--debian/postinst9
-rw-r--r--interface-templates/ipv6/ospfv3/mtu-ignore/node.def4
-rwxr-xr-xscripts/policy/vyatta-policy.pl29
5 files changed, 69 insertions, 10 deletions
diff --git a/.frlog b/.frlog
index d1b22e9b..219cb369 100644
--- a/.frlog
+++ b/.frlog
@@ -3,3 +3,4 @@ Thu Jul 7 20:55:49 PDT 2011: [new branch] at [debian/0.18.137]
Sat Mar 3 02:25:35 PST 2012: [new branch] at [debian/0.18.148]
Wed Sep 26 15:56:10 PDT 2012: [Forced release] at [debian/0.18.157]
Fri Oct 12 19:46:55 PDT 2012: [new branch] at [debian/0.18.160]
+Sat Oct 13 13:30:40 PDT 2012: [create daisy branch] at [debian/0.18.161]
diff --git a/debian/changelog b/debian/changelog
index e6c15b30..1831aff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,42 @@ vyatta-cfg-quagga (0.18.162) unstable; urgency=low
-- James Davidson <james.davidson@vyatta.com> Sat, 24 Nov 2012 11:41:33 -0800
+vyatta-cfg-quagga (0.18.161+daisy6) unstable; urgency=low
+
+ * Fixing 7975: provide MTU ignore for OSPFv3
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Wed, 27 Mar 2013 10:13:42 -0700
+
+vyatta-cfg-quagga (0.18.161+daisy5) unstable; urgency=low
+
+ * Fixing 8607
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Thu, 17 Jan 2013 10:32:54 -0800
+
+vyatta-cfg-quagga (0.18.161+daisy4) unstable; urgency=low
+
+ * Initial commit for supporting ACL config for multicast for SE
+ version.
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Fri, 14 Dec 2012 13:20:25 -0800
+
+vyatta-cfg-quagga (0.18.161+daisy3) unstable; urgency=low
+
+ * Bugfix 8501: fix ordering problems in IPv6 peer-groups
+
+ -- John Southworth <john.southworth@vyatta.com> Thu, 13 Dec 2012 09:37:16 -0800
+
+vyatta-cfg-quagga (0.18.161+daisy2) unstable; urgency=low
+
+ * Bugfix 7428: Update warning message text.
+
+ -- James Davidson <james.davidson@vyatta.com> Sat, 24 Nov 2012 11:25:58 -0800
+
+vyatta-cfg-quagga (0.18.161+daisy1) unstable; urgency=low
+
+ * create daisy branch
+
+ -- John Southworth <john.southworth@vyatta.com> Sat, 13 Oct 2012 13:30:41 -0700
vyatta-cfg-quagga (0.18.161) unstable; urgency=low
* new branch
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 00000000..02a3f77e
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -d /opt/vyatta/sbin/policy ];then
+ mkdir -p /opt/vyatta/sbin/policy
+fi
+
+if [ -f /usr/bin/vtysh ] && [ ! -f /opt/vyatta/sbin/policy/vtysh ]; then
+ ln -s /usr/bin/vtysh /opt/vyatta/sbin/policy/vtysh
+fi
diff --git a/interface-templates/ipv6/ospfv3/mtu-ignore/node.def b/interface-templates/ipv6/ospfv3/mtu-ignore/node.def
new file mode 100644
index 00000000..ad1bd4f3
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/mtu-ignore/node.def
@@ -0,0 +1,4 @@
+help: Disable Maximum Transmission Unit mismatch detection
+create:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 mtu-ignore"
+delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ipv6 ospf6 mtu-ignore"
+
diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl
index b4439bec..2d88505f 100755
--- a/scripts/policy/vyatta-policy.pl
+++ b/scripts/policy/vyatta-policy.pl
@@ -6,6 +6,7 @@ use Vyatta::Misc;
use Getopt::Long;
my $VTYSH = '/usr/bin/vtysh';
+my $ACL_CONSUMERS_DIR = "/opt/vyatta/sbin/policy";
my ( $accesslist, $accesslist6, $aspathlist, $communitylist, $peer );
my ( $routemap, $deleteroutemap, $listpolicy );
@@ -151,6 +152,20 @@ sub is_access_list6 {
return ( $count > 0 );
}
+sub notify_all_acl_consumers {
+ my $args_string = shift;
+ opendir (DIR, $ACL_CONSUMERS_DIR) or die "Could not open directory: $!";
+ while (my $file = readdir DIR) {
+ next if (-d "$ACL_CONSUMERS_DIR/$file");
+ my $target = "$ACL_CONSUMERS_DIR/$file";
+ if (-l "$ACL_CONSUMERS_DIR/$file") {
+ my $target = readlink "$ACL_CONSUMERS_DIR/$file";
+ }
+ system ("sudo $target $args_string");
+ }
+ closedir (DIR);
+}
+
sub update_access_list {
my $list = shift;
my $config = new Vyatta::Config;
@@ -158,7 +173,7 @@ sub update_access_list {
# remove the old rule if it already exists
if ( is_access_list($list) ) {
- system("$VTYSH -c \"configure terminal\" -c \"no access-list $list\" ");
+ notify_all_acl_consumers ("-c \"configure terminal\" -c \"no access-list $list\" ");
}
$config->setLevel("policy access-list $list rule");
@@ -222,10 +237,7 @@ sub update_access_list {
}
}
}
-
- system(
-"$VTYSH -c \"configure terminal\" -c \"access-list $list $action $ip $src $srcmsk $dst $dstmsk\" "
- );
+ notify_all_acl_consumers ("-c \"configure terminal\" -c \"access-list $list $action $ip $src $srcmsk $dst $dstmsk\" ");
}
exit 0;
@@ -238,7 +250,7 @@ sub update_access_list6 {
# remove the old rule if it already exists
if ( is_access_list6($list) ) {
- system("$VTYSH -c \"conf t\" -c \"no ipv6 access-list $list\" ");
+ notify_all_acl_consumers ("-c \"conf t\" -c \"no ipv6 access-list $list\" ");
}
$config->setLevel("policy access-list6 $list rule");
@@ -269,10 +281,7 @@ sub update_access_list6 {
exit 1;
}
}
-
- system(
-"$VTYSH -c \"configure terminal\" -c \"ipv6 access-list $list $action $src $exact\" "
- );
+ notify_all_acl_consumers ("-c \"configure terminal\" -c \"ipv6 access-list $list $action $src $exact\" ");
}
exit 0;