From 301ceeb33db1ab75db3abfda07d22a539af7cd24 Mon Sep 17 00:00:00 2001
From: ume <ume@FreeBSD.org>
Date: Mon, 22 Jan 2001 19:20:06 +0000
Subject: avoid conflicting #define symbol (s/FW_IFNLEN/IP6&/).
Obtained from: KAME
---
sys/netinet6/ip6_fw.c | 4 ++--
sys/netinet6/ip6_fw.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'sys/netinet6')
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index 6bcef8a..bd50857 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -293,7 +293,7 @@ iface_match(struct ifnet *ifp, union ip6_fw_if *ifu, int byname)
&& ifp->if_unit != ifu->fu_via_if.unit)
return(0);
/* Check name */
- if (strncmp(ifp->if_name, ifu->fu_via_if.name, FW_IFNLEN))
+ if (strncmp(ifp->if_name, ifu->fu_via_if.name, IP6FW_IFNLEN))
return(0);
return(1);
} else if (!IN6_IS_ADDR_UNSPECIFIED(&ifu->fu_via_ip6)) { /* Zero == wildcard */
@@ -793,7 +793,7 @@ add_entry6(struct ip6_fw_head *chainptr, struct ip6_fw *frwl)
}
bcopy(frwl, ftmp, sizeof(struct ip6_fw));
- ftmp->fw_in_if.fu_via_if.name[FW_IFNLEN - 1] = '\0';
+ ftmp->fw_in_if.fu_via_if.name[IP6FW_IFNLEN - 1] = '\0';
ftmp->fw_pcnt = 0L;
ftmp->fw_bcnt = 0L;
fwc->rule = ftmp;
diff --git a/sys/netinet6/ip6_fw.h b/sys/netinet6/ip6_fw.h
index 47a9cee..0418d18 100644
--- a/sys/netinet6/ip6_fw.h
+++ b/sys/netinet6/ip6_fw.h
@@ -37,8 +37,8 @@
union ip6_fw_if {
struct in6_addr fu_via_ip6; /* Specified by IPv6 address */
struct { /* Specified by interface name */
-#define FW_IFNLEN IFNAMSIZ
- char name[FW_IFNLEN];
+#define IP6FW_IFNLEN IFNAMSIZ
+ char name[IP6FW_IFNLEN];
short unit; /* -1 means match any unit */
} fu_via_if;
};
--
cgit v1.1