Merge branch 'master' into update-endpoint-ip

Author: tripplet

conf/config.go

@@ -27,9 +27,11 @@ type Endpoint struct {
 	Port uint16
 }
 
-type Key [KeyLength]byte
-type HandshakeTime time.Duration
-type Bytes uint64
+type (
+	Key           [KeyLength]byte
+	HandshakeTime time.Duration
+	Bytes         uint64
+)
 
 type Config struct {
 	Name      string

conf/migration_windows.go

@@ -18,8 +18,10 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-var migrating sync.Mutex
-var lastMigrationTimer *time.Timer
+var (
+	migrating          sync.Mutex
+	lastMigrationTimer *time.Timer
+)
 
 type MigrationCallback func(name, oldPath, newPath string)
 
@@ -53,7 +55,7 @@ func migrateUnencryptedConfigs(sharingBase int, migrated MigrationCallback) {
 		if err != nil {
 			continue
 		}
-		if info.Mode().Perm()&0444 == 0 {
+		if info.Mode().Perm()&0o444 == 0 {
 			continue
 		}
 

conf/name.go

@@ -18,9 +18,11 @@ var reservedNames = []string{
 	"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
 }
 
-const serviceNameForbidden = "$"
-const netshellDllForbidden = "\\/:*?\"<>|\t"
-const specialChars = "/\\<>:\"|?*\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x00"
+const (
+	serviceNameForbidden = "$"
+	netshellDllForbidden = "\\/:*?\"<>|\t"
+	specialChars         = "/\\<>:\"|?*\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x00"
+)
 
 var allowedNameFormat = regexp.MustCompile("^[a-zA-Z0-9_=+.-]{1,32}$")
 
@@ -60,6 +62,7 @@ type naturalSortToken struct {
 	maybeString string
 	maybeNumber int
 }
+
 type naturalSortString struct {
 	originalString string
 	tokens         []naturalSortToken

conf/parser.go

@@ -172,7 +172,7 @@ func (c *Config) maybeAddPeer(p *Peer) {
 	}
 }
 
-func FromWgQuick(s string, name string) (*Config, error) {
+func FromWgQuick(s, name string) (*Config, error) {
 	if !TunnelNameIsValid(name) {
 		return nil, &ParseError{l18n.Sprintf("Tunnel name is not valid"), name}
 	}
@@ -339,7 +339,7 @@ func FromWgQuick(s string, name string) (*Config, error) {
 	return &conf, nil
 }
 
-func FromWgQuickWithUnknownEncoding(s string, name string) (*Config, error) {
+func FromWgQuickWithUnknownEncoding(s, name string) (*Config, error) {
 	c, firstErr := FromWgQuick(s, name)
 	if firstErr == nil {
 		return c, nil

conf/parser_test.go

@@ -54,6 +54,7 @@ func equal(t *testing.T, expected, actual interface{}) bool {
 	t.Errorf("Failed equals at %s:%d\nactual   %#v\nexpected %#v", fn, line, actual, expected)
 	return false
 }
+
 func lenTest(t *testing.T, actualO interface{}, expected int) bool {
 	actual := reflect.ValueOf(actualO).Len()
 	if reflect.DeepEqual(expected, actual) {
@@ -63,6 +64,7 @@ func lenTest(t *testing.T, actualO interface{}, expected int) bool {
 	t.Errorf("Wrong length at %s:%d\nactual   %#v\nexpected %#v", fn, line, actual, expected)
 	return false
 }
+
 func contains(t *testing.T, list, element interface{}) bool {
 	listValue := reflect.ValueOf(list)
 	for i := 0; i < listValue.Len(); i++ {

conf/path_windows.go

@@ -15,8 +15,10 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-var cachedConfigFileDir string
-var cachedRootDir string
+var (
+	cachedConfigFileDir string
+	cachedRootDir       string
+)
 
 func tunnelConfigurationsDirectory() (string, error) {
 	if cachedConfigFileDir != "" {
@@ -27,7 +29,7 @@ func tunnelConfigurationsDirectory() (string, error) {
 		return "", err
 	}
 	c := filepath.Join(root, "Configurations")
-	err = os.Mkdir(c, os.ModeDir|0700)
+	err = os.Mkdir(c, os.ModeDir|0o700)
 	if err != nil && !os.IsExist(err) {
 		return "", err
 	}

conf/store.go

@@ -14,8 +14,10 @@ import (
 	"golang.zx2c4.com/wireguard/windows/conf/dpapi"
 )
 
-const configFileSuffix = ".conf.dpapi"
-const configFileUnencryptedSuffix = ".conf"
+const (
+	configFileSuffix            = ".conf.dpapi"
+	configFileUnencryptedSuffix = ".conf"
+)
 
 func ListConfigNames() ([]string, error) {
 	configFileDir, err := tunnelConfigurationsDirectory()
@@ -40,7 +42,7 @@ func ListConfigNames() ([]string, error) {
 		if err != nil {
 			continue
 		}
-		if info.Mode().Perm()&0444 == 0 {
+		if info.Mode().Perm()&0o444 == 0 {
 			continue
 		}
 		configs[i] = name

driver/driver_windows.go

@@ -79,7 +79,7 @@ func closeAdapter(wireguard *Adapter) {
 // the GUID of the created network adapter, which then influences NLA generation
 // deterministically. If it is set to nil, the GUID is chosen by the system at random,
 // and hence a new NLA entry is created for each new adapter.
-func CreateAdapter(name string, tunnelType string, requestedGUID *windows.GUID) (wireguard *Adapter, err error) {
+func CreateAdapter(name, tunnelType string, requestedGUID *windows.GUID) (wireguard *Adapter, err error) {
 	var name16 *uint16
 	name16, err = windows.UTF16PtrFromString(name)
 	if err != nil {

driver/memmod/memmod_windows.go

@@ -47,7 +47,7 @@ func (module *Module) headerDirectory(idx int) *IMAGE_DATA_DIRECTORY {
 	return &module.headers.OptionalHeader.DataDirectory[idx]
 }
 
-func (module *Module) copySections(address uintptr, size uintptr, oldHeaders *IMAGE_NT_HEADERS) error {
+func (module *Module) copySections(address, size uintptr, oldHeaders *IMAGE_NT_HEADERS) error {
 	sections := module.headers.Sections()
 	for i := range sections {
 		if sections[i].SizeOfRawData == 0 {
@@ -139,7 +139,7 @@ func (module *Module) finalizeSection(sectionData *sectionFinalizeData) error {
 	}
 
 	// determine protection flags based on characteristics
-	var ProtectionFlags = [8]uint32{
+	ProtectionFlags := [8]uint32{
 		windows.PAGE_NOACCESS,          // not writeable, not readable, not executable
 		windows.PAGE_EXECUTE,           // not writeable, not readable, executable
 		windows.PAGE_READONLY,          // not writeable, readable, not executable
@@ -387,10 +387,12 @@ type addressRange struct {
 	end   uintptr
 }
 
-var loadedAddressRanges []addressRange
-var loadedAddressRangesMu sync.RWMutex
-var haveHookedRtlPcToFileHeader sync.Once
-var hookRtlPcToFileHeaderResult error
+var (
+	loadedAddressRanges         []addressRange
+	loadedAddressRangesMu       sync.RWMutex
+	haveHookedRtlPcToFileHeader sync.Once
+	hookRtlPcToFileHeaderResult error
+)
 
 func hookRtlPcToFileHeader() error {
 	var kernelBase windows.Handle

driver/wintunremoval_windows.go

@@ -12,7 +12,7 @@ import (
 )
 
 func UninstallLegacyWintun() error {
-	var deviceClassNetGUID = &windows.GUID{0x4d36e972, 0xe325, 0x11ce, [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}
+	deviceClassNetGUID := &windows.GUID{0x4d36e972, 0xe325, 0x11ce, [8]byte{0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}
 	devInfo, err := windows.SetupDiCreateDeviceInfoListEx(deviceClassNetGUID, 0, "")
 	if err != nil {
 		return err