From patchwork Thu Jan 21 08:23:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhijian Li (Fujitsu)\" via" X-Patchwork-Id: 12035099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D311C433DB for ; Thu, 21 Jan 2021 08:24:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61E12239A1 for ; Thu, 21 Jan 2021 08:24:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61E12239A1 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2VGe-00020s-SC for qemu-devel@archiver.kernel.org; Thu, 21 Jan 2021 03:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <39jkJYAMKCpU2835DD5A3.1DBF3BJ-23K3ACDC5CJ.DG5@flex--dje.bounces.google.com>) id 1l2VFT-0000eq-E2 for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:23 -0500 Received: from mail-vs1-xe49.google.com ([2607:f8b0:4864:20::e49]:51203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <39jkJYAMKCpU2835DD5A3.1DBF3BJ-23K3ACDC5CJ.DG5@flex--dje.bounces.google.com>) id 1l2VFR-0007Ei-MJ for qemu-devel@nongnu.org; Thu, 21 Jan 2021 03:23:23 -0500 Received: by mail-vs1-xe49.google.com with SMTP id u15so149063vsg.18 for ; Thu, 21 Jan 2021 00:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=8FyVEsTE2UNLRLvEaTqaY1kG+4HxPxbGy2tRuWRf5XA=; b=sLVtmAq/Ex5CRblkJeEerPxaz8D0Qmm0656zlMdMcDp8R5HQRoFOdTkJ+h8GK0DHB+ fZYKX/wkwXaGheARueC4P32m1AEVRd1+pMitmR05Zt/s9ROUYtO3OD1rQpOUhrVeFLOO bfIiruXqGNplFt2zZAEmwPTodGjFKvr586i+qIkGWjfz10/50VwzLEYzCbh+2/BLyHvx 2uB/suBZCUyQ3loY82taReGna027+td6Aoz2UVjj55/f08tqTfLMGOPvU2RDCNOuc4GY SaX+rpOjsExLiYcgP4n8qs1CkSS5PF4FMvSb9VbRkX0+EmpluswQoydYeYM+gqYHiz3b s9tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=8FyVEsTE2UNLRLvEaTqaY1kG+4HxPxbGy2tRuWRf5XA=; b=XZSX6kxpZXs4zkzriBZbqk9Vkqi8T5kGMkDC5Cgo6EhHcWpRlbZOY9PMu82utPpoGi ay8HVvcwT8gQDqmU41GPoUTjlEQSy6AE8/sdqyCMSG73GyZjNqw4kaJe1ev49nB6bPtK u83y8nvXjMfk4oVfr1yugpLS2mdx/e9BFPY6w8IdNT/Ol0KHd/vSJfk2Ahn5sxldD9+N bZd9ZPauKJfeSN0xkTBSSXN/Ahcm5NqaGbcVmaRWFsf6vFbMIBM2aLWmJnmw441wNnBh 3DcEIpbPY5L9CVTZMFH8wQOgBnTjdAZJuHpw01JuA30jjbZVDkBcgIyktGjMfSioFn6n Ds5A== X-Gm-Message-State: AOAM532pOaVNx4O1mFRxZ554xG6bInoKAqjKNn1FEeHEtDs4jh1kVlsQ o6zfSxCR6StBclrMeqolSSg3Eq0me+bK3pe8512SDXFNLxYN501l77MZuxz1DPEtxpk/lbtOOB8 W1wXzHL+d0HA+y97R9ScH+DYH5/s/+/oYAhIeBuRAnK3IqcewUma8 X-Google-Smtp-Source: ABdhPJxYlA2q0Q4iK0BAEYxSAtOz2O9hmrT0kBV7iWIZCd05m4pxz5a8xdm78NwbHW0A4UPVEN0W+fs= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4a0f:cfff:fe66:e570]) (user=dje job=sendgmr) by 2002:a05:6102:22e7:: with SMTP id b7mr9885155vsh.3.1611217398950; Thu, 21 Jan 2021 00:23:18 -0800 (PST) Date: Thu, 21 Jan 2021 00:23:12 -0800 Message-Id: <20210121082314.458600-1-dje@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [PATCH 0/2] Add ipv6 hostfwd support To: qemu-devel@nongnu.org Received-SPF: pass client-ip=2607:f8b0:4864:20::e49; envelope-from=39jkJYAMKCpU2835DD5A3.1DBF3BJ-23K3ACDC5CJ.DG5@flex--dje.bounces.google.com; helo=mail-vs1-xe49.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Doug Evans Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans X-Patchwork-Original-From: dje--- via From: "Zhijian Li (Fujitsu)\" via" Hi. This patchset takes the original patch from Maxim, https://www.mail-archive.com/qemu-devel@nongnu.org/msg569573.html and updates it. The first patch is the slirp additions, the second patch adds the u/i. Doug Evans (2): slirp: Add ipv6 hostfwd support net: Add ipv6_hostfwd option Slirp: src/libslirp.h | 6 +++ src/slirp.c | 51 +++++++++++++++++++++-- src/socket.c | 109 +++++++++++++++++++++++++++++++++++-------------- src/socket.h | 9 ++++ src/udp.c | 73 ++++++++++++++++++++++++++------- src/udp.h | 2 + 6 files changed, 202 insertions(+), 48 deletions(-) QEMU: hmp-commands.hx | 29 ++++- include/net/slirp.h | 2 + net/slirp.c | 311 +++++++++++++++++++++++++++++++++++--------- qapi/net.json | 1 + slirp | 2 +- 5 files changed, 279 insertions(+), 66 deletions(-)