aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-15Add support for patterns on %include #25140Daniel Pinto
Also adds generic tor_glob function to expand globs.
2020-07-14Merge remote-tracking branch 'tor-gitlab/mr/50'Nick Mathewson
2020-07-14Update docstring for read_file_to_str() on stripping of CR characters.Alexander Færøy
See: https://bugs.torproject.org/tpo/core/tor/33781
2020-07-14Strip '\r' characters when reading text files on Unix.Alexander Færøy
This patch ensures that we strip "\r" characters on both Windows as well as Unix when we read text files. This should prevent the issue where some Tor state files have been moved from a Windows machine, and thus contains CRLF line ending, to a Unix machine where only \n is needed. We add a test-case to ensure that we handle this properly on all our platforms. See: https://bugs.torproject.org/tpo/core/tor/33781
2020-07-14Merge remote-tracking branch 'tor-gitlab/merge-requests/48'Alexander Færøy
2020-07-14Merge branch 'tor-gitlab/mr/49'David Goulet
2020-07-14Merge branch 'ticket40033_045_01_squashed'Nick Mathewson
2020-07-14Rename blacklist and whitelist wordingDavid Goulet
Closes #40033 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-14node: Standardize interface of format_node_description()David Goulet
Pass the IPv4 before the IPv6 like all our other interfaces. Changes unreleased code related to #40043. Closes #40045 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-14Merge branch 'maint-0.4.4'Alexander Færøy
2020-07-14Merge remote-tracking branch 'tor-gitlab/merge-requests/43' into maint-0.4.4Alexander Færøy
2020-07-14Merge branch 'tor-gitlab/mr/47'David Goulet
2020-07-14addr: Use tor_addr_t instead of uint32_t for IPv4David Goulet
This changes a LOT of code but in the end, behavior is the same. Unfortunately, many functions had to be changed to accomodate but in majority of cases, to become simpler. Functions are also removed specifically those that were there to convert an IPv4 as a host format to a tor_addr_t. Those are not needed anymore. The IPv4 address field has been standardized to "ipv4_addr", the ORPort to "ipv4_orport" (currently IPv6 uses ipv6_orport) and DirPort to "ipv4_dirport". This is related to Sponsor 55 work that adds IPv6 support for relays and this work is needed in order to have a common interface between IPv4 and IPv6. Closes #40043. Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-14doc: Fix aesthetic issues in HACKING/Tracing.mdDavid Goulet
Remove all the escape character "\" which is not needed for Markdown files. This also fixes the tracing event include to the correct path. Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-14conn: Fix doxygen comment in connstats.cDavid Goulet
Issue found by our CI: https://travis-ci.org/github/torproject/tor/jobs/707731598#L6059 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-14doc: Move manpages into doc/man/David Goulet
Closes #40044 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-13Merge branch 'maint-0.4.4'David Goulet
2020-07-13Merge branch 'maint-0.4.3' into maint-0.4.4David Goulet
2020-07-13Improve docs for addr, address, and real_addr fieldsNick Mathewson
These fields have a complicated history, some slightly complicated behavior, and some definitely inadequate documentation. Before we go fixing them up, let's document how they work now.
2020-07-13Merge branch 'maint-0.4.4'Nick Mathewson
2020-07-13Changes file for ticket 31812.Nick Mathewson
2020-07-13Bug 31812: Change http URL's to httpsJeremyRand
2020-07-13Merge branch 'ticket33919'Nick Mathewson
2020-07-13Update channel_matches_target_addr_for_extend test to current APINick Mathewson
2020-07-13Added testsMrSquanchee
Added tests for channel_matches_target_addr_for_extend(). Ticket #33919.
2020-07-13Remove check-cocci from check-local target.Nick Mathewson
check-cocci is still a good idea -- perhaps as a cron job? But doing it as part of our regular tests has just been confusing, especially to volunteers who shouldn't have to become coccinelle experts in order to get their patches through our CI. Closes #40030.
2020-07-13Syntax highlighting in the docsGuinness
This adds the syntax highlights in the MarkDown files. Fixes #33741
2020-07-10Add an extra comment about keeping rust and c protover in sync.Nick Mathewson
2020-07-10Merge remote-tracking branch 'tor-gitlab/mr/42'Nick Mathewson
2020-07-10Merge remote-tracking branch 'tor-gitlab/mr/41'Nick Mathewson
2020-07-10NSS: Tell NSS that our SSL sockets are nonblocking.Nick Mathewson
Closes ticket 40035.
2020-07-10Merge branch 'tor-gitlab/mr/39'David Goulet
2020-07-10addr: Remove BUG() that always triggersDavid Goulet
Fix on unreleased code. Logical || in the BUG() made it that it would always trigger the BUG(). Fixes #40034 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-10addr: Remove a BUG() that can normally occurDavid Goulet
Fix on unreleased code. The relay_new_address_suggestion() is called when a NETINFO cell is received thus not only for relay or bridges. Remove the BUG() that made sure only in server mode we could handle the suggested address. Fixes #40032 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-10Merge remote-tracking branch 'tor-gitlab/mr/29'Nick Mathewson
2020-07-10changes: Add changes file for #32910David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-10Changes file for ipv6 bidi (ticket 33264)Nick Mathewson
2020-07-10connstats: use correct formatter for uint32_t.Nick Mathewson
We have had no reports of negative counts here, so it is probably safe not to backport this.
2020-07-10Collect IPv6 bidi connection statisticsNick Mathewson
2020-07-10connstats: extract functions for summarizing a connection's statusNick Mathewson
2020-07-10connstats: extract connection type counts into a structure.Nick Mathewson
2020-07-10connstats: add and clarify some documentation.Nick Mathewson
2020-07-10Change connstats.c identifers to start with conn_statsNick Mathewson
This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ rep_hist_conn_stats_init conn_stats_init \ rep_hist_note_or_conn_bytes conn_stats_note_or_conn_bytes \ rep_hist_reset_conn_stats conn_stats_reset \ rep_hist_format_conn_stats conn_stats_format \ rep_hist_conn_stats_write conn_stats_save \ rep_hist_conn_stats_term conn_stats_terminate \ bidi_map_free_all conn_stats_free_all
2020-07-10Split bidi connection-stats code into a new C file.Nick Mathewson
2020-07-10Changes file for ticket 33263Nick Mathewson
2020-07-10Record IPv6 bandwidth history as appropriate.Nick Mathewson
2020-07-10Make channel_get_addr_if_possible() take a const channel_t.Nick Mathewson
(There is no reason that looking up the address of a channel should ever change it.)
2020-07-10Add IPv6 read and write history to bwhist, state, and extrainfo.Nick Mathewson
These values are stored, persisted, and published. They are not yet actually filled with anything.
2020-07-10Refactor bwhist_get_bandwidth_lines()Nick Mathewson
We've done a lot to improve our internal APIs since we wrote this code, and it shows. We can just use a buf_t to build up the bandwidth lines, and save a bunch of stack fiddling. Additionally, we can use a function to format a single line, and thereby get rid of the cheezy pattern that does for (i=0;i<n;++i) { switch (i) { ... } ... }
2020-07-10Rename private bandwidth-history identifiers to start with "bwhist".Nick Mathewson
This commit is a simple search-and-replace in bwhist.c