From ddfcc87ed15b91ced906feee64c0312cbb89f0a2 Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Tue, 27 Jul 2004 15:26:46 +0000 Subject: do not define the prefix, prefixlen and community structs used for the filters from within struct filter_match but explicit; no functional change --- usr.sbin/bgpd/bgpd.h | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index d1fc7b70dd4..ed27696b4c2 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.135 2004/07/05 16:54:53 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.136 2004/07/27 15:26:45 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -499,22 +499,28 @@ struct filter_peers { #define COMMUNITY_NO_EXPSUBCONFED 0xff03 #define COMMUNITY_NO_PEER 0xff04 /* rfc3765 */ +struct filter_prefix { + struct bgpd_addr addr; + u_int8_t len; +}; + +struct filter_prefixlen { + sa_family_t af; + enum comp_ops op; + u_int8_t len_min; + u_int8_t len_max; +}; + +struct filter_community { + int as; + int type; +}; + struct filter_match { - struct { - struct bgpd_addr addr; - u_int8_t len; - } prefix; - struct { - sa_family_t af; - enum comp_ops op; - u_int8_t len_min; - u_int8_t len_max; - } prefixlen; - struct as_filter as; - struct { - int as; - int type; - } community; + struct filter_prefix prefix; + struct filter_prefixlen prefixlen; + struct as_filter as; + struct filter_community community; }; TAILQ_HEAD(filter_head, filter_rule); -- cgit v1.2.3