From f9d729ab682156cc658eb451b95d7cbd37dfa139 Mon Sep 17 00:00:00 2001 From: Pavel TvrdĂ­k Date: Thu, 14 Jan 2016 10:03:50 +0100 Subject: NET ROAx: add max_pxlen, fix format --- lib/net.c | 4 ++-- lib/net.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/net.c b/lib/net.c index 986b57c8..d03a03b7 100644 --- a/lib/net.c +++ b/lib/net.c @@ -48,9 +48,9 @@ net_format(const net_addr *N, char *buf, int buflen) case NET_VPN6: return bsnprintf(buf, buflen, "%u:%u %I6/%d", (u32) (n->vpn6.rd >> 32), (u32) n->vpn6.rd, n->vpn6.prefix, n->vpn6.pxlen); case NET_ROA4: - return bsnprintf(buf, buflen, "%I4/%d AS%u", n->roa4.prefix, n->roa4.pxlen, n->roa4.asn); + return bsnprintf(buf, buflen, "%I4/%u-%u AS%u", n->roa4.prefix, n->roa4.pxlen, n->roa4.max_pxlen, n->roa4.asn); case NET_ROA6: - return bsnprintf(buf, buflen, "%I6/%d AS%u", n->roa6.prefix, n->roa6.pxlen, n->roa6.asn); + return bsnprintf(buf, buflen, "%I6/%u-%u AS%u", n->roa6.prefix, n->roa6.pxlen, n->roa6.max_pxlen, n->roa6.asn); } return 0; diff --git a/lib/net.h b/lib/net.h index dbcf4253..dd6e597a 100644 --- a/lib/net.h +++ b/lib/net.h @@ -64,7 +64,7 @@ typedef struct net_addr_roa4 { u8 pxlen; u16 length; ip4_addr prefix; - u8 max_pxlen; + u32 max_pxlen; u32 asn; } net_addr_roa4; @@ -73,7 +73,7 @@ typedef struct net_addr_roa6 { u8 pxlen; u16 length; ip6_addr prefix; - u8 max_pxlen; + u32 max_pxlen; u32 asn; } net_addr_roa6; -- cgit v1.2.3