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

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 03c686563b54bbdf1337cb047b2b6002c5a1a549 Merge: aebd0a4080 9f61d9238c Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 19 13:26:33 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5 changes/ticket40295 | 3 +++ src/core/mainloop/connection.c | 2 ++ src/feature/metrics/metrics.c | 9 +++++++++ src/feature/metrics/metrics.h | 1 + 4 files changed, 15 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/308'
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit cf1f03fe1d2a3b6e500ef1bf716976d6c2d9f192 Merge: e8cce1058c 9f61d9238c Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 19 13:25:47 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/308' changes/ticket40295 | 3 +++ src/core/mainloop/connection.c | 2 ++ src/feature/metrics/metrics.c | 9 +++++++++ src/feature/metrics/metrics.h | 1 + 4 files changed, 15 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 67938e019844d8143d683321faf45d7623a3a9ae Merge: cf1f03fe1d 03c686563b Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 19 13:26:52 2021 +0200 Merge branch 'maint-0.4.5'

1 0

[tor/release-0.4.5] metrics: Handle the connection finished flushing event
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 9f61d9238ce81444b988137508436255f275051d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 17 09:54:05 2021 -0500 metrics: Handle the connection finished flushing event Turns out, we forgot to add the METRICS connection type fo the finished flushing handler. Fixes #40295 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40295 | 3 +++ src/core/mainloop/connection.c | 2 ++ src/feature/metrics/metrics.c | 9 +++++++++ src/feature/metrics/metrics.h | 1 + 4 files changed, 15 insertions(+) diff --git a/changes/ticket40295 b/changes/ticket40295 new file mode 100644 index 0000000000..e6dba80120 --- /dev/null +++ b/changes/ticket40295 @@ -0,0 +1,3 @@ + o Minor bugfixes (metrics port): + - Fix a BUG() on the MetricsPort for an internal missing handler. Fixes bug + 40295; bugfix on 0.4.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 85cdec6e1e..ada542629a 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -5187,6 +5187,8 @@ connection_finished_flushing(connection_t *conn) return connection_dir_finished_flushing(TO_DIR_CONN(conn)); case CONN_TYPE_CONTROL: return connection_control_finished_flushing(TO_CONTROL_CONN(conn)); + case CONN_TYPE_METRICS: + return metrics_connection_finished_flushing(conn); default: log_err(LD_BUG,"got unexpected conn type %d.", conn->type); tor_fragile_assert(); diff --git a/src/feature/metrics/metrics.c b/src/feature/metrics/metrics.c index 7a77ab1104..9a72fe7145 100644 --- a/src/feature/metrics/metrics.c +++ b/src/feature/metrics/metrics.c @@ -258,6 +258,15 @@ metrics_connection_reached_eof(connection_t *conn) return 0; } +/** Called when conn has no more bytes left on its outbuf. Return 0 indicating + * success. */ +int +metrics_connection_finished_flushing(connection_t *conn) +{ + tor_assert(conn); + return 0; +} + /** Initialize the subsystem. */ void metrics_init(void) diff --git a/src/feature/metrics/metrics.h b/src/feature/metrics/metrics.h index 858722de59..e072519d10 100644 --- a/src/feature/metrics/metrics.h +++ b/src/feature/metrics/metrics.h @@ -28,6 +28,7 @@ buf_t *metrics_get_output(const metrics_format_t fmt); /* Connection. */ int metrics_connection_process_inbuf(struct connection_t *conn); int metrics_connection_reached_eof(struct connection_t *conn); +int metrics_connection_finished_flushing(struct connection_t *conn); /* Configuration. */ int metrics_parse_ports(or_options_t *options, smartlist_t *ports,

1 0

[tor/master] Elaborate a few of the items from Gaba's initial templates.
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 003e237dfc604edb7833701f61e869b0ad3b19b1 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 20:38:21 2021 +0000 Elaborate a few of the items from Gaba's initial templates. --- .gitlab/issue_templates/bug.md | 26 ++++++++------------------ .gitlab/issue_templates/feature.md | 6 ------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index d27dea552d..3702c1f0b6 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -1,16 +1,11 @@ - - ### Summary ### Steps to reproduce: -1. step 1 -2. step 2 -3. ... +1. Step 1 +2. ... ### What is the current bug behavior? @@ -22,21 +17,16 @@ ### Environment - - -- Version: e.g. 0.10, output of --version (without backslashes) -- Operating system: Debian GNU/Linux 9.1 (stretch), Windows 7, Ubuntu Xenial, etc -- Install method: distribution package, from source tarball, from git, etc -- etc... +- Which version of Tor are you using? Run `tor --version` to get the version if you are unsure. +- Which operating system are you using? For example: Debian GNU/Linux 10.1, Windows 10, Ubuntu Xenial, FreeBSD 12.2, etc. +- Which installation method did you use? Distribution package (apt, pkg, homebrew), from source tarball, from Git, etc. -### Relevant logs and/or screenshots: +### Relevant logs and/or screenshots -### Possible fixes: +### Possible fixes -/label ~bug +/label ~Bug diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md index f0c3f1bdfe..62b2f8e944 100644 --- a/.gitlab/issue_templates/feature.md +++ b/.gitlab/issue_templates/feature.md @@ -1,7 +1,3 @@ - - ### Summary @@ -10,6 +6,4 @@ - - /label ~Feature

1 0

