cpp/funstraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ugly family name/id mapping

Browse Source
This commit is contained in:
Ian Gulliver
2015-01-10 15:47:58 +00:00
parent f88c78de06
commit e7d80945b4
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nl80211.py
View File

@@ -248,24 +248,33 @@ class GenericNetlink(object):
7: ('mcast_groups', Array(_mcast_grp_attr)), 7: ('mcast_groups', Array(_mcast_grp_attr)),
}) })
_msgtypes = { _msgtypes = [
'nlctrl': [_ctrl_attr, 0x10], [0x10, 'nlctrl', _ctrl_attr],
} ]
CTRL_CMD_NEWFAMILY = 0x01 CTRL_CMD_NEWFAMILY = 0x01
CTRL_CMD_GETFAMILY = 0x03 CTRL_CMD_GETFAMILY = 0x03
def __init__(self): def __init__(self):
self._netlink = Netlink() self._netlink = Netlink()
self._UpdateMsgTypes()
self.Send('nlctrl', self._netlink.NLMSG_F_DUMP, self.CTRL_CMD_GETFAMILY, 1, '') self.Send('nlctrl', self._netlink.NLMSG_F_DUMP, self.CTRL_CMD_GETFAMILY, 1, '')
for msg in self.Recv(): for msg in self.Recv():
msgtype, attrs = msg msgtype, attrs = msg
assert msgtype == self.CTRL_CMD_NEWFAMILY, msgtype assert msgtype == self.CTRL_CMD_NEWFAMILY, msgtype
family_name = attrs['family_name'].rstrip('\0') family_name = attrs['family_name'].rstrip('\0')
self._msgtypes.setdefault(family_name, [None, None])[1] = attrs['family_id'] if family_name in self._msgtypes_by_name:
assert attrs['family_id'] == self._msgtypes_by_name[family_name][0], attrs['family_id']
else:
self._msgtypes.append([attrs['family_id'], family_name, None])
self._UpdateMsgTypes()
def _UpdateMsgTypes(self):
self._msgtypes_by_id = dict((i[0], i) for i in self._msgtypes)
self._msgtypes_by_name = dict((i[1], i) for i in self._msgtypes)
def RegisterMsgType(self, family_name, parser): def RegisterMsgType(self, family_name, parser):
self._msgtypes[family_name][0] = parser self._msgtypes_by_name[family_name][2] = parser
def Send(self, msgtype, flags, cmd, version, msg): def Send(self, msgtype, flags, cmd, version, msg):
accumulator = Accumulator() accumulator = Accumulator()
@@ -275,13 +284,13 @@ class GenericNetlink(object):
version=version, version=version,
reserved=0) reserved=0)
accumulator.Append(msg) accumulator.Append(msg)
msgtype_id = self._msgtypes[msgtype][1] msgtype_id = self._msgtypes_by_name[msgtype][0]
self._netlink.Send(msgtype_id, flags, str(accumulator)) self._netlink.Send(msgtype_id, flags, str(accumulator))
def Recv(self): def Recv(self):
for msgtype, iterator in self._netlink.Recv(): for msgtype, iterator in self._netlink.Recv():
genlhdr = self._genlmsghdr.Unpack(iterator) genlhdr = self._genlmsghdr.Unpack(iterator)
parser = [v[0] for v in self._msgtypes.itervalues() if v[1] == msgtype][0] parser = self._msgtypes_by_id[msgtype][2]
yield (genlhdr['cmd'], parser.Unpack(iterator)) yield (genlhdr['cmd'], parser.Unpack(iterator))