[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [pluggable-transports/snowflake] 02/07: Restore ListenAndServe error return in Transport.Listen.
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main
in repository pluggable-transports/snowflake.
commit 6bdd48c006a5c107dae7ba8330bbf1f9eda77059
Author: David Fifield <david@xxxxxxxxxxxxxxx>
AuthorDate: Tue Mar 21 15:48:53 2023 -0600
Restore ListenAndServe error return in Transport.Listen.
This error return was lost in 11f0846264d4033e7a7dc7824febb6ad7140762f;
i.e. !31.
Fixes #40043.
---
server/lib/snowflake.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/lib/snowflake.go b/server/lib/snowflake.go
index 4078358..c4d3fbc 100644
--- a/server/lib/snowflake.go
+++ b/server/lib/snowflake.go
@@ -125,13 +125,15 @@ func (t *Transport) Listen(addr net.Addr, numKCPInstances int) (*SnowflakeListen
errChan <- err
}
}()
-
select {
case err = <-errChan:
break
case <-time.After(listenAndServeErrorTimeout):
break
}
+ if err != nil {
+ return nil, err
+ }
listener.server = server
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits