diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-08-20 15:31:57 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-08-20 15:31:57 +0000 |
| commit | 42a71bc794ec337a9a2323d714b1c78f4b1945c6 (patch) | |
| tree | 2467f20e225f7af2f08cde675200d722ddcef1be /usr.sbin | |
| parent | 50be28188b0267eb4b19eb4ed737d31828803eb0 (diff) | |
Grrr. copy paste error. Dump MED and not local-pref. OK henning@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde_update.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 5c6347cef6f..689d21d3f9d 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.135 2004/08/20 14:56:09 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.136 2004/08/20 15:31:56 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -146,7 +146,7 @@ typedef struct { %token ALLOW DENY MATCH %token QUICK %token FROM TO ANY -%token PREFIX PREFIXLEN SOURCEAS TRANSITAS COMMUNITY +%token PREFIX PREFIXLEN SOURCEAS TRANSITAS EMPTYAS COMMUNITY %token SET LOCALPREF MED METRIC NEXTHOP PREPEND PFTABLE REJECT BLACKHOLE %token ERROR %token IPSEC ESP AH SPI IKE @@ -1048,6 +1048,7 @@ prefixlenop : unaryop number { filter_as_type : AS { $$ = AS_ALL; } | SOURCEAS { $$ = AS_SOURCE; } | TRANSITAS { $$ = AS_TRANSIT; } + | EMPTYAS { $$ = AS_EMPTY; } ; filter_set : /* empty */ { @@ -1205,6 +1206,7 @@ lookup(char *s) { "deny", DENY}, { "descr", DESCR}, { "dump", DUMP}, + { "empty-as", EMPTYAS}, { "enforce", ENFORCE}, { "esp", ESP}, { "fib-update", FIBUPDATE}, diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index 3af16ff7059..1b0028154cf 100644 --- a/usr.sbin/bgpd/rde_update.c +++ b/usr.sbin/bgpd/rde_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_update.c,v 1.29 2004/08/13 14:03:20 claudio Exp $ */ +/* $OpenBSD: rde_update.c,v 1.30 2004/08/20 15:31:56 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -630,7 +630,7 @@ up_generate_attr(struct rde_peer *peer, struct update_attr *upa, */ if (a->flags & F_ATTR_MED && (peer->conf.ebgp == 0 || a->flags & F_ATTR_MED_ANNOUNCE)) { - tmp32 = htonl(a->lpref); + tmp32 = htonl(a->med); if ((r = attr_write(up_attr_buf + wlen, len, ATTR_OPTIONAL, ATTR_MED, &tmp32, 4)) == -1) return (-1); |