Reformat code
This commit is contained in:
parent
558e1e0493
commit
d79d3c88fd
8 changed files with 11 additions and 22 deletions
|
|
@ -213,10 +213,8 @@ func (s *StdNetBind) getMessages() *[]ipv6.Message {
|
||||||
return s.msgsPool.Get().(*[]ipv6.Message)
|
return s.msgsPool.Get().(*[]ipv6.Message)
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
|
||||||
// If compilation fails here these are no longer the same underlying type.
|
// If compilation fails here these are no longer the same underlying type.
|
||||||
_ ipv6.Message = ipv4.Message{}
|
var _ ipv6.Message = ipv4.Message{}
|
||||||
)
|
|
||||||
|
|
||||||
type batchReader interface {
|
type batchReader interface {
|
||||||
ReadBatch([]ipv6.Message, int) (int, error)
|
ReadBatch([]ipv6.Message, int) (int, error)
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,8 @@ import (
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
"golang.org/x/sys/windows"
|
|
||||||
|
|
||||||
"github.com/sagernet/wireguard-go/conn/winrio"
|
"github.com/sagernet/wireguard-go/conn/winrio"
|
||||||
|
"golang.org/x/sys/windows"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,11 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/sagernet/wireguard-go/conn"
|
||||||
|
"github.com/sagernet/wireguard-go/tai64n"
|
||||||
"golang.org/x/crypto/blake2s"
|
"golang.org/x/crypto/blake2s"
|
||||||
"golang.org/x/crypto/chacha20poly1305"
|
"golang.org/x/crypto/chacha20poly1305"
|
||||||
"golang.org/x/crypto/poly1305"
|
"golang.org/x/crypto/poly1305"
|
||||||
|
|
||||||
"github.com/sagernet/wireguard-go/conn"
|
|
||||||
"github.com/sagernet/wireguard-go/tai64n"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type handshakeState int
|
type handshakeState int
|
||||||
|
|
|
||||||
|
|
@ -411,7 +411,6 @@ func (device *Device) RoutineHandshake(id int) {
|
||||||
// derive keypair
|
// derive keypair
|
||||||
|
|
||||||
err = peer.BeginSymmetricSession()
|
err = peer.BeginSymmetricSession()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
device.log.Errorf("%v - Failed to derive keypair: %v", peer, err)
|
device.log.Errorf("%v - Failed to derive keypair: %v", peer, err)
|
||||||
goto skip
|
goto skip
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,9 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
|
|
||||||
"github.com/sagernet/wireguard-go/conn"
|
"github.com/sagernet/wireguard-go/conn"
|
||||||
"github.com/sagernet/wireguard-go/rwcancel"
|
"github.com/sagernet/wireguard-go/rwcancel"
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {
|
func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) {
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,6 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) {
|
||||||
unix.IN_DELETE|
|
unix.IN_DELETE|
|
||||||
unix.IN_DELETE_SELF,
|
unix.IN_DELETE_SELF,
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrTooManySegments is returned by Device.Read() when segmentation
|
// ErrTooManySegments is returned by Device.Read() when segmentation
|
||||||
// overflows the length of supplied buffers. This error should not cause
|
// overflows the length of supplied buffers. This error should not cause
|
||||||
// reads to cease.
|
// reads to cease.
|
||||||
ErrTooManySegments = errors.New("too many segments")
|
var ErrTooManySegments = errors.New("too many segments")
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -506,9 +506,7 @@ func (tun *NativeTun) initFromFlags(name string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if e := sc.Control(func(fd uintptr) {
|
if e := sc.Control(func(fd uintptr) {
|
||||||
var (
|
var ifr *unix.Ifreq
|
||||||
ifr *unix.Ifreq
|
|
||||||
)
|
|
||||||
ifr, err = unix.NewIfreq(name)
|
ifr, err = unix.NewIfreq(name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue