diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/errors.go | 3 | ||||
| -rw-r--r-- | service/firewall/helpers.go | 3 | ||||
| -rw-r--r-- | service/firewall/rules.go | 5 | ||||
| -rw-r--r-- | service/install.go | 7 | ||||
| -rw-r--r-- | service/ipc_client.go | 5 | ||||
| -rw-r--r-- | service/ipc_pipe.go | 3 | ||||
| -rw-r--r-- | service/ipc_server.go | 11 | ||||
| -rw-r--r-- | service/names.go | 1 | ||||
| -rw-r--r-- | service/securityapi.go | 3 | ||||
| -rw-r--r-- | service/service_manager.go | 9 | ||||
| -rw-r--r-- | service/service_tunnel.go | 15 | ||||
| -rw-r--r-- | service/tunneltracker.go | 9 | ||||
| -rw-r--r-- | service/updatestate.go | 5 |
13 files changed, 46 insertions, 33 deletions
diff --git a/service/errors.go b/service/errors.go index 670c3305..339b61b3 100644 --- a/service/errors.go +++ b/service/errors.go @@ -7,8 +7,9 @@ package service import ( "fmt" - "golang.org/x/sys/windows" "syscall" + + "golang.org/x/sys/windows" ) type Error uint32 diff --git a/service/firewall/helpers.go b/service/firewall/helpers.go index 7b882712..c9968660 100644 --- a/service/firewall/helpers.go +++ b/service/firewall/helpers.go @@ -7,11 +7,12 @@ package firewall import ( "fmt" - "golang.org/x/sys/windows" "os" "runtime" "syscall" "unsafe" + + "golang.org/x/sys/windows" ) func runTransaction(session uintptr, operation wfpObjectInstaller) error { diff --git a/service/firewall/rules.go b/service/firewall/rules.go index 364c7d1d..00ca19ea 100644 --- a/service/firewall/rules.go +++ b/service/firewall/rules.go @@ -8,11 +8,12 @@ package firewall import ( "encoding/binary" "errors" - "golang.org/x/sys/windows" - "golang.zx2c4.com/wireguard/windows/version" "net" "runtime" "unsafe" + + "golang.org/x/sys/windows" + "golang.zx2c4.com/wireguard/windows/version" ) // diff --git a/service/install.go b/service/install.go index e20658e9..a989ac0e 100644 --- a/service/install.go +++ b/service/install.go @@ -7,13 +7,14 @@ package service import ( "errors" + "os" + "syscall" + "time" + "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/mgr" "golang.zx2c4.com/wireguard/windows/conf" - "os" - "syscall" - "time" ) var cachedServiceManager *mgr.Mgr diff --git a/service/ipc_client.go b/service/ipc_client.go index adfd456c..268f18e9 100644 --- a/service/ipc_client.go +++ b/service/ipc_client.go @@ -8,10 +8,11 @@ package service import ( "encoding/gob" "errors" - "golang.zx2c4.com/wireguard/windows/conf" - "golang.zx2c4.com/wireguard/windows/updater" "net/rpc" "os" + + "golang.zx2c4.com/wireguard/windows/conf" + "golang.zx2c4.com/wireguard/windows/updater" ) type Tunnel struct { diff --git a/service/ipc_pipe.go b/service/ipc_pipe.go index 00f54bf7..ecf24716 100644 --- a/service/ipc_pipe.go +++ b/service/ipc_pipe.go @@ -6,9 +6,10 @@ package service import ( - "golang.org/x/sys/windows" "os" "strconv" + + "golang.org/x/sys/windows" ) type pipeRWC struct { diff --git a/service/ipc_server.go b/service/ipc_server.go index 12e01ce2..9d9f7d99 100644 --- a/service/ipc_server.go +++ b/service/ipc_server.go @@ -9,11 +9,6 @@ import ( "bytes" "encoding/gob" "fmt" - "github.com/Microsoft/go-winio" - "golang.org/x/sys/windows" - "golang.org/x/sys/windows/svc" - "golang.zx2c4.com/wireguard/windows/conf" - "golang.zx2c4.com/wireguard/windows/updater" "io/ioutil" "log" "net/rpc" @@ -22,6 +17,12 @@ import ( "sync/atomic" "syscall" "time" + + "github.com/Microsoft/go-winio" + "golang.org/x/sys/windows" + "golang.org/x/sys/windows/svc" + "golang.zx2c4.com/wireguard/windows/conf" + "golang.zx2c4.com/wireguard/windows/updater" ) var managerServices = make(map[*ManagerService]bool) diff --git a/service/names.go b/service/names.go index ced657aa..e93ed66f 100644 --- a/service/names.go +++ b/service/names.go @@ -7,6 +7,7 @@ package service import ( "errors" + "golang.zx2c4.com/wireguard/windows/conf" ) diff --git a/service/securityapi.go b/service/securityapi.go index 2c1db5db..b7171198 100644 --- a/service/securityapi.go +++ b/service/securityapi.go @@ -7,9 +7,10 @@ package service import ( "errors" - "golang.org/x/sys/windows" "runtime" "unsafe" + + "golang.org/x/sys/windows" ) const ( diff --git a/service/service_manager.go b/service/service_manager.go index a3642712..0284810f 100644 --- a/service/service_manager.go +++ b/service/service_manager.go @@ -7,10 +7,6 @@ package service import ( "errors" - "golang.org/x/sys/windows" - "golang.org/x/sys/windows/svc" - "golang.zx2c4.com/wireguard/windows/conf" - "golang.zx2c4.com/wireguard/windows/ringlogger" "log" "os" "runtime" @@ -19,6 +15,11 @@ import ( "syscall" "time" "unsafe" + + "golang.org/x/sys/windows" + "golang.org/x/sys/windows/svc" + "golang.zx2c4.com/wireguard/windows/conf" + "golang.zx2c4.com/wireguard/windows/ringlogger" ) type managerService struct{} diff --git a/service/service_tunnel.go b/service/service_tunnel.go index 01e7b417..c7b469fb 100644 --- a/service/service_tunnel.go +++ b/service/service_tunnel.go @@ -9,13 +9,6 @@ import ( "bufio" "bytes" "fmt" - "golang.org/x/sys/windows/svc" - "golang.zx2c4.com/winipcfg" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/ipc" - "golang.zx2c4.com/wireguard/tun" - "golang.zx2c4.com/wireguard/windows/conf" - "golang.zx2c4.com/wireguard/windows/ringlogger" "log" "net" "os" @@ -23,6 +16,14 @@ import ( "runtime/debug" "strings" "time" + + "golang.org/x/sys/windows/svc" + "golang.zx2c4.com/winipcfg" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/ipc" + "golang.zx2c4.com/wireguard/tun" + "golang.zx2c4.com/wireguard/windows/conf" + "golang.zx2c4.com/wireguard/windows/ringlogger" ) type tunnelService struct { diff --git a/service/tunneltracker.go b/service/tunneltracker.go index 1c368584..e0f5414a 100644 --- a/service/tunneltracker.go +++ b/service/tunneltracker.go @@ -7,15 +7,16 @@ package service import ( "fmt" - "golang.org/x/sys/windows" - "golang.org/x/sys/windows/svc" - "golang.org/x/sys/windows/svc/mgr" - "golang.zx2c4.com/wireguard/windows/conf" "log" "runtime" "sync" "syscall" "time" + + "golang.org/x/sys/windows" + "golang.org/x/sys/windows/svc" + "golang.org/x/sys/windows/svc/mgr" + "golang.zx2c4.com/wireguard/windows/conf" ) //sys notifyServiceStatusChange(service windows.Handle, notifyMask uint32, notifier *SERVICE_NOTIFY) (ret error) = advapi32.NotifyServiceStatusChangeW diff --git a/service/updatestate.go b/service/updatestate.go index c046edb2..4d9330ff 100644 --- a/service/updatestate.go +++ b/service/updatestate.go @@ -6,10 +6,11 @@ package service import ( - "golang.zx2c4.com/wireguard/windows/updater" - "golang.zx2c4.com/wireguard/windows/version" "log" "time" + + "golang.zx2c4.com/wireguard/windows/updater" + "golang.zx2c4.com/wireguard/windows/version" ) type UpdateState uint32 |