raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-11 12:30:09 +00:00
Code Issues Projects Releases Wiki Activity

tools: ynl: support directional enum-model in CLI

Browse Source 
Support families which use different IDs for messages
to and from the kernel.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2023-01-30 18:33:46 -08:00
parent 19b64b48a3
commit fd0616d342
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/net/ynl/lib/ynl.py
View File

@@ -313,7 +313,7 @@ class YnlFamily(SpecFamily):
for msg in self.msgs.values(): for msg in self.msgs.values():
if msg.is_async: if msg.is_async:
self.async_msg_ids.add(msg.value) self.async_msg_ids.add(msg.rsp_value)
for op_name, op in self.ops.items(): for op_name, op in self.ops.items():
bound_f = functools.partial(self._op, op_name) bound_f = functools.partial(self._op, op_name)
@@ -398,7 +398,7 @@ class YnlFamily(SpecFamily):
if self.include_raw: if self.include_raw:
msg['nlmsg'] = nl_msg msg['nlmsg'] = nl_msg
msg['genlmsg'] = genl_msg msg['genlmsg'] = genl_msg
op = self.msgs_by_value[genl_msg.genl_cmd] op = self.rsp_by_value[genl_msg.genl_cmd]
msg['name'] = op['name'] msg['name'] = op['name']
msg['msg'] = self._decode(genl_msg.raw_attrs, op.attr_set.name) msg['msg'] = self._decode(genl_msg.raw_attrs, op.attr_set.name)
self.async_msg_queue.append(msg) self.async_msg_queue.append(msg)
@@ -435,7 +435,7 @@ class YnlFamily(SpecFamily):
nl_flags |= Netlink.NLM_F_DUMP nl_flags |= Netlink.NLM_F_DUMP
req_seq = random.randint(1024, 65535) req_seq = random.randint(1024, 65535)
msg = _genl_msg(self.family.family_id, nl_flags, op.value, 1, req_seq) msg = _genl_msg(self.family.family_id, nl_flags, op.req_value, 1, req_seq)
for name, value in vals.items(): for name, value in vals.items():
msg += self._add_attr(op.attr_set.name, name, value) msg += self._add_attr(op.attr_set.name, name, value)
msg = _genl_msg_finalize(msg) msg = _genl_msg_finalize(msg)
@@ -458,7 +458,7 @@ class YnlFamily(SpecFamily):
gm = GenlMsg(nl_msg) gm = GenlMsg(nl_msg)
# Check if this is a reply to our request # Check if this is a reply to our request
if nl_msg.nl_seq != req_seq or gm.genl_cmd != op.value: if nl_msg.nl_seq != req_seq or gm.genl_cmd != op.rsp_value:
if gm.genl_cmd in self.async_msg_ids: if gm.genl_cmd in self.async_msg_ids:
self.handle_ntf(nl_msg, gm) self.handle_ntf(nl_msg, gm)
continue continue