vhost build fix for i386

[qemu.git] / slirp / udp.c

diff --git a/slirp/udp.c b/slirp/udp.c
index d6c39b97bef215d57e25063a0cd7dd6b2cd4302a..5b060f397bbb25b88e39f0557b265a11969ed406 100644 (file)
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -41,7 +41,7 @@
 #include <slirp.h>
 #include "ip_icmp.h"
 
-static u_int8_t udp_tos(struct socket *so);
+static uint8_t udp_tos(struct socket *so);
 
 void
 udp_init(Slirp *slirp)
@@ -88,7 +88,7 @@ udp_input(register struct mbuf *m, int iphlen)
         * Make mbuf data length reflect UDP length.
         * If not enough data to reflect UDP length, drop.
         */
-       len = ntohs((u_int16_t)uh->uh_ulen);
+       len = ntohs((uint16_t)uh->uh_ulen);
 
        if (ip->ip_len != len) {
                if (len > ip->ip_len) {
@@ -120,23 +120,26 @@ udp_input(register struct mbuf *m, int iphlen)
         /*
          *  handle DHCP/BOOTP
          */
-        if (ntohs(uh->uh_dport) == BOOTP_SERVER) {
-            bootp_input(m);
-            goto bad;
-        }
-
-        if (slirp->restricted) {
-            goto bad;
-        }
+        if (ntohs(uh->uh_dport) == BOOTP_SERVER &&
+            (ip->ip_dst.s_addr == slirp->vhost_addr.s_addr ||
+             ip->ip_dst.s_addr == 0xffffffff)) {
+                bootp_input(m);
+                goto bad;
+            }
 
         /*
          *  handle TFTP
          */
-        if (ntohs(uh->uh_dport) == TFTP_SERVER) {
+        if (ntohs(uh->uh_dport) == TFTP_SERVER &&
+            ip->ip_dst.s_addr == slirp->vhost_addr.s_addr) {
             tftp_input(m);
             goto bad;
         }
 
+        if (slirp->restricted) {
+            goto bad;
+        }
+
        /*
         * Locate pcb for datagram.
         */
@@ -219,7 +222,7 @@ udp_input(register struct mbuf *m, int iphlen)
 
        return;
 bad:
-       m_freem(m);
+       m_free(m);
        return;
 }
 
@@ -321,7 +324,7 @@ static const struct tos_t udptos[] = {
        {0, 0, 0, 0}
 };
 
-static u_int8_t
+static uint8_t
 udp_tos(struct socket *so)
 {
        int i = 0;
@@ -339,7 +342,7 @@ udp_tos(struct socket *so)
 }
 
 struct socket *
-udp_listen(Slirp *slirp, u_int32_t haddr, u_int hport, u_int32_t laddr,
+udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
            u_int lport, int flags)
 {
        struct sockaddr_in addr;