- tor-commits - lists.torproject.org

[tor/master] Don't write ControlPorts to disk till after we setuid and make datadir
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit d79d648edcc19d1f11758016108fdbb57c80b4d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 11:22:16 2011 -0400 Don't write ControlPorts to disk till after we setuid and make datadir Fix for bug 3747; bugfix on 0.2.2.26-beta. --- changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3747 b/changes/bug3747 new file mode 100644 index 0000000..052dab1 --- /dev/null +++ b/changes/bug3747 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Write control ports to disk only after switching UID and + creating the data directory. This way, we don't fail when + starting up with a nonexistant DataDirectory and a + ControlPortWriteToFile setting based on that directory. Fixes + bug 3747; bugfix on Tor 0.2.2.26-beta. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index e0ecab2..7202ea2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1034,6 +1034,9 @@ options_act_reversible(or_options_t *old_options, char **msg) /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); diff --git a/src/or/connection.c b/src/or/connection.c index c791309..2049f42 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1061,9 +1061,6 @@ connection_create_listener(const struct sockaddr *listensockaddr, "%s listening on port %u.", conn_type_to_string(type), gotPort); - if (type == CONN_TYPE_CONTROL_LISTENER) - control_ports_write_to_file(); - conn->state = LISTENER_STATE_READY; if (start_reading) { connection_start_reading(conn);

1 0

[tor/maint-0.2.2] Don't write ControlPorts to disk till after we setuid and make datadir
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit d79d648edcc19d1f11758016108fdbb57c80b4d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 11:22:16 2011 -0400 Don't write ControlPorts to disk till after we setuid and make datadir Fix for bug 3747; bugfix on 0.2.2.26-beta. --- changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3747 b/changes/bug3747 new file mode 100644 index 0000000..052dab1 --- /dev/null +++ b/changes/bug3747 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Write control ports to disk only after switching UID and + creating the data directory. This way, we don't fail when + starting up with a nonexistant DataDirectory and a + ControlPortWriteToFile setting based on that directory. Fixes + bug 3747; bugfix on Tor 0.2.2.26-beta. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index e0ecab2..7202ea2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1034,6 +1034,9 @@ options_act_reversible(or_options_t *old_options, char **msg) /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); diff --git a/src/or/connection.c b/src/or/connection.c index c791309..2049f42 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1061,9 +1061,6 @@ connection_create_listener(const struct sockaddr *listensockaddr, "%s listening on port %u.", conn_type_to_string(type), gotPort); - if (type == CONN_TYPE_CONTROL_LISTENER) - control_ports_write_to_file(); - conn->state = LISTENER_STATE_READY; if (start_reading) { connection_start_reading(conn);

1 0

[torouter/master] Add status page for network interfaces
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit ed08b56338e9b230c2a475946511c0e13cfce487 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:43:17 2011 +0200 Add status page for network interfaces --- packages/torouter-web/config.py | 2 + packages/torouter-web/tui/controllers/network.py | 10 ++++++- packages/torouter-web/tui/utils/parsing.py | 27 +++++++++++++++++---- packages/torouter-web/tui/views/status.html | 4 ++- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 765c3df..8fd716d 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -11,3 +11,5 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") +interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces" + diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py index b5da4e3..d189d0c 100644 --- a/packages/torouter-web/tui/controllers/network.py +++ b/packages/torouter-web/tui/controllers/network.py @@ -1,7 +1,7 @@ import web import view, config from view import render -from tui.utils import session,configuration +from tui.utils import session,configuration,parsing """ This function is used to generate the network @@ -116,8 +116,14 @@ General status page, displays a bit more detail than main """ class status: def GET(self): - return render.base(render.status(),menu(4)) + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1) + return render.base(render.status(network),menu(4)) def POST(self): + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + network = itfc.html_output(itfc.wifi) + itfc.html_output(itfc.eth0) + itfc.html_output(itfc.eth1) return render.base(render.status(),menu(4)) diff --git a/packages/torouter-web/tui/utils/parsing.py b/packages/torouter-web/tui/utils/parsing.py index c6ebe02..e9ccc83 100644 --- a/packages/torouter-web/tui/utils/parsing.py +++ b/packages/torouter-web/tui/utils/parsing.py @@ -1,6 +1,8 @@ # These functions are for parsing /etc/network/interface # files, they will be used inside torouter to visualize # and edit configuration +import os + class interfaces: def __init__(self,filename): self.fp = open(filename, "r") @@ -47,6 +49,20 @@ class interfaces: if iface: self.parse_line(line, iface) + def html_output(self, data): + output = "<h3>Interface %s</h3>\n" % data['iface'].split(" ")[0] + output += "<table class=\"interface\" id=\"%s\">\n" % data['iface'].split(" ")[0] + + for item in data.items(): + if item[0] != "iface": + if type(item[1]) is list: + for i in item[1]: + output += "<tr><td>%s</td><td>%s</td></tr>\n" % (item[0], i) + else: + output += "<tr><td>%s</td><td>%s</td></tr>\n" % (item[0],item[1]) + output += "</table>" + print output + return output def output(self, data): print "iface %s" % data['iface'] @@ -58,9 +74,10 @@ class interfaces: else: print "%s %s" % (item[0],item[1]) -itfc = interfaces("/tmp/interfaces") -itfc.parse() -itfc.output(itfc.wifi) -itfc.output(itfc.eth1) -itfc.output(itfc.eth0) +#interfaces_file = os.getcwd() + "/../../../torouter-prep/configs/interfaces" +#itfc = interfaces(interfaces_file) +#itfc.parse() +#itfc.html_output(itfc.wifi) +#itfc.html_output(itfc.eth1) +#itfc.html_output(itfc.eth0) diff --git a/packages/torouter-web/tui/views/status.html b/packages/torouter-web/tui/views/status.html index 6a128dc..bfe2fcd 100644 --- a/packages/torouter-web/tui/views/status.html +++ b/packages/torouter-web/tui/views/status.html @@ -1 +1,3 @@ -the status page +$def with (content) + +$:content

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit cab97f7c6fc7f3c70c0b92ef07466251f7faca9e Merge: d7bbc0d b848fc8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:25:38 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/dnsmasq.conf | 556 ++++++++++++++++++++ packages/torouter-prep/configs/interfaces | 38 ++ packages/torouter-prep/configs/sources.list | 14 + packages/torouter-prep/configs/sshd_config | 87 +++ .../torouter-prep/configs/tor-wireless-firewall.sh | 20 + packages/torouter-prep/configs/torrc | 177 +++++++ packages/torouter-prep/configs/udhcpd.conf | 26 + packages/torouter-web/debian/README | 6 + packages/torouter-web/debian/README.Debian | 8 + packages/torouter-web/debian/changelog | 5 + packages/torouter-web/debian/compat | 1 + packages/torouter-web/debian/control | 13 + packages/torouter-web/debian/copyright | 36 ++ packages/torouter-web/debian/dirs | 1 + packages/torouter-web/debian/postinst | 39 ++ packages/torouter-web/debian/postrm | 37 ++ packages/torouter-web/debian/preinst | 35 ++ packages/torouter-web/debian/prerm | 38 ++ packages/torouter-web/debian/rules | 6 + packages/torouter-web/debian/source/format | 1 + packages/torouter-web/debian/torouter-tui.default | 10 + 21 files changed, 1154 insertions(+), 0 deletions(-)

