Merge branch 'pacifica' of git.vyatta.com:/git/vyatta-cfg-quagga into pacifica

10 files changed, 70 insertions, 191 deletions

diff --git a/Makefile.am b/Makefile.am
index cdff2263..9dfe6451 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,11 @@ sbin_SCRIPTS += scripts/vyatta-gateway-static_route-check.pl
 sbin_SCRIPTS += scripts/vyatta-link-detect
 sbin_SCRIPTS += scripts/vyatta-next-hop-check
 
-sbin_PROGRAMS := check_prefix_boundary check_next_hop
+sbin_PROGRAMS = src/check_prefix_boundary
 
 share_perl5_DATA = lib/Vyatta/Quagga/Config.pm
 
-check_prefix_boundary_SOURCES := src/check_prefix_boundary.c src/check_ucast_static.c
-check_next_hop_SOURCES := src/check_next_hop.c src/check_ucast_static.c
+src_check_prefix_boundary = src/check_prefix_boundary.c
 
 curver_DATA = cfg-version/quagga@2
 
diff --git a/debian/changelog b/debian/changelog
index e694b7e7..4b1b8a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vyatta-cfg-quagga (0.18.159) unstable; urgency=low
+
+  [ Bharat ]
+  * Bug 8345: Reverting changes which were committed against bug 8345.
+    We are seeing issues when we are upgrading to pacifica from
+
+  [ bharat ]
+
+ -- bharat <bharat@git.vyatta.com>  Thu, 04 Oct 2012 11:23:55 -0700
+
 vyatta-cfg-quagga (0.18.158) unstable; urgency=low
 
   * Forced release
diff --git a/src/check_next_hop.c b/src/check_next_hop.c
deleted file mode 100644
index 0730c43e..00000000
--- a/src/check_next_hop.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "check_ucast_static.h"
-
-static void usage(void)
-{
-	fprintf(stderr, "Usage: check_next_hop [-4|-6] address\n");
-	exit(1);
-}
-
-static void get_prefix_1(inet_prefix *dst, char *arg, int family)
-{
-
-	memset(dst, 0, sizeof(*dst));
-	get_addr_1(dst, arg, family);
-
-}
-
-int main(int argc, char **argv)
-{
-	int family = AF_UNSPEC;
-    
-	while (--argc) {
-		char *arg = *++argv;
-		inet_prefix dst;
-
-		if (arg[0] == '-') { 
-			switch(arg[1]) {
-			case '4':
-				family = AF_INET;
-				break;
-			case '6':
-				family = AF_INET6;
-				break;
-			default:
-				usage();
-			}
-            continue;
-        }
-
-		get_prefix_1(&dst, arg, family);
-
-        /*
-         * Macros to check for Mcast are based on:
-         *
-         *    Addr          dst.data
-         * 224.1.2.2    ==> 0x030201e0
-         * ff01:0203::  ==> 0x030201ff
-         *
-         */
-        if (family == AF_INET) {
-            if (IS_MULTICAST(dst.data[0])) {
-                err("Invalid next_hop...next_hop cannot be multicast\n");
-            } 
-            if (IS_BROADCAST(dst.data[0])) {
-                err("Invalid next_hop...next_hop cannot be broadcast\n");
-            } 
-        } else if (family == AF_INET6) {
-            if (IS_IPV6_MULTICAST(dst.data[0])) {
-                err("Invalid next_hop...next_hop cannot be IPv6 multicast\n");
-            } 
-        }
-
-	}
-
-	return 0;
-}
diff --git a/src/check_prefix_boundary.c b/src/check_prefix_boundary.c
index b432c788..5fa80d50 100644
--- a/src/check_prefix_boundary.c
+++ b/src/check_prefix_boundary.c
@@ -1,4 +1,33 @@
-#include "check_ucast_static.h"
+/*
+ * Check format of network prefix
+ */
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+
+typedef struct
+{
+	uint8_t family;
+	uint8_t bytelen;
+	unsigned int plen;
+	uint32_t data[4];
+} inet_prefix;
+
+static void err(const char *fmt, ...)
+{
+	va_list ap;
+	
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+
+	exit(1);
+}
 
 static void usage(void)
 {
@@ -6,6 +35,32 @@ static void usage(void)
 	exit(1);
 }
 
+static void get_addr_1(inet_prefix *addr, const char *name, int family)
+{
+	memset(addr, 0, sizeof(*addr));
+
+	if (strchr(name, ':')) {
+		addr->family = AF_INET6;
+		addr->bytelen = 16;
+		if (family != AF_UNSPEC && family != AF_INET6)
+			err("IPV6 address not allowed\n");
+
+		if (inet_pton(AF_INET6, name, addr->data) <= 0)
+			err("Invalid IPV6 address: %s\n", name);
+
+		return;
+	}
+
+	addr->family = AF_INET;
+	addr->bytelen = 4;
+	if (family != AF_UNSPEC && family != AF_INET)
+		err("IPV4 address not allowed\n");
+
+	if (inet_pton(AF_INET, name, addr->data) <= 0)
+		err("Invalid IPV4 address: %s\n", name);
+	return;
+}
+
 static void get_prefix_1(inet_prefix *dst, char *arg, int family)
 {
 	char *slash, *endp;
@@ -77,27 +132,6 @@ int main(int argc, char **argv)
 			    inet_ntop(msk.family, msk.data, buf, sizeof buf));
 		}
 