[tor/master] Adds issue creation templates for bugs, features, proposals and documentation.
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 3b0e0a87e77a120f3b18285ca223c33f83b8a5c7 Author: Gaba <gaba(a)riseup.net> Date: Tue Dec 22 09:05:55 2020 -0300 Adds issue creation templates for bugs, features, proposals and documentation. --- .gitlab/issue_templates/bug.md | 42 ++++++++++++++++++++++++++++++++ .gitlab/issue_templates/documentation.md | 35 ++++++++++++++++++++++++++ .gitlab/issue_templates/feature.md | 15 ++++++++++++ .gitlab/issue_templates/proposal.md | 5 ++++ 4 files changed, 97 insertions(+) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md new file mode 100644 index 0000000000..d27dea552d --- /dev/null +++ b/.gitlab/issue_templates/bug.md @@ -0,0 +1,42 @@ + + +### Summary + + + +### Steps to reproduce: + +1. step 1 +2. step 2 +3. ... + +### What is the current bug behavior? + + + +### What is the expected behavior? + + + +### Environment + + + +- Version: e.g. 0.10, output of --version (without backslashes) +- Operating system: Debian GNU/Linux 9.1 (stretch), Windows 7, Ubuntu Xenial, etc +- Install method: distribution package, from source tarball, from git, etc +- etc... + +### Relevant logs and/or screenshots: + + + +### Possible fixes: + + + +/label ~bug diff --git a/.gitlab/issue_templates/documentation.md b/.gitlab/issue_templates/documentation.md new file mode 100644 index 0000000000..6f0d4b49b8 --- /dev/null +++ b/.gitlab/issue_templates/documentation.md @@ -0,0 +1,35 @@ + + +### Problem to solve + + + +* What feature(s) affected? +* What docs or doc section affected? Include links or paths. +* Is there a problem with a specific document, or a feature/process that's not addressed sufficiently in docs? +* Any other ideas or requests? + + +### Further details + + + +### Proposal + + + +### Who can address the issue + + + +### Other links/references + + + +/label ~documentation diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md new file mode 100644 index 0000000000..f0c3f1bdfe --- /dev/null +++ b/.gitlab/issue_templates/feature.md @@ -0,0 +1,15 @@ + + +### Summary + + + +### What is the expected behavior? + + + + + +/label ~Feature diff --git a/.gitlab/issue_templates/proposal.md b/.gitlab/issue_templates/proposal.md new file mode 100644 index 0000000000..990ca70a0a --- /dev/null +++ b/.gitlab/issue_templates/proposal.md @@ -0,0 +1,5 @@ + + +### Proposal + +

1 0

[tor/master] Remove documentation issue template.
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit cdc66380021dcec7f2276164c9df4aa57e62f87f Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 20:36:17 2021 +0000 Remove documentation issue template. I think the issues we get in here will be covered by either the bug or feature document. --- .gitlab/issue_templates/documentation.md | 35 -------------------------------- 1 file changed, 35 deletions(-) diff --git a/.gitlab/issue_templates/documentation.md b/.gitlab/issue_templates/documentation.md deleted file mode 100644 index 6f0d4b49b8..0000000000 --- a/.gitlab/issue_templates/documentation.md +++ /dev/null @@ -1,35 +0,0 @@ - - -### Problem to solve - - - -* What feature(s) affected? -* What docs or doc section affected? Include links or paths. -* Is there a problem with a specific document, or a feature/process that's not addressed sufficiently in docs? -* Any other ideas or requests? - - -### Further details - - - -### Proposal - - - -### Who can address the issue - - - -### Other links/references - - - -/label ~documentation

1 0

[tor/master] Use titlecase for template filenames.
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 22df6a3127fe4f55217186be068048905a24d14d Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 20:39:28 2021 +0000 Use titlecase for template filenames. --- .gitlab/issue_templates/{bug.md => Bug.md} | 0 .gitlab/issue_templates/{feature.md => Feature.md} | 0 .gitlab/issue_templates/{proposal.md => Proposal.md} | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/Bug.md similarity index 100% rename from .gitlab/issue_templates/bug.md rename to .gitlab/issue_templates/Bug.md diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/Feature.md similarity index 100% rename from .gitlab/issue_templates/feature.md rename to .gitlab/issue_templates/Feature.md diff --git a/.gitlab/issue_templates/proposal.md b/.gitlab/issue_templates/Proposal.md similarity index 100% rename from .gitlab/issue_templates/proposal.md rename to .gitlab/issue_templates/Proposal.md

1 0

[tor/master] Remove Proposal.md.
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit 7f32ae0eb55382b9ef59a36713887b7a8927b794 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 20:39:48 2021 +0000 Remove Proposal.md. I don't think the Proposal.md fits well with the kind of tickets we see. Let's start with Features and Bug and expand upon it as we go. --- .gitlab/issue_templates/Proposal.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab/issue_templates/Proposal.md b/.gitlab/issue_templates/Proposal.md deleted file mode 100644 index 990ca70a0a..0000000000 --- a/.gitlab/issue_templates/Proposal.md +++ /dev/null @@ -1,5 +0,0 @@ - - -### Proposal - -

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/305'
by asn＠torproject.org 19 Feb '21

19 Feb '21

commit e8cce1058c06e8f1bec486c9e49bc2e81243b672 Merge: b2f025cb56 7f32ae0eb5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 19 13:24:34 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/305' .gitlab/issue_templates/Bug.md | 32 ++++++++++++++++++++++++++++++++ .gitlab/issue_templates/Feature.md | 9 +++++++++ 2 files changed, 41 insertions(+)

1 0