From a6adfa133e84851e52e8a63d278dc3b7bf7c186d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=80=9D=E6=95=8F?= Date: Thu, 25 Aug 2022 17:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 1 + go.sum | 2 ++ rpc.go | 3 +-- tap.go | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dec847f..3eebf69 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 require github.com/klauspost/compress v1.15.9 // indirect require ( + github.com/474420502/random v0.5.1 github.com/golang/protobuf v1.5.2 // indirect github.com/songgao/packets v0.0.0-20160404182456-549a10cd4091 // indirect golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect diff --git a/go.sum b/go.sum index c0d2b8e..5d4f5c3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/474420502/random v0.5.1 h1:AA/r690QEKiVdCsFD9OKbjUmmtmLJQ7Qxd4IMVV1sbc= +github.com/474420502/random v0.5.1/go.mod h1:Kq5VC8ezVvzp9CUahvebIdlSiFdHzEzscaOScLvbw2c= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/rpc.go b/rpc.go index 295abf4..4fba933 100644 --- a/rpc.go +++ b/rpc.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "log" "net" gen "slimming/proto/gen" @@ -22,7 +21,7 @@ func newRPCServer(netCard *NetCard) *RPCServer { func (rpc *RPCServer) run() { - lis, err := net.Listen("tcp", fmt.Sprintf("%s", config.Network.Self.Real)) + lis, err := net.Listen("tcp", config.Network.Self.Real) if err != nil { log.Fatalf("failed to listen: %v", err) } diff --git a/tap.go b/tap.go index 1dc67ce..6be7897 100644 --- a/tap.go +++ b/tap.go @@ -162,7 +162,7 @@ func (nc *NetCard) runRead() { var buffer *[][]byte if buffer, ok = bytesMap[rframe.Destination().String()]; !ok { mbuffer := make([][]byte, 100) - *buffer = mbuffer + buffer = &mbuffer bytesMap[rframe.Destination().String()] = buffer }