Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bgpd: changes for code maintainability #17040

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −50
Open

bgpd: changes for code maintainability #17040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bgpd/bgp_mplsvpn_snmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,8 +1411,8 @@ static struct bgp_path_info *bgpL3vpnRte_lookup(struct variable *v, oid name[],
break;
}
prefix.prefixlen = (uint8_t)name[i++];
*policy |= name[i++] << 8;
*policy |= name[i++];
SET_FLAG(*policy, name[i++] << 8);
SET_FLAG(*policy, name[i++]);
nexthop_type = name[i++];
switch (nexthop_type) {
case INETADDRESSTYPEUNKNOWN:
Expand Down
16 changes: 7 additions & 9 deletions bgpd/bgp_nexthop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,12 @@ bool bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type,
tmp_addr.p.prefixlen = p->prefixlen;
} else {
/* Here we need to find out which nexthop to be used*/
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP))) {
tmp_addr.p.u.prefix4 = attr->nexthop;
tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
} else if ((attr->mp_nexthop_len)
&& ((attr->mp_nexthop_len
== BGP_ATTR_NHLEN_IPV4)
|| (attr->mp_nexthop_len
== BGP_ATTR_NHLEN_VPNV4))) {
} else if ((attr->mp_nexthop_len) &&
((attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV4) ||
(attr->mp_nexthop_len == BGP_ATTR_NHLEN_VPNV4))) {
tmp_addr.p.u.prefix4 =
attr->mp_nexthop_global_in;
tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
Expand Down Expand Up @@ -564,11 +562,11 @@ bool bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type,
memset(&tmp_tip, 0, sizeof(tmp_tip));
tmp_tip.addr = attr->nexthop;

if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP))) {
tmp_tip.addr = attr->nexthop;
} else if ((attr->mp_nexthop_len) &&
((attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV4)
|| (attr->mp_nexthop_len == BGP_ATTR_NHLEN_VPNV4))) {
((attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV4) ||
(attr->mp_nexthop_len == BGP_ATTR_NHLEN_VPNV4))) {
tmp_tip.addr = attr->mp_nexthop_global_in;
}

Expand Down
68 changes: 29 additions & 39 deletions bgpd/bgp_packet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2935,35 +2935,31 @@ static int bgp_route_refresh_receive(struct peer_connection *connection,
if (bgp_debug_neighbor_events(peer)) {
char buf[INET6_BUFSIZ];

zlog_debug(
"%pBP rcvd %s %s seq %u %s/%d ge %d le %d%s",
peer,
(common & ORF_COMMON_PART_REMOVE
? "Remove"
: "Add"),
(common & ORF_COMMON_PART_DENY
? "deny"
: "permit"),
orfp.seq,
inet_ntop(
orfp.p.family,
&orfp.p.u.prefix,
buf,
INET6_BUFSIZ),
orfp.p.prefixlen,
orfp.ge, orfp.le,
ok ? "" : " MALFORMED");
zlog_debug("%pBP rcvd %s %s seq %u %s/%d ge %d le %d%s",
peer,
(CHECK_FLAG(common, ORF_COMMON_PART_REMOVE)
? "Remove"
: "Add"),
(CHECK_FLAG(common, ORF_COMMON_PART_DENY)
? "deny"
: "permit"),
orfp.seq,
inet_ntop(orfp.p.family, &orfp.p.u.prefix,
buf, INET6_BUFSIZ),
orfp.p.prefixlen, orfp.ge, orfp.le,
ok ? "" : " MALFORMED");
}

if (ok)
ret = prefix_bgp_orf_set(
name, afi, &orfp,
(common & ORF_COMMON_PART_DENY
? 0
: 1),
(common & ORF_COMMON_PART_REMOVE
? 0
: 1));
ret = prefix_bgp_orf_set(name, afi, &orfp,
(CHECK_FLAG(common,
ORF_COMMON_PART_DENY)
? 0
: 1),
(CHECK_FLAG(common,
ORF_COMMON_PART_REMOVE)
? 0
: 1));

if (!ok || (ok && ret != CMD_SUCCESS)) {
zlog_info(
Expand Down Expand Up @@ -3190,17 +3186,11 @@ static void bgp_dynamic_capability_addpath(uint8_t *pnt, int action,

if (bgp_debug_neighbor_events(peer))
zlog_debug("%s OPEN has %s capability for afi/safi: %s/%s%s%s",
peer->host,
lookup_msg(capcode_str, hdr->code,
NULL),
iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi),
(bac.flags & BGP_ADDPATH_RX)
? ", receive"
: "",
(bac.flags & BGP_ADDPATH_TX)
? ", transmit"
: "");
peer->host, lookup_msg(capcode_str, hdr->code, NULL),
iana_afi2str(pkt_afi), iana_safi2str(pkt_safi),
CHECK_FLAG(bac.flags, BGP_ADDPATH_RX) ? ", receive" : "",
CHECK_FLAG(bac.flags, BGP_ADDPATH_TX) ? ", transmit"
: "");

if (bgp_map_afi_safi_iana2int(pkt_afi, pkt_safi, &afi,
&safi)) {
Expand Down Expand Up @@ -3578,8 +3568,8 @@ static void bgp_dynamic_capability_llgr(uint8_t *pnt, int action,
uint8_t *stale_time_ptr = data + 4;

stale_time = stale_time_ptr[0] << 16;
stale_time |= stale_time_ptr[1] << 8;
stale_time |= stale_time_ptr[2];
SET_FLAG(stale_time, stale_time_ptr[1] << 8);
SET_FLAG(stale_time, stale_time_ptr[2]);

if (bgp_map_afi_safi_iana2int(pkt_afi, pkt_safi, &afi,
&safi)) {
Expand Down
Loading