February 2013 - tor-commits - lists.torproject.org

r26043: {website} fix a link (website/trunk/docs/en)
by Roger Dingledine 03 Feb '13

03 Feb '13

Author: arma Date: 2013-02-03 18:05:19 +0000 (Sun, 03 Feb 2013) New Revision: 26043 Modified: website/trunk/docs/en/documentation.wml Log: fix a link Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2013-02-03 18:02:47 UTC (rev 26042) +++ website/trunk/docs/en/documentation.wml 2013-02-03 18:05:19 UTC (rev 26043) @@ -113,7 +113,7 @@ </li> <li>Learn about the wide diversity of <a - href="<page volunteer>#Projects">projects in + href="<page getinvolved/volunteer>#Projects">projects in the Tor ecosystem</a> that need your help. Watch the <a href="https://media.torproject.org/video/29c3-5306-en-the_tor_software_ecosystem_…">29c3 video on the Tor software ecosystem</a> to learn more.

1 0

r26042: {website} clarify wording in our trademark faq (website/trunk/docs/en)
by Roger Dingledine 03 Feb '13

03 Feb '13

Author: arma Date: 2013-02-03 18:02:47 +0000 (Sun, 03 Feb 2013) New Revision: 26042 Modified: website/trunk/docs/en/trademark-faq.wml Log: clarify wording in our trademark faq Modified: website/trunk/docs/en/trademark-faq.wml =================================================================== --- website/trunk/docs/en/trademark-faq.wml 2013-02-02 08:20:05 UTC (rev 26041) +++ website/trunk/docs/en/trademark-faq.wml 2013-02-03 18:02:47 UTC (rev 26042) @@ -39,11 +39,13 @@ <a id="combining"></a> <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2> - <p>We recommend that you don't do this, but rather find a name that will - accurately identify <i>your</i> products or services. Remember that our goal + <p>Please don't use Tor in your product name or domain name. Instead, + find a name that will accurately identify <i>your</i> products + or services. Remember that our goal is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand - that incorporates the Tor brand is likely to lead to confusion.</p> + that incorporates the Tor brand is likely to lead to confusion, + and commercial confusion is a sign of trademark infringement.</p> <a id="researchpapers"></a> <h2>What about cute Tor-derived names in research paper titles?</h2>

1 0

