From nobody Sat Apr 08 19:45:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pv5LC5Htnz44nY8; Sat, 8 Apr 2023 19:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pv5LC36HLz44nQ; Sat, 8 Apr 2023 19:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=410Y+sOtQ9FEXStFk87ZJKZggPyaEDeAHl6IpGhkNcU=; b=yQFzq1Tf1js8p8mAr8aNFYyIwGMqca922nZXN1pfs5Qmhb/2FLwt+3Cl43+VSrl2YXSH07 sMVns2LhPAjQJyahJSRSC7wlox9HxVKr60XPumGQS1lt7goctiszohTzT2ifG3iN1+sQgK Jv7Sz+szCrawmK7E3uMKfSaDe7rQMyI1azQD7cT7vGlGo7cxWgQD+W5pAIwB5GjIinVKXm dswVPFx1ebO5PBUchto0Lj9U9tZHnqCe7dFQPsHoqGCD7yxmKdNRO2ND4ks3XEVhgmQDLx mtQITCG7p6a6uDTaI6V+F1vahX+BKv+WMOwKHsPlpJ3T/vSlNYnKP1QPPbZo6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680983107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=410Y+sOtQ9FEXStFk87ZJKZggPyaEDeAHl6IpGhkNcU=; b=Du/cBqA++dLFcvGUv2MlryOFALWa+Utd3I7MzsJCDBHXmrkyGSHa6cUy1QBqOd0ahR+6Zb +mX38MR7XQ2u2oh5auqUmDs/YdIZ+j+2VoIhC0vQsslHpRJXYi20fNtW1aF+ECEuVJFhtM IITPlxX7UXCzuqnZWggpx5eyT9zVKpIBj52vmmPMxbxAuma+/XCIc1fp46OjhBWuLni2N8 OTvq3mHE0MOGUpT6yfdv2M45Nr0KVBQzwXsxqdSQDxBNjGuLxPj7tOD9aWNlhRhcLdtix2 D22kEyWOVi3EBhWJt3CjJZLSdU3jZsMPCJvQ+sm37QqSWMp1nys34/AnWDDlhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680983107; a=rsa-sha256; cv=none; b=AaRZbtiMy8meSqbLXQZY5dSLRX5if5XF1fs2KsATKWubuR0Jir2GX827FdnRZc/VMsGTmb xo+m8rVrQUhfisNNxnudQkrazkd303Luji8qvoWBg6AhcJVaKDTzDx9AO8+xMIdBsveo45 kWjP8ULnNOb2xmS55LHk4MP1yTI0djKmhqKLk6fXYsVbxZjVqEUEU1CHTtH0frz3BGgHfq jfqLT0hn3G6HYHhGZfu6sj6hfMMlWyYRmgZklAgr9jIhsZgmR6G3ZM6if0ZmAi+CiDIi3r 8P914W1/fc3RIUltNDmAlW5l36D7gNDZYxyRhMd5sXfav6dc0YLdmonPaYGKWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pv5LB6CFmzfYc; Sat, 8 Apr 2023 19:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 338Jj6o5019015; Sat, 8 Apr 2023 19:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338Jj6aa019014; Sat, 8 Apr 2023 19:45:06 GMT (envelope-from git) Date: Sat, 8 Apr 2023 19:45:06 GMT Message-Id: <202304081945.338Jj6aa019014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 9a8ea61a14fc - stable/13 - tests: fix python parsing of netlink nested attributes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a8ea61a14fc698092370eff87f9723abc7dfc84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=9a8ea61a14fc698092370eff87f9723abc7dfc84 commit 9a8ea61a14fc698092370eff87f9723abc7dfc84 Author: Alexander V. Chernikov AuthorDate: 2023-03-13 10:17:36 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 19:18:47 +0000 tests: fix python parsing of netlink nested attributes MFC after: 2 weeks (cherry picked from commit 90bc2120b51bc5ac9fbcb29763cc47562ee49977) --- tests/atf_python/sys/net/netlink.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/atf_python/sys/net/netlink.py b/tests/atf_python/sys/net/netlink.py index bfbf3217d52a..053eb432e915 100644 --- a/tests/atf_python/sys/net/netlink.py +++ b/tests/atf_python/sys/net/netlink.py @@ -1082,6 +1082,7 @@ rtnl_ifla_attrs = prepare_attrs_map( AttrDescr(IflattrType.IFLA_BROADCAST, NlAttrMac), AttrDescr(IflattrType.IFLA_IFNAME, NlAttrStr), AttrDescr(IflattrType.IFLA_MTU, NlAttrU32), + AttrDescr(IflattrType.IFLA_LINK, NlAttrU32), AttrDescr(IflattrType.IFLA_PROMISCUITY, NlAttrU32), AttrDescr(IflattrType.IFLA_OPERSTATE, NlAttrU8), AttrDescr(IflattrType.IFLA_CARRIER, NlAttrU8), @@ -1279,8 +1280,8 @@ class StdNetlinkMessage(BaseNetlinkMessage): val = v["ad"].cls.from_bytes(data[off : off + nla_len], v["ad"].val) if "child" in v: # nested - attrs, _ = self.parse_attrs(data[off : off + nla_len], v["child"]) - val = NlAttrNested(raw_nla_type, attrs) + attrs, _ = self.parse_attrs(data[off + 4 : off + nla_len], v["child"]) + val = NlAttrNested(v["ad"].val, attrs) else: # unknown attribute val = NlAttr(raw_nla_type, data[off + 4 : off + nla_len])