From 4815c9234f29bbbaab56bf02227c5d94f7d24726 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 27 Apr 2019 17:08:11 +0200 Subject: service: tunnel: UAPI serialization is always DNS related --- service/errors.go | 6 +++--- service/service_tunnel.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/errors.go b/service/errors.go index a2050460..d3f02f54 100644 --- a/service/errors.go +++ b/service/errors.go @@ -20,7 +20,7 @@ const ( ErrorCreateWintun ErrorDetermineWintunName ErrorUAPIListen - ErrorUAPISerialization + ErrorDNSLookup ErrorDeviceSetConfig ErrorBindSocketsToDefaultRoutes ErrorSetNetConfig @@ -48,8 +48,8 @@ func (e Error) Error() string { return "Unable to determine Wintun name" case ErrorUAPIListen: return "Unable to listen on named pipe" - case ErrorUAPISerialization: - return "Unable to serialize configuration into uapi form" + case ErrorDNSLookup: + return "Unable to resolve one or more DNS hostname endpoints" case ErrorDeviceSetConfig: return "Unable to set device configuration" case ErrorBindSocketsToDefaultRoutes: diff --git a/service/service_tunnel.go b/service/service_tunnel.go index f8c843f6..dd681a33 100644 --- a/service/service_tunnel.go +++ b/service/service_tunnel.go @@ -117,7 +117,7 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, uapiConf, err := conf.ToUAPI() if err != nil { - serviceError = ErrorUAPISerialization + serviceError = ErrorDNSLookup return } ipcErr := dev.IpcSetOperation(bufio.NewReader(strings.NewReader(uapiConf))) -- cgit v1.2.3-59-g8ed1b