Merge from remote branch

listener/tproxy/tproxy.go

@@ -10,7 +10,6 @@ import (
 
 type Listener struct {
 	listener net.Listener
-	address  string
 	closed   bool
 }
 
@@ -33,7 +32,6 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
 
 	rl := &Listener{
 		listener: l,
-		address:  addr,
 	}
 
 	go func() {
@@ -58,7 +56,7 @@ func (l *Listener) Close() {
 }
 
 func (l *Listener) Address() string {
-	return l.address
+	return l.listener.Addr().String()
 }
 
 func (l *Listener) handleTProxy(conn net.Conn, in chan<- C.ConnContext) {

listener/tproxy/udp.go

@@ -11,7 +11,6 @@ import (
 
 type UDPListener struct {
 	packetConn net.PacketConn
-	address    string
 	closed     bool
 }
 
@@ -21,7 +20,9 @@ func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error)
 		return nil, err
 	}
 
-	rl := &UDPListener{l, addr, false}
+	rl := &UDPListener{
+		packetConn: l,
+	}
 
 	c := l.(*net.UDPConn)
 
@@ -65,7 +66,7 @@ func (l *UDPListener) Close() error {
 }
 
 func (l *UDPListener) Address() string {
-	return l.address
+	return l.packetConn.LocalAddr().String()
 }
 
 func handlePacketConn(pc net.PacketConn, in chan<- *inbound.PacketAdapter, buf []byte, lAddr *net.UDPAddr, rAddr *net.UDPAddr) {