Merge daisy support for mGRE

2 files changed, 15 insertions, 0 deletions

diff --git a/scripts/vyatta-encapsulation b/scripts/vyatta-encapsulation
new file mode 100644
index 00000000..8c64341e
--- /dev/null
+++ b/scripts/vyatta-encapsulation
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+list="gre gre-bridge ipip sit ipip6 ip6ip6"
+if [[ `dpkg -l | grep "vyatta-nhrp" | awk '{print $1}'` = "ii" ]]; then tmp="gre-multipoint"; fi
+full_list="${list} ${tmp}"
+if [[ -n "$1" ]]; then
+	for f in ${full_list}; do if [[ "$1" = "$f" ]]; then exit 0; fi; done
+	echo "Must be (${full_list})"
+	exit 1;
+else
+	echo ${full_list}
+fi
diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
index 979fb7bd..af73bc04 100755
--- a/scripts/vyatta-tunnel-cleanup
+++ b/scripts/vyatta-tunnel-cleanup
@@ -26,6 +26,9 @@ my %tunnel;
 foreach my $tun ( $config->listEffectiveNodes() ) {
     my $mode = $config->returnEffectiveValue("$tun encapsulation");
     next if ($interface eq $tun); # don't count the one being deleted
+    if ($mode eq "gre-multipoint") {
+       $mode = "gre";
+    }
     $tunnel{$mode} = 1;
 }