mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Use underlying tap device on netdev_linux_listen().

Browse Source 
Commit acf608 (ofproto-dpif: Use a single underlying datapath across
multiple bridges.) broke connectivity to userspace datapath devices.
The code assumed the first caller to open a tap device with
netdev_linux_open() wanted to write to it.  This commit moves that logic
to when netdev_linux_listen() is called.

Thanks to Ben Pfaff for helping debug the issue.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Reported-by: Simon Horman <horms@verge.net.au>
Tested-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Justin Pettit
2012-12-05 17:02:48 -08:00
parent 2520f45287
commit 33d82a56df
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/netdev-linux.c
View File

@@ -743,7 +743,6 @@ netdev_linux_destroy(struct netdev_dev *netdev_dev_)
static int
netdev_linux_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
{
struct netdev_dev_linux *netdev_dev = netdev_dev_linux_cast(netdev_dev_);
struct netdev_linux *netdev;
enum netdev_flags flags;
int error;
@@ -768,17 +767,6 @@ netdev_linux_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
}
}
if (!strcmp(netdev_dev_get_type(netdev_dev_), "tap") &&
!netdev_dev->state.tap.opened) {
/* We assume that the first user of the tap device is the primary user
* and give them the tap FD. Subsequent users probably just expect
* this to be a system device so open it normally to avoid send/receive
* directions appearing to be reversed. */
netdev->fd = netdev_dev->state.tap.fd;
netdev_dev->state.tap.opened = true;
}
*netdevp = &netdev->netdev;
return 0;
@@ -803,6 +791,8 @@ static int
netdev_linux_listen(struct netdev *netdev_)
{
struct netdev_linux *netdev = netdev_linux_cast(netdev_);
struct netdev_dev_linux *netdev_dev =
netdev_dev_linux_cast(netdev_get_dev(netdev_));
struct sockaddr_ll sll;
int ifindex;
int error;
@@ -812,6 +802,13 @@ netdev_linux_listen(struct netdev *netdev_)
return 0;
}
if (!strcmp(netdev_get_type(netdev_), "tap")
&& !netdev_dev->state.tap.opened) {
netdev->fd = netdev_dev->state.tap.fd;
netdev_dev->state.tap.opened = true;
return 0;
}
/* Create file descriptor. */
fd = socket(PF_PACKET, SOCK_RAW, 0);
if (fd < 0) {