Fix go.mod/go.sum again and update DoAsSystem call

This commit is contained in:
Neil Alexander 2019-11-23 13:56:48 +00:00
parent d0a307db97
commit 746fac6594
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 32 additions and 31 deletions

View file

@ -23,31 +23,30 @@ func (tun *TunAdapter) setup(ifname string, addr string, mtu int) error {
if ifname == "auto" {
ifname = defaults.GetDefaults().DefaultIfName
}
var err error
var iface wgtun.Device
err = elevate.DoAsSystem(func() {
if guid, gerr := windows.GUIDFromString("{8f59971a-7872-4aa6-b2eb-061fc4e9d0a7}"); gerr == nil {
iface, err = wgtun.CreateTUNWithRequestedGUID(ifname, &guid, mtu)
} else {
panic(gerr)
return elevate.DoAsSystem(func() error {
var err error
var iface wgtun.Device
var guid windows.GUID
if guid, err = windows.GUIDFromString("{8f59971a-7872-4aa6-b2eb-061fc4e9d0a7}"); err != nil {
return err
}
if err != nil {
panic(err)
if iface, err = wgtun.CreateTUNWithRequestedGUID(ifname, &guid, mtu); err != nil {
return err
}
tun.iface = iface
if err := tun.setupAddress(addr); err != nil {
if err = tun.setupAddress(addr); err != nil {
tun.log.Errorln("Failed to set up TUN address:", err)
return err
}
if err := tun.setupMTU(getSupportedMTU(mtu)); err != nil {
if err = tun.setupMTU(getSupportedMTU(mtu)); err != nil {
tun.log.Errorln("Failed to set up TUN MTU:", err)
return err
}
if mtu, err = iface.MTU(); err == nil {
tun.mtu = mtu
}
return nil
})
return err
}
// Sets the MTU of the TAP adapter.