diff options
| author |   phessler <phessler@openbsd.org> | 2015-04-25 15:28:18 +0000 |
|---|---|---|
| committer | phessler <phessler@openbsd.org> | 2015-04-25 15:28:18 +0000 |
| commit | 51e30acc2a3a1929305c69fef9ad77db4ba35117 (patch) | |
| tree | 6b5f12f87ba4cc952d0a2e13db6325e4be19c566 /usr.sbin/bgpctl/irr_output.c | |
| parent | Prepend files or directories containing ":" with "./" in directory (diff) | |
| download | wireguard-openbsd-51e30acc2a3a1929305c69fef9ad77db4ba35117.tar.xz wireguard-openbsd-51e30acc2a3a1929305c69fef9ad77db4ba35117.zip | |
allow us to write rules that match directly on the peer AS
...
allow from AS 1 prefix 192.0.2.0/24
...
Also adjust the IRR ruleset output to include the declared peer AS,
instead of hoping they listed their neighbor IP address!
OK benno@
older version OK: claudio@ henning@
Diffstat (limited to 'usr.sbin/bgpctl/irr_output.c')
| -rw-r--r-- | usr.sbin/bgpctl/irr_output.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/bgpctl/irr_output.c b/usr.sbin/bgpctl/irr_output.c index 36e77ffb99d..3a14e9badac 100644 --- a/usr.sbin/bgpctl/irr_output.c +++ b/usr.sbin/bgpctl/irr_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: irr_output.c,v 1.16 2015/01/16 06:40:15 deraadt Exp $ */ +/* $OpenBSD: irr_output.c,v 1.17 2015/04/25 15:28:18 phessler Exp $ */ /* * Copyright (c) 2007 Henning Brauer <henning@openbsd.org> @@ -30,6 +30,7 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include "bgpd.h" #include "irrfilter.h" int process_policies(FILE *, struct policy_head *); @@ -195,7 +196,7 @@ void print_rule(FILE *fh, struct policy_item *pi, char *sourceas, struct irr_prefix *prefix) { - char *peer = "any"; + char peer[PEER_DESCR_LEN]; char *action = ""; char *dir; char *srcas[2] = { "", "" }; @@ -208,7 +209,9 @@ print_rule(FILE *fh, struct policy_item *pi, char *sourceas, dir = "to"; if (pi->peer_addr) - peer = pi->peer_addr; + snprintf(peer, PEER_DESCR_LEN, "%s", pi->peer_addr); + else + snprintf(peer, PEER_DESCR_LEN, "AS %s", log_as(pi->peer_as)); if (pi->action) action = action_torule(pi->action); |