unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

don't error where the connection is not unicast

Browse Source
This commit is contained in:
Asim Aslam
2019-10-25 15:41:37 +01:00
parent 44c0f1946d
commit 5d7bf53f78
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tunnel/session.go
View File

@@ -110,7 +110,7 @@ func (s *session) newMessage(typ string) *message {
func (s *session) waitFor(msgType string, timeout time.Duration) (*message, error) { func (s *session) waitFor(msgType string, timeout time.Duration) (*message, error) {
now := time.Now() now := time.Now()
after := func() time.Duration { after := func(timeout time.Duration) time.Duration {
d := time.Since(now) d := time.Since(now)
// dial timeout minus time since // dial timeout minus time since
wait := timeout - d wait := timeout - d
@@ -133,7 +133,7 @@ func (s *session) waitFor(msgType string, timeout time.Duration) (*message, erro
} }
// got the message // got the message
return msg, nil return msg, nil
case <-time.After(after()): case <-time.After(after(timeout)):
return nil, ErrDialTimeout return nil, ErrDialTimeout
case <-s.closed: case <-s.closed:
return nil, io.EOF return nil, io.EOF
@@ -188,9 +188,6 @@ func (s *session) Discover() error {
// wait for announce // wait for announce
_, err = s.waitFor("announce", dialTimeout) _, err = s.waitFor("announce", dialTimeout)
if err != nil {
return err
}
// if its multicast just go ahead because this is best effort // if its multicast just go ahead because this is best effort
if s.mode != Unicast { if s.mode != Unicast {