From patchwork Wed Mar 17 07:36:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1454537 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iURh3G4r; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F0hnF573tz9sRR for ; Wed, 17 Mar 2021 18:37:05 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0FA6A100EB82A; Wed, 17 Mar 2021 00:37:04 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::1033; helo=mail-pj1-x1033.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 892EA100EB825 for ; Wed, 17 Mar 2021 00:37:02 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id w8so621368pjf.4 for ; Wed, 17 Mar 2021 00:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EtplKdJEpxcOqrixvWN5uGioPyylHRwkjcTLzx69c0=; b=iURh3G4rA+924lbpEjpHZDvmq+DVTEgof8+kDJckPgg4568FXkVncZNPb+y465nmkp QaJo+xC7i+uSdKLxwcfvpMVZdxYW4CFRybas1cKg0jo4FzFljDBBWnRYrHMd53wc0msn nVhY/a144o1fkx3oeNCoXNYGl9Gst/ltpLLeOHzo8/imH1N7CSSg9VwnXoUccG63uXEQ Er312zCZ+uhtUnNvKFVHz4yueXlgUwHWtowii/FOdTHpmZmJ5tr80+8kfIjuJt41SxNq rPoTLu5mxnDPf1Q2/ZkTSwjJX+3aV8l2NOosxTOK692JUvm+AEgy92x73xM9+ZQDuZ8H O+qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7EtplKdJEpxcOqrixvWN5uGioPyylHRwkjcTLzx69c0=; b=Gvawc7Ki/9IRlFu7aMFgt6TgCqyKr3YwjyrOH2Rfd/1lrg4fvjVq7zGeNf3goSiYyX K8v8fILcfDx+1MpDZiqjDxB6J5ObNvOInD03ClbpysDEOlrHC8sZ2aG01xqKbGQWDYdD Fw/VgltqYRWUH5EI4zyyq369HBvLDxLw9lNcpH16QNq6Y143DydAHnTTYoLXl9p1fCbU As+imUHj67r0pCjlnMJgTWvW2oxKZGYwK2dIHwVWFdq0ZGBXrKu+nNKZ8Z446ZQKT9Ar TshcGXhxnBo7YLHqrLlMRJvkb25k3xpqOIGfb1f5poKDtRAwXLiVNaHEbTO3gt4b2Wus R6hg== X-Gm-Message-State: AOAM5315JZteszHswlGePS0oXFEm7P3lDW71Goz4DmhnJGU5ZgVQxJI/ wJHZVFsZTncPwx59JNxMi/IPUzA2sZR0Cw== X-Google-Smtp-Source: ABdhPJxH0qSt+v2E3mKfct8kthDFw98eF1pbPyt0z3c1UZuhF63+2Evjzel25Im59SwJ0VNYx4Jgxg== X-Received: by 2002:a17:90a:a898:: with SMTP id h24mr3190493pjq.9.1615966621838; Wed, 17 Mar 2021 00:37:01 -0700 (PDT) Received: from localhost ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id q10sm17541680pgs.44.2021.03.17.00.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 00:37:00 -0700 (PDT) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 17 Mar 2021 15:36:20 +0800 Message-Id: <5842d55dd4413d694cf9c871261dac4fb99e5ab7.1615966219.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <5b55310e5e6682adfc02b6cc47480eae20612b83.1615966219.git.geliangtang@gmail.com> References: <468e80774d427c36d69d3927b2ed4e8bbf81fdef.1615966219.git.geliangtang@gmail.com> <48a821dc73542f7d4729015eb4c10ad95370dfb1.1615966219.git.geliangtang@gmail.com> <666cf05ae98c7be040adeac64c10c0e348723ff6.1615966219.git.geliangtang@gmail.com> <5b55310e5e6682adfc02b6cc47480eae20612b83.1615966219.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: KU7X347OR5LZIJQZZEPBNUZUV4THNBKK X-Message-ID-Hash: KU7X347OR5LZIJQZZEPBNUZUV4THNBKK X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v3 mptcp-next 5/7] mptcp: drop MPTCP_ADDR_IPVERSION_4/6 List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Since the type of the address family in struct mptcp_options_received became sa_family_t, we should set AF_INET/AF_INET6 to it, instead of using MPTCP_ADDR_IPVERSION_4/6. Signed-off-by: Geliang Tang --- net/mptcp/options.c | 14 +++++++------- net/mptcp/protocol.h | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 0bc5eb0f835c..5c6437c90859 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -220,22 +220,22 @@ static void mptcp_parse_option(const struct sk_buff *skb, if (!mp_opt->echo) { if (opsize == TCPOLEN_MPTCP_ADD_ADDR || opsize == TCPOLEN_MPTCP_ADD_ADDR_PORT) - mp_opt->addr.family = MPTCP_ADDR_IPVERSION_4; + mp_opt->addr.family = AF_INET; #if IS_ENABLED(CONFIG_MPTCP_IPV6) else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6 || opsize == TCPOLEN_MPTCP_ADD_ADDR6_PORT) - mp_opt->addr.family = MPTCP_ADDR_IPVERSION_6; + mp_opt->addr.family = AF_INET6; #endif else break; } else { if (opsize == TCPOLEN_MPTCP_ADD_ADDR_BASE || opsize == TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT) - mp_opt->addr.family = MPTCP_ADDR_IPVERSION_4; + mp_opt->addr.family = AF_INET; #if IS_ENABLED(CONFIG_MPTCP_IPV6) else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE || opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT) - mp_opt->addr.family = MPTCP_ADDR_IPVERSION_6; + mp_opt->addr.family = AF_INET6; #endif else break; @@ -243,7 +243,7 @@ static void mptcp_parse_option(const struct sk_buff *skb, mp_opt->add_addr = 1; mp_opt->addr.id = *ptr++; - if (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_4) { + if (mp_opt->addr.family == AF_INET) { memcpy((u8 *)&mp_opt->addr.addr.s_addr, (u8 *)ptr, 4); ptr += 4; if (opsize == TCPOLEN_MPTCP_ADD_ADDR_PORT || @@ -268,7 +268,7 @@ static void mptcp_parse_option(const struct sk_buff *skb, ptr += 8; } pr_debug("ADD_ADDR%s: id=%d, ahmac=%llu, echo=%d, port=%d", - (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_6) ? "6" : "", + (mp_opt->addr.family == AF_INET6) ? "6" : "", mp_opt->addr.id, mp_opt->ahmac, mp_opt->echo, ntohs(mp_opt->addr.port)); break; @@ -991,7 +991,7 @@ static bool add_addr_hmac_valid(struct mptcp_sock *msk, if (mp_opt->echo) return true; - if (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_4) + if (mp_opt->addr.family == AF_INET) hmac = add_addr_generate_hmac(msk->remote_key, msk->local_key, mp_opt->addr.id, &mp_opt->addr.addr, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7a2686ca7a0d..14f0114be17a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -90,8 +90,6 @@ /* MPTCP ADD_ADDR flags */ #define MPTCP_ADDR_ECHO BIT(0) -#define MPTCP_ADDR_IPVERSION_4 4 -#define MPTCP_ADDR_IPVERSION_6 6 /* MPTCP MP_PRIO flags */ #define MPTCP_PRIO_BKUP BIT(0)