mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 14:55:18 +00:00
Code Issues Releases Wiki Activity

route-table: Split header and attribute parsing.

Browse Source 
In a subsequent patch we will introduce support for handling the
RTA_MULTIPATH attribute.

The RTA_MULTIPATH attribute is a nested attribute containing
another set of route attributes.  There is some overlap of netlink
policy for parsing both sets of attributes.

Consequently we would want to reuse the code for parsing these
attributes, and splitting up the function allows us to do this in
a subsequent patch.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Frode Nordahl
2025-01-13 21:45:36 +01:00
committed by Ilya Maximets
parent 78d10bdc31
commit 71785737de
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/route-table.c
View File

@@ -225,9 +225,10 @@ route_table_reset(void)
/* Return RTNLGRP_IPV4_ROUTE or RTNLGRP_IPV6_ROUTE on success, 0 on parse
* error. */
static int
route_table_parse(struct ofpbuf *buf, void *change_)
route_table_parse__(struct ofpbuf *buf, size_t ofs,
const struct nlmsghdr *nlmsg,
const struct rtmsg *rtm, struct route_table_msg *change)
{
struct route_table_msg *change = change_;
bool parsed, ipv4 = false;
static const struct nl_policy policy[] = {
@@ -251,28 +252,22 @@ route_table_parse(struct ofpbuf *buf, void *change_)
};
struct nlattr *attrs[ARRAY_SIZE(policy)];
const struct rtmsg *rtm;
rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
if (rtm->rtm_family == AF_INET) {
parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
policy, attrs, ARRAY_SIZE(policy));
parsed = nl_policy_parse(buf, ofs, policy, attrs,
ARRAY_SIZE(policy));
ipv4 = true;
} else if (rtm->rtm_family == AF_INET6) {
parsed = nl_policy_parse(buf, NLMSG_HDRLEN + sizeof(struct rtmsg),
policy6, attrs, ARRAY_SIZE(policy6));
parsed = nl_policy_parse(buf, ofs, policy6, attrs,
ARRAY_SIZE(policy6));
} else {
VLOG_DBG_RL(&rl, "received non AF_INET rtnetlink route message");
return 0;
}
if (parsed) {
const struct nlmsghdr *nlmsg;
int rta_oif; /* Output interface index. */
nlmsg = buf->data;
memset(change, 0, sizeof *change);
change->relevant = true;
@@ -355,6 +350,19 @@ route_table_parse(struct ofpbuf *buf, void *change_)
return ipv4 ? RTNLGRP_IPV4_ROUTE : RTNLGRP_IPV6_ROUTE;
}
static int
route_table_parse(struct ofpbuf *buf, void *change)
{
struct nlmsghdr *nlmsg;
struct rtmsg *rtm;
nlmsg = ofpbuf_at(buf, 0, NLMSG_HDRLEN);
rtm = ofpbuf_at(buf, NLMSG_HDRLEN, sizeof *rtm);
return route_table_parse__(buf, NLMSG_HDRLEN + sizeof *rtm,
nlmsg, rtm, change);
}
static bool
is_standard_table_id(uint32_t table_id)
{