diff options
| -rw-r--r-- | exports/exports.go | 23 | ||||
| -rw-r--r-- | state.go | 11 | ||||
| -rw-r--r-- | wrappers/python/src/__init__.py | 2 | ||||
| -rw-r--r-- | wrappers/python/src/main.py | 14 |
4 files changed, 0 insertions, 50 deletions
diff --git a/exports/exports.go b/exports/exports.go index a00fa15..6341199 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -204,17 +204,6 @@ func SetSecureLocation(name *C.char, data *C.char) *C.char { return C.CString(ErrorToString(locationErr)) } -//export GetIdentifier -func GetIdentifier(name *C.char) (*C.char, *C.char) { - nameStr := C.GoString(name) - state, stateErr := GetVPNState(nameStr) - if stateErr != nil { - return C.CString(""), C.CString(ErrorToString(stateErr)) - } - identifier := state.GetIdentifier() - return C.CString(identifier), C.CString("") -} - //export GoBack func GoBack(name *C.char) (*C.char) { nameStr := C.GoString(name) @@ -226,18 +215,6 @@ func GoBack(name *C.char) (*C.char) { return C.CString(ErrorToString(goBackErr)) } -//export SetIdentifier -func SetIdentifier(name *C.char, identifier *C.char) *C.char { - nameStr := C.GoString(name) - identifierStr := C.GoString(identifier) - state, stateErr := GetVPNState(nameStr) - if stateErr != nil { - return C.CString(ErrorToString(stateErr)) - } - state.SetIdentifier(identifierStr) - return C.CString("") -} - //export SetSearchServer func SetSearchServer(name *C.char) *C.char { nameStr := C.GoString(name) @@ -29,9 +29,6 @@ type VPNState struct { // Whether to enable debugging Debug bool `json:"-"` - - // Serialized connection identifier - Identifier string `json:"identifier"` } func (state *VPNState) GetSavedServers() string { @@ -320,14 +317,6 @@ func (state *VPNState) SetProfileID(profileID string) error { return nil } -func (state *VPNState) GetIdentifier() string { - return state.Identifier -} - -func (state *VPNState) SetIdentifier(identifier string) { - state.Identifier = identifier -} - func (state *VPNState) SetSearchServer() error { if !state.FSM.HasTransition(fsm.SEARCH_SERVER) { return &types.WrappedErrorMessage{Message: "failed to set search server", Err: fsm.WrongStateTransitionError{Got: state.FSM.Current, Want: fsm.CONNECTED}.CustomError()} diff --git a/wrappers/python/src/__init__.py b/wrappers/python/src/__init__.py index 802ceec..ed6fcc7 100644 --- a/wrappers/python/src/__init__.py +++ b/wrappers/python/src/__init__.py @@ -84,8 +84,6 @@ lib.SetSecureLocation.argtypes, lib.SetSecureLocation.restype = [ lib.SetConnected.argtypes, lib.SetConnected.restype = [c_char_p], c_void_p lib.SetConnecting.argtypes, lib.SetConnecting.restype = [c_char_p], c_void_p lib.SetDisconnected.argtypes, lib.SetDisconnected.restype = [c_char_p], c_void_p -lib.GetIdentifier.argtypes, lib.GetIdentifier.restype = [c_char_p], DataError -lib.SetIdentifier.argtypes, lib.SetIdentifier.restype = [c_char_p, c_char_p], c_void_p lib.SetSearchServer.argtypes, lib.SetSearchServer.restype = [c_char_p], c_void_p lib.FreeString.argtypes, lib.FreeString.restype = [c_void_p], None diff --git a/wrappers/python/src/main.py b/wrappers/python/src/main.py index 008973d..87d2b53 100644 --- a/wrappers/python/src/main.py +++ b/wrappers/python/src/main.py @@ -156,20 +156,6 @@ class EduVPN(object): if disconnect_err: raise Exception(disconnect_err) - def get_identifier(self) -> str: - identifier, identifier_err = self.go_function(lib.GetIdentifier) - - if identifier_err: - raise Exception(identifier_err) - - return identifier - - def set_identifier(self, identifier: str) -> None: - identifier_err = self.go_function(lib.SetIdentifier, identifier) - - if identifier_err: - raise Exception(identifier_err) - def set_search_server(self) -> None: search_err = self.go_function(lib.SetSearchServer) |