slirp: Add sockaddr_equal, make solookup family-agnostic

This patch makes solookup() compatible with varying address
families, by using a new sockaddr_equal() function that compares
two sockaddr_storage.

This prepares for IPv6 support.

Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>

4 files changed, 51 insertions, 21 deletions

diff --git a/socket.c b/socket.c
index be51191..6f62c09 100644
--- a/socket.c
+++ b/socket.c
@@ -16,23 +16,20 @@ static void sofcantrcvmore(struct socket *so);
 static void sofcantsendmore(struct socket *so);
 
 struct socket *solookup(struct socket **last, struct socket *head,
-                        struct in_addr laddr, u_int lport, struct in_addr faddr,
-                        u_int fport)
+                        struct sockaddr_storage *lhost,
+                        struct sockaddr_storage *fhost)
 {
     struct socket *so = *last;
 
     /* Optimisation */
-    if (so != head && so->so_lport == lport &&
-        so->so_laddr.s_addr == laddr.s_addr &&
-        (!faddr.s_addr ||
-         (so->so_faddr.s_addr == faddr.s_addr && so->so_fport == fport))) {
+    if (so != head && sockaddr_equal(&(so->lhost.ss), lhost) &&
+        (!fhost || sockaddr_equal(&so->fhost.ss, fhost))) {
         return so;
     }
 
     for (so = head->so_next; so != head; so = so->so_next) {
-        if (so->so_lport == lport && so->so_laddr.s_addr == laddr.s_addr &&
-            (!faddr.s_addr ||
-             (so->so_faddr.s_addr == faddr.s_addr && so->so_fport == fport))) {
+        if (sockaddr_equal(&(so->lhost.ss), lhost) &&
+            (!fhost || sockaddr_equal(&so->fhost.ss, fhost))) {
             *last = so;
             return so;
         }
diff --git a/socket.h b/socket.h
index 6b7d081..873c7fb 100644
--- a/socket.h
+++ b/socket.h
@@ -94,8 +94,29 @@ struct socket {
 #define SS_INCOMING \
     0x2000 /* Connection was initiated by a host on the internet */
 
-struct socket *solookup(struct socket **, struct socket *, struct in_addr,
-                        u_int, struct in_addr, u_int);
+static inline int sockaddr_equal(struct sockaddr_storage *a,
+                                 struct sockaddr_storage *b)
+{
+    if (a->ss_family != b->ss_family) {
+        return 0;
+    }
+
+    switch (a->ss_family) {
+    case AF_INET: {
+        struct sockaddr_in *a4 = (struct sockaddr_in *)a;
+        struct sockaddr_in *b4 = (struct sockaddr_in *)b;
+        return a4->sin_addr.s_addr == b4->sin_addr.s_addr &&
+               a4->sin_port == b4->sin_port;
+    }
+    default:
+        g_assert_not_reached();
+    }
+
+    return 0;
+}
+
+struct socket *solookup(struct socket **, struct socket *,
+                        struct sockaddr_storage *, struct sockaddr_storage *);
 struct socket *socreate(Slirp *);
 void sofree(struct socket *);
 int soread(struct socket *);
diff --git a/tcp_input.c b/tcp_input.c
index 8858400..241fcf6 100644
--- a/tcp_input.c
+++ b/tcp_input.c
@@ -228,6 +228,8 @@ void tcp_input(struct mbuf *m, int iphlen, struct socket *inso)
     int iss = 0;
     u_long tiwin;
     int ret;
+    struct sockaddr_storage lhost, fhost;
+    struct sockaddr_in *lhost4, *fhost4;
     struct ex_list *ex_ptr;
     Slirp *slirp;
 
@@ -320,8 +322,16 @@ void tcp_input(struct mbuf *m, int iphlen, struct socket *inso)
      * Locate pcb for segment.
      */
 findso:
-    so = solookup(&slirp->tcp_last_so, &slirp->tcb, ti->ti_src, ti->ti_sport,
-                  ti->ti_dst, ti->ti_dport);
+    lhost.ss_family = AF_INET;
+    lhost4 = (struct sockaddr_in *)&lhost;
+    lhost4->sin_addr = ti->ti_src;
+    lhost4->sin_port = ti->ti_sport;
+    fhost.ss_family = AF_INET;
+    fhost4 = (struct sockaddr_in *)&fhost;
+    fhost4->sin_addr = ti->ti_dst;
+    fhost4->sin_port = ti->ti_dport;
+
+    so = solookup(&slirp->tcp_last_so, &slirp->tcb, &lhost, &fhost);
 
     /*
      * If the state is CLOSED (i.e., TCB does not exist) then
@@ -366,12 +376,8 @@ findso:
         sbreserve(&so->so_snd, TCP_SNDSPACE);
         sbreserve(&so->so_rcv, TCP_RCVSPACE);
 
-        so->so_lfamily = AF_INET;
-        so->so_laddr = ti->ti_src;
-        so->so_lport = ti->ti_sport;
-        so->so_ffamily = AF_INET;
-        so->so_faddr = ti->ti_dst;
-        so->so_fport = ti->ti_dport;
+        so->lhost.ss = lhost;
+        so->fhost.ss = fhost;
 
         if ((so->so_iptos = tcp_tos(so)) == 0)
             so->so_iptos = ((struct ip *)ti)->ip_tos;
diff --git a/udp.c b/udp.c
index 959bb5e..4e93608 100644
--- a/udp.c
+++ b/udp.c
@@ -68,6 +68,8 @@ void 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);
@@ -149,8 +151,12 @@ void udp_input(register struct mbuf *m, int iphlen)
     /*
      * Locate pcb for datagram.
      */
-    so = solookup(&slirp->udp_last_so, &slirp->udb, ip->ip_src, uh->uh_sport,
-                  (struct in_addr){ 0 }, 0);
+    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) {
         /*