Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

auto-t: allow multiple PSKAgent's to be registered

Browse Source 
By creating a new bus connection for each agent we can register multiple
with IWD. This did mean the agent interface needs to be unique for each
agent (removing _agent_manager_if) as well as tracking multiple agents
in a list.
This commit is contained in:
James Prestwood 2022-06-29 10:31:12 -07:00 committed by Denis Kenzior
parent d802762be1
commit 01ae1a9d88
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
autotests/util/iwd.py
View File

@ -858,10 +858,11 @@ class PSKAgent(dbus.service.Object):
users = [users] users = [users]
self.users = users self.users = users
self._path = '/test/agent/%s' % agent_count self._path = '/test/agent/%s' % agent_count
self._bus = dbus.bus.BusConnection(address_or_type=namespace.dbus_address)
agent_count += 1 agent_count += 1
dbus.service.Object.__init__(self, namespace.get_bus(), self._path) dbus.service.Object.__init__(self, self._bus, self._path)
@property @property
def path(self): def path(self):
@ -1079,11 +1080,10 @@ class IWD(AsyncOpAbstract):
start_iwd_daemon=True) start_iwd_daemon=True)
''' '''
_object_manager_if = None _object_manager_if = None
_agent_manager_if = None
_iwd_proc = None _iwd_proc = None
_devices = None _devices = None
_default_instance = None _default_instance = None
psk_agent = None psk_agents = []
def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp', def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp',
iwd_storage_dir = IWD_STORAGE_DIR, namespace=ctx): iwd_storage_dir = IWD_STORAGE_DIR, namespace=ctx):
@ -1107,11 +1107,12 @@ class IWD(AsyncOpAbstract):
IWD._default_instance = weakref.ref(self) IWD._default_instance = weakref.ref(self)
def __del__(self): def __del__(self):
if self.psk_agent: for agent in self.psk_agents:
self.unregister_psk_agent(self.psk_agent) self.unregister_psk_agent(agent)
self.psk_agents = []
self._object_manager_if = None self._object_manager_if = None
self._agent_manager_if = None
self._known_networks = None self._known_networks = None
self._devices = None self._devices = None
@ -1130,15 +1131,6 @@ class IWD(AsyncOpAbstract):
DBUS_OBJECT_MANAGER) DBUS_OBJECT_MANAGER)
return self._object_manager_if return self._object_manager_if
@property
def _agent_manager(self):
if self._agent_manager_if is None:
self._agent_manager_if =\
dbus.Interface(self._bus.get_object(IWD_SERVICE,
IWD_AGENT_MANAGER_PATH),
IWD_AGENT_MANAGER_INTERFACE)
return self._agent_manager_if
@staticmethod @staticmethod
def _wait_for_object_condition(obj, condition_str, max_wait = 50): def _wait_for_object_condition(obj, condition_str, max_wait = 50):
def _eval_wrap(obj, condition_str): def _eval_wrap(obj, condition_str):
@ -1264,22 +1256,27 @@ class IWD(AsyncOpAbstract):
return known_network_list return known_network_list
def register_psk_agent(self, psk_agent): def register_psk_agent(self, psk_agent):
self._agent_manager.RegisterAgent( iface = dbus.Interface(psk_agent._bus.get_object(IWD_SERVICE,
psk_agent.path, IWD_AGENT_MANAGER_PATH),
dbus_interface=IWD_AGENT_MANAGER_INTERFACE, IWD_AGENT_MANAGER_INTERFACE)
reply_handler=self._success, iface.RegisterAgent(psk_agent.path,
error_handler=self._failure) dbus_interface=IWD_AGENT_MANAGER_INTERFACE,
reply_handler=self._success,
error_handler=self._failure)
self._wait_for_async_op() self._wait_for_async_op()
self.psk_agent = psk_agent self.psk_agents.append(psk_agent)
def unregister_psk_agent(self, psk_agent): def unregister_psk_agent(self, psk_agent):
self._agent_manager.UnregisterAgent( iface = dbus.Interface(psk_agent._bus.get_object(IWD_SERVICE,
psk_agent.path, IWD_AGENT_MANAGER_PATH),
dbus_interface=IWD_AGENT_MANAGER_INTERFACE, IWD_AGENT_MANAGER_INTERFACE)
reply_handler=self._success, iface.UnregisterAgent(psk_agent.path,
error_handler=self._failure) dbus_interface=IWD_AGENT_MANAGER_INTERFACE,
reply_handler=self._success,
error_handler=self._failure)
self._wait_for_async_op() self._wait_for_async_op()
self.psk_agent = None self.psk_agents.remove(psk_agent)
@staticmethod @staticmethod
def get_instance(): def get_instance():