summaryrefslogtreecommitdiff
path: root/exports/servers.go
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-09-21 11:37:32 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-09-21 11:37:32 +0200
commit448c51d2142c186f0490b9d51c0d73beb3c76863 (patch)
tree4553269be84b58072a11645221649bcccd85c73f /exports/servers.go
parent7dbc3bbe2ca65fb7ec200ab7aa713855b0bdc11d (diff)
Exports + Python: Do not panic on error for getting disco + servers
Diffstat (limited to 'exports/servers.go')
-rw-r--r--exports/servers.go8
1 files changed, 4 insertions, 4 deletions
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