lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-26 11:44:22 -04:00
Code Issues Releases Wiki Activity

Fix(freebsd): ReadUDPMsg nil pointer

Browse Source 
Co-authored-by: ksco.he <ksco.he@ponyft.com>
Co-authored-by: 秋のかえで <autmaple@protonmail.com>
This commit is contained in:
_ksco 2022-10-09 10:15:16 +08:00 committed by GitHub
parent 052271b63a
commit d5b5d60956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
transport/internet/udp/hub_freebsd.go
View File

@ -8,6 +8,7 @@ import (
"encoding/gob"
"io"
"github.com/v2fly/v2ray-core/v5/common/errors"
"github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/transport/internet"
)
@ -28,11 +29,24 @@ func RetrieveOriginalDest(oob []byte) net.Destination {
// ReadUDPMsg stores laddr, caddr for later use
func ReadUDPMsg(conn *net.UDPConn, payload []byte, oob []byte) (int, int, int, *net.UDPAddr, error) {
nBytes, addr, err := conn.ReadFromUDP(payload)
if err != nil {
return nBytes, 0, 0, addr, err
}
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
enc.Encode(conn.LocalAddr().(*net.UDPAddr))
localAddr, ok := conn.LocalAddr().(*net.UDPAddr)
if !ok {
return 0, 0, 0, nil, errors.New("invalid local address")
}
if addr == nil {
return 0, 0, 0, nil, errors.New("invalid remote address")
}
enc.Encode(localAddr)
enc.Encode(addr)
var reader io.Reader = &buf
noob, _ := reader.Read(oob)
return nBytes, noob, 0, addr, err
return nBytes, noob, 0, addr, nil
}