From 3ecfc012e2db8b464596faf2c3bd4db1cab8697b Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 7 May 2024 11:51:34 +0200 Subject: Discovery: Implement search and do not return keywords This patch implements search by adding a second argument to DiscoOrganizations and DiscoServers. A search string of = "" returns everything. This also makes the subset that is returned to the client even fewer, no keywords. --- wrappers/python/eduvpn_common/loader.py | 4 ++-- wrappers/python/eduvpn_common/main.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'wrappers/python/eduvpn_common') diff --git a/wrappers/python/eduvpn_common/loader.py b/wrappers/python/eduvpn_common/loader.py index 08179ee..b74741f 100644 --- a/wrappers/python/eduvpn_common/loader.py +++ b/wrappers/python/eduvpn_common/loader.py @@ -49,8 +49,8 @@ def initialize_functions(lib: CDLL) -> None: lib.Deregister.argtypes, lib.Deregister.restype = [], None lib.ExpiryTimes.argtypes, lib.ExpiryTimes.restype = [], DataError lib.FreeString.argtypes, lib.FreeString.restype = [c_void_p], None - lib.DiscoOrganizations.argtypes, lib.DiscoOrganizations.restype = [c_int], DataError - lib.DiscoServers.argtypes, lib.DiscoServers.restype = [c_int], DataError + lib.DiscoOrganizations.argtypes, lib.DiscoOrganizations.restype = [c_int, c_char_p], DataError + lib.DiscoServers.argtypes, lib.DiscoServers.restype = [c_int, c_char_p], DataError lib.GetConfig.argtypes, lib.GetConfig.restype = ( [ c_int, diff --git a/wrappers/python/eduvpn_common/main.py b/wrappers/python/eduvpn_common/main.py index 4582c8d..cb81e53 100644 --- a/wrappers/python/eduvpn_common/main.py +++ b/wrappers/python/eduvpn_common/main.py @@ -178,13 +178,13 @@ class EduVPN(object): forwardError(server_err) return server - def get_disco_organizations(self) -> str: - orgs, _ = self.go_cookie_function(self.lib.DiscoOrganizations) + def get_disco_organizations(self, search="") -> str: + orgs, _ = self.go_cookie_function(self.lib.DiscoOrganizations, search) # TODO: Log error return orgs - def get_disco_servers(self) -> str: - servers, _ = self.go_cookie_function(self.lib.DiscoServers) + def get_disco_servers(self, search="") -> str: + servers, _ = self.go_cookie_function(self.lib.DiscoServers, search) # TODO: Log error return servers -- cgit v1.2.3