From nobody Wed Apr 24 15:49:26 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20075.outbound.protection.outlook.com [40.107.2.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C5797C for ; Wed, 16 Nov 2022 11:46:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D1jhUla0VftVDSnbQSJkWaxEDcsjUNLMk1FFgHwYE0/nu3fHPfQtP+pItc8OUKzhUz3ejIWAUsoEUoWaCxPPPsAliJhP9imQN5zTI5k3nOezDfH3AYWBcll3kFPybZoi6X02UHvyBO338CD80PTJeDAIzd7gnPn6Gldw6heTmlGedWay4upZHdq7bhc0c1fA0XpU3zohqtRlA06PnsjRdmpLlFdZ6S6dhRW2XBKVvXJHMkogz/z8u/iXWt/vKDh79rHjrKm+kw/0/rPkmS1leJQWGQWq1jIrtncIqVqixOe7Zh766Yb4HAYi8GmHOD1soBu+PxDUxgETap9DwgHHJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=V56A/O+/cDbnvxU9ZLzBJRTYFaYPfUhVHADzxVOXEck=; b=Y5KxdrPt1hw6f1kKvVmH3OzdBTFh0uefxE9ioXxf0eIzeqsz5c1GoWvTU+RYQvnx1mYyxf3MXLSb8f5S6+HAJHdTrxXS/dUw4NKeNIguqyVEWUwxoJsvvvC4K2hX+sdwiqPh1i8pwANDQGG318GUgqzq1Vd8/YsIioKLWIkeptn90m+FvIXiCn2eDroqJ+aNi/glU4u4Lhqz789XubjmEaQY78wuAkvHPEr8X2gUzPm0xe1/25I5Qi7XDaxrUXrM/Xm7tlWIxqN7mynWgLfldJPysIDWQGGVHoI3Cnfo1lkUzw+T4pY3DxAJcsbCUmWjZQI7H5cWrecg7oEuJdg7FA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V56A/O+/cDbnvxU9ZLzBJRTYFaYPfUhVHADzxVOXEck=; b=YAsiXVDkZ4cLzQQZFyJhCzR8XShKLerItdNqUXmLCJ62m1go9b60yWVCdHl+Z/c/alHX18CJRuevoqlvWH7WmPWcVdZ5u9xQuPAPdeaqfTt+L/D0/8P2aMdVauHv2zivL7ixo9VFy6znkZgbS1UtiMJ0vZUNOiWMWN5QsERmtBirQ9sne94ARC+r0bBna2lKoxjKevAWtSDVKK5ujoq3Q0kkuVZLIAcrFMt5kT6OkpJdjqIJEQMEhmvK92733fJVPrIZXOVjK3ilHiNX5ZfSFUT4ro2v0pSOqNhLpP7uIgZQbUtCRt4ADYDbkivW+2NwNtSMcyLuaeN+MhzvC21V1w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB9PR04MB8430.eurprd04.prod.outlook.com (2603:10a6:10:24f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:46:09 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:46:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/4] mptcp: add pm listener events Date: Wed, 16 Nov 2022 19:46:17 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0010.apcprd01.prod.exchangelabs.com (2603:1096:404:92::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DB9PR04MB8430:EE_ X-MS-Office365-Filtering-Correlation-Id: 73437d08-1493-44f6-448d-08dac7c82707 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TB/67hQXWCLYak92FjEE3+/C860DMBN58s0VYQG/ZET27nOBe3jqRL16q9ltKTHb2wOMrH9gTg2YbO7z/1rwaq2dbBj3Da6qN/uVFUPvqbTsX7JgROIKMkiNemlCKlOIF/WVb80Ld0ztoRWMEOIHy/DnIqZuZV7gDb50bJkk7r5Cy0+KvUIRcaZMyRSJNKjkQLAS3GUW2WahBU4guXVSLGGfh69zHBtOsZIYIXIi7/sLlyqnByPdhRDQNmcUfNVqxmcH/BYaWHa2u3dI7V5nEsHQut+n/JmZ5drkXPO+zr8wNUyCSmnqLiBl3PEVKUoXRqfdX9Bj2q52wVEqJQOJTi/ENhvnFyZQjq3PDVmeeGn8psYdRUh2YDV6mU3DPWcGa1ipsc86hY0weAItkzJ79i4bDrLWjKWmRNhrcnZk64ayWKtYVD78p/Lr9xRl/iGSxJkshCJlZv7cxsLVz49XiAsbYFAF5dhVjREtZq2qGAFtnGMY+cLpGz5RaRut4on0MJcJyIoCgWMtfT4S2A5324n00mE5c/seVNJJv2YGh5F5Us66lC8upioWpGaeOd5DLjkAG6SJBMfUiI9zoYzKi4R2UcfTaGJwCWs9r+mPdFnnLy31uwdj8BctzTNdc5KkdkXKk0jn5K9DwvhYNBfIPnj+lkjiN3K0VnXBIzrhM8tdqlV+oW18UNx916Cr1cuUCTwExXQeVdOKW12kcvDItg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(346002)(366004)(39860400002)(396003)(376002)(451199015)(107886003)(478600001)(6486002)(6916009)(6666004)(83380400001)(8676002)(4326008)(66946007)(26005)(66476007)(66556008)(41300700001)(36756003)(86362001)(6506007)(316002)(38100700002)(186003)(8936002)(5660300002)(44832011)(2616005)(6512007)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4BJ7WnBratAnU8VSQqEwdf+fJ8gXJn6A4srGORUNtaB4N+KCjatIttHbP4fW?= =?us-ascii?Q?HYnh5dzRE+sqE1r4BsIJG7SOqVvn3rfpv5ZyIHG3wMEUBq4nwC+z9FnVTGjY?= =?us-ascii?Q?6MxMKhfsvY9aVFFbAzQONPY1yLCa1CZaogigeyTmPYb27XRjY5o84Vlzz6Rn?= =?us-ascii?Q?KiRx+GfeiqaGWe6tDLBwN/z+Pwzov4mKDfLYf+CSd+w4BA0/WXvvH3lnFOue?= =?us-ascii?Q?tGBo8OT29t5x0pa853ARoMqDdd6tc9YUwde13VLKrhY81tsGTFNRkwCJGHlT?= =?us-ascii?Q?g67kXg2RyakqPhfMBakyYBekgeolBwoG0MVGaBbqk9h6CHMqyBbQQw6gOr9x?= =?us-ascii?Q?CYz4LRCVCu96yR4JxWALw1B6JlRC8GnNth7x0TJe0gJIA6Pzo/Lri/x+Hphz?= =?us-ascii?Q?ZsZs5rSwDdq6uDwU8kfia9dB3kXQBHtZBBDKjdr/lCH0S6GULF8fsOuuzt/M?= =?us-ascii?Q?4aEJgfwCVkL9YRdQeZAs/QyksSOvKX+nobDUlTPXJ2Zb8snS+XdL8CVlodsx?= =?us-ascii?Q?gft8cSeCEie4EdRWebksuZxsGvlrDCQr3D1tUrIBaCL4Jp8sVgFOWp3uSw29?= =?us-ascii?Q?F17O4DcMdg7xoOktbgVJjPTLShv6v9SomnwMIbzzO+K5IWoZgQjwZCMwsuzz?= =?us-ascii?Q?7pQNcnFqg2IFWruHTPMevG1f6mh8H9eJbDAj7kV2vAgEahfy7MvPrX0Tf6EI?= =?us-ascii?Q?g7ZT5kKzMXc1oR67LVO2xMyOgQ0ZdGnQ8FM6vliFdJWrDZ2IJfMSaKZGJwI0?= =?us-ascii?Q?DxTROgyWfg+AoW6kEgZKsApY5eYmPiPyBaY352f0caASJTTmZkda8RK0J6Uh?= =?us-ascii?Q?HY+SdbbFDqyfuJxwPTQRotVNRMnuOKMFjdAZZ4Li92dX9MMNhDnO2XFPj6yU?= =?us-ascii?Q?H2+aDA2iiEnyLgUv6/agMdg+FjKVPx2qOC8u+s+HAtCBjWJ4j+AGLAXkzzmn?= =?us-ascii?Q?GnSOb4mREfQRXJe+VmeBfNpgtBVGogairsl6G9zSPPV7XOLY7uMQIZ2OAQV3?= =?us-ascii?Q?MV4ZSV7DXpj0uL6VBV2TjpE6ekM1M8kgfa/JuBEy6JFgAfauijj85OyM6QZi?= =?us-ascii?Q?lFPHkA+rw+cmGUBT5tkU5g7LwNot67JTfiwJseKnAbxogDqn0G6RbDJpGERb?= =?us-ascii?Q?TAcfadUDcFByGl+fl4o362JN/PxWKO50wNMFZp3BtCAFNRqWl7ZKgxpcjVQc?= =?us-ascii?Q?+wJsHOJICvpILDMMAHsUTF25R3Ox1H0CFlg4WhM0N6skbMZYWv8uSTtKUE1r?= =?us-ascii?Q?L4zTzAFWUWc/z3DG8bRa2W6gxHH1Yb7T36yTVkqTPfGG+x7D/KkhjtPHzLLk?= =?us-ascii?Q?vgz8biPBaGWsGTCcdUJjiFql0xEE3AXlLvDoVNUw1wGvQVD5szGFs5h93MPi?= =?us-ascii?Q?p1Qm22KJW7jzJRp7C8vBcr4b0bDD35PVKQufe1YCOy+L7aRT7jTHxvdICFCn?= =?us-ascii?Q?VE/vQCR7261k7WrZ8Ohe/k2Ih0pMiCDSDHyV3JW59K9MoI1THQkyv6yauNzS?= =?us-ascii?Q?45q0VID6++bBLQgetbo3/fLgt6zacNHch0OnPa5DS462PdcKaucROObfveJR?= =?us-ascii?Q?aKAhGpCi/AJKga9bjNWKdY3+C+KMMN8zegncHhprgJLWRyIxk7/CSXFDqOyl?= =?us-ascii?Q?YQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73437d08-1493-44f6-448d-08dac7c82707 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:46:09.2270 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 641X0nnhGNwemga+CPTB1KnJMCnodNSEaunexQBA9nhOnUev1ztDVGU/xG5+Kzu+nre8ZHnyqX85rgSRzIT2Tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8430 Content-Type: text/plain; charset="utf-8" This patch adds MPTCP netlink events for PM listening socket create and close. Signed-off-by: Geliang Tang --- include/uapi/linux/mptcp.h | 9 ++++++ net/mptcp/pm_netlink.c | 57 ++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 2 ++ 4 files changed, 71 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index dfe19bf13f4c..32af2d278cb4 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -160,6 +160,12 @@ struct mptcp_info { * daddr4 | daddr6, sport, dport, backup, if_idx * [, error] * The priority of a subflow has changed. 'error' should not be set. + * + * MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 + * A new PM listener is created. + * + * MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 + * A PM listener is closed. */ enum mptcp_event_type { MPTCP_EVENT_UNSPEC =3D 0, @@ -174,6 +180,9 @@ enum mptcp_event_type { MPTCP_EVENT_SUB_CLOSED =3D 11, =20 MPTCP_EVENT_SUB_PRIORITY =3D 13, + + MPTCP_EVENT_LISTENER_CREATED =3D 15, + MPTCP_EVENT_LISTENER_CLOSED =3D 16, }; =20 enum mptcp_event_attr { diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 08806f97c8fb..685240f6bc80 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1026,6 +1026,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, if (err) return err; =20 + mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); + return 0; } =20 @@ -2149,6 +2151,58 @@ void mptcp_event_addr_announced(const struct sock *s= sk, kfree_skb(skb); } =20 +void mptcp_event_pm_listener(const struct sock *ssk, + enum mptcp_event_type event) +{ + const struct inet_sock *issk =3D inet_sk(ssk); + struct net *net =3D sock_net(ssk); + struct nlmsghdr *nlh; + struct sk_buff *skb; + + if (!genl_has_listeners(&mptcp_genl_family, net, MPTCP_PM_EV_GRP_OFFSET)) + return; + + skb =3D nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); + if (!skb) + return; + + nlh =3D genlmsg_put(skb, 0, 0, &mptcp_genl_family, 0, event); + if (!nlh) + goto nla_put_failure; + + if (nla_put_u16(skb, MPTCP_ATTR_FAMILY, ssk->sk_family)) + goto nla_put_failure; + + if (nla_put_be16(skb, MPTCP_ATTR_SPORT, issk->inet_sport)) + goto nla_put_failure; + + switch (ssk->sk_family) { + case AF_INET: + if (nla_put_in_addr(skb, MPTCP_ATTR_SADDR4, issk->inet_saddr)) + goto nla_put_failure; + break; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + case AF_INET6: { + const struct ipv6_pinfo *np =3D inet6_sk(ssk); + + if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &np->saddr)) + goto nla_put_failure; + break; + } +#endif + default: + WARN_ON_ONCE(1); + goto nla_put_failure; + } + + genlmsg_end(skb, nlh); + mptcp_nl_mcast_send(net, skb, GFP_ATOMIC); + return; + +nla_put_failure: + kfree_skb(skb); +} + void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp) { @@ -2194,6 +2248,9 @@ void mptcp_event(enum mptcp_event_type type, const st= ruct mptcp_sock *msk, if (mptcp_event_sub_closed(skb, msk, ssk) < 0) goto nla_put_failure; break; + case MPTCP_EVENT_LISTENER_CREATED: + case MPTCP_EVENT_LISTENER_CLOSED: + break; } =20 genlmsg_end(skb, nlh); diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1f9b72b62998..c2bb4255969e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2366,6 +2366,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, tcp_set_state(ssk, TCP_CLOSE); mptcp_subflow_queue_clean(ssk); inet_csk_listen_stop(ssk); + mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CLOSED); } __tcp_close(ssk, 0); =20 @@ -3682,6 +3683,8 @@ static int mptcp_listen(struct socket *sock, int back= log) if (!err) mptcp_copy_inaddrs(sock->sk, ssock->sk); =20 + mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); + unlock: release_sock(sock->sk); return err; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index ffecd103cc50..bae216bff6e4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -846,6 +846,8 @@ void mptcp_event(enum mptcp_event_type type, const stru= ct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); void mptcp_event_addr_announced(const struct sock *ssk, const struct mptcp= _addr_info *info); void mptcp_event_addr_removed(const struct mptcp_sock *msk, u8 id); +void mptcp_event_pm_listener(const struct sock *ssk, + enum mptcp_event_type event); bool mptcp_userspace_pm_active(const struct mptcp_sock *msk); =20 void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_su= bflow_context *subflow, --=20 2.35.3 From nobody Wed Apr 24 15:49:26 2024 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20052.outbound.protection.outlook.com [40.107.2.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2F667C for ; Wed, 16 Nov 2022 11:46:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JP6GpRMTgq3f9fkocI+sHJwEWM3aNuUwpd9xKLsYVfJFo53dwvFvuFgmcA+qVE0AMl4OsemEfyh8PJUmXTVI2ra74Kc98kboRQEX6fjr/ymWc5q2L/QUv6gmILHxlK4loKLpiJNLK1boFLQbt34IfFf+n2l6r8mWKd/lIxBQsN/1FH7MLQKhe0Vo55omPAbnQNrRbw6Av9/vMiBGLoYS+JKJX+yGAvGEJ9V/3ULCK5F/yK0B6w87OzdTck/jy27ezRnkUBg9i40fVcXoe9qjOE3kQ6CfUDEyy1q7MUbkrDCIpn5v+ic8+eDCdOoHv7ImDhMZI6kKgCBae1nPGTLECw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NF8ttSRAoDQvzRahf8gtyI/IcjgylmXPSk5Tm/vST5o=; b=SxFLsSb2zawAwaS96bz0bGE0WKaITBmL6bbC2Zl1n4q71m+itPHrNxKwryWX7LNI5u4Qf1nI9AiRMzRvGySbv0bArBbDibgqR3Rp3ZuEneHYbIUEK6AIpS2mGcGWflqZeEl5J19Pdc2oO6aE22dhsOwXfyP9BsuhnH2ZyrSNxBl0u+xLfAxxWsY2S/Ca0MFzkgb5vyLPbPsbeqjlbOXpJX0VCl0XPoRqf0rtNuXy4XV3njqbn2ytOPz3kvt8TBOqY/001kCN4Z2M9MwwsxSTt7sB9P8BTarA8HxSfVzfR/jlPtQOB+L+GUNT4FrhL3914turfJmPkL8R/5yLZqwqbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NF8ttSRAoDQvzRahf8gtyI/IcjgylmXPSk5Tm/vST5o=; b=OOl8zk4h3mtvZrYHm0iTgtrr4QwKiiwbb+m71r/WEX2+8cf0ooP1Jd81UGCVEm2fxXZdy41OuSm5JmbCVvFZl+m03JfFuwkbds7WR0iNCqAsYmbJPJU5SeqJl1armoAGDRDqeiV/mo2pCuiaMuLrurYrwWo2GMQVAwRqMwpJxLjCNniVM8d6frA69zmdnlg2QMWaDFKYrakXMz/BIxPXrjsRTwQ1L4eKNjFQ9ZuMNYpZwYtXvlIwYIV1XF+6U52yazVYUpIAX6WxDT38h+FoZol/ZXglcDlgZcmX/55CC7raulfzS/37+JUjh4suF3ZH0eUxQmWi3THa5tyTzf5hzg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB9PR04MB8430.eurprd04.prod.outlook.com (2603:10a6:10:24f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:46:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:46:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 2/4] selftests: mptcp: update userspace pm tests Date: Wed, 16 Nov 2022 19:46:18 +0800 Message-Id: <8ff444f2b41ff403fa8d3efcb9128bb99bc51bb7.1668599064.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0023.apcprd01.prod.exchangelabs.com (2603:1096:404:92::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DB9PR04MB8430:EE_ X-MS-Office365-Filtering-Correlation-Id: e9fad183-722a-4543-d953-08dac7c82d52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJZ5YaoJQr1MOeGwInw8wE83LPWW9QVjx11issRkHZ8MzrAacjiMpNO7xDct1/Ac33ceIFBFzGcXwceiFGwPq7RkbbID58cPPf9RQ95UMZuqtPmKxKqEzrqIBXyI3RyDNVc2n8TMyyqGWaM29dyGyZU0ZwZfpu1D2cdaEB/x54K0uzZcOGFiFwVc8AovkouwxmHwoAqNWrH9pEA44juHZK/ySzHzY7gBBUp8HvZIF2bNlMIoNPR4MmUQhITLp2pWrpvvpduJtf6Neh87w/SSDZ6RRcMOIzv7a+cFj5nMdRumPRWt+RjP3KvlGHfLeJihmiXCLzs8c1naty0qP4AEvuaRvbYzZckrwHALMwavSSwUwScdANmZHLi1EXPTjGd1cCnefgYrGPGVSCpQm5Narq5Wb3HxJnP0EEcsw7HLnW98KU25q6/URF7Pd+27jrFWBy1G4p3oqCtf67EyV8lntm6isEB73tDo5BHNRlRwwmV+GSDp+X2YfNuJW/V2eUtE3u+1+cjmB0OUnjGOYhcwmwxbsz/1O2ioh26K4voHB4G+fDUUtIP9eiiZ8XBPYp4PnlPzRo172pLLAQUK1LgEncyPAP1WaCGKCmPY8RFMvq8XIYfF30DhO7IjTUAme2+zwdQY5u326ptdKeK7abtZyq6fIYSqnvWixAneZT8sMMifHoWZXSjLE3QBeTxkdnN5q2cnWSASOxymeT5UmO5+QA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(346002)(366004)(39860400002)(396003)(376002)(451199015)(107886003)(478600001)(6486002)(6916009)(83380400001)(8676002)(4326008)(66946007)(26005)(66476007)(66556008)(41300700001)(36756003)(86362001)(6506007)(316002)(38100700002)(186003)(8936002)(5660300002)(44832011)(2616005)(6512007)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6dH1WnP6Ci1pcrDPeY5cAHRGJq6Fa+RRZ0BzZMhAVxU8m+lD/dZCSI60S10u?= =?us-ascii?Q?uGW6eGoprSYxOI9gM2OKo2bp6Yp5UYdJ1m4cn2sV0HZ+F2Sc6mc24ntlhEUo?= =?us-ascii?Q?KzWwUe0F30WYo7e/7/oehcZq0S0FH7eKNn+9ULej/5U0Yc3b2qDOZnU1h3fh?= =?us-ascii?Q?D7+T7JdlKO8E097JJGBkHo2sHMqIz5C5xt4eiWtaSPYmfsOuHO+uS6qi6vjL?= =?us-ascii?Q?p7OcCnmurMmVUysBfOpDzWKu00pN9XJnRau3QqQecl8+40IU//WNSYfbmYUJ?= =?us-ascii?Q?PJe3e4cHlnXbg/A+hB+Xd2Zmc+i9GeArjCbgWIeiPBjSV9O9hG0NNXm5IRLX?= =?us-ascii?Q?NYjqsgMEfZBQDBgX0EaBeBPvampFZAcfIgBZWXWvzhtg6A6lK50BrM4v4YuB?= =?us-ascii?Q?aLMMoi7vHkBnjSgtCQtD29bIMN4kKUBltIwGSR3XjuWUy1GbypPNWK1+6Ybq?= =?us-ascii?Q?zqosBBwbCZFJrunoDr0RNs/lIbjyP5XFLz2c2rNso9hEgqhiPHsQLLqD4LkU?= =?us-ascii?Q?hUONk8GG25gcxltIfHHjsnNPNuXiUJDk2I2YUi6G+Ndqsz719S7mgvIA7Xzm?= =?us-ascii?Q?d1UVq+4VwvX4fPO1KRePv7oe6PzWHugpca/kNGc5+SNPp+EVEI2+Gjkm8lMy?= =?us-ascii?Q?NkY7vO1LUWgDRTWFU6LrXpjpx2pcR/+e2p+TFwxqGESgBzWfet+nGu2TB1ir?= =?us-ascii?Q?4pfAf5NdoBxuiIKC26ENlSkIy/xlSXLuK/N6Q8hjOI5vDC8DQ+agYggErX+0?= =?us-ascii?Q?kIIZXya1pDUsKfukI5TZZi3Lt/EpT73zuuEtQVcaMisEaNR1rGiTEN6Xjrj6?= =?us-ascii?Q?/CLqQYoxqpF8m5xqBxXpU0rOha7b7GbSbyvNDXPxaLgsWBxuzcjPjtBhMBme?= =?us-ascii?Q?FiIOtxCx9t8x2lEFJLVi8mgXdT0iBnaoHW3Ne4I1SQXOks3s5WW5EvRJO4pz?= =?us-ascii?Q?6sm+CRU4+IZGzr/9HFlRjCeTOeV5v5x7v/Y12qh6c2kLG+frxxQucf/BtW7y?= =?us-ascii?Q?GfnUfZLbcybtH58d1+EeYP4KF6AduUpvA05atWLwjSxjKiafP2nzTYvMTM+1?= =?us-ascii?Q?twNES46tmfDusqgpuM2T2G56TVkW78Q7/xgy38UlTCB1zqL4M2tUcYt73KmD?= =?us-ascii?Q?gNQNARLvGLHg0KODEa8OaGnnqNFQu5S/9SYlRAGtx4DjX2PX4GDa2dXupkbO?= =?us-ascii?Q?nneeAfpALizcZ4YmaHYEHPhGwHwycJp23vKEBDlvFOyLEeKJz5lTfEqOp/ld?= =?us-ascii?Q?xHChVQHwLqBsQRShJ9W500rEpQlUbwOOiy+p9PE+4b/SNuo8C83isPzzTwuP?= =?us-ascii?Q?SWXMNEmOBZT/sTeqll4o3AraSZLC0lPTvMUOhH3C12tAOWq2cT0PXb3BzXiV?= =?us-ascii?Q?TUcq+uLAQ/irmjrn5A1MscSTSmDTmSuo7ZRMIT3SyAnqBYvefY4wVonEKRWY?= =?us-ascii?Q?yd5v1ZM4qLaTS6XgERG616oCffvjCKyKR+d9pB/+KnX5qfoYqI6yTdCW5eaw?= =?us-ascii?Q?ZOvxMkd2bLW6tfv4hR99G4uN07Na76n/0lnEa9Wupivq+l4is76bFewVX87E?= =?us-ascii?Q?vqH3xRzTX3Pkw6BRpP3Z8oGC/ifDrLupsK1Ex5n2c/DXdgRZQT3xNnAfrBrF?= =?us-ascii?Q?xQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9fad183-722a-4543-d953-08dac7c82d52 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:46:19.7730 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SmSdDUiSxQnSlVdEUpnRpfl+UdVojrntrfMHS7+dr7RnYAAcIKBO/gBk+7lCVkrEeMQ18LWIWeu0kq8uyYLTXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8430 Content-Type: text/plain; charset="utf-8" Some userspace pm tests failed since pm listener events have been added. Fix them. patch 3 in "add pm listener events" series. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- tools/testing/selftests/net/mptcp/userspace_pm.sh | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2a402b3b771f..f10ef65a7009 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -830,7 +830,8 @@ do_transfer() if [ $userspace_pm -eq 0 ]; then pm_nl_add_endpoint $ns1 $addr flags signal else - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns1") + tk=3D$(grep "type:1," "$evts_ns1" | + sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 5dfc3ee74b98..08a88ea47a29 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -172,9 +172,10 @@ make_connection() client_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ "$client_evts") kill_wait $server_evts_pid - server_token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\= 2/p;q' "$server_evts") - server_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ - "$server_evts") + server_token=3D$(grep "type:1," "$server_evts" | + sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') + server_serverside=3D$(grep "type:1," "$server_evts" | + sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q= ') rm -f "$client_evts" "$server_evts" "$file" =20 if [ "$client_token" !=3D "" ] && [ "$server_token" !=3D "" ] && [ "$clie= nt_serverside" =3D 0 ] && --=20 2.35.3 From nobody Wed Apr 24 15:49:26 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2055.outbound.protection.outlook.com [40.107.22.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 930EC7C for ; Wed, 16 Nov 2022 11:46:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RxYCAJd6a/TjncTKn0NHZhoWmHFzAMLY8IkE54f2+f3AcjDh+kufuxvMglLQweT/g+BebvA0nE0QM239+8DQDAQ0JQJ1iU9UYgYiRsqsffe4BaXufIVrCOAd1UBYbAh+Ozx+OpEq/Rmv5VCRKUobmIXBA9XGZGT2T6/PAg8f9+dl2lq0J4vggZdDVQooHYScox+iIUFMtJXQudYg6Wa1g+uWEouAWr1ovXF1ZRsEh2bO0HftcOJnWkS0IK0i5U0SgZupquQTf+WMco5NcZQUvDQckCZjXRJLJMLF9hcPu9C45yZKMFnJdtxxDa6ISjM5vdsT/EH4ePV0/Kv1QWcstQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wus+zWOQc4wN2qe7W5VZKJm3CMNW7FXPHXeR87UP7S8=; b=FHoRchynyIma/EnWyPrVc3ay/J4mnJSNVMQAbKSSTnvZYTi4/uPVtk9oz7v53rBm0IzulEQu9+MKNq+2R12F4rHp9Y+Lny+9wHzuUm5nZwL8rufFLnFcPYT+QSOK0qdKSiBLL4iXUiTv7giFO8YLe8nVFHDlVQCiUBx5065v6+x6hgUsOWtPYggt9JWt6svhMlresHNE8KoWXVxMggCdO77iDmq3Yb1NhGODAIiX8otWQd2NeczSzr9WobGs7ZolT4ZijFXDtuaESRjN5qUkxHosXYBztWa/nJDLiH6cuCDM7lcgmDiQHbSKaTb5vFxxoI1iQEcTGgRlqXgbO5Sfxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wus+zWOQc4wN2qe7W5VZKJm3CMNW7FXPHXeR87UP7S8=; b=WkV9+9G8/YjclyOZnrONkUQsQm9WiutJgKFrRyZDs2GrpXnAjjtSHaMdUTMxOQqmDEyKM1htwqg5+tmbJ9eqsf71anWJhDzW++V7rsLUXRygHzadyyizisioGk/Z5Y3H3ZHW+DG5ePeH154zsbiNlWo+qO4VIAjox9A4qH4JN8Q/wf7h2IdTeb9seEOZ+Qir4VGh+rnuVEDZgbViFbppJHGfdtOO+selcqUCb/U5UDg/c5rwe6B0/Z2BCHvZhvZftD01T1oXoFwJWzWGLRdyQIeZoJf8xugCcKvag6NZsZqo/Q8Br6/pYzziWOHCLgC/ArPcxCWdDKl0eAIekkNNow== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB9PR04MB8430.eurprd04.prod.outlook.com (2603:10a6:10:24f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Wed, 16 Nov 2022 11:46:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:46:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 3/4] selftests: mptcp: pm_listener tests for userspace_pm Date: Wed, 16 Nov 2022 19:46:19 +0800 Message-Id: <2c71346c03507837d10b7a047004348b8c39ece2.1668599064.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0006.apcprd01.prod.exchangelabs.com (2603:1096:404:92::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DB9PR04MB8430:EE_ X-MS-Office365-Filtering-Correlation-Id: e92704fd-5ed9-41e7-b5e8-08dac7c832df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4O13tBAxqdVH+O2QWGVVnfo/a6ocE40WCT4CsRqvIP1G3mwaPN+pXOyurLtIjzMZQyyKGXEofJEmbLvogyOWFS/P3MbamCioqp+aGZ0ZtV49Czo7efI2/9ju6u3oXmVkMZPzG0OCcTpGVoVd+A0E8wrKprxFBpnqMIystLWjPRju1kpGvewkaaA31f4kFeGEyklZ6rRu2LvIXbpFIAktfgtvn1zb3HvW5YgwwDz9+VXv2GT/qkhZcJ9OJvf/VhjQKlwHvNwH7V9S0h9dbqLt8rx7DdBnw57U2+k8e+ik8kToPvDCKEkoU8LeS/52IDpWjbw7PhqHrl/DfOL4KJ0ON2iBenRbnzHX0ObXxP/jSTpIAx9j8SNOwEPJ5HLJmaUV2PiX7HLOkPqpyCXLNrjU1TbZ0SWiK9nuFLmsDln/paqeH85pJIyuYadb6s+4AgVBpkk6Cg3FXRppPlflmf8Gv0iau3Z0F3qNpTmitfvYZDfkv1UiJ2wF0irBA+CDqlKhdjUA0vDL4I2zZmtX34ewv9UPvgPYJBbJFIUvJ3Gn1hd6aHCSGkACIiIZMRrH5d0Cvymc7cm9amstBjdZ7bWXKF+eI7+d+0CVpuNPOrMsjSfbIRO4htiITski6tkLVt+YCOXo3rKgsru5in0bGXUFPM5appSf04Do3opT2LExVds295hDQ534M2y4/3bHEbcwrgfAlDsAPDzy2s5S/fkB3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(346002)(366004)(39860400002)(396003)(376002)(451199015)(107886003)(478600001)(6486002)(6916009)(6666004)(83380400001)(8676002)(4326008)(66946007)(26005)(66476007)(66556008)(41300700001)(36756003)(86362001)(6506007)(316002)(38100700002)(186003)(8936002)(5660300002)(44832011)(2616005)(6512007)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Q0M0NAn/fNWNEjS6Oxt4lvvhmi6e+LS3j02ia79JRQaYS9JVgJRMFNpU2jc0?= =?us-ascii?Q?+RuGi1M2tqLC07AuPBwfrl173k49gtXf+mJlqWS+U+GuZcwdt7ehghVxPnGM?= =?us-ascii?Q?HvZUJtlptdJF2t7eG+D0ouebcdJ/o8Koa54Jz3ObFU0BNOLhQ/gRKmvhV6Lj?= =?us-ascii?Q?3g+MC+4as8QPDGZzvYxLQr7YWc0//XZDkwNH/yP2vtOo2WGObmyPiGs1y4fp?= =?us-ascii?Q?NxF/eoFVKfE2Dhh3ZADHT9tzPaUH3sJmhVu1eqdqP21knrFc3UcoqnqEp5xp?= =?us-ascii?Q?O3yr4miCfwf5dYK7ziHCoocCIlngdJ1MyD4cf95TLCGEq0Kj868RchhM1obv?= =?us-ascii?Q?UGX5LUvbpeGoMSKJ//M5cAZ3xZBvJaIy3BUCbHvyO6DusjYcynyv0jDNkg/9?= =?us-ascii?Q?TzY5hd3Phdcbde+G3/OzyaDm101wSHQ45FauwJ9gUbypWBx6nV0wYRSmyu3H?= =?us-ascii?Q?R1dVLAgEOmj1Ai5a33h2Lvu3x8cGyf8sTs2LYBo/U6KCFX5bYYOMQJyC3y4X?= =?us-ascii?Q?41kSz4qI2Nhi/s8f6O55nzCDoO4ZS/+KuQO3j1KPe8E9PeKfnhMYXKg8aExH?= =?us-ascii?Q?8Cx3ZsNZ1LlMXGzs3SvCssvCgVz/3Sd3GtYE0SyMWBBDDVpwOBnBfr6rS8ap?= =?us-ascii?Q?ZZiQfu549g86W6+NwWND55KTSpyi/oGzxDLzdnXpib7YXoQ55yjGOZqb1CQi?= =?us-ascii?Q?XHnBQVv3LhXi0BWXkLeJf6EYYs+AElMTfvMsjYEAsCq9MTRoHjuvMaoOgeLn?= =?us-ascii?Q?3le7pOCHKCafMCYkdBToBhlZq8ZbcSWkifEFn+RK203pr97iAkl4Mobm8dRY?= =?us-ascii?Q?3n6a17MXukjt7MpqxaT9oQ62/HppjAqdx1vRL7VgD6N9qFuFumiXggM1pKE2?= =?us-ascii?Q?YU+6wG20qGCB+QbhJy4j9GbCT4CFIu2PUBD3KPYcxugfc2Hr6xQ52Nf2BrXv?= =?us-ascii?Q?ZQgR6lqZUhO6/2P3hzV3pS606HstSNVq//DXWXhB/N+1q0nsokM2ttgFHmmx?= =?us-ascii?Q?j//xk+yJbRcjT8BNm/j/EYtCPAWJBCe2UDAYuldqzbVV0Nwjp6pm57W/PaH/?= =?us-ascii?Q?fq73yoMK0bhzJbx1mQAjchM3nH2wfChy0gWdQgbRcZYGJdHvERUffElgKC3O?= =?us-ascii?Q?ZsB518+1VgFRxmt8iz2r0d1Qlq9+zBpcUOT5MekNk0z+WgAQdboc6syokB0F?= =?us-ascii?Q?IAR66DvANtZBBi456ONWmz9LwQYUrRIzRVwzk3ew+USfjcMcSv9AcpEFLYCY?= =?us-ascii?Q?EJZJ4zfqas3QGMCfjqel5hz10CY4vOb6tiPl9Owlh/GxlC+V09/kiSy+PGsp?= =?us-ascii?Q?hj7TczFZw4QGy2KuJ5UuC8Mix84Zpmek3S/jqFwL9B2wIWH9glW1sAUCCYKM?= =?us-ascii?Q?NXnJnZcDCrtAlGsw3a6aC8KJxXx47oN9WvO6bErqYdtOBRpO8vbHqKdtefn/?= =?us-ascii?Q?sDZ8a7hIAc2zhsjOk/8scGenqBxQvBMeHdrJclpbFUGncobZ0ulAtU0hCsO8?= =?us-ascii?Q?OUC+S4cIuWj7QByBQlYDmJgCaUQo0e4c9iDQ0RrRma3kR0DMOU5mqn9mGT3T?= =?us-ascii?Q?tpdRHsUk4s5FrAZZTwmioMRFDSaGW9dBD++WxzrbgPcR7Goss7OHgIyB7Ld+?= =?us-ascii?Q?tg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e92704fd-5ed9-41e7-b5e8-08dac7c832df X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:46:29.0692 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9XOomLu+9iPGCNymoU1tQPjb+EQZ9opN01g+vW0NxfnzpBxoT9yHAyQ5OoszAHO9qAcZsXlmD1B27EQPdwrCrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8430 Content-Type: text/plain; charset="utf-8" Add pm_listener selftests for userspace_pm.sh. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/userspace_pm.sh | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 08a88ea47a29..40801279ebdf 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -11,6 +11,8 @@ ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED +LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED =20 AF_INET=3D2 AF_INET6=3D10 @@ -808,11 +810,91 @@ test_prio() fi } =20 +verify_listener_events() +{ + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + + if [ $e_type =3D $LISTENER_CREATED ]; then + stdbuf -o0 -e0 printf "CREATE_LISTENER %s:%s\t\t\t\t\t"\ + $e_saddr $e_sport + elif [ $e_type =3D $LISTENER_CLOSED ]; then + stdbuf -o0 -e0 printf "CLOSE_LISTENER %s:%s\t\t\t\t\t"\ + $e_saddr $e_sport + fi + + type=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q') + family=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q') + sport=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + if [ $family =3D $AF_INET6 ]; then + saddr=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + else + saddr=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q') + fi + + if [ $type =3D $e_type ] && [ $family =3D $e_family ] && + [ $saddr =3D $e_saddr ] && [ $sport =3D $e_sport ]; then + stdbuf -o0 -e0 printf "[OK]\n" + return 0 + fi + stdbuf -o0 -e0 printf "[FAIL]\n" + exit 1 +} + +test_listener() +{ + local evts + evts=3D$(mktemp) + # Capture events on the network namespace running the server + :>$evts + ip netns exec $ns2 ./pm_nl_ctl events >> $evts 2>&1 & + evts_pid=3D$! + sleep 0.5 + + # Attempt to add a listener at 10.0.2.2: + ip netns exec $ns2 ./pm_nl_ctl listen 10.0.2.2\ + $client4_port > /dev/null 2>&1 & + local listener_pid=3D$! + + verify_listener_events $evts 15 $AF_INET 10.0.2.2 $client4_port + + # ADD_ADDR from client to server machine reusing the subflow port + ip netns exec $ns2 ./pm_nl_ctl ann 10.0.2.2 token $client4_token id\ + $client_addr_id > /dev/null 2>&1 + sleep 0.5 + + # CREATE_SUBFLOW from server to client machine + ip netns exec $ns1 ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\ + rport $client4_port token $server4_token > /dev/null 2>&1 + sleep 0.5 + + # Delete the listener from the client ns, if one was created + kill_wait $listener_pid + + verify_listener_events $evts 16 $AF_INET 10.0.2.2 $client4_port + + kill_wait $evts_pid + rm -f $evts +} + make_connection make_connection "v6" test_announce test_remove test_subflows test_prio +test_listener =20 exit 0 --=20 2.35.3 From nobody Wed Apr 24 15:49:26 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130055.outbound.protection.outlook.com [40.107.13.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D69377C for ; Wed, 16 Nov 2022 11:46:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TWjqVrthj+dfDwjMpqQIcfExQCDxrrojyp57SgT5QN7uJTBTF1raM/D8XXJII0/U8tnQ1iK/OqyI/c6gntXDeayZYR0WC4J1ChM9Ct1ZkKT1AV+lMIIiG7iFpM03xl2YG+yGyDZCPMAAimRW055Ia5qKXM3+TNsYvZfUBllp1lxsxdo+S5UqvOskuz/XgGbooU3ggUPNsJUN/FeGwWzG00Ym4PA2rLiBr2hsSDwXNViQ5+DQ3iX2sq8p4NJJrZOkS91Qfxa57yIaLdvar+ta2XGsbkZ7hZqkVKBUeXX2qUOX/4Zj/HN0Jc2wW/HzS7wJTACfd7ulwsalu5Mzm1P63w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E3xQautB4P0fmkw1HOwKWhfub5hS7pcWPFi9zow16Aw=; b=eaIhs8tTMUPzkilRPPRxPdlKm3SmmJwxMpxWCMSvXJhyQ+7vBO9gkQMErwiKd/Xtju7NbLXmBB/2pNjgLq+LxFM6DnlWQX1YAYBOcoYARCRNhCO9p8tvtNf6wgbUV+AjjdyJSikq6l2SNgOQJNMph4gSgoiJ/+WYvT67DLxMqje62YmbjXiVl6SfqAJZGp0luvSoAXorjlqDH7nrjAvZC8685/f/f6pPWRKo2A/ULPzUnzEZGGRBRHta5q997+emzx+8c2V6lrPxwZtzfwiC5nDI21VWgdXdlb90ZTVR6urHUkga27Awg/hejWA6LSI+MwlVyhtUjZwc87+4JfVADQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E3xQautB4P0fmkw1HOwKWhfub5hS7pcWPFi9zow16Aw=; b=DT5CGOp5Gj6sTUvmF7qLgyauYz2kG0HsIIgikex3M8CpbAc7kfI17Q0ZJQo3cnwEGBLhpiOtyI5NEZCBmz712MrW42ersGIKqdPKJzMpTKMV7RA8zr0Kk1LnW0s8s4bE4Ls7HGaUG57EkwIuGPj80qrFxej+vfRgRm/KDjmtnvnvLbCKiinDICzq/vRw1ODKL4rJ2E4okL6N5srHN1uGHGhppx37UdjNSbd/pKssL3VlfNC6dxbKgQCYWojXHzK4Wy/nlbYhZF2WGdX2pX9h9FPH8p2T1cI4zBvWcXle57JIHS8qJmYhbA6raE/KW/jxIWfw1alYvdwPP/+x1fud6g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8657.eurprd04.prod.outlook.com (2603:10a6:20b:428::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.16; Wed, 16 Nov 2022 11:46:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::40e6:908c:5bd1:7bb4%6]) with mapi id 15.20.5813.017; Wed, 16 Nov 2022 11:46:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 4/4] selftests: mptcp: pm_listener tests for mptcp_join Date: Wed, 16 Nov 2022 19:46:20 +0800 Message-Id: <9962e346177f1f5b00f418a6b965a025050aa960.1668599064.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0010.apcprd01.prod.exchangelabs.com (2603:1096:404:92::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8657:EE_ X-MS-Office365-Filtering-Correlation-Id: bb66fe56-0703-4d7f-c5bc-08dac7c837b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HbuiS1eX5RWrwsEeoYiVAyg77AjuWwpfuIrKKZsKbTxJZtDhKnA9gGfBGKZ0cH481rehVK5qMrc9m0J7QhLDCt44E0Ip4As4CM+bBTjARxdXOx2eO5DM0egZOsJI0jZ/+/Jn/QHMrKSp0Qg9gpNzqHsRvnC91telvUL2fwD+EEx1njCC0zbgkNSWouBY72Hg8soTyDGevJK30NF3RR4BdyB1mnroH6ImBLTtdbdAOQyyjywuaKVevw27FBFwxjV+s5JvTQNtl/Tr2HPUAdkFhqPN08kh4f9LV1fwn0+rfOP0jL1ZR0WV/g40tElWuYJW0xivj9i1/U23Jym1A3A0ZdNEf/B8Tv6tQUydohODbnP83uaQd590HXYxrqwWaUOs0O/qat8g4AzwcsoWXA4EX6v/Syu/oGJNOte4uhu8mVmf2yV0hEG+/vQIXlvr86Y260OWlj/Gc10OHY3lYYlYxVlmTH9Q5Xq5lop56tQW6oSkEUDHYRNXL2UzIh5ZIkkwgBO872A3tQN0MSbIR74PBcBvpDgVjfSsi4d/qxBxarI3aec9tdh9bSaZ+w6pDT7dnjPC4QdWOcxlS0rEsdwa3ZpMZpp+dyLN2UsodTPxBJrn7FVwNHS8NvSVQICZSHWzW5bM2ipq89/pmtkYl3PccHoZVwAWJuMKvrdXQ/KuEal9aCsw242JW8f098ZdBdN5QAouPVivrFYXkpWxQKPbXg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(136003)(366004)(396003)(376002)(39860400002)(451199015)(2616005)(186003)(44832011)(8936002)(26005)(6506007)(36756003)(107886003)(316002)(66556008)(6916009)(66476007)(478600001)(86362001)(4326008)(6666004)(8676002)(66946007)(6486002)(5660300002)(41300700001)(6512007)(38100700002)(83380400001)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VSxveC2F771aFDb30co3Kjjm1ptQ/uXRqG0RLkvhJaQFjNfWXVVGqSEkzirq?= =?us-ascii?Q?V1zCU8LsnZAZL5wPbwNtADrPbIdMf/ehWX5WCZpswGLfFSd8o7JU71aKmAD6?= =?us-ascii?Q?5sQ3JZdo8U8wS/0YpI/Zf9I+cw/god0Zp9J+5XVMTDgsKoRh3Fj4gR2K/nWz?= =?us-ascii?Q?LlYcAbnD3KgX093RDqwEoqWytiEQPPG+Zkg22KOZg0227ViRKkDPQ/5FVaf+?= =?us-ascii?Q?viOHM2jb4Fblwuw9B1OT/UBJqk2gJ72kncTKl7Zz8tHsaJ6KoP3ye3/0Y3pA?= =?us-ascii?Q?wMrEAvrNwowRRKk7RRXqWH2/QuegzC3D0kROVWRsHIVXqqfW/MhIo/qElF5y?= =?us-ascii?Q?B4mX3XB6A9uyI3NHHNskJtRfygk62MZGM0xbT3/OUNQ/GvyZ8lFNDPjZMz0a?= =?us-ascii?Q?g6PTbgrxCaw3L2//mYv1Dxvpp44xaZqBKvNGj6iaRCYXdVjbXPVOj/S6Nak7?= =?us-ascii?Q?a47LgH0aQB92ZJdBqj7lU924EpKN8hcARYdNop/qb0luDqPrCCisE272a3FM?= =?us-ascii?Q?SreOHNs/4IUTcDYfLXC9rVanK59fbFdJCUQ/mDfIP43cRVhjG/k74MuYYunh?= =?us-ascii?Q?5Q4svTH6Ab5MQVsHcJsMj3EwhnR27GH6uPfeWKv0ASmZR+lzaHObFuhC50bs?= =?us-ascii?Q?qUrtLayJcPEXVuFmiHOWWXEQqpXD7gW8QM273P5JyER2ZowxjZxFc3u+mTx1?= =?us-ascii?Q?02Tsa7yfvTWJqTlHDau3GNO8za1azxEcu6s1qT5NJLU2M/KNVDxJ0xxV2FN/?= =?us-ascii?Q?vuqBjxEc9/DE+3mUvZIzgDu9pONWHzuwICrPtqEwrEl/OwtpmKsi5qqSKCa9?= =?us-ascii?Q?fMehFgFyfO1CdD3c83oKyR6CXX5SkO/eiE1H6NebuxbPDWG0zLFiPjGG29Up?= =?us-ascii?Q?gBBK+7MYhGJrwjraJo5iepOCYBztJU8xNro8Svb9xZMwQgTnjrfxC4IzYITW?= =?us-ascii?Q?4FRxlBUh9t0gQp6u9Ke1RCrAexJqAbL4IEmgV2tHk+n4o4NMx1bOFoLqqh/M?= =?us-ascii?Q?OWUf8dsWfS1pm4ZxYsMBIi/SbMaBbjt6jmaHn1UMy4mdxPd9HcKD6aIJmfN7?= =?us-ascii?Q?PKI7sMA8Onqyx4cllH3tx1R/rSEEUEbB4HlIOxibNZnWKiR4RDcbTfVWCE06?= =?us-ascii?Q?3OnHuqQK912oyVXiU09p58Br0Q7D8CQBKBwNBfQY5bIL3VTMbKrihIWEOxJY?= =?us-ascii?Q?3MBGuq2oqMehieCOdzK8tRgEtGwN62bHQJtZtlnMgN72TeHbBvN54x42qdNZ?= =?us-ascii?Q?7UYwbG66v11B32MrmxH76wIhISlJGFGWeD5OuaU2ZtQZVDOUDwnR6tGDSFK3?= =?us-ascii?Q?trQFFFdW6y0h5pHSmLImKCrpEcGsfaAECnn+P6Fi02AmuWhUN2ZH0PASKNj9?= =?us-ascii?Q?lUe4sjHpNlN7zWMc+1cS66XIHPcfxBDpYZCXdJDtqjKgHjlQfkO1fdZQdfCm?= =?us-ascii?Q?asnmLH/WxHEM5Jc1NUUV+R6CYM9s7u4d0OL8inqjtYrwPLWe7QhpU+/DsxIm?= =?us-ascii?Q?MiONc7AOUvrCyqJXh2Y0ZFmUz6mAV4Ea1fx7bZGJpNA3Y2pSNoMX6KxynKUu?= =?us-ascii?Q?11bvCiyK4vGsGeRrcv4h18k17uH5R+RxsEygJEzkrhvCOTEmsigI3rxENzkO?= =?us-ascii?Q?Kg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb66fe56-0703-4d7f-c5bc-08dac7c837b9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 11:46:37.2404 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: th9PRRAm2wmhohHcpYdax3mOz+SG8l2VNKJIjQezJMVkpXUKIsrzbgPMkaJBLtXlHi1e+iWd00Fk9/+xxY6XPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8657 Content-Type: text/plain; charset="utf-8" Add pm_listener selftests for mptcp_join.sh. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f10ef65a7009..0810e9c12fd5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2509,6 +2509,54 @@ backup_tests() fi } =20 +LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +AF_INET=3D2 +AF_INET6=3D10 + +verify_listener_events() +{ + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + + if [ $e_type =3D $LISTENER_CREATED ]; then + stdbuf -o0 -e0 printf "\t\t\t\t\t CREATE_LISTENER %s:%s"\ + $e_saddr $e_sport + elif [ $e_type =3D $LISTENER_CLOSED ]; then + stdbuf -o0 -e0 printf "\t\t\t\t\t CLOSE_LISTENER %s:%s "\ + $e_saddr $e_sport + fi + + type=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q') + family=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q') + sport=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + if [ $family =3D $AF_INET6 ]; then + saddr=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + else + saddr=3D$(grep "type:$e_type," $evt | + sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q') + fi + + if [ $type =3D $e_type ] && [ $family =3D $e_family ] && + [ $saddr =3D $e_saddr ] && [ $sport =3D $e_sport ]; then + stdbuf -o0 -e0 printf "[ ok ]\n" + return 0 + fi + stdbuf -o0 -e0 printf "[fail]\n" +} + add_addr_ports_tests() { # signal address with port @@ -2589,6 +2637,30 @@ add_addr_ports_tests() chk_join_nr 2 2 2 chk_add_nr 2 2 2 fi + + # pm listener events + if reset "pm listener events"; then + local evts + local pid + + evts=3D$(mktemp) + :> $evts + ip netns exec $ns1 ./pm_nl_ctl events >> $evts 2>&1 & + pid=3D$! + + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns2 1 1 + run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow + chk_join_nr 1 1 1 + chk_add_nr 1 1 1 + chk_rm_nr 1 1 invert + + verify_listener_events $evts 15 $AF_INET 10.0.2.1 10100 + verify_listener_events $evts 16 $AF_INET 10.0.2.1 10100 + kill_wait $pid + rm -rf $evts + fi } =20 syncookies_tests() --=20 2.35.3