mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

netlink-socket: add support for nl_lookup_genl_mcgroup()

Browse Source 
While we work out whether nl_sock_join_mcgroup() will be the mechanism
to support VPORT events, it is easy to add support for
nl_lookup_genl_mcgroup() and make progress on the other commands.

In this patch, we implement support for nl_lookup_genl_mcgroup() only
for the VPORT family though, which is all what dpif-linux.c needs.

Validation:
- A ported dpif-linux.c with epoll code commented out went so far as
to call dp_enumerate! DP Dump commands can be implemented next.

Signed-off-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Nithin Raju
2014-08-26 20:17:03 -07:00
committed by Ben Pfaff
parent bbb5e7e2b6
commit 4c484aca0d
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/netlink-socket.c
View File

@@ -1172,16 +1172,20 @@ do_lookup_genl_family(const char *name, struct nlattr **attrs,
struct ofpbuf **replyp) struct ofpbuf **replyp)
{ {
struct nl_sock *sock; struct nl_sock *sock;
struct nlmsghdr *nlmsg;
struct ofpbuf *reply; struct ofpbuf *reply;
int error; int error;
uint16_t family_id; uint16_t family_id;
const char *family_name; const char *family_name;
uint32_t family_version; uint32_t family_version;
uint32_t family_attrmax; uint32_t family_attrmax;
uint32_t mcgrp_id = OVS_WIN_NL_INVALID_MCGRP_ID;
const char *mcgrp_name = NULL;
*replyp = NULL; *replyp = NULL;
reply = ofpbuf_new(1024); reply = ofpbuf_new(1024);
/* CTRL_ATTR_MCAST_GROUPS is supported only for VPORT family. */
if (!strcmp(name, OVS_WIN_CONTROL_FAMILY)) { if (!strcmp(name, OVS_WIN_CONTROL_FAMILY)) {
family_id = OVS_WIN_NL_CTRL_FAMILY_ID; family_id = OVS_WIN_NL_CTRL_FAMILY_ID;
family_name = OVS_WIN_CONTROL_FAMILY; family_name = OVS_WIN_CONTROL_FAMILY;
@@ -1202,6 +1206,8 @@ do_lookup_genl_family(const char *name, struct nlattr **attrs,
family_name = OVS_VPORT_FAMILY; family_name = OVS_VPORT_FAMILY;
family_version = OVS_VPORT_VERSION; family_version = OVS_VPORT_VERSION;
family_attrmax = OVS_VPORT_ATTR_MAX; family_attrmax = OVS_VPORT_ATTR_MAX;
mcgrp_id = OVS_WIN_NL_VPORT_MCGRP_ID;
mcgrp_name = OVS_VPORT_MCGROUP;
} else if (!strcmp(name, OVS_FLOW_FAMILY)) { } else if (!strcmp(name, OVS_FLOW_FAMILY)) {
family_id = OVS_WIN_NL_FLOW_FAMILY_ID; family_id = OVS_WIN_NL_FLOW_FAMILY_ID;
family_name = OVS_FLOW_FAMILY; family_name = OVS_FLOW_FAMILY;
@@ -1221,6 +1227,21 @@ do_lookup_genl_family(const char *name, struct nlattr **attrs,
nl_msg_put_u32(reply, CTRL_ATTR_VERSION, family_version); nl_msg_put_u32(reply, CTRL_ATTR_VERSION, family_version);
nl_msg_put_u32(reply, CTRL_ATTR_MAXATTR, family_attrmax); nl_msg_put_u32(reply, CTRL_ATTR_MAXATTR, family_attrmax);
if (mcgrp_id != OVS_WIN_NL_INVALID_MCGRP_ID) {
size_t mcgrp_ofs1 = nl_msg_start_nested(reply, CTRL_ATTR_MCAST_GROUPS);
size_t mcgrp_ofs2= nl_msg_start_nested(reply,
OVS_WIN_NL_VPORT_MCGRP_ID - OVS_WIN_NL_MCGRP_START_ID);
nl_msg_put_u32(reply, CTRL_ATTR_MCAST_GRP_ID, mcgrp_id);
ovs_assert(mcgrp_name != NULL);
nl_msg_put_string(reply, CTRL_ATTR_MCAST_GRP_NAME, mcgrp_name);
nl_msg_end_nested(reply, mcgrp_ofs2);
nl_msg_end_nested(reply, mcgrp_ofs1);
}
/* Set the total length of the netlink message. */
nlmsg = nl_msg_nlmsghdr(reply);
nlmsg->nlmsg_len = ofpbuf_size(reply);
if (!nl_policy_parse(reply, NLMSG_HDRLEN + GENL_HDRLEN, if (!nl_policy_parse(reply, NLMSG_HDRLEN + GENL_HDRLEN,
family_policy, attrs, ARRAY_SIZE(family_policy)) family_policy, attrs, ARRAY_SIZE(family_policy))
|| nl_attr_get_u16(attrs[CTRL_ATTR_FAMILY_ID]) == 0) { || nl_attr_get_u16(attrs[CTRL_ATTR_FAMILY_ID]) == 0) {