yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts

Browse source
This commit is contained in:
Arceliar 2019-09-18 18:40:01 -05:00
commit 92d9274f3f
4 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/yggdrasil/tcp.go
View file

@ -271,6 +271,7 @@ func (t *tcp) call(saddr string, options interface{}, sintf string) {
}
dialer := net.Dialer{
Control: t.tcpContext,
Timeout: time.Second * 5,
}
if sintf != "" {
ief, err := net.InterfaceByName(sintf)