July 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 8bc70a2ad2c0363986e4b002ceaf259908d67e70 Merge: d9427c0 bb97f68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22801 | 5 +++++ src/common/util.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/master] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 0000000..619baaa --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc4..eee52ad 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/maint-0.3.1] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 0000000..619baaa --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc4..eee52ad 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/master] Merge branch 'teor-bug22797-025' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit e88aa98451e5fe28b2840cf218dba67e4596aa56 Merge: d011126 878e0d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:16:30 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.3.1 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'teor-bug22797-025' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit e88aa98451e5fe28b2840cf218dba67e4596aa56 Merge: d011126 878e0d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:16:30 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.3.1 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit e04cc7e27fdc4ae4767ec29be08609a5e3540f83 Merge: cd77ea7 e88aa98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:16:51 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.1] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 0000000..619baaa --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc4..eee52ad 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 402f4bcef1b4dc9d2800e02ddb5ffc217dea81c3 Merge: ba45eec e88aa98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:16:51 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'teor-bug22797-025' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit e88aa98451e5fe28b2840cf218dba67e4596aa56 Merge: d011126 878e0d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 11:16:30 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.3.1 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/master] Fix the changes file
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit aafeffe02af5b3c8306fe36eec00baaabc8e68eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 21 11:15:44 2017 -0400 Fix the changes file --- changes/bug1667 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug1667 b/changes/bug1667 index 195993d..368f9e3 100644 --- a/changes/bug1667 +++ b/changes/bug1667 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (control port): - If the control port is used as the HTTP proxy, responds with - a meaningful "This is the Tor control port" message, and logs - the event. Fixes bug 1667. + a meaningful "This is the Tor control port" message, and log + the event. Closes ticket 1667. Patch from Ravi Chandra Padmala.

1 0