pc: acpi: SRAT: create only valid processor lapic entries

[qemu.git] / slirp / udp.c

diff --git a/slirp/udp.c b/slirp/udp.c
index 7a5c95b6f470be955cc7eebff91c89fb54ba3861..6b39cab0c65cd45dcad5a4eb8ef15dce1dfece25 100644 (file)
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -38,6 +38,7 @@
  * terms and conditions of the copyright.
  */
 
+#include "qemu/osdep.h"
 #include <slirp.h>
 #include "ip_icmp.h"
 
@@ -70,6 +71,8 @@ udp_input(register struct mbuf *m, int iphlen)
        int len;
        struct ip save_ip;
        struct socket *so;
+       struct sockaddr_storage lhost;
+       struct sockaddr_in *lhost4;
 
        DEBUG_CALL("udp_input");
        DEBUG_ARG("m = %p", m);
@@ -151,25 +154,12 @@ udp_input(register struct mbuf *m, int iphlen)
        /*
         * Locate pcb for datagram.
         */
-       so = slirp->udp_last_so;
-       if (so == &slirp->udb || so->so_lport != uh->uh_sport ||
-           so->so_laddr.s_addr != ip->ip_src.s_addr) {
-               struct socket *tmp;
-
-               for (tmp = slirp->udb.so_next; tmp != &slirp->udb;
-                    tmp = tmp->so_next) {
-                       if (tmp->so_lport == uh->uh_sport &&
-                           tmp->so_laddr.s_addr == ip->ip_src.s_addr) {
-                               so = tmp;
-                               break;
-                       }
-               }
-               if (tmp == &slirp->udb) {
-                 so = NULL;
-               } else {
-                 slirp->udp_last_so = so;
-               }
-       }
+       lhost.ss_family = AF_INET;
+       lhost4 = (struct sockaddr_in *) &lhost;
+       lhost4->sin_addr = ip->ip_src;
+       lhost4->sin_port = uh->uh_sport;
+
+       so = solookup(&slirp->udp_last_so, &slirp->udb, &lhost, NULL);
 
        if (so == NULL) {
          /*
@@ -180,7 +170,7 @@ udp_input(register struct mbuf *m, int iphlen)
          if (!so) {
              goto bad;
          }
-         if(udp_attach(so) == -1) {
+         if (udp_attach(so, AF_INET) == -1) {
            DEBUG_MISC((dfd," udp_attach errno = %d-%s\n",
                        errno,strerror(errno)));
            sofree(so);
@@ -236,7 +226,7 @@ bad:
        m_free(m);
 }
 
-int udp_output2(struct socket *so, struct mbuf *m,
+int udp_output(struct socket *so, struct mbuf *m,
                 struct sockaddr_in *saddr, struct sockaddr_in *daddr,
                 int iptos)
 {
@@ -287,35 +277,11 @@ int udp_output2(struct socket *so, struct mbuf *m,
        return (error);
 }
 
-int udp_output(struct socket *so, struct mbuf *m,
-               struct sockaddr_in *addr)
-
-{
-    Slirp *slirp = so->slirp;
-    struct sockaddr_in saddr, daddr;
-
-    saddr = *addr;
-    if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
-        slirp->vnetwork_addr.s_addr) {
-        uint32_t inv_mask = ~slirp->vnetwork_mask.s_addr;
-
-        if ((so->so_faddr.s_addr & inv_mask) == inv_mask) {
-            saddr.sin_addr = slirp->vhost_addr;
-        } else if (addr->sin_addr.s_addr == loopback_addr.s_addr ||
-                   so->so_faddr.s_addr != slirp->vhost_addr.s_addr) {
-            saddr.sin_addr = so->so_faddr;
-        }
-    }
-    daddr.sin_addr = so->so_laddr;
-    daddr.sin_port = so->so_lport;
-
-    return udp_output2(so, m, &saddr, &daddr, so->so_iptos);
-}
-
 int
-udp_attach(struct socket *so)
+udp_attach(struct socket *so, unsigned short af)
 {
-  if((so->s = qemu_socket(AF_INET,SOCK_DGRAM,0)) != -1) {
+  so->s = qemu_socket(af, SOCK_DGRAM, 0);
+  if (so->s != -1) {
     so->so_expire = curtime + SO_EXPIRE;
     insque(so, &so->slirp->udb);
   }
@@ -378,14 +344,8 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
        socket_set_fast_reuse(so->s);
 
        getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
-       so->so_ffamily = AF_INET;
-       so->so_fport = addr.sin_port;
-       if (addr.sin_addr.s_addr == 0 ||
-           addr.sin_addr.s_addr == loopback_addr.s_addr) {
-          so->so_faddr = slirp->vhost_addr;
-       } else {
-          so->so_faddr = addr.sin_addr;
-       }
+       so->fhost.sin = addr;
+       sotranslate_accept(so);
        so->so_lfamily = AF_INET;
        so->so_lport = lport;
        so->so_laddr.s_addr = laddr;