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

netdev-linux: Support 'send' for netdevs opened with NETDEV_ETH_TYPE_NONE.

Browse Source 
The new implementation of the bonding code expects to be able to
send packets using netdev_send().  This makes it possible for
Linux netdevs.
This commit is contained in:
Ben Pfaff
2011-04-01 09:22:39 -07:00
parent d61113d992
commit 76c308b50d
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/netdev-linux.c
View File

@@ -368,8 +368,9 @@ struct netdev_linux {
int fd;
};
/* An AF_INET socket (used for ioctl operations). */
static int af_inet_sock = -1;
/* Sockets used for ioctl operations. */
static int af_inet_sock = -1; /* AF_INET, SOCK_DGRAM. */
static int af_packet_sock = -1; /* AF_PACKET, SOCK_RAW. */
/* A Netlink routing socket that is not subscribed to any multicast groups. */
static struct nl_sock *rtnl_sock;
@@ -443,6 +444,14 @@ netdev_linux_init(void)
status = af_inet_sock >= 0 ? 0 : errno;
if (status) {
VLOG_ERR("failed to create inet socket: %s", strerror(status));
} else {
/* Create AF_PACKET socket. */
af_packet_sock = socket(AF_PACKET, SOCK_RAW, 0);
status = af_packet_sock >= 0 ? 0 : errno;
if (status) {
VLOG_ERR("failed to create packet socket: %s",
strerror(status));
}
}
/* Create rtnetlink socket. */
@@ -819,16 +828,36 @@ netdev_linux_drain(struct netdev *netdev_)
static int
netdev_linux_send(struct netdev *netdev_, const void *data, size_t size)
{
struct netdev_linux *netdev = netdev_linux_cast(netdev_);
struct sockaddr_ll sll;
struct msghdr msg;
struct iovec iov;
int ifindex;
int error;
/* XXX should support sending even if 'ethertype' was NETDEV_ETH_TYPE_NONE.
*/
if (netdev->fd < 0) {
return EPIPE;
error = get_ifindex(netdev_, &ifindex);
if (error) {
return error;
}
/* We don't bother setting most fields in sockaddr_ll because the kernel
* ignores them for SOCK_RAW. */
memset(&sll, 0, sizeof sll);
sll.sll_family = AF_PACKET;
sll.sll_ifindex = ifindex;
iov.iov_base = (void *) data;
iov.iov_len = size;
msg.msg_name = &sll;
msg.msg_namelen = sizeof sll;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
for (;;) {
ssize_t retval = write(netdev->fd, data, size);
ssize_t retval = sendmsg(af_packet_sock, &msg, 0);
if (retval < 0) {
/* The Linux AF_PACKET implementation never blocks waiting for room
* for packets, instead returning ENOBUFS. Translate this into

3
lib/netdev-provider.h
View File

@@ -210,7 +210,8 @@ struct netdev_class {
* transmission through this interface. This function may be set to null
* if it would always return EOPNOTSUPP anyhow. (This will prevent the
* network device from being usefully used by the netdev-based "userspace
* datapath".) */
* datapath". It will also prevent the OVS implementation of bonding from
* working properly over 'netdev'.) */
int (*send)(struct netdev *netdev, const void *buffer, size_t size);
/* Registers with the poll loop to wake up from the next call to