[flashproxy/master] fmt.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 7994fd5005b25185bfd7edd982fc0bacc399ba1e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 22:34:58 2013 -0800 fmt. --- websocket-transport/websocket-server.go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index a0ba3d7..6ce9e54 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -172,7 +172,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { var config WebsocketConfig config.Subprotocols = []string{"base64"} // 16 kilobytes, possibly base64-encoded. - config.MaxMessageSize = 16 * 1024 * 4 / 3 + 1 + config.MaxMessageSize = 16*1024*4/3 + 1 http.Handle("/", config.Handler(websocketHandler)) err = http.Serve(ln, nil) if err != nil {

1 0

[flashproxy/master] Ignore errors that may happen while trying to write a Close frame.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 9302af93d7c8e02f01db3c0db25fabb661f1d8b6 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 22:27:15 2013 -0800 Ignore errors that may happen while trying to write a Close frame. --- websocket-transport/websocket-server.go | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index e8ccd53..a0ba3d7 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -103,14 +103,10 @@ func (conn *websocketConn) Write(b []byte) (n int, err error) { } // Implements io.Closer. -func (conn *websocketConn) Close() (err error) { - err = conn.Ws.WriteFrame(8, nil) - if err != nil { - conn.Ws.Conn.Close() - return - } - err = conn.Ws.Conn.Close() - return +func (conn *websocketConn) Close() error { + // Ignore any error in trying to write a Close frame. + _ = conn.Ws.WriteFrame(8, nil) + return conn.Ws.Conn.Close() } // Create a new websocketConn.

1 0

[flashproxy/master] Whitespace.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 212916c80c10ffa124a414f389ca9ec1addb2bc8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Feb 3 01:44:00 2013 -0800 Whitespace. --- flashproxy-reg-email | 2 +- flashproxy-reg-http | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 33d9db4..e446590 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -104,7 +104,7 @@ This program requires the M2Crypto library for Python. -e, --email=ADDRESS send mail to ADDRESS (default "%(email_addr)s"). -h, --help show this help. -s, --smtp=HOST[:PORT] use the given SMTP server - (default "%(smtp_addr)s"). \ + (default "%(smtp_addr)s").\ """ % { "progname": sys.argv[0], "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 8c851bf..9c2f507 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -27,7 +27,7 @@ remote address registered is "%(remote_addr)s". -6 name lookups use only IPv6. -f, --facilitator=URL register with the given facilitator (by default "%(fac_url)s"). - -h, --help show this help. \ + -h, --help show this help.\ """ % { "progname": sys.argv[0], "fac_url": DEFAULT_FACILITATOR_URL,

1 0

[flashproxy/master] Put a mutex on Log.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 4b4b120f1813c3971d2e96ffed764ab0fbe26cac Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 21:16:33 2013 -0800 Put a mutex on Log. It can be called by independent goroutines. --- websocket-transport/websocket-server.go | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 0638c72..b79d412 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -26,7 +26,11 @@ var ptInfo PtServerInfo // ends, -1 is written. var handlerChan = make(chan int) +var logMutex sync.Mutex + func Log(format string, v ...interface{}) { + logMutex.Lock() + defer logMutex.Unlock() fmt.Fprintf(logFile, format+"\n", v...) }

1 0

[flashproxy/master] Add timestamps to log messages.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit d7ab23aa64c3b38229ab2160b54b4cc366a0e833 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 21:20:29 2013 -0800 Add timestamps to log messages. --- websocket-transport/websocket-server.go | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index aea3f2c..e8ccd53 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -16,6 +16,7 @@ import ( "os" "os/signal" "sync" + "time" ) var logFile = os.Stderr @@ -29,9 +30,11 @@ var handlerChan = make(chan int) var logMutex sync.Mutex func Log(format string, v ...interface{}) { + dateStr := time.Now().Format("2006-01-02 15:04:05") logMutex.Lock() defer logMutex.Unlock() - fmt.Fprintf(logFile, format+"\n", v...) + msg := fmt.Sprintf(format, v...) + fmt.Fprintf(logFile, "%s %s\n", dateStr, msg) } // An abstraction that makes an underlying WebSocket connection look like an

1 0

[flashproxy/master] Add some log messages on startup.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit fddb97c798404edb773489a23821149d836b2bd4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 21:17:06 2013 -0800 Add some log messages on startup. --- websocket-transport/websocket-server.go | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index b79d412..aea3f2c 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -201,6 +201,7 @@ func main() { logFile = f } + Log("starting") ptInfo = PtServerSetup([]string{ptMethodName}) listeners := make([]*net.TCPListener, 0) @@ -217,6 +218,7 @@ func main() { PtSmethodError(bindAddr.MethodName, err.Error()) } PtSmethod(bindAddr.MethodName, ln.Addr()) + Log("listening on %s", ln.Addr().String()) listeners = append(listeners, ln) } PtSmethodsDone()

1 0

[flashproxy/master] Account for base64 encoding in frame size limit.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 2e89edcf5d2310e838e0a4057505c98b41cabb1d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 20:22:29 2013 -0800 Account for base64 encoding in frame size limit. --- websocket-transport/websocket-server.go | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index c269951..3288e96 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -168,7 +168,8 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { go func() { var config WebsocketConfig config.Subprotocols = []string{"base64"} - config.MaxMessageSize = 16 * 1024 + // 16 kilobytes, possibly base64-encoded. + config.MaxMessageSize = 16 * 1024 * 4 / 3 + 1 http.Handle("/", config.Handler(websocketHandler)) err = http.Serve(ln, nil) if err != nil {

1 0

[flashproxy/master] Rename logDebug to Log.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 8168c2868a391fd560f544b5821e259910ffad1e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 20:45:46 2013 -0800 Rename logDebug to Log. --- websocket-transport/websocket-server.go | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 3288e96..0638c72 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -26,7 +26,7 @@ var ptInfo PtServerInfo // ends, -1 is written. var handlerChan = make(chan int) -func logDebug(format string, v ...interface{}) { +func Log(format string, v ...interface{}) { fmt.Fprintf(logFile, format+"\n", v...) } @@ -123,7 +123,7 @@ func proxy(local *net.TCPConn, conn *websocketConn) { go func() { _, err := io.Copy(conn, local) if err != nil { - logDebug("error copying ORPort to WebSocket: " + err.Error()) + Log("error copying ORPort to WebSocket: " + err.Error()) } local.CloseRead() conn.Close() @@ -133,7 +133,7 @@ func proxy(local *net.TCPConn, conn *websocketConn) { go func() { _, err := io.Copy(local, conn) if err != nil { - logDebug("error copying WebSocket to ORPort: " + err.Error()) + Log("error copying WebSocket to ORPort: " + err.Error()) } local.CloseWrite() conn.Close() @@ -153,7 +153,7 @@ func websocketHandler(ws *Websocket) { s, err := PtConnectOr(&ptInfo, ws.Conn) if err != nil { - logDebug("Failed to connect to ORPort: " + err.Error()) + Log("Failed to connect to ORPort: " + err.Error()) return } @@ -173,7 +173,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { http.Handle("/", config.Handler(websocketHandler)) err = http.Serve(ln, nil) if err != nil { - logDebug("http.Serve: " + err.Error()) + Log("http.Serve: " + err.Error()) } }() return ln, nil @@ -227,7 +227,7 @@ func main() { case n := <-handlerChan: numHandlers += n case <-signalChan: - logDebug("SIGINT") + Log("SIGINT") sigint = true } } @@ -242,7 +242,7 @@ func main() { case n := <-handlerChan: numHandlers += n case <-signalChan: - logDebug("SIGINT") + Log("SIGINT") sigint = true } }

1 0