anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-11 02:13:49 +09:00
Code Activity

yamux fixes

Browse source
This commit is contained in:
Sergey Cherepanov 2023-06-06 20:45:18 +02:00
parent 2ec42e5e1f
commit ddc900a93c
No known key found for this signature in database
GPG key ID: 87F8EDE8FBDF637C
4 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/transport/yamux/config.go
View file

@ -8,5 +8,4 @@ type Config struct {
ListenAddrs []string `yaml:"listenAddrs"` ListenAddrs []string `yaml:"listenAddrs"`
WriteTimeoutSec int `yaml:"writeTimeoutSec"` WriteTimeoutSec int `yaml:"writeTimeoutSec"`
DialTimeoutSec int `yaml:"dialTimeoutSec"` DialTimeoutSec int `yaml:"dialTimeoutSec"`
MaxStreams int `yaml:"maxStreams"`
} }

4
net/transport/yamux/conn.go
View file

@ -29,7 +29,7 @@ func (y *yamuxConn) Open(ctx context.Context) (conn net.Conn, err error) {
if conn, err = y.Session.Open(); err != nil { if conn, err = y.Session.Open(); err != nil {
return return
} }
return connutil.NewTimeout(conn, time.Second*10), nil return
} }
func (y *yamuxConn) LastUsage() time.Time { func (y *yamuxConn) LastUsage() time.Time {
@ -51,5 +51,5 @@ func (y *yamuxConn) Accept() (conn net.Conn, err error) {
} }
return return
} }
return connutil.NewTimeout(conn, time.Second*10), nil return
} }

3
net/transport/yamux/yamux.go
View file

@ -43,9 +43,6 @@ func (y *yamuxTransport) Init(a *app.App) (err error) {
y.secure = a.MustComponent(secureservice.CName).(secureservice.SecureService) y.secure = a.MustComponent(secureservice.CName).(secureservice.SecureService)
y.conf = a.MustComponent("config").(configGetter).GetYamux() y.conf = a.MustComponent("config").(configGetter).GetYamux()
y.yamuxConf = yamux.DefaultConfig() y.yamuxConf = yamux.DefaultConfig()
if y.conf.MaxStreams > 0 {
y.yamuxConf.AcceptBacklog = y.conf.MaxStreams
}
y.yamuxConf.EnableKeepAlive = false y.yamuxConf.EnableKeepAlive = false
y.yamuxConf.StreamOpenTimeout = time.Duration(y.conf.DialTimeoutSec) * time.Second y.yamuxConf.StreamOpenTimeout = time.Duration(y.conf.DialTimeoutSec) * time.Second
y.yamuxConf.ConnectionWriteTimeout = time.Duration(y.conf.WriteTimeoutSec) * time.Second y.yamuxConf.ConnectionWriteTimeout = time.Duration(y.conf.WriteTimeoutSec) * time.Second

1
net/transport/yamux/yamux_test.go
View file

@ -173,7 +173,6 @@ func (c *testConf) GetYamux() Config {
ListenAddrs: []string{"127.0.0.1:0"}, ListenAddrs: []string{"127.0.0.1:0"},
WriteTimeoutSec: 10, WriteTimeoutSec: 10,
DialTimeoutSec: 10, DialTimeoutSec: 10,
MaxStreams: 1024,
} }
} }