diff --git a/tun/tun_darwin.go b/tun/tun_darwin.go index f470908..d4cf969 100644 --- a/tun/tun_darwin.go +++ b/tun/tun_darwin.go @@ -31,6 +31,7 @@ func isIPv6(ip net.IP) bool { } func OpenTunDevice(name, addr, gw, mask string, dnsServers []string) (io.ReadWriteCloser, error) { + _ = dnsServers tunDev, err := water.New(water.Config{ DeviceType: water.TUN, }) @@ -47,11 +48,11 @@ func OpenTunDevice(name, addr, gw, mask string, dnsServers []string) (io.ReadWri if isIPv4(ip) { params = fmt.Sprintf("%s inet %s netmask %s %s", name, addr, mask, gw) } else if isIPv6(ip) { - prefixlen, err := strconv.Atoi(mask) + prefixLen, err := strconv.Atoi(mask) if err != nil { return nil, errors.New(fmt.Sprintf("parse IPv6 prefixlen failed: %v", err)) } - params = fmt.Sprintf("%s inet6 %s/%d", name, addr, prefixlen) + params = fmt.Sprintf("%s inet6 %s/%d", name, addr, prefixLen) } else { return nil, errors.New("invalid IP address") } diff --git a/tun/tun_windows.go b/tun/tun_windows.go index 2776eee..76f42e6 100644 --- a/tun/tun_windows.go +++ b/tun/tun_windows.go @@ -150,7 +150,7 @@ func getTuntapComponentId() (string, error) { return "", errors.New("not found component id") } -func OpenTunDevice(name, addr, gw, mask string, dns []string) (io.ReadWriteCloser, error) { +func OpenTunDevice(name, addr, gw, mask string, dnsServers []string) (io.ReadWriteCloser, error) { componentId, err := getTuntapComponentId() if err != nil { return nil, err @@ -207,10 +207,10 @@ func OpenTunDevice(name, addr, gw, mask string, dns []string) (io.ReadWriteClose // set dns with dncp dnsParam := []byte{6, 4} - primaryDNS := net.ParseIP(dns[0]).To4() + primaryDNS := net.ParseIP(dnsServers[0]).To4() dnsParam = append(dnsParam, primaryDNS...) - if len(dns) >= 2 { - secondaryDNS := net.ParseIP(dns[1]).To4() + if len(dnsServers) >= 2 { + secondaryDNS := net.ParseIP(dnsServers[1]).To4() dnsParam = append(dnsParam, secondaryDNS...) dnsParam[1] += 4 } @@ -228,7 +228,7 @@ func OpenTunDevice(name, addr, gw, mask string, dns []string) (io.ReadWriteClose windows.Close(fd) return nil, err } else { - log.Printf("set %s with dns: %s through DHCP", devName, strings.Join(dns, ",")) + log.Printf("set %s with dns: %s through DHCP", devName, strings.Join(dnsServers, ",")) } // set connect.