Move more attributes to AllocationConfig

Author: stv0g

client.go

@@ -314,6 +314,9 @@ func (c *Client) Allocate() (net.PacketConn, error) {
 	relayedConn = client.NewUDPConn(&client.AllocationConfig{
 		Client:      c,
 		RelayedAddr: relayedAddr,
+		ServerAddr:  c.turnServerAddr,
+		Realm:       c.realm,
+		Username:    c.username,
 		Integrity:   c.integrity,
 		Nonce:       nonce,
 		Lifetime:    lifetime.Duration,
@@ -350,6 +353,9 @@ func (c *Client) AllocateTCP() (*client.TCPAllocation, error) {
 	allocation = client.NewTCPAllocation(&client.AllocationConfig{
 		Client:      c,
 		RelayedAddr: relayedAddr,
+		ServerAddr:  c.turnServerAddr,
+		Realm:       c.realm,
+		Username:    c.username,
 		Integrity:   c.integrity,
 		Nonce:       nonce,
 		Lifetime:    lifetime.Duration,

internal/client/allocation.go

@@ -20,8 +20,11 @@ import (
 type AllocationConfig struct {
 	Client      Client
 	RelayedAddr net.Addr
+	ServerAddr  net.Addr
 	Integrity   stun.MessageIntegrity
 	Nonce       stun.Nonce
+	Username    stun.Username
+	Realm       stun.Realm
 	Lifetime    time.Duration
 	Net         transport.Net
 	Log         logging.LeveledLogger
@@ -30,8 +33,11 @@ type AllocationConfig struct {
 type allocation struct {
 	client            Client                // Read-only
 	relayedAddr       net.Addr              // Read-only
+	serverAddr        net.Addr              // Read-only
 	permMap           *permissionMap        // Thread-safe
 	integrity         stun.MessageIntegrity // Read-only
+	username          stun.Username         // Read-only
+	realm             stun.Realm            // Read-only
 	_nonce            stun.Nonce            // Needs mutex x
 	_lifetime         time.Duration         // Needs mutex x
 	net               transport.Net         // Thread-safe
@@ -58,8 +64,8 @@ func (a *allocation) refreshAllocation(lifetime time.Duration, dontWait bool) er
 		stun.TransactionID,
 		stun.NewType(stun.MethodRefresh, stun.ClassRequest),
 		proto.Lifetime{Duration: lifetime},
-		a.client.Username(),
-		a.client.Realm(),
+		a.username,
+		a.realm,
 		a.nonce(),
 		a.integrity,
 		stun.Fingerprint,
@@ -69,7 +75,7 @@ func (a *allocation) refreshAllocation(lifetime time.Duration, dontWait bool) er
 	}
 
 	a.log.Debugf("send refresh request (dontWait=%v)", dontWait)
-	trRes, err := a.client.PerformTransaction(msg, a.client.TURNServerAddr(), dontWait)
+	trRes, err := a.client.PerformTransaction(msg, a.serverAddr, dontWait)
 	if err != nil {
 		return fmt.Errorf("%w: %s", errFailedToRefreshAllocation, err.Error())
 	}

internal/client/client.go

@@ -12,9 +12,6 @@ import (
 
 // Client is an interface for the public turn.Client in order to break cyclic dependencies
 type Client interface {
-	TURNServerAddr() net.Addr
-	Username() stun.Username
-	Realm() stun.Realm
 	WriteTo(data []byte, to net.Addr) (int, error)
 	PerformTransaction(msg *stun.Message, to net.Addr, dontWait bool) (TransactionResult, error)
 	OnDeallocated(relayedAddr net.Addr)

internal/client/tcp_alloc.go

@@ -42,6 +42,9 @@ func NewTCPAllocation(config *AllocationConfig) *TCPAllocation {
 		allocation: allocation{
 			client:      config.Client,
 			relayedAddr: config.RelayedAddr,
+			serverAddr:  config.ServerAddr,
+			username:    config.Username,
+			realm:       config.Realm,
 			permMap:     newPermissionMap(),
 			integrity:   config.Integrity,
 			_nonce:      config.Nonce,
@@ -81,8 +84,8 @@ func (a *TCPAllocation) Connect(peer net.Addr) (proto.ConnectionID, error) {
 		stun.TransactionID,
 		stun.NewType(stun.MethodConnect, stun.ClassRequest),
 		addr2PeerAddress(peer),
-		a.client.Username(),
-		a.client.Realm(),
+		a.username,
+		a.realm,
 		a.nonce(),
 		a.integrity,
 		stun.Fingerprint,
@@ -94,7 +97,7 @@ func (a *TCPAllocation) Connect(peer net.Addr) (proto.ConnectionID, error) {
 	}
 
 	a.log.Debugf("Send connect request (peer=%v)", peer)
-	trRes, err := a.client.PerformTransaction(msg, a.client.TURNServerAddr(), false)
+	trRes, err := a.client.PerformTransaction(msg, a.serverAddr, false)
 	if err != nil {
 		return 0, err
 	}
@@ -143,7 +146,7 @@ func (a *TCPAllocation) DialWithConn(conn net.Conn, network, rAddrStr string) (*
 // DialTCP acts like Dial for TCP networks.
 func (a *TCPAllocation) DialTCP(network string, lAddr, rAddr *net.TCPAddr) (*TCPConn, error) {
 	var rAddrServer *net.TCPAddr
-	if addr, ok := a.client.TURNServerAddr().(*net.TCPAddr); ok {
+	if addr, ok := a.serverAddr.(*net.TCPAddr); ok {
 		rAddrServer = &net.TCPAddr{
 			IP:   addr.IP,
 			Port: addr.Port,
@@ -216,8 +219,8 @@ func (a *TCPAllocation) BindConnection(dataConn *TCPConn, cid proto.ConnectionID
 		stun.TransactionID,
 		stun.NewType(stun.MethodConnectionBind, stun.ClassRequest),
 		cid,
-		a.client.Username(),
-		a.client.Realm(),
+		a.username,
+		a.realm,
 		a.nonce(),
 		a.integrity,
 		stun.Fingerprint,
@@ -280,7 +283,7 @@ func (a *TCPAllocation) Accept() (net.Conn, error) {
 
 // AcceptTCP accepts the next incoming call and returns the new connection.
 func (a *TCPAllocation) AcceptTCP() (transport.TCPConn, error) {
-	addr, err := net.ResolveTCPAddr("tcp4", a.client.TURNServerAddr().String())
+	addr, err := net.ResolveTCPAddr("tcp4", a.serverAddr.String())
 	if err != nil {
 		return nil, err
 	}

internal/client/tcp_conn_test.go

@@ -51,18 +51,6 @@ type dummyConnObserver struct {
 	_onDeallocated      func(relayedAddr net.Addr)
 }
 
-func (obs *dummyConnObserver) TURNServerAddr() net.Addr {
-	return obs.turnServerAddr
-}
-
-func (obs *dummyConnObserver) Username() stun.Username {
-	return obs.username
-}
-
-func (obs *dummyConnObserver) Realm() stun.Realm {
-	return obs.realm
-}
-
 func (obs *dummyConnObserver) Net() transport.Net {
 	if obs.net == nil {
 		n, err := stdnet.NewNet()

internal/client/udp_conn.go

@@ -50,8 +50,11 @@ func NewUDPConn(config *AllocationConfig) *UDPConn {
 		allocation: allocation{
 			client:      config.Client,
 			relayedAddr: config.RelayedAddr,
+			serverAddr:  config.ServerAddr,
 			readTimer:   time.NewTimer(time.Duration(math.MaxInt64)),
 			permMap:     newPermissionMap(),
+			username:    config.Username,
+			realm:       config.Realm,
 			integrity:   config.Integrity,
 			_nonce:      config.Nonce,
 			_lifetime:   config.Lifetime,
@@ -220,7 +223,7 @@ func (c *UDPConn) WriteTo(p []byte, addr net.Addr) (int, error) { //nolint: goco
 
 		// Indication has no transaction (fire-and-forget)
 
-		return c.client.WriteTo(msg.Raw, c.client.TURNServerAddr())
+		return c.client.WriteTo(msg.Raw, c.serverAddr)
 	}
 
 	// Binding is either ready
@@ -346,8 +349,8 @@ func (a *allocation) CreatePermissions(addrs ...net.Addr) error {
 	}
 
 	setters = append(setters,
-		a.client.Username(),
-		a.client.Realm(),
+		a.username,
+		a.realm,
 		a.nonce(),
 		a.integrity,
 		stun.Fingerprint)
@@ -357,7 +360,7 @@ func (a *allocation) CreatePermissions(addrs ...net.Addr) error {
 		return err
 	}
 
-	trRes, err := a.client.PerformTransaction(msg, a.client.TURNServerAddr(), false)
+	trRes, err := a.client.PerformTransaction(msg, a.serverAddr, false)
 	if err != nil {
 		return err
 	}
@@ -408,8 +411,8 @@ func (c *UDPConn) bind(b *binding) error {
 		stun.NewType(stun.MethodChannelBind, stun.ClassRequest),
 		addr2PeerAddress(b.addr),
 		proto.ChannelNumber(b.number),
-		c.client.Username(),
-		c.client.Realm(),
+		c.username,
+		c.realm,
 		c.nonce(),
 		c.integrity,
 		stun.Fingerprint,
@@ -420,7 +423,7 @@ func (c *UDPConn) bind(b *binding) error {
 		return err
 	}
 
-	trRes, err := c.client.PerformTransaction(msg, c.client.TURNServerAddr(), false)
+	trRes, err := c.client.PerformTransaction(msg, c.serverAddr, false)
 	if err != nil {
 		c.bindingMgr.deleteByAddr(b.addr)
 		return err
@@ -444,7 +447,7 @@ func (c *UDPConn) sendChannelData(data []byte, chNum uint16) (int, error) {
 		Number: proto.ChannelNumber(chNum),
 	}
 	chData.Encode()
-	_, err := c.client.WriteTo(chData.Raw, c.client.TURNServerAddr())
+	_, err := c.client.WriteTo(chData.Raw, c.serverAddr)
 	if err != nil {
 		return 0, err
 	}