mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 23:35:27 +00:00
Code Issues Releases Wiki Activity

Netlink_socket.c Join/Unjoin an MC group for event subscription

Browse Source 
Use a specific out of band device control to subscribe/unsubscribe a socket
to the driver event queue for notification.

Signed-off-by: Eitan Eliahu <eliahue@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Acked-by: Saurabh Shah <ssaurabh@vmware.com>
Acked-by: Ankur Sharma <ankursharma@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Eitan Eliahu
2014-09-11 10:01:02 -07:00
committed by Ben Pfaff
parent 988672a76f
commit b8f958eaf3
2 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datapath-windows/include/OvsDpInterfaceExt.h
View File

@@ -70,7 +70,14 @@
/* Commands available under the OVS_WIN_CONTROL_FAMILY. */ /* Commands available under the OVS_WIN_CONTROL_FAMILY. */
enum ovs_win_control_cmd { enum ovs_win_control_cmd {
OVS_CTRL_CMD_WIN_GET_PID, OVS_CTRL_CMD_WIN_GET_PID,
OVS_CTRL_CMD_WIN_PEND_REQ OVS_CTRL_CMD_WIN_PEND_REQ,
OVS_CTRL_CMD_MC_SUBSCRIBE_REQ,
};
/* NL Attributes for joining/unjoining an MC group */
enum ovs_nl_mcast_attr {
OVS_NL_ATTR_MCAST_GRP, /* (UINT32) Join an MC group */
OVS_NL_ATTR_MCAST_JOIN, /* (UINT8) 1/0 - Join/Unjoin */
}; };
#endif /* __OVS_DP_INTERFACE_EXT_H_ */ #endif /* __OVS_DP_INTERFACE_EXT_H_ */

82
lib/netlink-socket.c
View File

@@ -332,6 +332,33 @@ done:
} }
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef _WIN32
static int __inline
nl_sock_mcgroup(struct nl_sock *sock, unsigned int multicast_group, bool join)
{
struct ofpbuf request;
uint64_t request_stub[128];
struct ovs_header *ovs_header;
struct nlmsghdr *nlmsg;
int error;
ofpbuf_use_stub(&request, request_stub, sizeof request_stub);
nl_msg_put_genlmsghdr(&request, 0, OVS_WIN_NL_CTRL_FAMILY_ID, 0,
OVS_CTRL_CMD_MC_SUBSCRIBE_REQ,
OVS_WIN_CONTROL_VERSION);
ovs_header = ofpbuf_put_uninit(&request, sizeof *ovs_header);
ovs_header->dp_ifindex = 0;
nl_msg_put_u32(&request, OVS_NL_ATTR_MCAST_GRP, multicast_group);
nl_msg_put_u8(&request, OVS_NL_ATTR_MCAST_JOIN, join ? 1 : 0);
error = nl_sock_send(sock, &request, true);
ofpbuf_uninit(&request);
return error;
}
#endif
/* Tries to add 'sock' as a listener for 'multicast_group'. Returns 0 if /* Tries to add 'sock' as a listener for 'multicast_group'. Returns 0 if
* successful, otherwise a positive errno value. * successful, otherwise a positive errno value.
* *
@@ -347,31 +374,12 @@ int
nl_sock_join_mcgroup(struct nl_sock *sock, unsigned int multicast_group) nl_sock_join_mcgroup(struct nl_sock *sock, unsigned int multicast_group)
{ {
#ifdef _WIN32 #ifdef _WIN32
#define OVS_VPORT_MCGROUP_FALLBACK_ID 33 int error = nl_sock_mcgroup(sock, multicast_group, true);
struct ofpbuf msg_buf; if (error) {
struct message_multicast VLOG_WARN("could not join multicast group %u (%s)",
{ multicast_group, ovs_strerror(errno));
struct nlmsghdr; return errno;
/* if true, join; if else, leave */ }
unsigned char join;
unsigned int groupId;
};
struct message_multicast msg = { 0 };
msg.nlmsg_len = sizeof(struct message_multicast);
msg.nlmsg_type = OVS_VPORT_MCGROUP_FALLBACK_ID;
msg.nlmsg_flags = 0;
msg.nlmsg_seq = 0;
msg.nlmsg_pid = sock->pid;
msg.join = 1;
msg.groupId = multicast_group;
msg_buf.base_ = &msg;
msg_buf.data_ = &msg;
msg_buf.size_ = msg.nlmsg_len;
nl_sock_send__(sock, &msg_buf, msg.nlmsg_seq, 0);
#else #else
if (setsockopt(sock->fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, if (setsockopt(sock->fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP,
&multicast_group, sizeof multicast_group) < 0) { &multicast_group, sizeof multicast_group) < 0) {
@@ -397,24 +405,12 @@ int
nl_sock_leave_mcgroup(struct nl_sock *sock, unsigned int multicast_group) nl_sock_leave_mcgroup(struct nl_sock *sock, unsigned int multicast_group)
{ {
#ifdef _WIN32 #ifdef _WIN32
struct ofpbuf msg_buf; int error = nl_sock_mcgroup(sock, multicast_group, false);
struct message_multicast if (error) {
{ VLOG_WARN("could not leave multicast group %u (%s)",
struct nlmsghdr; multicast_group, ovs_strerror(errno));
/* if true, join; if else, leave*/ return errno;
unsigned char join; }
};
struct message_multicast msg = { 0 };
nl_msg_put_nlmsghdr(&msg, sizeof(struct message_multicast),
multicast_group, 0);
msg.join = 0;
msg_buf.base_ = &msg;
msg_buf.data_ = &msg;
msg_buf.size_ = msg.nlmsg_len;
nl_sock_send__(sock, &msg_buf, msg.nlmsg_seq, 0);
#else #else
if (setsockopt(sock->fd, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP, if (setsockopt(sock->fd, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP,
&multicast_group, sizeof multicast_group) < 0) { &multicast_group, sizeof multicast_group) < 0) {