commit 9300eeb31c74035fd829da3cce9782d5b6e800c2
Author: David Fifield <[email protected]>
Date: Sat Jun 27 20:14:34 2015 -0700
Use new convention for Temporary errors from AcceptSocks.
https://trac.torproject.org/projects/tor/ticket/14135
https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=50b39b746c6ff34bf31977b658848d876ee84fbf
---
meek-client/meek-client.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 6198d37..2b8bbaa 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -303,10 +303,10 @@ func acceptLoop(ln *pt.SocksListener) error {
conn, err := ln.AcceptSocks()
if err != nil {
log.Printf("error in AcceptSocks: %s", err)
- if e, ok := err.(net.Error); ok && !e.Temporary() {
- return err
+ if e, ok := err.(net.Error); ok && e.Temporary() {
+ continue
}
- continue
+ return err
}
go func() {
err := handler(conn)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
