summaryrefslogtreecommitdiff
path: root/net/openbgpd/files/patch-bgpd_printconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_printconf.c')
-rw-r--r--net/openbgpd/files/patch-bgpd_printconf.c228
1 files changed, 203 insertions, 25 deletions
diff --git a/net/openbgpd/files/patch-bgpd_printconf.c b/net/openbgpd/files/patch-bgpd_printconf.c
index ee5be19032af..82fb337ccb7b 100644
--- a/net/openbgpd/files/patch-bgpd_printconf.c
+++ b/net/openbgpd/files/patch-bgpd_printconf.c
@@ -2,17 +2,21 @@ Index: bgpd/printconf.c
===================================================================
RCS file: /home/cvs/private/hrs/openbgpd/bgpd/printconf.c,v
retrieving revision 1.1.1.7
-retrieving revision 1.7
-diff -u -p -r1.1.1.7 -r1.7
+retrieving revision 1.8
+diff -u -p -r1.1.1.7 -r1.8
--- bgpd/printconf.c 14 Feb 2010 20:19:57 -0000 1.1.1.7
-+++ bgpd/printconf.c 10 Apr 2010 12:16:23 -0000 1.7
++++ bgpd/printconf.c 2 Jul 2011 16:06:38 -0000 1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: printconf.c,v 1.70 2009/06/06 01:10:29 claudio Exp $ */
+/* $OpenBSD: printconf.c,v 1.79 2010/03/05 15:25:00 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -19,6 +19,9 @@
+@@ -16,9 +16,13 @@
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -22,7 +26,7 @@ diff -u -p -r1.1.1.7 -r1.7
#include "bgpd.h"
#include "mrt.h"
-@@ -27,6 +30,8 @@
+@@ -27,14 +31,19 @@
void print_op(enum comp_ops);
void print_community(int, int);
@@ -30,8 +34,11 @@ diff -u -p -r1.1.1.7 -r1.7
+void print_origin(u_int8_t);
void print_set(struct filter_set_head *);
void print_mainconf(struct bgpd_config *);
++void print_rdomain_targets(struct filter_set_head *, const char *);
++void print_rdomain(struct rdomain *);
++const char *print_af(u_int8_t);
void print_network(struct network_config *);
-@@ -34,7 +39,7 @@ void print_peer(struct peer_config *,
+ void print_peer(struct peer_config *, struct bgpd_config *,
const char *);
const char *print_auth_alg(u_int8_t);
const char *print_enc_alg(u_int8_t);
@@ -40,7 +47,7 @@ diff -u -p -r1.1.1.7 -r1.7
void print_rule(struct peer *, struct filter_rule *);
const char * mrt_type(enum mrt_type);
void print_mrt(u_int32_t, u_int32_t, const char *, const char *);
-@@ -94,6 +99,45 @@ print_community(int as, int type)
+@@ -94,6 +103,45 @@ print_community(int as, int type)
}
void
@@ -61,10 +68,10 @@ diff -u -p -r1.1.1.7 -r1.7
+ break;
+ case EXT_COMMUNITY_OPAQUE:
+ printf("%s 0x%llx ", log_ext_subtype(c->subtype),
-+ c->data.ext_opaq);
++ (long long unsigned int)c->data.ext_opaq);
+ break;
+ default:
-+ printf("0x%x 0x%llx ", c->type, c->data.ext_opaq);
++ printf("0x%x 0x%llx ", c->type, (long long unsigned int)c->data.ext_opaq);
+ break;
+ }
+}
@@ -86,7 +93,7 @@ diff -u -p -r1.1.1.7 -r1.7
print_set(struct filter_set_head *set)
{
struct filter_set *s;
-@@ -161,11 +205,23 @@ print_set(struct filter_set_head *set)
+@@ -161,11 +209,23 @@ print_set(struct filter_set_head *set)
case ACTION_RTLABEL:
printf("rtlabel %s ", s->action.rtlabel);
break;
@@ -110,16 +117,127 @@ diff -u -p -r1.1.1.7 -r1.7
}
}
printf("}");
-@@ -236,7 +292,7 @@ print_mainconf(struct bgpd_config *conf)
- print_set(&conf->connectset6);
+@@ -182,6 +242,10 @@ print_mainconf(struct bgpd_config *conf)
+ printf(" %u", conf->short_as);
+ ina.s_addr = conf->bgpid;
+ printf("\nrouter-id %s\n", inet_ntoa(ina));
++
++ printf("socket \"%s\"\n", conf->csock);
++ if (conf->rcsock)
++ printf("socket \"%s\" restricted\n", conf->rcsock);
+ if (conf->holdtime)
+ printf("holdtime %u\n", conf->holdtime);
+ if (conf->min_holdtime)
+@@ -189,11 +253,6 @@ print_mainconf(struct bgpd_config *conf)
+ if (conf->connectretry)
+ printf("connect-retry %u\n", conf->connectretry);
+
+- if (conf->flags & BGPD_FLAG_NO_FIB_UPDATE)
+- printf("fib-update no\n");
+- else
+- printf("fib-update yes\n");
+-
+ if (conf->flags & BGPD_FLAG_NO_EVALUATE)
+ printf("route-collector yes\n");
+
+@@ -214,43 +273,67 @@ print_mainconf(struct bgpd_config *conf)
+ printf("nexthop qualify via bgp\n");
+ if (conf->flags & BGPD_FLAG_NEXTHOP_DEFAULT)
+ printf("nexthop qualify via default\n");
++}
+
+- if (conf->flags & BGPD_FLAG_REDIST_CONNECTED) {
+- printf("network inet connected");
+- if (!TAILQ_EMPTY(&conf->connectset))
+- printf(" ");
+- print_set(&conf->connectset);
+- printf("\n");
+- }
+- if (conf->flags & BGPD_FLAG_REDIST_STATIC) {
+- printf("network inet static");
+- if (!TAILQ_EMPTY(&conf->staticset))
+- printf(" ");
+- print_set(&conf->staticset);
+- printf("\n");
+- }
+- if (conf->flags & BGPD_FLAG_REDIST6_CONNECTED) {
+- printf("network inet6 connected");
+- if (!TAILQ_EMPTY(&conf->connectset6))
+- printf(" ");
+- print_set(&conf->connectset6);
+- printf("\n");
+- }
+- if (conf->flags & BGPD_FLAG_REDIST_STATIC) {
+- printf("network inet6 static");
+- if (!TAILQ_EMPTY(&conf->staticset6))
+- printf(" ");
+- print_set(&conf->staticset6);
++void
++print_rdomain_targets(struct filter_set_head *set, const char *tgt)
++{
++ struct filter_set *s;
++ TAILQ_FOREACH(s, set, entry) {
++ printf("\t%s ", tgt);
++ print_extcommunity(&s->action.ext_community);
printf("\n");
}
-- if (conf->flags & BGPD_FLAG_REDIST_STATIC) {
-+ if (conf->flags & BGPD_FLAG_REDIST6_STATIC) {
- printf("network inet6 static");
- if (!TAILQ_EMPTY(&conf->staticset6))
- printf(" ");
-@@ -263,8 +319,8 @@ print_peer(struct peer_config *p, struct
+- if (conf->rtableid)
+- printf("rtable %u\n", conf->rtableid);
++}
++
++void
++print_rdomain(struct rdomain *r)
++{
++ printf("rdomain %u {\n", r->rtableid);
++ printf("\tdescr \"%s\"\n", r->descr);
++ if (r->flags & F_RIB_NOFIBSYNC)
++ printf("\tfib-update no\n");
++ else
++ printf("\tfib-update yes\n");
++ printf("\tdepend on %s\n", r->ifmpe);
++
++ printf("\n\t%s\n", log_rd(r->rd));
++
++ print_rdomain_targets(&r->export, "export-target");
++ print_rdomain_targets(&r->import, "import-target");
++
++ printf("}\n");
++}
++
++const char *
++print_af(u_int8_t aid)
++{
++ /*
++ * Hack around the fact that aid2str() will return "IPv4 unicast"
++ * for AID_INET. AID_INET and AID_INET6 need special handling and
++ * the other AID should never end up here (at least for now).
++ */
++ if (aid == AID_INET)
++ return ("inet");
++ if (aid == AID_INET6)
++ return ("inet6");
++ return (aid2str(aid));
+ }
+
+ void
+ print_network(struct network_config *n)
+ {
+- printf("network %s/%u", log_addr(&n->prefix), n->prefixlen);
++ switch (n->type) {
++ case NETWORK_STATIC:
++ printf("network %s static", print_af(n->prefix.aid));
++ break;
++ case NETWORK_CONNECTED:
++ printf("network %s connected", print_af(n->prefix.aid));
++ break;
++ default:
++ printf("network %s/%u", log_addr(&n->prefix), n->prefixlen);
++ break;
++ }
+ if (!TAILQ_EMPTY(&n->attrset))
+ printf(" ");
+ print_set(&n->attrset);
+@@ -263,8 +346,8 @@ print_peer(struct peer_config *p, struct
char *method;
struct in_addr ina;
@@ -130,7 +248,7 @@ diff -u -p -r1.1.1.7 -r1.7
printf("%sneighbor %s/%u {\n", c, log_addr(&p->remote_addr),
p->remote_masklen);
else
-@@ -281,7 +337,7 @@ print_peer(struct peer_config *p, struct
+@@ -281,7 +364,7 @@ print_peer(struct peer_config *p, struct
printf("%s\tmultihop %u\n", c, p->distance);
if (p->passive)
printf("%s\tpassive\n", c);
@@ -139,7 +257,7 @@ diff -u -p -r1.1.1.7 -r1.7
printf("%s\tlocal-address %s\n", c, log_addr(&p->local_addr));
if (p->max_prefix) {
printf("%s\tmax-prefix %u", c, p->max_prefix);
-@@ -295,6 +351,12 @@ print_peer(struct peer_config *p, struct
+@@ -295,6 +378,12 @@ print_peer(struct peer_config *p, struct
printf("%s\tholdtime min %u\n", c, p->min_holdtime);
if (p->announce_capa == 0)
printf("%s\tannounce capabilities no\n", c);
@@ -152,7 +270,7 @@ diff -u -p -r1.1.1.7 -r1.7
if (p->announce_type == ANNOUNCE_SELF)
printf("%s\tannounce self\n", c);
else if (p->announce_type == ANNOUNCE_NONE)
-@@ -324,6 +386,10 @@ print_peer(struct peer_config *p, struct
+@@ -324,6 +413,10 @@ print_peer(struct peer_config *p, struct
printf("%s\tdepend on \"%s\"\n", c, p->if_depend);
if (p->flags & PEERFLAG_TRANS_AS)
printf("%s\ttransparent-as yes\n", c);
@@ -163,7 +281,7 @@ diff -u -p -r1.1.1.7 -r1.7
if (p->auth.method == AUTH_MD5SIG)
printf("%s\ttcp md5sig\n", c);
-@@ -354,8 +420,7 @@ print_peer(struct peer_config *p, struct
+@@ -354,8 +447,7 @@ print_peer(struct peer_config *p, struct
if (p->ttlsec)
printf("%s\tttl-security yes\n", c);
@@ -173,7 +291,7 @@ diff -u -p -r1.1.1.7 -r1.7
if (p->softreconfig_in == 1)
printf("%s\tsoftreconfig in yes\n", c);
-@@ -399,17 +464,14 @@ print_enc_alg(u_int8_t alg)
+@@ -399,17 +491,14 @@ print_enc_alg(u_int8_t alg)
}
}
@@ -198,7 +316,7 @@ diff -u -p -r1.1.1.7 -r1.7
}
void
-@@ -455,14 +517,14 @@ print_rule(struct peer *peer_l, struct f
+@@ -455,14 +544,14 @@ print_rule(struct peer *peer_l, struct f
} else
printf("any ");
@@ -217,7 +335,17 @@ diff -u -p -r1.1.1.7 -r1.7
printf("inet6 ");
}
-@@ -497,6 +559,10 @@ print_rule(struct peer *peer_l, struct f
+@@ -492,11 +581,20 @@ print_rule(struct peer *peer_l, struct f
+ printf("unfluffy-as %s ", log_as(r->match.as.as));
+ }
+
++ if (r->match.aslen.type) {
++ printf("%s %u ", r->match.aslen.type == ASLEN_MAX ?
++ "max-as-len" : "max-as-seq", r->match.aslen.aslen);
++ }
++
+ if (r->match.community.as != COMMUNITY_UNSET) {
+ printf("community ");
print_community(r->match.community.as,
r->match.community.type);
}
@@ -228,3 +356,53 @@ diff -u -p -r1.1.1.7 -r1.7
print_set(&r->set);
+@@ -547,7 +645,7 @@ print_mrt(u_int32_t pid, u_int32_t gid,
+ else
+ printf("%s %s %d\n", mrt_type(m->type),
+ MRT2MC(m)->name,
+- MRT2MC(m)->ReopenTimerInterval);
++ (int)MRT2MC(m)->ReopenTimerInterval);
+ }
+ }
+
+@@ -612,26 +710,34 @@ peer_compare(const void *aa, const void
+ void
+ print_config(struct bgpd_config *conf, struct rib_names *rib_l,
+ struct network_head *net_l, struct peer *peer_l,
+- struct filter_head *rules_l, struct mrt_head *mrt_l)
++ struct filter_head *rules_l, struct mrt_head *mrt_l,
++ struct rdomain_head *rdom_l)
+ {
+ struct filter_rule *r;
+ struct network *n;
+ struct rde_rib *rr;
++ struct rdomain *rd;
+
+ xmrt_l = mrt_l;
+- printf("\n");
+ print_mainconf(conf);
+ printf("\n");
++ TAILQ_FOREACH(n, net_l, entry)
++ print_network(&n->net);
++ printf("\n");
++ SIMPLEQ_FOREACH(rd, rdom_l, entry)
++ print_rdomain(rd);
++ printf("\n");
+ SIMPLEQ_FOREACH(rr, rib_l, entry) {
+ if (rr->flags & F_RIB_NOEVALUATE)
+ printf("rde rib %s no evaluate\n", rr->name);
+- else
++ else if (rr->flags & F_RIB_NOFIB)
+ printf("rde rib %s\n", rr->name);
++ else
++ printf("rde rib %s rtable %u fib-update %s\n", rr->name,
++ rr->rtableid, rr->flags & F_RIB_NOFIBSYNC ?
++ "no" : "yes");
+ }
+ printf("\n");
+- TAILQ_FOREACH(n, net_l, entry)
+- print_network(&n->net);
+- printf("\n");
+ print_mrt(0, 0, "", "");
+ printf("\n");
+ print_groups(conf, peer_l);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 19:19:43 +0000