diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-05-27 20:57:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 20:57:19 -0300 |
| commit | 53ad6c152188b196d1a0140b4926e5e67dfdbec7 (patch) | |
| tree | 7514c017123d2ab0ff71f4d524f9941baef81f21 | |
| parent | ea63f68b9116b492963a3da68e77f2769d2bdd5c (diff) | |
| parent | 7c3f09506cb421e1073fae7a32cda7220f3b7168 (diff) | |
Merge pull request #4396 from donaldsharp/rpki_stuff
bgpd: convert a couple of debug strings in rpki to prefix2str
| -rw-r--r-- | bgpd/bgp_rpki.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 010322233d..aa09026b78 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -737,28 +737,27 @@ static int rpki_validate_prefix(struct peer *peer, struct attr *attr, prefix->prefixlen, &result); // Print Debug output - prefix_string = - inet_ntop(prefix->family, &prefix->u.prefix, buf, BUFSIZ); + prefix_string = prefix2str(prefix, buf, sizeof(buf)); switch (result) { case BGP_PFXV_STATE_VALID: RPKI_DEBUG( - "Validating Prefix %s/%hhu from asn %u Result: VALID", - prefix_string, prefix->prefixlen, as_number); + "Validating Prefix %s from asn %u Result: VALID", + prefix_string, as_number); return RPKI_VALID; case BGP_PFXV_STATE_NOT_FOUND: RPKI_DEBUG( - "Validating Prefix %s/%hhu from asn %u Result: NOT FOUND", - prefix_string, prefix->prefixlen, as_number); + "Validating Prefix %s from asn %u Result: NOT FOUND", + prefix_string, as_number); return RPKI_NOTFOUND; case BGP_PFXV_STATE_INVALID: RPKI_DEBUG( - "Validating Prefix %s/%hhu from asn %u Result: INVALID", - prefix_string, prefix->prefixlen, as_number); + "Validating Prefix %s from asn %u Result: INVALID", + prefix_string, as_number); return RPKI_INVALID; default: RPKI_DEBUG( - "Validating Prefix %s/%hhu from asn %u Result: CANNOT VALIDATE", - prefix_string, prefix->prefixlen, as_number); + "Validating Prefix %s from asn %u Result: CANNOT VALIDATE", + prefix_string, as_number); break; } return 0; |