summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-12-25 02:09:20 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-12-25 02:09:20 +0000
commit9971e57c7c66ae0dbf17d2524c5ca10d12325449 (patch)
tree847d24f32d81b5307d3db930fa40bde9289414a5
parentaff4e946780ebe3758791b22e15c5cb3dd94d38d (diff)
it actually makes more sense to call the merged function kroute_change
-rw-r--r--usr.sbin/bgpd/bgpd.c6
-rw-r--r--usr.sbin/bgpd/bgpd.h4
-rw-r--r--usr.sbin/bgpd/kroute.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 36787a3334b..468a6842882 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.26 2003/12/25 02:04:46 henning Exp $ */
+/* $OpenBSD: bgpd.c,v 1.27 2003/12/25 02:09:19 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -338,13 +338,13 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx, struct mrt_config *conf)
case IMSG_KROUTE_ADD:
if (idx != PFD_PIPE_ROUTE)
fatal("route request not from RDE", 0);
- if (kroute_add(rfd, imsg.data))
+ if (kroute_change(rfd, imsg.data))
fatal("kroute_add error", errno);
break;
case IMSG_KROUTE_CHANGE:
if (idx != PFD_PIPE_ROUTE)
fatal("route request not from RDE", 0);
- if (kroute_add(rfd, imsg.data))
+ if (kroute_change(rfd, imsg.data))
fatal("kroute_change error", errno);
case IMSG_KROUTE_DELETE:
if (idx != PFD_PIPE_ROUTE)
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index a8cf5707af3..e35242314ee 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.21 2003/12/25 02:04:46 henning Exp $ */
+/* $OpenBSD: bgpd.h,v 1.22 2003/12/25 02:09:19 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -298,7 +298,7 @@ int mrt_mergeconfig(struct mrt_config *, struct mrt_config *);
/* kroute.c */
int kroute_init(void);
-int kroute_add(int, struct kroute *);
+int kroute_change(int, struct kroute *);
int kroute_delete(int, struct kroute *);
void kroute_shutdown(int);
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index c0026545abd..ce39206cadc 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.13 2003/12/25 02:04:46 henning Exp $ */
+/* $OpenBSD: kroute.c,v 1.14 2003/12/25 02:09:19 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -128,7 +128,7 @@ retry:
}
int
-kroute_add(int fd, struct kroute *kroute)
+kroute_change(int fd, struct kroute *kroute)
{
struct kroute_node *kr, s;
int n;