From e8ef2adcee8294640eea77676232e06ae7a5ed62 Mon Sep 17 00:00:00 2001
From: Henning Brauer <henning@cvs.openbsd.org>
Date: Fri, 26 Dec 2003 00:27:24 +0000
Subject: kroute_nexthop_check -> kroute_nexthop_add kroute_validate_nexthop ->
 kroute_nexthop_insert

---
 usr.sbin/bgpd/bgpd.c   |  4 ++--
 usr.sbin/bgpd/bgpd.h   |  4 ++--
 usr.sbin/bgpd/kroute.c | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index ac5b448380a..68ecfcc7eed 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.c,v 1.30 2003/12/26 00:14:04 henning Exp $ */
+/*	$OpenBSD: bgpd.c,v 1.31 2003/12/26 00:27:23 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -360,7 +360,7 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx, struct mrt_config *conf)
 			if (idx != PFD_PIPE_ROUTE)
 				fatal("nexthop request not from RDE", 0);
 			memcpy(&ina, imsg.data, sizeof(ina));
-			kroute_nexthop_check(ina);
+			kroute_nexthop_add(ina);
 			break;
 		case IMSG_NEXTHOP_REMOVE:
 			if (idx != PFD_PIPE_ROUTE)
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 253c9f95624..7343bd41e24 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.h,v 1.29 2003/12/26 00:23:48 henning Exp $ */
+/*	$OpenBSD: bgpd.h,v 1.30 2003/12/26 00:27:23 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -316,6 +316,6 @@ int	kroute_change(int, struct kroute *);
 int	kroute_delete(int, struct kroute *);
 void	kroute_shutdown(int);
 void	kroute_dispatch_msg(int);
-void	kroute_nexthop_check(in_addr_t);
+void	kroute_nexthop_add(in_addr_t);
 
 #endif /* __BGPD_H__ */
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index 1abbf6efbf5..92417cb6959 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.25 2003/12/26 00:23:48 henning Exp $ */
+/*	$OpenBSD: kroute.c,v 1.26 2003/12/26 00:27:23 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -53,7 +53,7 @@ u_int8_t	prefixlen_classful(in_addr_t);
 u_int8_t	mask2prefixlen(in_addr_t);
 int		kroute_fetchtable(void);
 void		kroute_remove(struct kroute_node *);
-void		kroute_validate_nexthop(in_addr_t, struct kroute_nexthop *);
+void		kroute_nexthop_insert(in_addr_t, struct kroute_nexthop *);
 int		knexthop_compare(struct knexthop_node *,
 		    struct knexthop_node *);
 
@@ -468,7 +468,7 @@ kroute_remove(struct kroute_node *kr)
 				 * that this nexthop is now invalid
 				 */
 				bzero(&nh, sizeof(nh));
-				kroute_validate_nexthop(s->nexthop, &nh);
+				kroute_nexthop_insert(s->nexthop, &nh);
 				if (nh.valid == 0)	/* no alternate route */
 					send_nexthop_update(&nh);
 			}
@@ -496,7 +496,7 @@ kroute_match(in_addr_t key)
 }
 
 void
-kroute_nexthop_check(in_addr_t key)
+kroute_nexthop_add(in_addr_t key)
 {
 	struct kroute_nexthop	 nh;
 	struct knexthop_node	*h, s;
@@ -513,12 +513,12 @@ kroute_nexthop_check(in_addr_t key)
 			nh.gateway = h->kroute->r.nexthop;
 		}
 	} else
-		kroute_validate_nexthop(key, &nh);
+		kroute_nexthop_insert(key, &nh);
 	send_nexthop_update(&nh);
 }
 
 void
-kroute_validate_nexthop(in_addr_t key, struct kroute_nexthop *nh)
+kroute_nexthop_insert(in_addr_t key, struct kroute_nexthop *nh)
 {
 	struct kroute_node	*kr;
 	struct knexthop_node	*h;
-- 
cgit v1.2.3