summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-06-14 04:00:40 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-06-14 04:00:40 +0000
commit8452a7098f21b24abdd719acdc65ace5314cf6e3 (patch)
tree7fea5c482a50f3900306b8e7ada515d52e90a879 /sys
parent425cbe2292bab7c7e0072b156040a407848e3792 (diff)
rename function and define to reflect the external -> egress name change
so it is clear what it is all about
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if.c18
-rw-r--r--sys/net/if.h4
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/net/if.c b/sys/net/if.c
index ce489f154f9..12be3ae98fb 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.134 2005/06/13 21:02:21 henning Exp $ */
+/* $OpenBSD: if.c,v 1.135 2005/06/14 04:00:38 henning Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -143,7 +143,7 @@ int if_clone_list(struct if_clonereq *);
struct if_clone *if_clone_lookup(const char *, int *);
void if_congestion_clear(void *);
-int if_group_ext_build(void);
+int if_group_egress_build(void);
TAILQ_HEAD(, ifg_group) ifg_head;
LIST_HEAD(, if_clone) if_cloners = LIST_HEAD_INITIALIZER(if_cloners);
@@ -1768,7 +1768,7 @@ if_group_routechange(struct sockaddr *dst, struct sockaddr *mask)
case AF_INET:
if (satosin(dst)->sin_addr.s_addr == INADDR_ANY &&
mask && satosin(mask)->sin_addr.s_addr == INADDR_ANY)
- if_group_ext_build();
+ if_group_egress_build();
break;
#ifdef INET6
case AF_INET6:
@@ -1776,14 +1776,14 @@ if_group_routechange(struct sockaddr *dst, struct sockaddr *mask)
&in6addr_any) &&
mask && IN6_ARE_ADDR_EQUAL(&(satosin6(mask))->sin6_addr,
&in6addr_any))
- if_group_ext_build();
+ if_group_egress_build();
break;
#endif
}
}
int
-if_group_ext_build(void)
+if_group_egress_build(void)
{
struct ifg_group *ifg;
struct ifg_member *ifgm, *next;
@@ -1796,13 +1796,13 @@ if_group_ext_build(void)
struct rtentry *rt;
TAILQ_FOREACH(ifg, &ifg_head, ifg_next)
- if (!strcmp(ifg->ifg_group, IFG_EXTERNAL))
+ if (!strcmp(ifg->ifg_group, IFG_EGRESS))
break;
if (ifg != NULL)
for (ifgm = TAILQ_FIRST(&ifg->ifg_members); ifgm; ifgm = next) {
next = TAILQ_NEXT(ifgm, ifgm_next);
- if_delgroup(ifgm->ifgm_ifp, IFG_EXTERNAL);
+ if_delgroup(ifgm->ifgm_ifp, IFG_EGRESS);
}
if ((rnh = rt_tables[AF_INET]) == NULL)
@@ -1815,7 +1815,7 @@ if_group_ext_build(void)
do {
rt = (struct rtentry *)rn;
if (rt->rt_ifp)
- if_addgroup(rt->rt_ifp, IFG_EXTERNAL);
+ if_addgroup(rt->rt_ifp, IFG_EGRESS);
#ifndef SMALL_KERNEL
if (rn_mpath_capable(rnh))
rn = rn_mpath_next(rn);
@@ -1834,7 +1834,7 @@ if_group_ext_build(void)
do {
rt = (struct rtentry *)rn;
if (rt->rt_ifp)
- if_addgroup(rt->rt_ifp, IFG_EXTERNAL);
+ if_addgroup(rt->rt_ifp, IFG_EGRESS);
#ifndef SMALL_KERNEL
if (rn_mpath_capable(rnh))
rn = rn_mpath_next(rn);
diff --git a/sys/net/if.h b/sys/net/if.h
index efc5401fa8e..1db23f36d84 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.h,v 1.75 2005/06/14 03:54:31 henning Exp $ */
+/* $OpenBSD: if.h,v 1.76 2005/06/14 04:00:39 henning Exp $ */
/* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */
/*
@@ -426,7 +426,7 @@ struct if_announcemsghdr {
*/
#define IFG_ALL "all" /* group contains all interfaces */
-#define IFG_EXTERNAL "egress" /* if(s) default route(s) point to */
+#define IFG_EGRESS "egress" /* if(s) default route(s) point to */
struct ifg_group {
char ifg_group[IFNAMSIZ];