Fix 64 bit issue in slirp

[qemu] / slirp / tcp_subr.c

diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 00f61c1..497b988 100644 (file)
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -73,7 +73,7 @@ tcp_template(tp)
        struct socket *so = tp->t_socket;
        register struct tcpiphdr *n = &tp->t_template;
 
-       n->ti_next = n->ti_prev = 0;
+       n->ti_mbuf = NULL;
        n->ti_x1 = 0;
        n->ti_pr = IPPROTO_TCP;
        n->ti_len = htons(sizeof (struct tcpiphdr) - sizeof (struct ip));
@@ -156,7 +156,7 @@ tcp_respond(tp, ti, m, ack, seq, flags)
        tlen += sizeof (struct tcpiphdr);
        m->m_len = tlen;
 
-       ti->ti_next = ti->ti_prev = 0;
+       ti->ti_mbuf = 0;
        ti->ti_x1 = 0;
        ti->ti_seq = htonl(seq);
        ti->ti_ack = htonl(ack);
@@ -196,7 +196,7 @@ tcp_newtcpcb(so)
                return ((struct tcpcb *)0);
 
        memset((char *) tp, 0, sizeof(struct tcpcb));
-       tp->seg_next = tp->seg_prev = (tcpiphdrp_32)tp;
+       tp->seg_next = tp->seg_prev = (struct tcpiphdr*)tp;
        tp->t_maxseg = TCP_MSS;
 
        tp->t_flags = TCP_DO_RFC1323 ? (TF_REQ_SCALE|TF_REQ_TSTMP) : 0;
@@ -272,11 +272,11 @@ tcp_close(tp)
        DEBUG_ARG("tp = %lx", (long )tp);
 
        /* free the reassembly queue, if any */
-       t = (struct tcpiphdr *) tp->seg_next;
-       while (t != (struct tcpiphdr *)tp) {
-               t = (struct tcpiphdr *)t->ti_next;
-               m = (struct mbuf *) REASS_MBUF((struct tcpiphdr *)t->ti_prev);
-               remque_32((struct tcpiphdr *) t->ti_prev);
+       t = tcpfrag_list_first(tp);
+       while (!tcpfrag_list_end(t, tp)) {
+               t = tcpiphdr_next(t);
+               m = tcpiphdr_prev(t)->ti_mbuf;
+               remque(tcpiphdr2qlink(tcpiphdr_prev(t)));
                m_freem(m);
        }
        /* It's static */