netbird/ice
0
0
Fork 0
mirror of https://github.com/netbirdio/ice.git synced 2026-05-22 17:10:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Run TestRemoteLocalAddr in VNet

Browse Source 
Avoid being affected by bridged network interfaces.
This commit is contained in:
Atsushi Watanabe
2020-07-05 22:23:59 -07:00
committed by Sean DuBois
parent e48e65b062
commit b2fbb12d0a
3 changed files with 137 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connectivity_vnet_test.go
+44 -23
View File
@@ -4,6 +4,7 @@ package ice
import (
"context"
"fmt"
"net"
"sync/atomic"
"testing"
@@ -17,6 +18,17 @@ import (
"github.com/stretchr/testify/assert"
)
const (
vnetGlobalIPA = "27.1.1.1"
vnetLocalIPA = "192.168.0.1"
vnetLocalSubnetMaskA = "24"
vnetGlobalIPB = "28.1.1.1"
vnetLocalIPB = "10.2.0.1"
vnetLocalSubnetMaskB = "24"
vnetSTUNServerIP = "1.2.3.4"
vnetSTUNServerPort = 3478
)
type virtualNet struct {
wan *vnet.Router
net0 *vnet.Net
@@ -42,7 +54,7 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
}
wanNet := vnet.NewNet(&vnet.NetConfig{
StaticIP: "1.2.3.4", // will be assigned to eth0
StaticIP: vnetSTUNServerIP, // will be assigned to eth0
})
err = wan.AddNet(wanNet)
@@ -55,14 +67,14 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
StaticIPs: func() []string {
if natType0.Mode == vnet.NATModeNAT1To1 {
return []string{
"27.1.1.1/192.168.0.1",
vnetGlobalIPA + "/" + vnetLocalIPA,
}
}
return []string{
"27.1.1.1",
vnetGlobalIPA,
}
}(),
CIDR: "192.168.0.0/24",
CIDR: vnetLocalIPA + "/" + vnetLocalSubnetMaskA,
NATType: natType0,
LoggerFactory: loggerFactory,
})
@@ -71,7 +83,7 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
}
net0 := vnet.NewNet(&vnet.NetConfig{
StaticIPs: []string{"192.168.0.1"},
StaticIPs: []string{vnetLocalIPA},
})
err = lan0.AddNet(net0)
if err != nil {
@@ -88,14 +100,14 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
StaticIPs: func() []string {
if natType1.Mode == vnet.NATModeNAT1To1 {
return []string{
"28.1.1.1/10.2.0.1",
vnetGlobalIPB + "/" + vnetLocalIPB,
}
}
return []string{
"28.1.1.1",
vnetGlobalIPB,
}
}(),
CIDR: "10.2.0.0/24",
CIDR: vnetLocalIPB + "/" + vnetLocalSubnetMaskB,
NATType: natType1,
LoggerFactory: loggerFactory,
})
@@ -104,7 +116,7 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
}
net1 := vnet.NewNet(&vnet.NetConfig{
StaticIPs: []string{"10.2.0.1"},
StaticIPs: []string{vnetLocalIPB},
})
err = lan1.AddNet(net1)
if err != nil {
@@ -122,10 +134,24 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
return nil, err
}
server, err := addVNetSTUN(wanNet, loggerFactory)
if err != nil {
return nil, err
}
return &virtualNet{
wan: wan,
net0: net0,
net1: net1,
server: server,
}, nil
}
func addVNetSTUN(wanNet *vnet.Net, loggerFactory logging.LoggerFactory) (*turn.Server, error) {
// Run TURN(STUN) server
credMap := map[string]string{}
credMap["user"] = "pass"
wanNetPacketConn, err := wanNet.ListenPacket("udp", "1.2.3.4:3478")
wanNetPacketConn, err := wanNet.ListenPacket("udp", fmt.Sprintf("%s:%d", vnetSTUNServerIP, vnetSTUNServerPort))
if err != nil {
return nil, err
}
@@ -140,7 +166,7 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
{
PacketConn: wanNetPacketConn,
RelayAddressGenerator: &turn.RelayAddressGeneratorStatic{
RelayAddress: net.ParseIP("1.2.3.4"),
RelayAddress: net.ParseIP(vnetSTUNServerIP),
Address: "0.0.0.0",
Net: wanNet,
},
@@ -153,12 +179,7 @@ func buildVNet(natType0, natType1 *vnet.NATType) (*virtualNet, error) {
return nil, err
}
return &virtualNet{
wan: wan,
net0: net0,
net1: net1,
server: server,
}, nil
return server, err
}
func connectWithVNet(aAgent, bAgent *Agent) (*Conn, *Conn) {
@@ -201,7 +222,7 @@ func pipeWithVNet(v *virtualNet, a0TestConfig, a1TestConfig *agentTestConfig) (*
var nat1To1IPs []string
if a0TestConfig.nat1To1IPCandidateType != CandidateTypeUnspecified {
nat1To1IPs = []string{
"27.1.1.1",
vnetGlobalIPA,
}
}
@@ -225,7 +246,7 @@ func pipeWithVNet(v *virtualNet, a0TestConfig, a1TestConfig *agentTestConfig) (*
if a1TestConfig.nat1To1IPCandidateType != CandidateTypeUnspecified {
nat1To1IPs = []string{
"28.1.1.1",
vnetGlobalIPB,
}
}
cfg1 := &AgentConfig{
@@ -271,15 +292,15 @@ func TestConnectivityVNet(t *testing.T) {
stunServerURL := &URL{
Scheme: SchemeTypeSTUN,
Host: "1.2.3.4",
Port: 3478,
Host: vnetSTUNServerIP,
Port: vnetSTUNServerPort,
Proto: ProtoTypeUDP,
}
turnServerURL := &URL{
Scheme: SchemeTypeTURN,
Host: "1.2.3.4",
Port: 3478,
Host: vnetSTUNServerIP,
Port: vnetSTUNServerPort,
Username: "user",
Password: "pass",
Proto: ProtoTypeUDP,
transport_test.go
-38
View File
@@ -11,7 +11,6 @@ import (
"time"
"github.com/pion/transport/test"
"github.com/stretchr/testify/assert"
)
func TestStressDuplex(t *testing.T) {
@@ -425,40 +424,3 @@ func TestConnStats(t *testing.T) {
panic(err)
}
}
func TestRemoteLocalAddr(t *testing.T) {
// Check for leaking routines
report := test.CheckRoutines(t)
defer report()
// Limit runtime in case of deadlocks
lim := test.TimeOut(time.Second * 20)
defer lim.Stop()
t.Run("Disconnected Returns nil", func(t *testing.T) {
disconnectedAgent, err := NewAgent(&AgentConfig{})
assert.NoError(t, err)
disconnectedConn := Conn{agent: disconnectedAgent}
assert.Nil(t, disconnectedConn.RemoteAddr())
assert.Nil(t, disconnectedConn.LocalAddr())
assert.NoError(t, disconnectedConn.Close())
})
t.Run("Remote/Local Pair Match between Agents", func(t *testing.T) {
ca, cb := pipe(nil)
// Assert that nothing is nil
assert.NotNil(t, ca.RemoteAddr())
assert.NotNil(t, ca.LocalAddr())
// Assert that they are equal
assert.Equal(t, ca.LocalAddr(), cb.RemoteAddr())
assert.Equal(t, cb.LocalAddr(), ca.RemoteAddr())
// Close
assert.NoError(t, ca.Close())
assert.NoError(t, cb.Close())
})
}
transport_vnet_test.go
+93
View File
@@ -0,0 +1,93 @@
// +build !js
package ice
import (
"fmt"
"net"
"testing"
"time"
"github.com/pion/transport/test"
"github.com/pion/transport/vnet"
"github.com/stretchr/testify/assert"
)
func TestRemoteLocalAddr(t *testing.T) {
// Check for leaking routines
report := test.CheckRoutines(t)
defer report()
// Limit runtime in case of deadlocks
lim := test.TimeOut(time.Second * 20)
defer lim.Stop()
// Agent0 is behind 1:1 NAT
natType0 := &vnet.NATType{Mode: vnet.NATModeNAT1To1}
// Agent1 is behind 1:1 NAT
natType1 := &vnet.NATType{Mode: vnet.NATModeNAT1To1}
v, errVnet := buildVNet(natType0, natType1)
if !assert.NoError(t, errVnet, "should succeed") {
return
}
defer v.close()
stunServerURL := &URL{
Scheme: SchemeTypeSTUN,
Host: vnetSTUNServerIP,
Port: vnetSTUNServerPort,
Proto: ProtoTypeUDP,
}
t.Run("Disconnected Returns nil", func(t *testing.T) {
disconnectedAgent, err := NewAgent(&AgentConfig{})
assert.NoError(t, err)
disconnectedConn := Conn{agent: disconnectedAgent}
assert.Nil(t, disconnectedConn.RemoteAddr())
assert.Nil(t, disconnectedConn.LocalAddr())
assert.NoError(t, disconnectedConn.Close())
})
t.Run("Remote/Local Pair Match between Agents", func(t *testing.T) {
ca, cb := pipeWithVNet(v,
&agentTestConfig{
urls: []*URL{stunServerURL},
},
&agentTestConfig{
urls: []*URL{stunServerURL},
},
)
aRAddr := ca.RemoteAddr()
aLAddr := ca.LocalAddr()
bRAddr := cb.RemoteAddr()
bLAddr := cb.LocalAddr()
// Assert that nothing is nil
assert.NotNil(t, aRAddr)
assert.NotNil(t, aLAddr)
assert.NotNil(t, bRAddr)
assert.NotNil(t, bLAddr)
// Assert addresses
assert.Equal(t, aLAddr.String(),
fmt.Sprintf("%s:%d", vnetLocalIPA, bRAddr.(*net.UDPAddr).Port),
)
assert.Equal(t, bLAddr.String(),
fmt.Sprintf("%s:%d", vnetLocalIPB, aRAddr.(*net.UDPAddr).Port),
)
assert.Equal(t, aRAddr.String(),
fmt.Sprintf("%s:%d", vnetGlobalIPB, bLAddr.(*net.UDPAddr).Port),
)
assert.Equal(t, bRAddr.String(),
fmt.Sprintf("%s:%d", vnetGlobalIPA, aLAddr.(*net.UDPAddr).Port),
)
// Close
assert.NoError(t, ca.Close())
assert.NoError(t, cb.Close())
})
}