From nobody Thu Nov 6 19:45:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542838154305122.11890402213658; Wed, 21 Nov 2018 14:09:14 -0800 (PST) Received: from localhost ([::1]:42564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPagG-0005DV-BO for importer@patchew.org; Wed, 21 Nov 2018 17:09:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPaeK-0003bt-7m for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPaeI-0000pH-43 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59162) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPaeG-0000lP-40 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:06 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74AB23DBEC; Wed, 21 Nov 2018 22:07:01 +0000 (UTC) Received: from localhost (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id C51471054FD3; Wed, 21 Nov 2018 22:06:57 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 22 Nov 2018 02:06:18 +0400 Message-Id: <20181121220647.18844-2-marcandre.lureau@redhat.com> In-Reply-To: <20181121220647.18844-1-marcandre.lureau@redhat.com> References: <20181121220647.18844-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 21 Nov 2018 22:07:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 for-3.2 v2 01/30] fixup! net: do not depend on slirp internals X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , Jan Kiszka , Jason Wang , Zhang Chen , Samuel Thibault , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Somehow, I broke the build and failed to detect it. Please squash! Signed-off-by: Marc-Andr=C3=A9 Lureau --- net/colo.h | 1 + net/util.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/net/colo.h b/net/colo.h index 420d916af2..b2f60e4d56 100644 --- a/net/colo.h +++ b/net/colo.h @@ -18,6 +18,7 @@ #include "qemu/jhash.h" #include "qemu/timer.h" #include "net/eth.h" +#include "util.h" =20 #define HASHTABLE_MAX_SIZE 16384 =20 diff --git a/net/util.h b/net/util.h index 358185fd50..0e0748913a 100644 --- a/net/util.h +++ b/net/util.h @@ -25,6 +25,9 @@ #ifndef QEMU_NET_UTIL_H #define QEMU_NET_UTIL_H =20 +#include "qemu/osdep.h" + +typedef uint32_t tcp_seq; =20 /* * Structure of an internet header, naked of options. @@ -50,6 +53,29 @@ struct ip { struct in_addr ip_src, ip_dst; /* source and dest address */ } QEMU_PACKED; =20 +/* + * TCP header. + * Per RFC 793, September, 1981. + */ +#define tcphdr slirp_tcphdr +struct tcphdr { + uint16_t th_sport; /* source port */ + uint16_t th_dport; /* destination port */ + tcp_seq th_seq; /* sequence number */ + tcp_seq th_ack; /* acknowledgement number */ +#ifdef HOST_WORDS_BIGENDIAN + uint8_t th_off:4, /* data offset */ + th_x2:4; /* (unused) */ +#else + uint8_t th_x2:4, /* (unused) */ + th_off:4; /* data offset */ +#endif + uint8_t th_flags; + uint16_t th_win; /* window */ + uint16_t th_sum; /* checksum */ + uint16_t th_urp; /* urgent pointer */ +}; + static inline bool in6_equal_net(const struct in6_addr *a, const struct in6_addr *b, int prefix_len) --=20 2.20.0.rc1