summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2004-04-10 17:27:28 +0000
committerhenning <henning@openbsd.org>2004-04-10 17:27:28 +0000
commitfec8b2bfeba0b7f6da3fc6f1df0aa3911277d367 (patch)
treeccb85d6d36f341e1f0c3c6848b0fb1f222f8a760
parentsync (diff)
downloadwireguard-openbsd-fec8b2bfeba0b7f6da3fc6f1df0aa3911277d367.tar.xz
wireguard-openbsd-fec8b2bfeba0b7f6da3fc6f1df0aa3911277d367.zip
move the API_* and SAFI_* defines to where they belong
-rw-r--r--usr.sbin/bgpd/bgpd.h11
-rw-r--r--usr.sbin/bgpd/rde.h12
2 files changed, 11 insertions, 12 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 95db970c195..8beb6f285a5 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.106 2004/03/11 17:12:51 claudio Exp $ */
+/* $OpenBSD: bgpd.h,v 1.107 2004/04/10 17:27:28 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -432,6 +432,15 @@ struct filter_rule {
struct filter_set set;
};
+/* Address Family Numbers as per rfc1700 */
+#define AFI_IPv4 1
+#define AFI_IPv6 2
+
+/* Subsequent Address Family Identifier as per rfc2858 */
+#define SAFI_UNICAST 1
+#define SAFI_MULTICAST 2
+#define SAFI_BOTH 3
+
/* prototypes */
/* bgpd.c */
void send_nexthop_update(struct kroute_nexthop *);
diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index bd5eacb6014..a168d5a6e32 100644
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.h,v 1.36 2004/03/11 17:12:51 claudio Exp $ */
+/* $OpenBSD: rde.h,v 1.37 2004/04/10 17:27:28 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -25,16 +25,6 @@
#include "bgpd.h"
-/* XXX generic stuff, should be somewhere else */
-/* Address Family Numbers as per rfc1700 */
-#define AFI_IPv4 1
-#define AFI_IPv6 2
-
-/* Subsequent Address Family Identifier as per rfc2858 */
-#define SAFI_UNICAST 1
-#define SAFI_MULTICAST 2
-#define SAFI_BOTH 3
-
/* rde internal structures */
enum peer_state {