From e47788dc5abec3c8f3d35513fc3b597ebd3beff3 Mon Sep 17 00:00:00 2001 From: Bharat Date: Thu, 4 Oct 2012 11:20:00 -0700 Subject: Bug 8345: Reverting changes which were committed against bug 8345. We are seeing issues when we are upgrading to pacifica from earlier releases. Customers may have the multicast blackhole route in earlier releases which is causing the issue after upgrade. This will fail the commit for the other unicast routes. --- src/check_ucast_static.h | 58 ------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 src/check_ucast_static.h (limited to 'src/check_ucast_static.h') 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 -#include -#include -#include -#include -#include -#include -#include - -#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, ...); -- cgit v1.2.3