mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Fix netdev_send() to tap device.

Browse Source 
Commit 76c308b50d "netdev-linux: Support 'send' for netdevs opened with
NETDEV_ETH_TYPE_NONE" broke sending packets to tap devices.  Sending a
packet to a tap device with an AF_PACKET socket causes that packet to be
looped back to be received on the tap device again, which obviously isn't
useful.
This commit is contained in:
Ben Pfaff
2011-04-08 16:34:17 -07:00
parent b981622b84
commit f23347eaf5
1 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/netdev-linux.c
View File

@@ -829,36 +829,49 @@ netdev_linux_drain(struct netdev *netdev_)
static int
netdev_linux_send(struct netdev *netdev_, const void *data, size_t size)
{
struct sockaddr_ll sll;
struct msghdr msg;
struct iovec iov;
int ifindex;
int error;
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;
struct netdev_linux *netdev = netdev_linux_cast(netdev_);
for (;;) {
ssize_t retval = sendmsg(af_packet_sock, &msg, 0);
ssize_t retval;
if (netdev->fd < 0) {
/* Use our AF_PACKET socket to send to this device. */
struct sockaddr_ll sll;
struct msghdr msg;
struct iovec iov;
int ifindex;
int error;
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;
retval = sendmsg(af_packet_sock, &msg, 0);
} else {
/* Use the netdev's own fd to send to this device. This is
* essential for tap devices, because packets sent to a tap device
* with an AF_PACKET socket will loop back to be *received* again
* on the tap device. */
retval = write(netdev->fd, data, size);
}
if (retval < 0) {
/* The Linux AF_PACKET implementation never blocks waiting for room
* for packets, instead returning ENOBUFS. Translate this into