11

RO_Server_Trunk-branch_0.1.39/rocommon/socket/http/acceptor.go

@@ -51,7 +51,7 @@ func (this *httpAcceptor) Start() rocommon.ServerNode {
 	//ServeHTTP
 	this.sv = &http.Server{Addr: this.GetAddr(), Handler: this}
 
-	ln, err := net.Listen("tcpa", this.GetAddr())
+	ln, err := net.Listen("tcp", this.GetAddr())
 	if err != nil {
 		util.ErrorF("http.listen failed=%v", err)
 		return this

RO_Server_Trunk-branch_0.1.39/rocommon/socket/procrpc.go

@@ -81,7 +81,7 @@ func SessionQueueCall(s rocommon.Session, cb func()) {
 
 // 注册和回掉函数相关操作
 func init() {
-	RegisterProcessRPC("tcpa.pb",
+	RegisterProcessRPC("tcp.pb",
 		func(b rocommon.ProcessorRPCBundle, usercb rocommon.EventCallBack, arg ...interface{}) {
 			b.SetTransmitter(new(TCPMessageProcessor))
 			b.SetHooker(new(TCPEventHook))

RO_Server_Trunk-branch_0.1.39/rocommon/socket/tcp/acceptor.go

@@ -34,8 +34,8 @@ func (this *tcpAcceptor) Start() rocommon.ServerNode {
 	//https://github.com/gogf/greuse/blob/master/greuse.go
 	var listenCfg = net.ListenConfig{Control: Control}
 	util.InfoF("tcpAcceptor GetAddr:%v", this.GetAddr())
-	ln, err := listenCfg.Listen(context.Background(), "tcpa", this.GetAddr())
-	//ln, err := net.Listen("tcpa", this.GetAddr())
+	ln, err := listenCfg.Listen(context.Background(), "tcp", this.GetAddr())
+	//ln, err := net.Listen("tcp", this.GetAddr())
 	if err != nil {
 		util.PanicF("tcpAcceptor listen failure=%v", err)
 	}

RO_Server_Trunk-branch_0.1.39/rocommon/socket/tcp/connector.go

@@ -41,7 +41,7 @@ func (c *tcpConnector) connect(addr string) {
 				util.DebugF("[tcpConnector] connect begin=%v sid=%v[%v]", addr, preDesc.ID, c.connNum-1)
 			}
 		}
-		conn, err := net.Dial("tcpa", addr)
+		conn, err := net.Dial("tcp", addr)
 		if err != nil {
 			//log.Println("dail err:", err)
 			if c.reconnectTime == 0 || c.GetCloseFlag() {

RO_Server_Trunk-branch_0.1.39/rocommon/socket/websocket/acceptor.go

@@ -48,7 +48,7 @@ func (this *tcpWebSocketAcceptor) Start() rocommon.ServerNode {
 
 	//https://github.com/gogf/greuse/blob/master/greuse.go
 	var listenCfg = net.ListenConfig{Control: Control}
-	ln, err := listenCfg.Listen(context.Background(), "tcpa", this.GetAddr())
+	ln, err := listenCfg.Listen(context.Background(), "tcp", this.GetAddr())
 	//ln, err := net.Listen("tcpa", this.GetAddr())
 	if err != nil {
 		util.PanicF("webSocketAcceptor listen failure=%v", err)

RO_Server_Trunk-branch_0.1.39/rorank/go.mod

@@ -1,3 +1,7 @@
 module rorank
 
-go 1.21.1
+go 1.12
+
+replace (
+	rocommon => ../rocommon
+)

RO_Server_Trunk-branch_0.1.39/roserver/benchmark/main.go

@@ -25,7 +25,7 @@ func client() {
 	node := socket.NewServerNode("tcpConnector", "client", "127.0.0.1:21001", queue)
 	rv := rocommon.NewNetSyncRecv(node)
 
-	socket.SetProcessorRPC(node, "tcpa.demo", rv.EventCB())
+	socket.SetProcessorRPC(node, "tcp.demo", rv.EventCB())
 	node.(rocommon.TCPConnector).SetReconnectTime(5 * time.Second)
 	node.Start()
 

RO_Server_Trunk-branch_0.1.39/roserver/test/model/cli_conn.go

@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	socket.RegisterProcessRPC("tcpa.demo",
+	socket.RegisterProcessRPC("tcp.demo",
 		func(b rocommon.ProcessorRPCBundle, userCb rocommon.EventCallBack, arg ...interface{}) {
 			b.SetTransmitter(new(socket.TCPMessageProcessor))
 
@@ -41,7 +41,7 @@ func CreateClientConn(f func(rocommon.Session)) {
 	var servicID string = ""
 	var addrStr string = "127.0.0.1:21001"
 	cli := socket.NewServerNode("tcpConnector", servicID, addrStr, nil)
-	socket.SetProcessorRPC(cli, "tcpa.demo", func(ev rocommon.ProcEvent) {
+	socket.SetProcessorRPC(cli, "tcp.demo", func(ev rocommon.ProcEvent) {
 		//todo...
 		switch m := ev.Msg().(type) {
 		case *rocommon.SessionConnectError:

RO_Server_Trunk-branch_0.1.39/roserver/test/model/game_benchmark.go

@@ -63,7 +63,7 @@ func Client(id int) {
 
 	rv := rocommon.NewNetSyncRecv(node)
 
-	socket.SetProcessorRPC(node, "tcpa.demo", rv.EventCB())
+	socket.SetProcessorRPC(node, "tcp.demo", rv.EventCB())
 	node.(rocommon.TCPConnector).SetReconnectTime(20 * time.Millisecond)
 	node.Start()
 

RO_Server_Trunk-branch_bt/rocommon/socket/http/acceptor.go

@@ -51,7 +51,7 @@ func (this *httpAcceptor) Start() rocommon.ServerNode {
 	//ServeHTTP
 	this.sv = &http.Server{Addr: this.GetAddr(), Handler: this}
 
-	ln, err := net.Listen("tcpa", this.GetAddr())
+	ln, err := net.Listen("tcp", this.GetAddr())
 	if err != nil {
 		util.ErrorF("http.listen failed=%v", err)
 		return this

RO_Server_Trunk-branch_bt/rocommon/socket/procrpc.go

@@ -80,7 +80,7 @@ func SessionQueueCall(s rocommon.Session, cb func()) {
 
 // 注册和回掉函数相关操作
 func init() {
-	RegisterProcessRPC("tcpa.pb",
+	RegisterProcessRPC("tcp.pb",
 		func(b rocommon.ProcessorRPCBundle, usercb rocommon.EventCallBack, arg ...interface{}) {
 			b.SetTransmitter(new(TCPMessageProcessor))
 			b.SetHooker(new(TCPEventHook))

RO_Server_Trunk-branch_bt/rocommon/socket/tcp/acceptor.go

@@ -34,7 +34,7 @@ func (this *tcpAcceptor) Start() rocommon.ServerNode {
 	//https://github.com/gogf/greuse/blob/master/greuse.go
 	var listenCfg = net.ListenConfig{Control: Control}
 
-	ln, err := listenCfg.Listen(context.Background(), "tcpa", this.GetAddr())
+	ln, err := listenCfg.Listen(context.Background(), "tcp", this.GetAddr())
 	//ln, err := net.Listen("tcpa", this.GetAddr())
 	if err != nil {
 		util.PanicF("tcpAcceptor listen failure=%v", err)

RO_Server_Trunk-branch_bt/rocommon/socket/tcp/connector.go

@@ -41,7 +41,7 @@ func (c *tcpConnector) connect(addr string) {
 				util.DebugF("[tcpConnector] connect begin=%v sid=%v[%v]", addr, preDesc.ID, c.connNum-1)
 			}
 		}
-		conn, err := net.Dial("tcpa", addr)
+		conn, err := net.Dial("tcp", addr)
 		if err != nil {
 			//log.Println("dail err:", err)
 			if c.reconnectTime == 0 || c.GetCloseFlag() {

RO_Server_Trunk-branch_bt/rocommon/socket/websocket/acceptor.go

@@ -48,7 +48,7 @@ func (this *tcpWebSocketAcceptor) Start() rocommon.ServerNode {
 
 	//https://github.com/gogf/greuse/blob/master/greuse.go
 	var listenCfg = net.ListenConfig{Control: Control}
-	ln, err := listenCfg.Listen(context.Background(), "tcpa", this.GetAddr())
+	ln, err := listenCfg.Listen(context.Background(), "tcp", this.GetAddr())
 	//ln, err := net.Listen("tcpa", this.GetAddr())
 	if err != nil {
 		util.PanicF("webSocketAcceptor listen failure=%v", err)

RO_Server_Trunk-branch_bt/roserver/benchmark/main.go

@@ -25,7 +25,7 @@ func client() {
 	node := socket.NewServerNode("tcpConnector", "client", "127.0.0.1:21001", queue)
 	rv := rocommon.NewNetSyncRecv(node)
 
-	socket.SetProcessorRPC(node, "tcpa.demo", rv.EventCB())
+	socket.SetProcessorRPC(node, "tcp.demo", rv.EventCB())
 	node.(rocommon.TCPConnector).SetReconnectTime(5 * time.Second)
 	node.Start()
 

RO_Server_Trunk-branch_bt/roserver/test/model/cli_conn.go

@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	socket.RegisterProcessRPC("tcpa.demo",
+	socket.RegisterProcessRPC("tcp.demo",
 		func(b rocommon.ProcessorRPCBundle, userCb rocommon.EventCallBack, arg ...interface{}) {
 			b.SetTransmitter(new(socket.TCPMessageProcessor))
 
@@ -41,7 +41,7 @@ func CreateClientConn(f func(rocommon.Session)) {
 	var servicID string = ""
 	var addrStr string = "127.0.0.1:21001"
 	cli := socket.NewServerNode("tcpConnector", servicID, addrStr, nil)
-	socket.SetProcessorRPC(cli, "tcpa.demo", func(ev rocommon.ProcEvent) {
+	socket.SetProcessorRPC(cli, "tcp.demo", func(ev rocommon.ProcEvent) {
 		//todo...
 		switch m := ev.Msg().(type) {
 		case *rocommon.SessionConnectError:

RO_Server_Trunk-branch_bt/roserver/test/model/game_benchmark.go

@@ -63,7 +63,7 @@ func Client(id int) {
 
 	rv := rocommon.NewNetSyncRecv(node)
 
-	socket.SetProcessorRPC(node, "tcpa.demo", rv.EventCB())
+	socket.SetProcessorRPC(node, "tcp.demo", rv.EventCB())
 	node.(rocommon.TCPConnector).SetReconnectTime(20 * time.Millisecond)
 	node.Start()