-        /*
-         * Macros to check for Mcast are based on:
-         *
-         *    Addr          dst.data
-         * 224.1.2.2    ==> 0x030201e0
-         * ff01:0203::  ==> 0x030201ff
-         *
-         */
-        if (family == AF_INET) {
-            if (IS_MULTICAST(dst.data[0])) {
-                err("Invalid Prefix...Route cannot be Multicast\n");
-            } 
-            if (IS_BROADCAST(dst.data[0])) {
-                err("Invalid Prefix...Route cannot be Broadcast\n");
-            } 
-        } else if (family == AF_INET6) {
-            if (IS_IPV6_MULTICAST(dst.data[0])) {
-                err("Invalid Prefix...Route cannot be IPv6 Multicast\n");
-            } 
-        }
-
 	}
 
 	return 0;
diff --git a/src/check_ucast_static.c b/src/check_ucast_static.c
deleted file mode 100644
index d3c4e557..00000000
--- a/src/check_ucast_static.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "check_ucast_static.h"
-
-void get_addr_1(inet_prefix *addr, const char *name, int family)
-{
-	memset(addr, 0, sizeof(*addr));
-
-	if (strchr(name, ':')) {
-		addr->family = AF_INET6;
-		addr->bytelen = 16;
-		if (family != AF_UNSPEC && family != AF_INET6)
-			err("IPV6 address not allowed\n");
-
-		if (inet_pton(AF_INET6, name, addr->data) <= 0)
-			err("Invalid IPV6 address: %s\n", name);
-
-		return;
-	}
-
-	addr->family = AF_INET;
-	addr->bytelen = 4;
-	if (family != AF_UNSPEC && family != AF_INET)
-		err("IPV4 address not allowed\n");
-
-	if (inet_pton(AF_INET, name, addr->data) <= 0)
-		err("Invalid IPV4 address: %s\n", name);
-	return;
-}
-
-void err(const char *fmt, ...)
-{
-	va_list ap;
-	
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	exit(1);
-}
diff --git a/src/check_ucast_static.h b/src/check_ucast_static.h
deleted file mode 100644
index e5d87ade..00000000
--- a/src/check_ucast_static.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Check format of network prefix
- */
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
-#define IS_CLASSD(a)        ((((uint32_t)(a)) & 0x000000f0) == 0x000000e0)
-#define IS_MULTICAST(a)     IS_CLASSD(a)
-#define IS_BROADCAST(a)     ((((uint32_t)(a)) & 0xffffffff) == 0xffffffff)
-
-#define IS_IPV6_MULTICAST(a) ((((uint32_t)(a)) & 0x000000ff) == 0x000000ff)
-
-
-typedef struct
-{
-	uint8_t family;
-	uint8_t bytelen;
-	unsigned int plen;
-	uint32_t data[4];
-} inet_prefix;
-
-void get_addr_1(inet_prefix *addr, const char *name, int family);
-void err(const char *fmt, ...);
-
-/*
-static void get_addr_1(inet_prefix *addr, const char *name, int family)
-{
-	memset(addr, 0, sizeof(*addr));
-
-	if (strchr(name, ':')) {
-		addr->family = AF_INET6;
-		addr->bytelen = 16;
-		if (family != AF_UNSPEC && family != AF_INET6)
-			err("IPV6 address not allowed\n");
-
-		if (inet_pton(AF_INET6, name, addr->data) <= 0)
-			err("Invalid IPV6 address: %s\n", name);
-
-		return;
-	}
-
-	addr->family = AF_INET;
-	addr->bytelen = 4;
-	if (family != AF_UNSPEC && family != AF_INET)
-		err("IPV4 address not allowed\n");
-
-	if (inet_pton(AF_INET, name, addr->data) <= 0)
-		err("Invalid IPV4 address: %s\n", name);
-	return;
-}
-*/
-void err(const char *fmt, ...);
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index ced516ea..682ca944 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary -4 $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \
                    "Must add either a next-hop or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index 89d00664..f5d5d417 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -1,7 +1,6 @@
 tag:
 type: ipv4
 help: Next-hop router [REQUIRED]
-syntax:expression: exec "${vyatta_sbindir}/check_next_hop -4 $VAR(@)"
 end:
   if [[ -z "$VAR(./disable)" ]]
   then 
diff --git a/templates/protocols/static/route6/node.def b/templates/protocols/static/route6/node.def
index bba42943..de3f1cd8 100644
--- a/templates/protocols/static/route6/node.def
+++ b/templates/protocols/static/route6/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Static IPv6 route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary -6 $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \
                    "Must add either a next-hop or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index 82bc78a8..e3a668b7 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -4,8 +4,6 @@ type: ipv6
 
 help: Next-hop IPv6 router [REQUIRED]
 
-syntax:expression: exec "${vyatta_sbindir}/check_next_hop -6 $VAR(@)"
-
 end:
   if [[ -z "$VAR(./disable)" ]]
   then