diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-11-19 14:43:58 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-11-19 14:43:58 +0000 |
| commit | 8cb2f85096f6a3df1541d68236b6221cda8e2c9f (patch) | |
| tree | 0a846986d7a668d20869bccda676d5eb70adcec8 | |
| parent | 7da959fda179fb9f25725c4c4f37a8571f52dfda (diff) | |
For consistency reasons rename struct as_filter to struct filter_as.
OK henning@
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 738706573a8..78705360cc8 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.149 2004/11/18 17:17:56 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.150 2004/11/19 14:43:56 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -454,7 +454,7 @@ enum as_spec { AS_EMPTY }; -struct as_filter { +struct filter_as { u_int16_t as; enum as_spec type; }; @@ -536,7 +536,7 @@ struct filter_community { struct filter_match { struct filter_prefix prefix; struct filter_prefixlen prefixlen; - struct as_filter as; + struct filter_as as; struct filter_community community; }; diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 4de7725958a..ff2598518ed 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.146 2004/11/19 10:03:34 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.147 2004/11/19 14:43:57 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -74,7 +74,7 @@ struct filter_prefix_l { struct filter_as_l { struct filter_as_l *next; - struct as_filter a; + struct filter_as a; }; struct filter_match_l { @@ -1892,7 +1892,7 @@ expand_rule(struct filter_rule *rule, struct filter_peers_l *peer, if (a != NULL) memcpy(&r->match.as, &a->a, - sizeof(struct as_filter)); + sizeof(struct filter_as)); TAILQ_INSERT_TAIL(filter_l, r, entry); diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index a537ba6f071..5a051ae19cc 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.151 2004/11/11 16:59:47 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.152 2004/11/19 14:43:57 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -63,7 +63,7 @@ int rde_reflector(struct rde_peer *, struct rde_aspath *); void rde_dump_rib_as(struct prefix *, pid_t); void rde_dump_rib_prefix(struct prefix *, pid_t); void rde_dump_upcall(struct pt_entry *, void *); -void rde_dump_as(struct as_filter *, pid_t); +void rde_dump_as(struct filter_as *, pid_t); void rde_dump_prefix_upcall(struct pt_entry *, void *); void rde_dump_prefix(struct ctl_show_rib_prefix *, pid_t); void rde_update_queue_runner(void); @@ -355,7 +355,7 @@ rde_dispatch_imsg_session(struct imsgbuf *ibuf) break; case IMSG_CTL_SHOW_RIB_AS: if (imsg.hdr.len - IMSG_HEADER_SIZE != - sizeof(struct as_filter)) { + sizeof(struct filter_as)) { log_warnx("rde_dispatch: wrong imsg len"); break; } @@ -1494,7 +1494,7 @@ rde_dump_upcall(struct pt_entry *pt, void *ptr) } void -rde_dump_as(struct as_filter *a, pid_t pid) +rde_dump_as(struct filter_as *a, pid_t pid) { extern struct path_table pathtable; struct rde_aspath *asp; |