commit 0a83ecfaa1d406a5cfd502da6d7e367b64eaad86 Merge: e369c8f d9e5f9d Author: teor teor@torproject.org Date: Fri Aug 2 08:58:04 2019 +1000

Merge remote-tracking branch 'tor-github/pr/34'

lib/chutney/Templating.py | 29 ++++++++++++- lib/chutney/TorNet.py | 75 ++++++++++++++++++++++++++++----- networks/bridges-obfs2 | 15 +++++++ networks/bridges-obfs4 | 39 +++++++++++++++++ torrc_templates/bridge-obfs2.tmpl | 6 +++ torrc_templates/bridge-obfs4.tmpl | 6 +++ torrc_templates/bridgeclient-obfs2.tmpl | 3 ++ torrc_templates/bridgeclient-obfs4.tmpl | 3 ++ 8 files changed, 164 insertions(+), 12 deletions(-)

diff --cc lib/chutney/TorNet.py index 87555a9,5190b94..e9cf8f4 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@@ -1219,24 -1175,10 +1266,26 @@@ class Network(object) for n in self._nodes: n.getBuilder().checkConfig(self)

+ def supported(self): + """Check whether this network is supported by the set of binaries + and host information we have. + """ + missing_any = False + for r in self._requirements: + if not KNOWN_REQUIREMENTS[r](): + print(("Can't run this network: %s is missing.")) + missing_any = True + for n in self._nodes: + if not n.getBuilder().isSupported(self): + missing_any = False + + if missing_any: + sys.exit(1) + def configure(self): - self.create_new_nodes_dir() + phase = self._dfltEnv['CUR_CONFIG_PHASE'] + if phase == 1: + self.create_new_nodes_dir() network = self altauthlines = [] bridgelines = []