From dc0663b72d78655210ee7685bb8193ceec699969 Mon Sep 17 00:00:00 2001 From: jvernet Date: Wed, 4 Oct 2017 18:22:53 +0200 Subject: [PATCH] Revert "64 bits slirp ?" This reverts commit 000ec0f135c7509a13b3c2bacd26f9ce27503c80. --- BasiliskII/src/slirp/tcp_input.c | 6 +----- BasiliskII/src/slirp/udp.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/BasiliskII/src/slirp/tcp_input.c b/BasiliskII/src/slirp/tcp_input.c index 5c06f16f..032e5378 100644 --- a/BasiliskII/src/slirp/tcp_input.c +++ b/BasiliskII/src/slirp/tcp_input.c @@ -292,11 +292,7 @@ void tcp_input(register struct mbuf *m, int iphlen, struct socket *inso) * Checksum extended TCP header and data. */ tlen = ((struct ip *)ti)->ip_len; - //ti->ti_next = ti->ti_prev = 0; - - tcpiphdr2qlink(ti)->next = tcpiphdr2qlink(ti)->prev = 0; - memset(&ti->ti_i.ih_mbuf, 0 , sizeof(struct mbuf_ptr)); - + ti->ti_next = ti->ti_prev = 0; ti->ti_x1 = 0; ti->ti_len = htons((u_int16_t)tlen); len = sizeof(struct ip) + tlen; diff --git a/BasiliskII/src/slirp/udp.c b/BasiliskII/src/slirp/udp.c index 9d805ff3..deedb1e7 100644 --- a/BasiliskII/src/slirp/udp.c +++ b/BasiliskII/src/slirp/udp.c @@ -272,10 +272,7 @@ int udp_output2(struct socket *so, struct mbuf *m, * and addresses and length put into network format. */ ui = mtod(m, struct udpiphdr *); - //ui->ui_next = ui->ui_prev = 0; - - memset(&ui->ui_i.ih_mbuf, 0 , sizeof(struct mbuf_ptr)); - + ui->ui_next = ui->ui_prev = 0; ui->ui_x1 = 0; ui->ui_pr = IPPROTO_UDP; ui->ui_len = htons((u_short) (m->m_len - sizeof(struct ip))); /* + sizeof (struct udphdr)); */