Skip to content

Commit 10b3b20

Browse files
marten-seemannmarten-seemann
committed
use the new network.ConnStats
1 parent a33e1f6 commit 10b3b20

File tree

7 files changed

+35
-25
lines changed

7 files changed

+35
-25
lines changed

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/ipfs/go-cid v0.0.7
1313
github.com/ipfs/go-datastore v0.5.0
1414
github.com/ipfs/go-ipfs-util v0.0.2
15-
github.com/ipfs/go-log/v2 v2.3.0
15+
github.com/ipfs/go-log/v2 v2.4.0
1616
github.com/jbenet/goprocess v0.1.4
1717
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
1818
github.com/koron/go-ssdp v0.0.2 // indirect
@@ -24,18 +24,18 @@ require (
2424
github.com/libp2p/go-libp2p-autonat v0.6.0
2525
github.com/libp2p/go-libp2p-blankhost v0.2.0
2626
github.com/libp2p/go-libp2p-circuit v0.4.0
27-
github.com/libp2p/go-libp2p-core v0.12.0
27+
github.com/libp2p/go-libp2p-core v0.12.1-0.20211212050835-73c55fafd9ea
2828
github.com/libp2p/go-libp2p-discovery v0.6.0
2929
github.com/libp2p/go-libp2p-mplex v0.4.1
3030
github.com/libp2p/go-libp2p-nat v0.1.0
3131
github.com/libp2p/go-libp2p-netutil v0.1.0
3232
github.com/libp2p/go-libp2p-noise v0.3.0
3333
github.com/libp2p/go-libp2p-peerstore v0.6.0
3434
github.com/libp2p/go-libp2p-quic-transport v0.15.0
35-
github.com/libp2p/go-libp2p-swarm v0.8.0
35+
github.com/libp2p/go-libp2p-swarm v0.8.1-0.20211212051748-acefb994a054
3636
github.com/libp2p/go-libp2p-testing v0.5.0
3737
github.com/libp2p/go-libp2p-tls v0.3.1
38-
github.com/libp2p/go-libp2p-transport-upgrader v0.5.0
38+
github.com/libp2p/go-libp2p-transport-upgrader v0.5.1-0.20211212051415-e55d2132d02b
3939
github.com/libp2p/go-libp2p-yamux v0.6.0
4040
github.com/libp2p/go-msgio v0.1.0
4141
github.com/libp2p/go-netroute v0.1.6

‎go.sum

+11-5
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,9 @@ github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBW
332332
github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
333333
github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
334334
github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g=
335-
github.com/ipfs/go-log/v2 v2.3.0 h1:31Re/cPqFHpsRHgyVwjWADPoF0otB1WrjTy8ZFYwEZU=
336335
github.com/ipfs/go-log/v2 v2.3.0/go.mod h1:QqGoj30OTpnKaG/LKTGTxoP2mmQtjVMEnK72gynbe/g=
336+
github.com/ipfs/go-log/v2 v2.4.0 h1:iR/2o9PGWanVJrBgIH5Ff8mPGOwpqLaPIAFqSnsdlzk=
337+
github.com/ipfs/go-log/v2 v2.4.0/go.mod h1:nPZnh7Cj7lwS3LpRU5Mwr2ol1c2gXIEXuF6aywqrtmo=
337338
github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
338339
github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
339340
github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
@@ -429,8 +430,9 @@ github.com/libp2p/go-libp2p-core v0.8.6/go.mod h1:dgHr0l0hIKfWpGpqAMbpo19pen9wJf
429430
github.com/libp2p/go-libp2p-core v0.9.0/go.mod h1:ESsbz31oC3C1AvMJoGx26RTuCkNhmkSRCqZ0kQtJ2/8=
430431
github.com/libp2p/go-libp2p-core v0.10.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
431432
github.com/libp2p/go-libp2p-core v0.11.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
432-
github.com/libp2p/go-libp2p-core v0.12.0 h1:S9bO2lhSJtOvAKo8QAdW9Zp1FEo0XkfXymqvrW6l/I8=
433433
github.com/libp2p/go-libp2p-core v0.12.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
434+
github.com/libp2p/go-libp2p-core v0.12.1-0.20211212050835-73c55fafd9ea h1:9bLjhd9bTVeVcCRId1O4nplKVuWBj8F8+OTR1ZP3pr8=
435+
github.com/libp2p/go-libp2p-core v0.12.1-0.20211212050835-73c55fafd9ea/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
434436
github.com/libp2p/go-libp2p-discovery v0.6.0 h1:1XdPmhMJr8Tmj/yUfkJMIi8mgwWrLUsCB3bMxdT+DSo=
435437
github.com/libp2p/go-libp2p-discovery v0.6.0/go.mod h1:/u1voHt0tKIe5oIA1RHBKQLVCWPna2dXmPNHc2zR9S8=
436438
github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
@@ -454,8 +456,9 @@ github.com/libp2p/go-libp2p-quic-transport v0.13.0/go.mod h1:39/ZWJ1TW/jx1iFkKzz
454456
github.com/libp2p/go-libp2p-quic-transport v0.15.0 h1:DR0mP6kcieowikBprWkcNtbquRKOPWb5dLZ4ahDZujk=
455457
github.com/libp2p/go-libp2p-quic-transport v0.15.0/go.mod h1:wv4uGwjcqe8Mhjj7N/Ic0aKjA+/10UnMlSzLO0yRpYQ=
456458
github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
457-
github.com/libp2p/go-libp2p-swarm v0.8.0 h1:nRHNRhi86L7jhka02N4MoV+PSFFPoJFkHNQwCTFxNhw=
458459
github.com/libp2p/go-libp2p-swarm v0.8.0/go.mod h1:sOMp6dPuqco0r0GHTzfVheVBh6UEL0L1lXUZ5ot2Fvc=
460+
github.com/libp2p/go-libp2p-swarm v0.8.1-0.20211212051748-acefb994a054 h1:wGJoyPXMQgLouZNk9IQYcumQMwisy3+swf94P5qz1s0=
461+
github.com/libp2p/go-libp2p-swarm v0.8.1-0.20211212051748-acefb994a054/go.mod h1:heS13LZzESB6yMyaR6ZjTHdP8kqk5PLNuaxORbE8b54=
459462
github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
460463
github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
461464
github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
@@ -470,8 +473,9 @@ github.com/libp2p/go-libp2p-tls v0.3.1/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5o
470473
github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
471474
github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
472475
github.com/libp2p/go-libp2p-transport-upgrader v0.4.3/go.mod h1:bpkldbOWXMrXhpZbSV1mQxTrefOg2Fi+k1ClDSA4ppw=
473-
github.com/libp2p/go-libp2p-transport-upgrader v0.5.0 h1:7SDl3O2+AYOgfE40Mis83ClpfGNkNA6m4FwhbOHs+iI=
474476
github.com/libp2p/go-libp2p-transport-upgrader v0.5.0/go.mod h1:Rc+XODlB3yce7dvFV4q/RmyJGsFcCZRkeZMu/Zdg0mo=
477+
github.com/libp2p/go-libp2p-transport-upgrader v0.5.1-0.20211212051415-e55d2132d02b h1:PltkHDDwjxgLxMiujCGhnbEwwQI056kD84bSd9ExE4U=
478+
github.com/libp2p/go-libp2p-transport-upgrader v0.5.1-0.20211212051415-e55d2132d02b/go.mod h1:YRaICAG6mlmZlTSiEZXeFbqpzVnxS0KtYg8cK2n7DdA=
475479
github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30=
476480
github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
477481
github.com/libp2p/go-libp2p-yamux v0.6.0 h1:TKayW983n92JhCGdCo7ej7eEb+DQ0VYfKNOxlN/1kNQ=
@@ -545,8 +549,9 @@ github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcncea
545549
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
546550
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
547551
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
548-
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
549552
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
553+
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
554+
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
550555
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
551556
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
552557
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -1061,6 +1066,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
10611066
golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10621067
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10631068
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1069+
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10641070
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU=
10651071
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10661072
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

‎p2p/net/mock/mock_conn.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,25 @@ type conn struct {
3838
link *link
3939
rconn *conn // counterpart
4040
streams list.List
41-
stat network.Stat
41+
stat network.ConnStats
4242

4343
pairProc, connProc process.Process
4444

4545
sync.RWMutex
4646
}
4747

4848
func newConn(p process.Process, ln, rn *peernet, l *link, dir network.Direction) *conn {
49-
c := &conn{net: ln, link: l, pairProc: p}
50-
c.local = ln.peer
51-
c.remote = rn.peer
52-
c.stat = network.Stat{Direction: dir}
53-
c.id = atomic.AddInt64(&connCounter, 1)
49+
c := &conn{
50+
net: ln,
51+
link: l,
52+
pairProc: p,
53+
local: ln.peer,
54+
remote: ln.peer,
55+
id: atomic.AddInt64(&connCounter, 1),
56+
localAddr: ln.ps.Addrs(ln.peer)[0],
57+
}
58+
c.stat.Direction = dir
5459

55-
c.localAddr = ln.ps.Addrs(ln.peer)[0]
5660
for _, a := range rn.ps.Addrs(rn.peer) {
5761
if !manet.IsIPUnspecified(a) {
5862
c.remoteAddr = a
@@ -194,6 +198,6 @@ func (c *conn) RemotePublicKey() ic.PubKey {
194198
}
195199

196200
// Stat returns metadata about the connection
197-
func (c *conn) Stat() network.Stat {
201+
func (c *conn) Stat() network.ConnStats {
198202
return c.stat
199203
}

‎p2p/net/mock/mock_stream.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/libp2p/go-libp2p-core/mux"
1414
"github.com/libp2p/go-libp2p-core/network"
15-
protocol "github.com/libp2p/go-libp2p-core/protocol"
15+
"github.com/libp2p/go-libp2p-core/protocol"
1616
)
1717

1818
var streamCounter int64
@@ -36,7 +36,7 @@ type stream struct {
3636
writeErr error
3737

3838
protocol atomic.Value
39-
stat network.Stat
39+
stat network.Stats
4040
}
4141

4242
var ErrClosed error = errors.New("stream closed")
@@ -66,7 +66,7 @@ func newStream(w *io.PipeWriter, r *io.PipeReader, dir network.Direction) *strea
6666
close: make(chan struct{}, 1),
6767
closed: make(chan struct{}),
6868
toDeliver: make(chan *transportObject),
69-
stat: network.Stat{Direction: dir},
69+
stat: network.Stats{Direction: dir},
7070
}
7171

7272
go s.transport()
@@ -101,7 +101,7 @@ func (s *stream) Protocol() protocol.ID {
101101
return p
102102
}
103103

104-
func (s *stream) Stat() network.Stat {
104+
func (s *stream) Stat() network.Stats {
105105
return s.stat
106106
}
107107

‎p2p/protocol/circuitv2/client/conn.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var (
2626
type Conn struct {
2727
stream network.Stream
2828
remote peer.AddrInfo
29-
stat network.Stat
29+
stat network.ConnStats
3030

3131
client *Client
3232
}
@@ -110,7 +110,7 @@ func (c *Conn) RemoteAddr() net.Addr {
110110
// ConnStat interface
111111
var _ network.ConnStat = (*Conn)(nil)
112112

113-
func (c *Conn) Stat() network.Stat {
113+
func (c *Conn) Stat() network.ConnStats {
114114
return c.stat
115115
}
116116

‎p2p/protocol/circuitv2/client/dial.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func (c *Client) connectV2(s network.Stream, dest peer.AddrInfo) (*Conn, error)
184184

185185
// check for a limit provided by the relay; if the limit is not nil, then this is a limited
186186
// relay connection and we mark the connection as transient.
187-
var stat network.Stat
187+
var stat network.ConnStats
188188
if limit := msg.GetLimit(); limit != nil {
189189
stat.Transient = true
190190
stat.Extra = make(map[interface{}]interface{})

‎p2p/protocol/circuitv2/client/handlers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (c *Client) handleStreamV2(s network.Stream) {
6767

6868
// check for a limit provided by the relay; if the limit is not nil, then this is a limited
6969
// relay connection and we mark the connection as transient.
70-
var stat network.Stat
70+
var stat network.ConnStats
7171
if limit := msg.GetLimit(); limit != nil {
7272
stat.Transient = true
7373
stat.Extra = make(map[interface{}]interface{})

0 commit comments

Comments
 (0)