Fix regression: -netspeed <speed> and -netdelay <latency> didn't work.
The bug was introduced in a past integration patch that moved code from vl.c
to net-android.c
Change-Id: I5415c27959da396975b51bcf047399a9781ccd8a
diff --git a/net-android.c b/net-android.c
index d208cd6..8649b82 100644
--- a/net-android.c
+++ b/net-android.c
@@ -750,7 +750,13 @@
int slirp_can_output(void)
{
+#ifdef CONFIG_SHAPER
+ return !slirp_vc ||
+ ( netshaper_can_send(slirp_shaper_out) &&
+ qemu_can_send_packet(slirp_vc) );
+#else
return !slirp_vc || qemu_can_send_packet(slirp_vc);
+#endif
}
void slirp_output(const uint8_t *pkt, int pkt_len)
@@ -764,7 +770,12 @@
if (!slirp_vc)
return;
+
+#ifdef CONFIG_SHAPER
+ netshaper_send(slirp_shaper_out, (void*)pkt, pkt_len);
+#else
qemu_send_packet(slirp_vc, pkt, pkt_len);
+#endif
}
int slirp_is_inited(void)
@@ -781,7 +792,11 @@
if (qemu_tcpdump_active)
qemu_tcpdump_packet(buf, size);
+#ifdef CONFIG_SHAPER
+ netshaper_send(slirp_shaper_in, (char*)buf, size);
+#else
slirp_input(buf, size);
+#endif
return size;
}