From 448c51d2142c186f0490b9d51c0d73beb3c76863 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Wed, 21 Sep 2022 11:37:32 +0200 Subject: Exports + Python: Do not panic on error for getting disco + servers --- exports/servers.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'exports/servers.go') diff --git a/exports/servers.go b/exports/servers.go index e5c9301..a487176 100644 --- a/exports/servers.go +++ b/exports/servers.go @@ -293,14 +293,14 @@ func getSavedServersWithOptions(state *eduvpn.VPNState, servers *server.Servers) //export GetSavedServers // This function takes the name as input which is the name of the client // It gets the state by name and then returns the saved servers as a c struct belonging to it -func GetSavedServers(name *C.char) *C.servers { +func GetSavedServers(name *C.char) (*C.servers, *C.char) { nameStr := C.GoString(name) state, stateErr := GetVPNState(nameStr) if stateErr != nil { - // TODO: Remove this panic - panic(stateErr) + return nil, C.CString(ErrorToString(stateErr)) } - return getSavedServersWithOptions(state, &state.Servers) + servers := getSavedServersWithOptions(state, &state.Servers) + return servers, nil } // This function takes the state as input which is the main state -- cgit v1.2.3