summaryrefslogtreecommitdiff
path: root/qemu
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2019-07-31 08:14:18 -0400
committerReinhard Tartler <siretart@tauware.de>2019-07-31 08:14:18 -0400
commitc8b43eee2d4982826d293781d37aebd5a385c8de (patch)
treeb14767184782a5d32ee7d11c68903ad84f02d5b5 /qemu
parent3925631f27136b690f806464227497af42cb529d (diff)
New upstream version 0.3.1
Diffstat (limited to 'qemu')
-rw-r--r--qemu/README.md6
-rw-r--r--qemu/slirp/src/ip_icmp.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/qemu/README.md b/qemu/README.md
index aaeb1e7..9592b5b 100644
--- a/qemu/README.md
+++ b/qemu/README.md
@@ -3,9 +3,9 @@
This directory was synced from QEMU `49fc899f8d673dd9e73f3db0d9e9ea60b77c331b` (`https://github.com/qemu/qemu.git`),
with the following patches (sha256sum):
```
-6bed7e4f10c4d462a84656b08441a740fb86c31a0b5394e4c89c06f6a8f44827 0001-slirp-add-slirp_initx-SlirpConfig-SlirpCb-void.patch
-ec3aaabaee978867456e245eaa2353e43dbdb64e1a4dbd5a1b6070176dfd581f 0002-slirp-allow-custom-MTU.patch
-a55b85550b07be4f99710ff6e9baa63294a33924f275c5be18f771736a9dcc56 0003-slirp-add-disable_host_loopback-prohibit-connections.patch
+11dd49c9d594c1f3194e2e04d4a03e39d52d2f1cfc1478621fe439792b0135b8 0001-slirp-add-slirp_initx-SlirpConfig-SlirpCb-void.patch
+5e884ab4a471c1360e24c364379f069ace17d34b7cec6df084f8221d5a6a585f 0002-slirp-allow-custom-MTU.patch
+ff5b0fc69291aa7fe23337044245a5709f13e843ade734bf63c77a533f663a0b 0003-slirp-add-disable_host_loopback-prohibit-connections.patch
```
Please do not edit the contents under this directory manually.
diff --git a/qemu/slirp/src/ip_icmp.c b/qemu/slirp/src/ip_icmp.c
index 5a7b9a6..b0f116d 100644
--- a/qemu/slirp/src/ip_icmp.c
+++ b/qemu/slirp/src/ip_icmp.c
@@ -192,6 +192,7 @@ icmp_input(struct mbuf *m, int hlen)
if (sotranslate_out(so, &addr) < 0) {
icmp_send_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
udp_detach(so);
+ return;
}
if(sendto(so->s, icmp_ping_msg, strlen(icmp_ping_msg), 0,