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

zebra: changes for code maintainability #15612

Merged
merged 1 commit into from
Apr 14, 2024
+11 −13
Merged

zebra: changes for code maintainability #15612

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
12 changes: 5 additions & 7 deletions zebra/zebra_neigh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ zebra_neigh_new(ifindex_t ifindex, struct ipaddr *ip, struct ethaddr *mac)
n->ifindex = ifindex;
if (mac) {
memcpy(&n->mac, mac, sizeof(*mac));
n->flags |= ZEBRA_NEIGH_ENT_ACTIVE;
SET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);
}

/* Add to rb_tree */
Expand Down Expand Up @@ -118,10 +118,8 @@ static void zebra_neigh_free(struct zebra_neigh_ent *n)
/* if rules are still using the neigh mark it as inactive and
* update the dataplane
*/
if (n->flags & ZEBRA_NEIGH_ENT_ACTIVE) {
n->flags &= ~ZEBRA_NEIGH_ENT_ACTIVE;
memset(&n->mac, 0, sizeof(n->mac));
}
UNSET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);
memset(&n->mac, 0, sizeof(n->mac));
ton31337 marked this conversation as resolved.
Show resolved Hide resolved
zebra_neigh_pbr_rules_update(n);
return;
}
Expand Down Expand Up @@ -181,7 +179,7 @@ void zebra_neigh_add(struct interface *ifp, struct ipaddr *ip,
return;

memcpy(&n->mac, mac, sizeof(*mac));
n->flags |= ZEBRA_NEIGH_ENT_ACTIVE;
SET_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE);

/* update rules linked to the neigh */
zebra_neigh_pbr_rules_update(n);
Expand All @@ -201,7 +199,7 @@ void zebra_neigh_deref(struct zebra_pbr_rule *rule)
rule->action.neigh = NULL;
/* remove rule from the list and free if it is inactive */
list_delete_node(n->pbr_rule_list, &rule->action.neigh_listnode);
if (!(n->flags & ZEBRA_NEIGH_ENT_ACTIVE))
if (!CHECK_FLAG(n->flags, ZEBRA_NEIGH_ENT_ACTIVE))
zebra_neigh_free(n);
}

Expand Down
4 changes: 2 additions & 2 deletions zebra/zebra_netns_id.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define NETLINK_SOCKET_BUFFER_SIZE 512
#define NETLINK_ALIGNTO 4
#define NETLINK_ALIGN(len) \
(((len) + NETLINK_ALIGNTO - 1) & ~(NETLINK_ALIGNTO - 1))
CHECK_FLAG(((len) + NETLINK_ALIGNTO - 1), ~(NETLINK_ALIGNTO - 1))
#define NETLINK_NLATTR_LEN(_a, _b) (unsigned int)((char *)_a - (char *)_b)

#endif /* defined(HAVE_NETLINK) */
Expand All @@ -66,7 +66,7 @@ static struct nlmsghdr *initiate_nlh(char *buf, unsigned int *seq, int type)
nlh->nlmsg_type = type;
nlh->nlmsg_flags = NLM_F_REQUEST;
if (type == RTM_NEWNSID)
nlh->nlmsg_flags |= NLM_F_ACK;
SET_FLAG(nlh->nlmsg_flags, NLM_F_ACK);
nlh->nlmsg_seq = *seq = frr_sequence32_next();
return nlh;
}
Expand Down
4 changes: 2 additions & 2 deletions zebra/zebra_netns_notify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static void zebra_ns_notify_read(struct event *t)
char *netnspath;
struct zebra_netns_info *netnsinfo;

if (!(event->mask & (IN_CREATE | IN_DELETE)))
if (!CHECK_FLAG(event->mask, (IN_CREATE | IN_DELETE)))
continue;

if (offsetof(struct inotify_event, name) + event->len
Expand Down Expand Up @@ -350,7 +350,7 @@ static void zebra_ns_notify_read(struct event *t)
memcpy(event_name, event->name, event->len);
event_name[event->len - 1] = 0;

if (event->mask & IN_DELETE) {
if (CHECK_FLAG(event->mask, IN_DELETE)) {
zebra_ns_delete(event_name);
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions zebra/zebra_nhg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,8 +1795,8 @@ static struct nexthop *nexthop_set_resolved(afi_t afi,
break;
}

if (newhop->flags & NEXTHOP_FLAG_ONLINK)
resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
if (CHECK_FLAG(newhop->flags, NEXTHOP_FLAG_ONLINK))
SET_FLAG(resolved_hop->flags, NEXTHOP_FLAG_ONLINK);

/* Copy labels of the resolved route and the parent resolving to it */
if (policy) {
Expand Down
Loading