lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 01:17:30 -05:00
Code Issues Releases Wiki Activity

move port allocation to udp package

Browse Source
This commit is contained in:
Darien Raymond 2017-11-14 23:45:07 +01:00
parent 268d7264e8
commit a430e2065a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testing/scenarios/common.go
View File

@ -29,18 +29,6 @@ func pickPort() net.Port {
return net.Port(addr.Port) return net.Port(addr.Port)
} }
func pickUDPPort() net.Port {
conn, err := net.ListenUDP("udp4", &net.UDPAddr{
IP: net.LocalHostIP.IP(),
Port: 0,
})
common.Must(err)
defer conn.Close()
addr := conn.LocalAddr().(*net.UDPAddr)
return net.Port(addr.Port)
}
func xor(b []byte) []byte { func xor(b []byte) []byte {
r := make([]byte, len(b)) r := make([]byte, len(b))
for i, v := range b { for i, v := range b {

3
testing/scenarios/tls_test.go
View File

@ -17,6 +17,7 @@ import (
"v2ray.com/core/proxy/vmess/inbound" "v2ray.com/core/proxy/vmess/inbound"
"v2ray.com/core/proxy/vmess/outbound" "v2ray.com/core/proxy/vmess/outbound"
"v2ray.com/core/testing/servers/tcp" "v2ray.com/core/testing/servers/tcp"
"v2ray.com/core/testing/servers/udp"
tlsgen "v2ray.com/core/testing/tls" tlsgen "v2ray.com/core/testing/tls"
"v2ray.com/core/transport/internet" "v2ray.com/core/transport/internet"
"v2ray.com/core/transport/internet/tls" "v2ray.com/core/transport/internet/tls"
@ -149,7 +150,7 @@ func TestTLSOverKCP(t *testing.T) {
defer tcpServer.Close() defer tcpServer.Close()
userID := protocol.NewID(uuid.New()) userID := protocol.NewID(uuid.New())
serverPort := pickUDPPort() serverPort := udp.PickPort()
serverConfig := &core.Config{ serverConfig := &core.Config{
Inbound: []*proxyman.InboundHandlerConfig{ Inbound: []*proxyman.InboundHandlerConfig{
{ {

4
testing/scenarios/vmess_test.go
View File

@ -674,7 +674,7 @@ func TestVMessKCP(t *testing.T) {
defer tcpServer.Close() defer tcpServer.Close()
userID := protocol.NewID(uuid.New()) userID := protocol.NewID(uuid.New())
serverPort := pickUDPPort() serverPort := udp.PickPort()
serverConfig := &core.Config{ serverConfig := &core.Config{
App: []*serial.TypedMessage{ App: []*serial.TypedMessage{
serial.ToTypedMessage(&log.Config{ serial.ToTypedMessage(&log.Config{
@ -1098,7 +1098,7 @@ func TestVMessGCMMuxUDP(t *testing.T) {
} }
clientPort := pickPort() clientPort := pickPort()
clientUDPPort := pickUDPPort() clientUDPPort := udp.PickPort()
clientConfig := &core.Config{ clientConfig := &core.Config{
App: []*serial.TypedMessage{ App: []*serial.TypedMessage{
serial.ToTypedMessage(&log.Config{ serial.ToTypedMessage(&log.Config{

18
testing/servers/udp/port.go Normal file
View File

@ -0,0 +1,18 @@
package udp
import (
"v2ray.com/core/common"
"v2ray.com/core/common/net"
)
func PickPort() net.Port {
conn, err := net.ListenUDP("udp4", &net.UDPAddr{
IP: net.LocalHostIP.IP(),
Port: 0,
})
common.Must(err)
defer conn.Close()
addr := conn.LocalAddr().(*net.UDPAddr)
return net.Port(addr.Port)
}