mod 侦听器和连接器都拥有port

peer/tcp/acceptor.go

@@ -1,7 +1,6 @@
 package tcp
 
 import (
-	"fmt"
 	"github.com/davyxu/cellnet"
 	"github.com/davyxu/cellnet/peer"
 	"github.com/davyxu/cellnet/util"
@@ -21,7 +20,7 @@ type tcpAcceptor struct {
 	listener net.Listener
 }
 
-func (self *tcpAcceptor) ListenPort() int {
+func (self *tcpAcceptor) Port() int {
 	if self.listener == nil {
 		return 0
 	}
@@ -65,7 +64,7 @@ func (self *tcpAcceptor) ListenAddress() string {
 		return self.Address()
 	}
 
-	return fmt.Sprintf("%s:%d", host, self.ListenPort())
+	return util.JoinAddress(host, self.Port())
 }
 
 func (self *tcpAcceptor) accept() {

peer/tcp/connector.go

@@ -75,6 +75,14 @@ func (self *tcpConnector) SetReconnectDuration(v time.Duration) {
 	self.reconDur = v
 }
 
+func (self *tcpConnector) Port() int {
+	if self.defaultSes.conn == nil {
+		return 0
+	}
+
+	return self.defaultSes.conn.LocalAddr().(*net.TCPAddr).Port
+}
+
 const reportConnectFailedLimitTimes = 3
 
 // 连接器，传入连接地址和发送封包次数

peer/tcp/syncconn.go

@@ -18,6 +18,14 @@ type tcpSyncConnector struct {
 	defaultSes *tcpSession
 }
 
+func (self *tcpSyncConnector) Port() int {
+	if self.defaultSes.conn == nil {
+		return 0
+	}
+
+	return self.defaultSes.conn.LocalAddr().(*net.TCPAddr).Port
+}
+
 func (self *tcpSyncConnector) Start() cellnet.Peer {
 
 	// 尝试用Socket连接地址

peertype.go

@@ -58,6 +58,8 @@ type TCPConnector interface {
 
 	// 设置会话管理器 实现peer.SessionManager接口
 	SetSessionManager(raw interface{})
+
+	Port() int
 }
 
 // TCP接受器，具备会话访问
@@ -70,7 +72,7 @@ type TCPAcceptor interface {
 	TCPSocketOption
 
 	// 查看当前侦听端口，使用host:0 作为Address时，socket底层自动分配侦听端口
-	ListenPort() int
+	Port() int
 }
 
 // UDP连接器