From: Donald Hunter <donald.hunter@gmail.com>
To: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>
Cc: donald.hunter@redhat.com, Donald Hunter <donald.hunter@gmail.com>
Subject: [PATCH net-next v2 1/6] tools: ynl: Fix genlmsg header encoding formats
Date: Sun, 19 Mar 2023 19:37:58 +0000 [thread overview]
Message-ID: <20230319193803.97453-2-donald.hunter@gmail.com> (raw)
In-Reply-To: <20230319193803.97453-1-donald.hunter@gmail.com>
The pack strings use 'b' signed char for cmd and version but struct
genlmsghdr defines them as unsigned char. Use 'B' instead.
Fixes: 4e4480e89c47 ("tools: ynl: move the cli and netlink code around")
Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
---
tools/net/ynl/lib/ynl.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 90764a83c646..32536e1f9064 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -200,7 +200,7 @@ def _genl_msg(nl_type, nl_flags, genl_cmd, genl_version, seq=None):
if seq is None:
seq = random.randint(1, 1024)
nlmsg = struct.pack("HHII", nl_type, nl_flags, seq, 0)
- genlmsg = struct.pack("bbH", genl_cmd, genl_version, 0)
+ genlmsg = struct.pack("BBH", genl_cmd, genl_version, 0)
return nlmsg + genlmsg
@@ -264,7 +264,7 @@ class GenlMsg:
self.hdr = nl_msg.raw[0:4]
self.raw = nl_msg.raw[4:]
- self.genl_cmd, self.genl_version, _ = struct.unpack("bbH", self.hdr)
+ self.genl_cmd, self.genl_version, _ = struct.unpack("BBH", self.hdr)
self.raw_attrs = NlAttrs(self.raw)
@@ -358,7 +358,7 @@ class YnlFamily(SpecFamily):
raw >>= 1
i += 1
else:
- value = enum['entries'][raw - i]
+ value = enum.entries_by_val[raw - i].name
rsp[attr_spec['name']] = value
def _decode(self, attrs, space):
--
2.39.0
next prev parent reply other threads:[~2023-03-19 19:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 19:37 [PATCH net-next v2 0/6] ynl: add support for user headers and struct attrs Donald Hunter
2023-03-19 19:37 ` Donald Hunter [this message]
2023-03-19 19:37 ` [PATCH net-next v2 2/6] tools: ynl: Add struct parsing to nlspec Donald Hunter
2023-03-22 5:22 ` Jakub Kicinski
2023-03-22 11:38 ` Donald Hunter
2023-03-22 18:25 ` Jakub Kicinski
2023-03-19 19:38 ` [PATCH net-next v2 3/6] tools: ynl: Add array-nest attr decoding to ynl Donald Hunter
2023-03-22 5:18 ` Jakub Kicinski
2023-03-22 11:27 ` Donald Hunter
2023-03-22 18:27 ` Jakub Kicinski
2023-03-19 19:38 ` [PATCH net-next v2 4/6] tools: ynl: Add struct " Donald Hunter
2023-03-22 5:30 ` Jakub Kicinski
2023-03-22 11:48 ` Donald Hunter
2023-03-22 18:37 ` Jakub Kicinski
2023-03-22 22:06 ` Donald Hunter
2023-03-19 19:38 ` [PATCH net-next v2 5/6] tools: ynl: Add fixed-header support " Donald Hunter
2023-03-22 5:34 ` Jakub Kicinski
2023-03-22 11:54 ` Donald Hunter
2023-03-19 19:38 ` [PATCH net-next v2 6/6] netlink: specs: add partial specification for openvswitch Donald Hunter
2023-03-23 3:50 ` [PATCH net-next v2 0/6] ynl: add support for user headers and struct attrs patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319193803.97453-2-donald.hunter@gmail.com \
--to=donald.hunter@gmail.com \
--cc=davem@davemloft.net \
--cc=donald.hunter@redhat.com \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.