summaryrefslogtreecommitdiffstats
path: root/net.c
diff options
context:
space:
mode:
authorVincent Palatin <[email protected]>2011-03-02 17:25:02 -0500
committerBlue Swirl <[email protected]>2011-03-05 12:00:59 +0000
commit60c07d933c66c4b30a83b7ccbc8a0cb3df1b2d0e (patch)
treea60247ab922b1d6a4af7aeb1e636bbc880a9f67c /net.c
parent24ac3a7d4eacea38d514dbf50baa845e5bc6840b (diff)
downloadqemu-kvm-60c07d933c66c4b30a83b7ccbc8a0cb3df1b2d0e.tar.gz
qemu-kvm-60c07d933c66c4b30a83b7ccbc8a0cb3df1b2d0e.tar.bz2
qemu-kvm-60c07d933c66c4b30a83b7ccbc8a0cb3df1b2d0e.zip
net: fix qemu_can_send_packet logic
If any of the clients is not ready to receive (ie it has a can_receive callback and can_receive() returns false), we don't want to start sending, else this client may miss/discard the packet. I got this behaviour with the following setup : the emulated machine is using an USB-ethernet adapter, it is connected to the network using SLIRP and I'm dumping the traffic in a .pcap file. As per the following command line : -net nic,model=usb,vlan=1 -net user,vlan=1 -net dump,vlan=1,file=/tmp/pkt.pcap Every time that two packets are coming in a row from the host, the usb-net code will receive the first one, then returns 0 to can_receive call since it has a 1 packet long queue. But as the dump code is always ready to receive, qemu_can_send_packet will return true and the next packet will discard the previous one in the usb-net code. Signed-off-by: Vincent Palatin <[email protected]> Signed-off-by: Blue Swirl <[email protected]>
Diffstat (limited to 'net.c')
-rw-r--r--net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net.c b/net.c
index ec4745df3..72ac4cf5d 100644
--- a/net.c
+++ b/net.c
@@ -411,11 +411,11 @@ int qemu_can_send_packet(VLANClientState *sender)
}
/* no can_receive() handler, they can always receive */
- if (!vc->info->can_receive || vc->info->can_receive(vc)) {
- return 1;
+ if (vc->info->can_receive && !vc->info->can_receive(vc)) {
+ return 0;
}
}
- return 0;
+ return 1;
}
static ssize_t qemu_deliver_packet(VLANClientState *sender,