proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 07:03:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6578 from ton31337/fix/constants

Browse Source 
bgpd: Use constants for nexthop length instead of just numbers
This commit is contained in:
Sri Mohana Singamsetty 2020-06-14 15:00:50 -07:00 committed by GitHub
commit 1a5fc72066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgpd/bgp_updgrp_packet.c
View File

@ -493,7 +493,8 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
PAF_SUBGRP(paf)->update_group->id, PAF_SUBGRP(paf)->update_group->id,
PAF_SUBGRP(paf)->id, peer->host, PAF_SUBGRP(paf)->id, peer->host,
inet_ntoa(*mod_v4nh), inet_ntoa(*mod_v4nh),
(nhlen == 12 ? " and RD" : "")); (nhlen == BGP_ATTR_NHLEN_VPNV4 ? " and RD"
: ""));
} else if (nhafi == AFI_IP6) { } else if (nhafi == AFI_IP6) {
struct in6_addr v6nhglobal, *mod_v6nhg; struct in6_addr v6nhglobal, *mod_v6nhg;
struct in6_addr v6nhlocal, *mod_v6nhl; struct in6_addr v6nhlocal, *mod_v6nhl;
@ -590,7 +591,8 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
stream_put_in6_addr_at(s, offset_nhlocal, mod_v6nhl); stream_put_in6_addr_at(s, offset_nhlocal, mod_v6nhl);
if (bgp_debug_update(peer, NULL, NULL, 0)) { if (bgp_debug_update(peer, NULL, NULL, 0)) {
if (nhlen == 32 || nhlen == 48) if (nhlen == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL
|| nhlen == BGP_ATTR_NHLEN_VPNV6_GLOBAL_AND_LL)
zlog_debug( zlog_debug(
"u%" PRIu64 ":s%" PRIu64 "u%" PRIu64 ":s%" PRIu64
" %s send UPDATE w/ mp_nexthops %s, %s%s", " %s send UPDATE w/ mp_nexthops %s, %s%s",
@ -600,7 +602,9 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
BUFSIZ), BUFSIZ),
inet_ntop(AF_INET6, mod_v6nhl, buf2, inet_ntop(AF_INET6, mod_v6nhl, buf2,
BUFSIZ), BUFSIZ),
(nhlen == 48 ? " and RD" : "")); (nhlen == BGP_ATTR_NHLEN_VPNV6_GLOBAL_AND_LL
? " and RD"
: ""));
else else
zlog_debug("u%" PRIu64 ":s%" PRIu64 zlog_debug("u%" PRIu64 ":s%" PRIu64
" %s send UPDATE w/ mp_nexthop %s%s", " %s send UPDATE w/ mp_nexthop %s%s",
@ -608,7 +612,9 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
PAF_SUBGRP(paf)->id, peer->host, PAF_SUBGRP(paf)->id, peer->host,
inet_ntop(AF_INET6, mod_v6nhg, buf, inet_ntop(AF_INET6, mod_v6nhg, buf,
BUFSIZ), BUFSIZ),
(nhlen == 24 ? " and RD" : "")); (nhlen == BGP_ATTR_NHLEN_VPNV6_GLOBAL
? " and RD"
: ""));
} }
} else if (paf->afi == AFI_L2VPN) { } else if (paf->afi == AFI_L2VPN) {
struct in_addr v4nh, *mod_v4nh; struct in_addr v4nh, *mod_v4nh;