[flashproxy/master] Change defaultPort → port.

dcf at torproject.org dcf at torproject.org
Thu May 30 23:40:11 UTC 2013


commit ca925217fb08d16b057761e5a15ccd8a1e7960e9
Author: David Fifield <david at bamsoftware.com>
Date:   Thu May 30 15:06:01 2013 -0700

    Change defaultPort → port.
---
 websocket-transport/websocket-server.go |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go
index 365ebc6..11e2daf 100644
--- a/websocket-transport/websocket-server.go
+++ b/websocket-transport/websocket-server.go
@@ -202,11 +202,11 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) {
 
 func main() {
 	var logFilename string
-	var defaultPort int
+	var port int
 
 	flag.Usage = usage
 	flag.StringVar(&logFilename, "log", "", "log file to write to")
-	flag.IntVar(&defaultPort, "port", 0, "port to listen on if unspecified by Tor")
+	flag.IntVar(&port, "port", 0, "port to listen on if unspecified by Tor")
 	flag.Parse()
 
 	if logFilename != "" {
@@ -226,8 +226,8 @@ func main() {
 		// Override tor's requested port (which is 0 if this transport
 		// has not been run before) with the one requested by the --port
 		// option.
-		if defaultPort != 0 {
-			bindAddr.Addr.Port = defaultPort
+		if port != 0 {
+			bindAddr.Addr.Port = port
 		}
 
 		ln, err := startListener(bindAddr.Addr)





More information about the tor-commits mailing list