1 0

[torouter/master] Add License
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit d7bbc0d688a33764e8113a8e691fad5a83089a21 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 17:25:09 2011 +0200 Add License --- packages/torouter-web/LICENSE | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/LICENSE b/packages/torouter-web/LICENSE new file mode 100644 index 0000000..cb2a71c --- /dev/null +++ b/packages/torouter-web/LICENSE @@ -0,0 +1,32 @@ +=============================================================================== +The tui code is distributed under this license: + +Copyright (c) 2011, Arturo Filasto' + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[torouter/master] Add basic debian directory
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit b848fc89a09e1ac2c3de4049e2cb7294cf589820 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:14:21 2011 +0200 Add basic debian directory --- packages/torouter-web/debian/README | 6 +++ packages/torouter-web/debian/README.Debian | 8 ++++ packages/torouter-web/debian/changelog | 5 +++ packages/torouter-web/debian/compat | 1 + packages/torouter-web/debian/control | 13 +++++++ packages/torouter-web/debian/copyright | 36 +++++++++++++++++++ packages/torouter-web/debian/dirs | 1 + packages/torouter-web/debian/postinst | 39 +++++++++++++++++++++ packages/torouter-web/debian/postrm | 37 +++++++++++++++++++ packages/torouter-web/debian/preinst | 35 ++++++++++++++++++ packages/torouter-web/debian/prerm | 38 ++++++++++++++++++++ packages/torouter-web/debian/rules | 6 +++ packages/torouter-web/debian/source/format | 1 + packages/torouter-web/debian/torouter-tui.default | 10 +++++ 14 files changed, 236 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/debian/README b/packages/torouter-web/debian/README new file mode 100644 index 0000000..cda2d60 --- /dev/null +++ b/packages/torouter-web/debian/README @@ -0,0 +1,6 @@ +The Debian Package torouter-tui +---------------------------- + +This package is for the Torouter Web UI project from the Tor Project. + + -- Jacob Appelbaum <jacob(a)torproject.org> Wed, 17 Aug 2011 17:15:08 -0400 diff --git a/packages/torouter-web/debian/README.Debian b/packages/torouter-web/debian/README.Debian new file mode 100644 index 0000000..27e430c --- /dev/null +++ b/packages/torouter-web/debian/README.Debian @@ -0,0 +1,8 @@ +torouter for Debian +------------------- + +This is a package for Debian that converts a DreamPlug into a Torouter. + +It will configure the system without prompting the user for any input. + + -- Jacob Appelbaum <jacob(a)torproject.org> Wed, 27 Jul 2011 09:51:21 -0400 diff --git a/packages/torouter-web/debian/changelog b/packages/torouter-web/debian/changelog new file mode 100644 index 0000000..0dda21c --- /dev/null +++ b/packages/torouter-web/debian/changelog @@ -0,0 +1,5 @@ +torouter-tui (0.0.1-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + + -- Jacob Appelbaum <jacob(a)appelbaum.net> Wed, 17 Aug 2011 16:58:00 -0400 diff --git a/packages/torouter-web/debian/compat b/packages/torouter-web/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/packages/torouter-web/debian/compat @@ -0,0 +1 @@ +7 diff --git a/packages/torouter-web/debian/control b/packages/torouter-web/debian/control new file mode 100644 index 0000000..a2aaac6 --- /dev/null +++ b/packages/torouter-web/debian/control @@ -0,0 +1,13 @@ +Source: torouter-tui +Section: unknown +Priority: extra +Maintainer: Jacob Appelbaum <jacob(a)torproject.org> +Build-Depends: debhelper (>= 7.0.50~) +Standards-Version: 3.9.1 +Homepage: <https://www.torproject.org/> + +Package: torouter +Architecture: all +Depends: ${misc:Depends}, python, python-webpy +Description: Torouter web UI + This package provides the Torouter web UI. diff --git a/packages/torouter-web/debian/copyright b/packages/torouter-web/debian/copyright new file mode 100644 index 0000000..eeef3f2 --- /dev/null +++ b/packages/torouter-web/debian/copyright @@ -0,0 +1,36 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: torouter +Source: <https://www.torproject.org/> + +Files: * +Copyright: 2011 Arturo Filasto' <hellais(a)torproject.org> +License: BSD-3-Clause + +Files: debian/* +Copyright: 2011 Jacob Appelbaum <jacob(a)torproject.org> +License: BSD-3-Clause + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff --git a/packages/torouter-web/debian/dirs b/packages/torouter-web/debian/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/packages/torouter-web/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/packages/torouter-web/debian/postinst b/packages/torouter-web/debian/postinst new file mode 100644 index 0000000..97e9113 --- /dev/null +++ b/packages/torouter-web/debian/postinst @@ -0,0 +1,39 @@ +#!/bin/sh +# postinst script for torouter +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packages/torouter-web/debian/postrm b/packages/torouter-web/debian/postrm new file mode 100644 index 0000000..632ac80 --- /dev/null +++ b/packages/torouter-web/debian/postrm @@ -0,0 +1,37 @@ +#!/bin/sh +# postrm script for torouter +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packages/torouter-web/debian/preinst b/packages/torouter-web/debian/preinst new file mode 100644 index 0000000..1cc598e --- /dev/null +++ b/packages/torouter-web/debian/preinst @@ -0,0 +1,35 @@ +#!/bin/sh +# preinst script for torouter +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packages/torouter-web/debian/prerm b/packages/torouter-web/debian/prerm new file mode 100644 index 0000000..4bb95dd --- /dev/null +++ b/packages/torouter-web/debian/prerm @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for torouter +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packages/torouter-web/debian/rules b/packages/torouter-web/debian/rules new file mode 100755 index 0000000..74439ab --- /dev/null +++ b/packages/torouter-web/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +# -*- makefile -*- +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/packages/torouter-web/debian/source/format b/packages/torouter-web/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/packages/torouter-web/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/packages/torouter-web/debian/torouter-tui.default b/packages/torouter-web/debian/torouter-tui.default new file mode 100644 index 0000000..f0fa807 --- /dev/null +++ b/packages/torouter-web/debian/torouter-tui.default @@ -0,0 +1,10 @@ +# Defaults for torouter-web initscript +# sourced by /etc/init.d/torouter-web +# installed at /etc/default/torouter-web by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# When the package is configured - we set this accordingly +# ARGS=""

1 0

[tor/master] Remove a needless config_find_option
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 6650dc932a69c3935523f0a19a6c1aaceb187731 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 10:46:22 2011 -0400 Remove a needless config_find_option --- src/or/config.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5d41ab6..315884c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -591,8 +591,6 @@ static int write_configuration_file(const char *fname, static config_line_t *get_assigned_option(const config_format_t *fmt, const void *options, const char *key, int escape_val); -static const config_var_t *config_find_option(const config_format_t *fmt, - const char *key); static void config_init(const config_format_t *fmt, void *options); static int or_state_validate(or_state_t *old_options, or_state_t *options, int from_setconf, char **msg); @@ -701,7 +699,6 @@ set_options(or_options_t *new_val, char **msg) int i; smartlist_t *elements; config_line_t *line; - config_var_t *var; or_options_t *old_options = global_options; global_options = new_val; /* Note that we pass the *old* options below, for comparison. It @@ -721,16 +718,14 @@ set_options(or_options_t *new_val, char **msg) if (old_options) { elements = smartlist_create(); for (i=0; options_format.vars[i].name; ++i) { - var = config_find_option(&options_format, - options_format.vars[i].name); + const config_var_t *var = &options_format.vars[i]; + const char *var_name = var->name; if (var->type == CONFIG_TYPE_LINELIST_S || var->type == CONFIG_TYPE_OBSOLETE) { continue; } - if (!option_is_same(&options_format, new_val, old_options, - options_format.vars[i].name)) { - line = get_assigned_option(&options_format, new_val, - options_format.vars[i].name, 1); + if (!option_is_same(&options_format, new_val, old_options, var_name)) { + line = get_assigned_option(&options_format, new_val, var_name, 1); if (line) { for (; line; line = line->next) {

1 0

[tor/master] Merge branch 'bug3743'
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 14552a12b3b6ff0770153d9d2f116febad349303 Merge: 6a06f45 6650dc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 10:46:28 2011 -0400 Merge branch 'bug3743' src/or/config.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Don't compare LINELIST_S and OBSOLETE config options.
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit e6e804848c4764f5ea0d6705707b2c81de4c02ae Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 16 06:28:38 2011 +0500 Don't compare LINELIST_S and OBSOLETE config options. --- src/or/config.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b4d733a..5d41ab6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -591,6 +591,8 @@ static int write_configuration_file(const char *fname, static config_line_t *get_assigned_option(const config_format_t *fmt, const void *options, const char *key, int escape_val); +static const config_var_t *config_find_option(const config_format_t *fmt, + const char *key); static void config_init(const config_format_t *fmt, void *options); static int or_state_validate(or_state_t *old_options, or_state_t *options, int from_setconf, char **msg); @@ -699,6 +701,7 @@ set_options(or_options_t *new_val, char **msg) int i; smartlist_t *elements; config_line_t *line; + config_var_t *var; or_options_t *old_options = global_options; global_options = new_val; /* Note that we pass the *old* options below, for comparison. It @@ -718,6 +721,12 @@ set_options(or_options_t *new_val, char **msg) if (old_options) { elements = smartlist_create(); for (i=0; options_format.vars[i].name; ++i) { + var = config_find_option(&options_format, + options_format.vars[i].name); + if (var->type == CONFIG_TYPE_LINELIST_S || + var->type == CONFIG_TYPE_OBSOLETE) { + continue; + } if (!option_is_same(&options_format, new_val, old_options, options_format.vars[i].name)) { line = get_assigned_option(&options_format, new_val,

1 0

[tor/master] Actually pick a random port when "auto" is specified
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 6a06f45b04b8c9336ff150d299732c67bb5cb885 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 16 01:38:15 2011 +0200 Actually pick a random port when "auto" is specified ddc65e2b3303559ab7b842a176ee6c2eda9e4027 had broken this --- src/common/torint.h | 9 +++++++++ src/or/connection.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/common/torint.h b/src/common/torint.h index 0b5c29a..af97547 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -111,6 +111,15 @@ typedef signed int int32_t; typedef unsigned int uint32_t; #define HAVE_UINT32_T #endif +#ifndef UINT16_MAX +#define UINT16_MAX 0xffffu +#endif +#ifndef INT16_MAX +#define INT16_MAX 0x7fff +#endif +#ifndef INT16_MIN +#define INT16_MIN (-INT16_MAX-1) +#endif #ifndef UINT32_MAX #define UINT32_MAX 0xffffffffu #endif diff --git a/src/or/connection.c b/src/or/connection.c index 2087ced..452ddc1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1787,6 +1787,8 @@ retry_listener_ports(smartlist_t *old_conns, socklen_t listensocklen = 0; char *address=NULL; connection_t *conn; + int real_port = port->port == CFG_AUTO_PORT ? 0 : port->port; + tor_assert(real_port <= UINT16_MAX); if (port->is_unix_addr) { listensockaddr = (struct sockaddr *) @@ -1795,7 +1797,7 @@ retry_listener_ports(smartlist_t *old_conns, } else { listensockaddr = tor_malloc(sizeof(struct sockaddr_storage)); listensocklen = tor_addr_to_sockaddr(&port->addr, - port->port, + real_port, listensockaddr, sizeof(struct sockaddr_storage)); address = tor_dup_addr(&port->addr);

1 0