Hesham/wireguard-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented missing methods for Bind and Endpoint

Browse Source
This commit is contained in:
Mathias Hall-Andersen 2017-11-19 13:14:15 +01:00
parent a79fdc13a2
commit 9ebab57c41
1 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/conn_default.go
View File

@ -25,7 +25,7 @@ var _ Endpoint = (*NativeEndpoint)(nil)
func CreateEndpoint(s string) (Endpoint, error) { func CreateEndpoint(s string) (Endpoint, error) {
addr, err := parseEndpoint(s) addr, err := parseEndpoint(s)
return (addr).(*NativeEndpoint), err return (*NativeEndpoint)(addr), err
} }
func (_ *NativeEndpoint) ClearSrc() {} func (_ *NativeEndpoint) ClearSrc() {}
@ -40,7 +40,7 @@ func (e *NativeEndpoint) SrcIP() net.IP {
func (e *NativeEndpoint) DstToBytes() []byte { func (e *NativeEndpoint) DstToBytes() []byte {
addr := (*net.UDPAddr)(e) addr := (*net.UDPAddr)(e)
out := addr.IP.([]byte) out := addr.IP
out = append(out, byte(addr.Port&0xff)) out = append(out, byte(addr.Port&0xff))
out = append(out, byte((addr.Port>>8)&0xff)) out = append(out, byte((addr.Port>>8)&0xff))
return out return out
@ -54,11 +54,11 @@ func (e *NativeEndpoint) SrcToString() string {
return "" return ""
} }
func listenNet(net string, port int) (*net.UDPConn, int, error) { func listenNet(network string, port int) (*net.UDPConn, int, error) {
// listen // listen
conn, err := net.ListenUDP("udp", &UDPAddr{Port: port}) conn, err := net.ListenUDP(network, &net.UDPAddr{Port: port})
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
@ -66,32 +66,66 @@ func listenNet(net string, port int) (*net.UDPConn, int, error) {
// retrieve port // retrieve port
laddr := conn.LocalAddr() laddr := conn.LocalAddr()
uaddr, _ = net.ResolveUDPAddr( uaddr, err := net.ResolveUDPAddr(
laddr.Network(), laddr.Network(),
laddr.String(), laddr.String(),
) )
if err != nil {
return nil, 0, err
}
return conn, uaddr.Port, nil return conn, uaddr.Port, nil
} }
func CreateBind(port uint16) (Bind, uint16, error) { func CreateBind(uport uint16) (Bind, uint16, error) {
var err error
var bind NativeBind
// listen port := int(uport)
addr := UDPAddr{ bind.ipv4, port, err = listenNet("udp4", port)
Port: int(port),
}
conn, err := net.ListenUDP("udp", &addr)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
// retrieve port bind.ipv6, port, err = listenNet("udp6", port)
if err != nil {
laddr := conn.LocalAddr() bind.ipv4.Close()
uaddr, _ = net.ResolveUDPAddr( return nil, 0, err
laddr.Network(), }
laddr.String(),
) return &bind, uint16(port), nil
return uaddr.Port }
func (bind *NativeBind) Close() error {
err1 := bind.ipv4.Close()
err2 := bind.ipv6.Close()
if err1 != nil {
return err1
}
return err2
}
func (bind *NativeBind) ReceiveIPv4(buff []byte) (int, Endpoint, error) {
n, endpoint, err := bind.ipv4.ReadFromUDP(buff)
return n, (*NativeEndpoint)(endpoint), err
}
func (bind *NativeBind) ReceiveIPv6(buff []byte) (int, Endpoint, error) {
n, endpoint, err := bind.ipv6.ReadFromUDP(buff)
return n, (*NativeEndpoint)(endpoint), err
}
func (bind *NativeBind) Send(buff []byte, endpoint Endpoint) error {
var err error
nend := endpoint.(*NativeEndpoint)
if nend.IP.To16() != nil {
_, err = bind.ipv6.WriteToUDP(buff, (*net.UDPAddr)(nend))
} else {
_, err = bind.ipv4.WriteToUDP(buff, (*net.UDPAddr)(nend))
}
return err
}
func (bind *NativeBind) SetMark(_ uint32) error {
return nil
} }