diff --git a/client/client.go b/client/client.go index 2bcbe7cd..9cf90ca9 100755 --- a/client/client.go +++ b/client/client.go @@ -71,7 +71,6 @@ func (s *TRPClient) processor(c *utils.Conn) { if link, err := c.GetLinkInfo(); err != nil { break } else { - log.Println(link) s.Lock() s.linkMap[link.Id] = link s.Unlock() @@ -118,10 +117,10 @@ func (s *TRPClient) linkProcess(link *utils.Link, c *utils.Conn) { break } utils.PutBufPoolCopy(buf) - if link.ConnType == utils.CONN_UDP { - c.Close() - break - } + //if link.ConnType == utils.CONN_UDP { + // c.Close() + // break + //} } } diff --git a/cmd/proxy_client/proxy_client.go b/cmd/proxy_client/proxy_client.go index 88e5e081..cc2726d6 100644 --- a/cmd/proxy_client/proxy_client.go +++ b/cmd/proxy_client/proxy_client.go @@ -13,7 +13,6 @@ var ( ) func main() { - log.SetFlags(log.Lshortfile) flag.Parse() stop := make(chan int) for _, v := range strings.Split(*verifyKey, ",") { diff --git a/cmd/proxy_server/proxy_server.go b/cmd/proxy_server/proxy_server.go index f031c4e1..529a73aa 100644 --- a/cmd/proxy_server/proxy_server.go +++ b/cmd/proxy_server/proxy_server.go @@ -22,7 +22,6 @@ var ( ) func main() { - log.SetFlags(log.Lshortfile) flag.Parse() task := &utils.Tunnel{ TcpPort: *httpPort, @@ -45,6 +44,8 @@ func main() { Remark: "", Status: true, IsConnect: false, + Cnf: &utils.Config{}, + Flow: &utils.Flow{}, } c.Cnf.CompressDecode, c.Cnf.CompressEncode = utils.GetCompressType(c.Cnf.Compress) server.CsvDb.Clients[0] = c @@ -60,5 +61,8 @@ func main() { } log.Println("服务端启动,监听tcp服务端端口:", *TcpPort) task.Config.CompressDecode, task.Config.CompressEncode = utils.GetCompressType(task.Config.Compress) + if *rpMode!="webServer" { + server.CsvDb.Tasks[0] = task + } server.StartNewServer(*TcpPort, task) } diff --git a/server/socks5.go b/server/socks5.go index 3d927073..ac36b072 100755 --- a/server/socks5.go +++ b/server/socks5.go @@ -143,7 +143,6 @@ func (s *Sock5ModeServer) doConnect(c net.Conn, command uint8) { link := utils.NewLink(s.task.Client.GetId(), ltype, addr, s.config.CompressEncode, s.config.CompressDecode, s.config.Crypt, utils.NewConn(c), s.task.Flow, nil, s.task.Client.Rate, nil) if tunnel, err := s.bridge.SendLinkInfo(s.task.Client.Id, link); err != nil { - log.Println("error", err, link) c.Close() return } else { diff --git a/server/tcp.go b/server/tcp.go index 50262948..d54bd521 100755 --- a/server/tcp.go +++ b/server/tcp.go @@ -127,7 +127,6 @@ func ProcessHttp(c *utils.Conn, s *TunnelModeServer) error { } method, addr, rb, err, r := c.GetHost() if err != nil { - log.Println(err) c.Close() return err }