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

[tor-browser/tor-browser-24.1.0esr-1] fixup! Limit the number of fonts per document.
by mikeperry＠torproject.org 14 Nov '13

14 Nov '13

commit 0ae26ccccbec874689e5fbda6f30ba27a3c48b96 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 00:07:37 2013 -0800 fixup! Limit the number of fonts per document. Kill signed comparison warnings. --- layout/base/nsPresContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 3cf6628..7d84667 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -1417,7 +1417,7 @@ nsPresContext::FontUseCountReached(const nsFont &font) { } } - if (mFontsUsed.Length() >= mMaxFonts) { + if (mFontsUsed.Length() >= (unsigned)mMaxFonts) { return PR_TRUE; } @@ -1440,7 +1440,7 @@ nsPresContext::FontAttemptCountReached(const nsFont &font) { } } - if (mFontsTried.Length() >= mMaxFontAttempts) { + if (mFontsTried.Length() >= (unsigned)mMaxFontAttempts) { return PR_TRUE; } @@ -1463,7 +1463,7 @@ nsPresContext::AddFontUse(const nsFont &font) { } } - if (mFontsUsed.Length() >= mMaxFonts) { + if (mFontsUsed.Length() >= (unsigned)mMaxFonts) { return; } @@ -1487,7 +1487,7 @@ nsPresContext::AddFontAttempt(const nsFont &font) { } } - if (mFontsTried.Length() >= mMaxFontAttempts) { + if (mFontsTried.Length() >= (unsigned)mMaxFontAttempts) { return; }

1 0

[tor-browser/tor-browser-24.1.0esr-1] fixup! Randomize HTTP request order and pipeline depth.
by mikeperry＠torproject.org 14 Nov '13

14 Nov '13

commit 45ab63e8f863a0c60a78e8e1f19a0e2f333fcd60 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 00:09:40 2013 -0800 fixup! Randomize HTTP request order and pipeline depth. Fix some unused variable warnings. --- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 4 ++-- netwerk/protocol/http/nsHttpPipeline.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index 9b79c1d..a02fe07 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -1512,8 +1512,8 @@ nsHttpConnectionMgr::AddToBestPipeline(nsConnectionEntry *ent, if (NS_FAILED(rv)) return false; - LOG((" scheduling trans %p on pipeline at position %d\n", - trans, trans->PipelinePosition())); + LOG((" scheduling trans %p on pipeline at position %d, type %s\n", + trans, trans->PipelinePosition(), type)); #ifdef WTF_DEBUG pipeline = activeTrans->QueryPipeline(); diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index d385720..367a663 100644 --- a/netwerk/protocol/http/nsHttpPipeline.cpp +++ b/netwerk/protocol/http/nsHttpPipeline.cpp @@ -872,7 +872,6 @@ nsHttpPipeline::FillSendBuf() uint32_t n; uint64_t avail; - uint64_t totalAvailable = Available(); uint64_t totalSent = 0; uint64_t reqsSent = 0; uint64_t alreadyPending = 0; @@ -882,6 +881,7 @@ nsHttpPipeline::FillSendBuf() nsAHttpTransaction *trans; nsITransport *transport = Transport(); #ifdef WTF_TEST + uint64_t totalAvailable = Available(); nsRefPtr<nsHttpConnectionInfo> ci; GetConnectionInfo(getter_AddRefs(ci)); #endif @@ -946,7 +946,7 @@ nsHttpPipeline::FillSendBuf() #ifdef WTF_TEST if (totalSent) - fprintf(stderr, "WTF-combine: Sent %d/%d bytes of %d combined pipelined requests for host %s\n", + fprintf(stderr, "WTF-combine: Sent %ld/%ld bytes of %ld combined pipelined requests for host %s\n", alreadyPending+totalSent, totalAvailable, reqsSent, ci->Host()); #endif

1 0

[goptlib/master] Change net.ResolveTCPAddr to resolveAddr.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit 77e9b135f2fb4cea4b2365e5855c8452611657fe Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 23:01:55 2013 -0800 Change net.ResolveTCPAddr to resolveAddr. --- pt.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt.go b/pt.go index b5466fd..fcd17b8 100644 --- a/pt.go +++ b/pt.go @@ -403,7 +403,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { if err != nil { return info, err } - info.OrAddr, err = net.ResolveTCPAddr("tcp", orPort) + info.OrAddr, err = resolveAddr(orPort) if err != nil { return info, EnvError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) } @@ -415,7 +415,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { var extendedOrPort = getenv("TOR_PT_EXTENDED_SERVER_PORT") if extendedOrPort != "" { - info.ExtendedOrAddr, err = net.ResolveTCPAddr("tcp", extendedOrPort) + info.ExtendedOrAddr, err = resolveAddr(extendedOrPort) if err != nil { return info, EnvError(fmt.Sprintf("cannot resolve TOR_PT_EXTENDED_SERVER_PORT %q: %s", extendedOrPort, err.Error())) }

1 0

[goptlib/master] Show environment variable names in test output.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit 11a483916bf4d9db9565fa4c111b63bc966536df Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 13 00:47:32 2013 -0800 Show environment variable names in test output. --- pt_test.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pt_test.go b/pt_test.go index 01dd0ad..e06b24f 100644 --- a/pt_test.go +++ b/pt_test.go @@ -69,7 +69,7 @@ func TestGetManagedTransportVer(t *testing.T) { os.Setenv("TOR_PT_MANAGED_TRANSPORT_VER", input) _, err := getManagedTransportVer() if err == nil { - t.Errorf("%q unexpectedly succeeded", input) + t.Errorf("TOR_PT_MANAGED_TRANSPORT_VER=%q unexpectedly succeeded", input) } } @@ -77,10 +77,10 @@ func TestGetManagedTransportVer(t *testing.T) { os.Setenv("TOR_PT_MANAGED_TRANSPORT_VER", test.input) output, err := getManagedTransportVer() if err != nil { - t.Errorf("%q unexpectedly returned an error: %s", test.input, err) + t.Errorf("TOR_PT_MANAGED_TRANSPORT_VER=%q unexpectedly returned an error: %s", test.input, err) } if output != test.expected { - t.Errorf("%q → %q (expected %q)", test.input, output, test.expected) + t.Errorf("TOR_PT_MANAGED_TRANSPORT_VER=%q → %q (expected %q)", test.input, output, test.expected) } } } @@ -105,9 +105,9 @@ func stringSetsEqual(a, b []string) bool { func TestGetClientTransports(t *testing.T) { tests := [...]struct { - envvar string - methodNames []string - expected []string + ptServerClientTransports string + methodNames []string + expected []string }{ { "*", @@ -160,13 +160,15 @@ func TestGetClientTransports(t *testing.T) { } for _, test := range tests { - os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.envvar) + os.Setenv("TOR_PT_CLIENT_TRANSPORTS", test.ptServerClientTransports) output, err := getClientTransports(test.methodNames) if err != nil { - t.Errorf("%q unexpectedly returned an error: %s", test.envvar, err) + t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q unexpectedly returned an error: %s", + test.ptServerClientTransports, err) } if !stringSetsEqual(output, test.expected) { - t.Errorf("%q %q → %q (expected %q)", test.envvar, test.methodNames, output, test.expected) + t.Errorf("TOR_PT_CLIENT_TRANSPORTS=%q %q → %q (expected %q)", + test.ptServerClientTransports, test.methodNames, output, test.expected) } } }

1 0

[goptlib/master] getServerBindAddrs returns a slice, not a map.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit 2cde041c183302abab0f94ea07e9cb4025731076 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 23:15:35 2013 -0800 getServerBindAddrs returns a slice, not a map. --- pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.go b/pt.go index fcd17b8..5d0bcfd 100644 --- a/pt.go +++ b/pt.go @@ -298,7 +298,7 @@ func filterBindAddrs(addrs []BindAddr, methodNames []string) []BindAddr { return result } -// Return a map from method names to bind addresses. The map is the contents of +// Return an array of BindAddrs, those being the contents of // TOR_PT_SERVER_BINDADDR, with keys filtered by TOR_PT_SERVER_TRANSPORTS, and // further filtered by the methods in methodNames. func getServerBindAddrs(methodNames []string) ([]BindAddr, error) {

1 0

[goptlib/master] Fix stringSetsEqual.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit 3c87b69d5af9943741a0fed8b9595fc20646c06d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 13 00:56:31 2013 -0800 Fix stringSetsEqual. --- pt_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pt_test.go b/pt_test.go index e06b24f..86a38dc 100644 --- a/pt_test.go +++ b/pt_test.go @@ -90,6 +90,8 @@ func TestGetManagedTransportVer(t *testing.T) { func stringSetsEqual(a, b []string) bool { ac := make([]string, len(a)) bc := make([]string, len(b)) + copy(ac, a) + copy(bc, b) sort.Strings(ac) sort.Strings(bc) if len(ac) != len(bc) {

1 0

[goptlib/master] Change "bindAddr" to "bindaddr".
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit c8bc124b5e9b574fe350a3603321e039ba48650b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 13 01:04:56 2013 -0800 Change "bindAddr" to "bindaddr". --- examples/dummy-server/dummy-server.go | 8 +++---- pt.go | 42 ++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index f4cacbf..599a5bf 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -81,13 +81,13 @@ func main() { } listeners := make([]net.Listener, 0) - for _, bindAddr := range ptInfo.BindAddrs { - ln, err := startListener(bindAddr.Addr) + for _, bindaddr := range ptInfo.Bindaddrs { + ln, err := startListener(bindaddr.Addr) if err != nil { - pt.SmethodError(bindAddr.MethodName, err.Error()) + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } - pt.Smethod(bindAddr.MethodName, ln.Addr()) + pt.Smethod(bindaddr.MethodName, ln.Addr()) listeners = append(listeners, ln) } pt.SmethodsDone() diff --git a/pt.go b/pt.go index 5d0bcfd..ab2b78f 100644 --- a/pt.go +++ b/pt.go @@ -28,13 +28,13 @@ // if err != nil { // os.Exit(1) // } -// for _, bindAddr := range ptInfo.BindAddrs { -// ln, err := startListener(bindAddr.Addr, bindAddr.MethodName) +// for _, bindaddr := range ptInfo.Bindaddrs { +// ln, err := startListener(bindaddr.Addr, bindaddr.MethodName) // if err != nil { -// pt.SmethodError(bindAddr.MethodName, err.Error()) +// pt.SmethodError(bindaddr.MethodName, err.Error()) // continue // } -// pt.Smethod(bindAddr.MethodName, ln.Addr()) +// pt.Smethod(bindaddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() // func handler(conn net.Conn, methodName string) { @@ -240,7 +240,7 @@ func ClientSetup(methodNames []string) (ClientInfo, error) { // A combination of a method name and an address, as extracted from // TOR_PT_SERVER_BINDADDR. -type BindAddr struct { +type Bindaddr struct { MethodName string Addr *net.TCPAddr } @@ -283,8 +283,8 @@ func resolveAddr(addrStr string) (*net.TCPAddr, error) { // Return a new slice, the members of which are those members of addrs having a // MethodName in methodNames. -func filterBindAddrs(addrs []BindAddr, methodNames []string) []BindAddr { - var result []BindAddr +func filterBindaddrs(addrs []Bindaddr, methodNames []string) []Bindaddr { + var result []Bindaddr for _, ba := range addrs { for _, methodName := range methodNames { @@ -298,31 +298,31 @@ func filterBindAddrs(addrs []BindAddr, methodNames []string) []BindAddr { return result } -// Return an array of BindAddrs, those being the contents of +// Return an array of Bindaddrs, those being the contents of // TOR_PT_SERVER_BINDADDR, with keys filtered by TOR_PT_SERVER_TRANSPORTS, and // further filtered by the methods in methodNames. -func getServerBindAddrs(methodNames []string) ([]BindAddr, error) { - var result []BindAddr +func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { + var result []Bindaddr // Get the list of all requested bindaddrs. - serverBindAddr, err := getenvRequired("TOR_PT_SERVER_BINDADDR") + serverBindaddr, err := getenvRequired("TOR_PT_SERVER_BINDADDR") if err != nil { return nil, err } - for _, spec := range strings.Split(serverBindAddr, ",") { - var bindAddr BindAddr + for _, spec := range strings.Split(serverBindaddr, ",") { + var bindaddr Bindaddr parts := strings.SplitN(spec, "-", 2) if len(parts) != 2 { return nil, EnvError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: doesn't contain \"-\"", spec)) } - bindAddr.MethodName = parts[0] + bindaddr.MethodName = parts[0] addr, err := resolveAddr(parts[1]) if err != nil { return nil, EnvError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: %s", spec, err.Error())) } - bindAddr.Addr = addr - result = append(result, bindAddr) + bindaddr.Addr = addr + result = append(result, bindaddr) } // Filter by TOR_PT_SERVER_TRANSPORTS. @@ -331,11 +331,11 @@ func getServerBindAddrs(methodNames []string) ([]BindAddr, error) { return nil, err } if serverTransports != "*" { - result = filterBindAddrs(result, strings.Split(serverTransports, ",")) + result = filterBindaddrs(result, strings.Split(serverTransports, ",")) } // Finally filter by what we understand. - result = filterBindAddrs(result, methodNames) + result = filterBindaddrs(result, methodNames) return result, nil } @@ -377,10 +377,10 @@ func readAuthCookieFile(filename string) ([]byte, error) { } // This structure is returned by ServerSetup. It consists of a list of -// BindAddrs, an address for the ORPort, an address for the extended ORPort (if +// Bindaddrs, an address for the ORPort, an address for the extended ORPort (if // any), and an authentication cookie (if any). type ServerInfo struct { - BindAddrs []BindAddr + Bindaddrs []Bindaddr OrAddr *net.TCPAddr ExtendedOrAddr *net.TCPAddr AuthCookie []byte @@ -408,7 +408,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { return info, EnvError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) } - info.BindAddrs, err = getServerBindAddrs(methodNames) + info.Bindaddrs, err = getServerBindaddrs(methodNames) if err != nil { return info, err }

1 0

[goptlib/master] Add tests for getServerBindaddrs.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit c6a697b11c41a39cbcc53eb2f878c836a4d15bf7 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 13 22:55:36 2013 -0800 Add tests for getServerBindaddrs. --- pt_test.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/pt_test.go b/pt_test.go index ff3373d..ee471fa 100644 --- a/pt_test.go +++ b/pt_test.go @@ -221,6 +221,115 @@ func TestResolveAddr(t *testing.T) { } } +func bindaddrSliceContains(s []Bindaddr, v Bindaddr) bool { + for _, sv := range s { + if sv.MethodName == v.MethodName && tcpAddrsEqual(sv.Addr, v.Addr) { + return true + } + } + return false +} + +func bindaddrSetsEqual(a, b []Bindaddr) bool { + for _, v := range a { + if !bindaddrSliceContains(b, v) { + return false + } + } + for _, v := range b { + if !bindaddrSliceContains(a, v) { + return false + } + } + return true +} + +func TestGetServerBindaddrs(t *testing.T) { + badTests := [...]struct { + ptServerBindaddr string + ptServerTransports string + methodNames []string + }{ + { + "xxx", + "xxx", + []string{}, + }, + { + "alpha-1.2.3.4", + "alpha", + []string{"alpha", "beta", "gamma"}, + }, + } + goodTests := [...]struct { + ptServerBindaddr string + ptServerTransports string + methodNames []string + expected []Bindaddr + }{ + { + "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", + "alpha,beta,gamma", + []string{"alpha", "beta"}, + []Bindaddr{ + {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, + {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, + }, + }, + { + "alpha-1.2.3.4:1111", + "xxx", + []string{"alpha", "beta", "gamma"}, + []Bindaddr{}, + }, + { + "alpha-1.2.3.4:1111", + "alpha,beta,gamma", + []string{}, + []Bindaddr{}, + }, + { + "alpha-1.2.3.4:1111,beta-[1:2::3:4]:2222", + "*", + []string{"alpha", "beta"}, + []Bindaddr{ + {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, + {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, + }, + }, + } + + os.Clearenv() + _, err := getServerBindaddrs([]string{"alpha", "beta", "gamma"}) + if err == nil { + t.Errorf("empty environment unexpectedly succeeded") + } + + for _, test := range badTests { + os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) + os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) + _, err := getServerBindaddrs(test.methodNames) + if err == nil { + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q %q unexpectedly succeeded", + test.ptServerBindaddr, test.ptServerTransports, test.methodNames) + } + } + + for _, test := range goodTests { + os.Setenv("TOR_PT_SERVER_BINDADDR", test.ptServerBindaddr) + os.Setenv("TOR_PT_SERVER_TRANSPORTS", test.ptServerTransports) + output, err := getServerBindaddrs(test.methodNames) + if err != nil { + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q %q unexpectedly returned an error: %s", + test.ptServerBindaddr, test.ptServerTransports, test.methodNames, err) + } + if !bindaddrSetsEqual(output, test.expected) { + t.Errorf("TOR_PT_SERVER_BINDADDR=%q TOR_PT_SERVER_TRANSPORTS=%q %q → %q (expected %q)", + test.ptServerBindaddr, test.ptServerTransports, test.methodNames, output, test.expected) + } + } +} + func TestReadAuthCookie(t *testing.T) { badTests := [...][]byte{ []byte(""),

1 0

[goptlib/master] Factor out a tcpAddrsEqual function.
by dcf＠torproject.org 14 Nov '13

14 Nov '13

commit 639435bcb76bd026143dcd019d9af878b338bac2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 13 22:34:42 2013 -0800 Factor out a tcpAddrsEqual function. --- pt_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pt_test.go b/pt_test.go index 86a38dc..ff3373d 100644 --- a/pt_test.go +++ b/pt_test.go @@ -105,6 +105,10 @@ func stringSetsEqual(a, b []string) bool { return true } +func tcpAddrsEqual(a, b *net.TCPAddr) bool { + return a.IP.Equal(b.IP) && a.Port == b.Port +} + func TestGetClientTransports(t *testing.T) { tests := [...]struct { ptServerClientTransports string @@ -211,7 +215,7 @@ func TestResolveAddr(t *testing.T) { if err != nil { t.Errorf("%q unexpectedly returned an error: %s", test.input, err) } - if !output.IP.Equal(test.expected.IP) || output.Port != test.expected.Port { + if !tcpAddrsEqual(output, &test.expected) { t.Errorf("%q → %q (expected %q)", test.input, output, test.expected) } }

1 0

[chutney/master] Use AlternateDirAuthority when Bridge Authority exists in network
by nickm＠torproject.org 14 Nov '13

14 Nov '13

commit cd68031aec2bccad647cda5d1bb82454dfb0e158 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Nov 13 23:24:19 2013 +0000 Use AlternateDirAuthority when Bridge Authority exists in network Setting both DirServer and AlternateBridgeAuthority are incompatible. We should use AlternateDirAuthority when we also have a Bridge Authority. --- lib/chutney/TorNet.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index c377a03..77e768a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -302,7 +302,7 @@ class LocalNodeBuilder(NodeBuilder): assert re.match(r'^[A-F0-9]{40}$', fingerprint) self._env['fingerprint'] = fingerprint - def _getAltAuthLines(self): + def _getAltAuthLines(self, hasbridgeauth=False): """Return a combination of AlternateDirAuthority, AlternateHSAuthority and AlternateBridgeAuthority lines for this Node, appropriately. Non-authorities return "".""" @@ -330,8 +330,10 @@ class LocalNodeBuilder(NodeBuilder): # the 'hs' and 'v3ident' flags set. # XXXX This next line is needed for 'bridges' but breaks # 'basic' - #options = ("AlternateDirAuthority",) - options = ("DirServer",) + if hasbridgeauth: + options = ("AlternateDirAuthority",) + else: + options = ("DirAuthority",) self._env['dirserver_flags'] += " hs v3ident=%s" % v3id authlines = "" @@ -470,6 +472,7 @@ class LocalNodeController(NodeController): DEFAULTS = { 'authority' : False, 'bridgeauthority' : False, + 'hasbridgeauth' : False, 'relay' : False, 'bridge' : False, 'connlimit' : 60, @@ -575,7 +578,8 @@ class Network(object): for b in builders: b.preConfig(network) - altauthlines.append(b._getAltAuthLines()) + altauthlines.append(b._getAltAuthLines( + self._dfltEnv['hasbridgeauth'])) bridgelines.append(b._getBridgeLines()) self._dfltEnv['authorities'] = "".join(altauthlines) @@ -656,6 +660,8 @@ def ConfigureNodes(nodelist): for n in nodelist: network._addNode(n) + if n._env['bridgeauthority']: + network._dfltEnv['hasbridgeauth'] = True def usage(network): return "\n".join(["Usage: chutney {command} {networkfile}",

1 0