David Goulet
063cdb3142
Merge branch 'tor-gitlab/mr/39'
2020-07-10 13:12:22 -04:00
David Goulet
401b3a8a3c
addr: Remove BUG() that always triggers
...
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-10 13:09:46 -04:00
David Goulet
46b86b22e3
addr: Remove a BUG() that can normally occur
...
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-10 13:06:20 -04:00
Nick Mathewson
6fb1637255
Merge remote-tracking branch 'tor-gitlab/mr/29'
2020-07-10 12:53:46 -04:00
David Goulet
dfaa0a82ac
changes: Add changes file for #32910
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-10 12:12:26 -04:00
Nick Mathewson
fae19df985
Changes file for ipv6 bidi (ticket 33264)
2020-07-10 09:52:35 -04:00
Nick Mathewson
0f60a1d33c
connstats: use correct formatter for uint32_t.
...
We have had no reports of negative counts here, so it is probably
safe not to backport this.
2020-07-10 09:50:04 -04:00
Nick Mathewson
dbdf8bebde
Collect IPv6 bidi connection statistics
2020-07-10 09:47:55 -04:00
Nick Mathewson
54141d66e2
connstats: extract functions for summarizing a connection's status
2020-07-10 09:36:07 -04:00
Nick Mathewson
0b5e19d223
connstats: extract connection type counts into a structure.
2020-07-10 09:32:30 -04:00
Nick Mathewson
515cc49cb7
connstats: add and clarify some documentation.
2020-07-10 09:27:42 -04:00
Nick Mathewson
3f2de0bcca
Change connstats.c identifers to start with conn_stats
...
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-10 09:27:42 -04:00
Nick Mathewson
50bf2520b3
Split bidi connection-stats code into a new C file.
2020-07-10 09:27:42 -04:00
Nick Mathewson
1a4e475d5d
Changes file for ticket 33263
2020-07-10 09:25:28 -04:00
Nick Mathewson
27c5cadf7e
Record IPv6 bandwidth history as appropriate.
2020-07-10 09:25:28 -04:00
Nick Mathewson
a81827d99f
Make channel_get_addr_if_possible() take a const channel_t.
...
(There is no reason that looking up the address of a channel should
ever change it.)
2020-07-10 09:25:28 -04:00
Nick Mathewson
c5db7667d6
Add IPv6 read and write history to bwhist, state, and extrainfo.
...
These values are stored, persisted, and published. They are not yet
actually filled with anything.
2020-07-10 09:25:28 -04:00
Nick Mathewson
11da5229d1
Refactor bwhist_get_bandwidth_lines()
...
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-10 09:25:28 -04:00
Nick Mathewson
c5eb601e60
Rename private bandwidth-history identifiers to start with "bwhist".
...
This commit is a simple search-and-replace in bwhist.c
2020-07-10 07:56:21 -04:00
Nick Mathewson
2fc8257ac4
Rename public bandwidth-history identifiers to start with "bwhist".
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
rep_hist_note_bytes_read bwhist_note_bytes_read \
rep_hist_note_bytes_written bwhist_note_bytes_written \
rep_hist_note_dir_bytes_read bwhist_note_dir_bytes_read \
rep_hist_note_dir_bytes_written bwhist_note_dir_bytes_written \
rep_hist_get_bandwidth_lines bwhist_get_bandwidth_lines \
rep_hist_update_state bwhist_update_state \
rep_hist_load_state bwhist_load_state \
rep_hist_bandwidth_assess bwhist_bandwidth_assess
2020-07-10 07:54:04 -04:00
Nick Mathewson
8390df917b
Split bandwidth history functions into a separate C file.
...
These are logically independent from the rest of rephist, and make
more sense in isolation. The next patch will rename them too.
2020-07-10 07:50:17 -04:00
Nick Mathewson
18391f689e
git-install-tools: use -b, not --backup.
...
The osx version of this tool doesn't have --backup
2020-07-09 17:12:37 -04:00
Nick Mathewson
7b24d56acc
Merge remote-tracking branch 'tor-gitlab/mr/36'
2020-07-09 14:39:02 -04:00
Nick Mathewson
7207b4f2e4
Merge remote-tracking branch 'tor-gitlab/mr/21'
2020-07-09 14:30:15 -04:00
Nick Mathewson
97a9966b04
Update git scripts to include tor-gitlab repository
...
Analogously to tor-github, we now make a tor-gitlab repository. It
is set up to disable push direct attempts, and to fetch merge
requests into appropriate branches.
git-pull-all.sh knows how to fetch this repository.
2020-07-09 14:27:10 -04:00
David Goulet
edb5ef2540
test: Add IPv6 inet_pton double "::" test
...
Unclear but that somehow failed on Windows once (?) according to ticket #33768
but we are not seeing that failure.
Nevertheless, add a simple unit test.
Closes #33768
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09 13:39:56 -04:00
David Goulet
7bc54ccba9
addr: Static assert resolved address cache size
...
This will make sure that we always properly initialize the cache by the exact
size all the time.
Related to #40022
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09 13:33:52 -04:00
Nick Mathewson
2eb7673a8c
Merge branch 'maint-0.4.4'
...
`-s ours` to avoid version bump.
2020-07-09 13:15:49 -04:00
Nick Mathewson
20e2787352
Bump to 0.4.4.2-alpha-dev
2020-07-09 13:15:45 -04:00
Nick Mathewson
eb6fc9f9bd
Merge branch 'maint-0.4.3' into maint-0.4.4
...
`-s ours` to avoid version bump.
2020-07-09 13:15:23 -04:00
Nick Mathewson
3517d20322
Bump to 0.4.3.6-dev
2020-07-09 13:15:15 -04:00
Nick Mathewson
42c0358ceb
Merge branch 'maint-0.4.2' into maint-0.4.3
...
`-s ours` to avoid version bump.
2020-07-09 13:14:58 -04:00
Nick Mathewson
49b4d1765c
Bump to 0.4.2.8-dev
2020-07-09 13:14:48 -04:00
Nick Mathewson
6e01d5e685
Merge branch 'maint-0.3.5' into maint-0.4.2
...
`-s ours` to avoid version bump.
2020-07-09 13:14:22 -04:00
Nick Mathewson
c9751e2611
Bump to 0.3.5.11-dev
2020-07-09 13:12:45 -04:00
Nick Mathewson
4877283419
Merge branch 'maint-0.4.4'
...
`-s ours` to avoid version bump
2020-07-09 10:32:20 -04:00
Nick Mathewson
3efd604743
Update version to 0.4.4.2-alpha.
2020-07-09 10:31:55 -04:00
Nick Mathewson
f9f4c4ab1d
Merge branch 'maint-0.4.3' into maint-0.4.4
...
`-s ours` to avoid version bump.
2020-07-09 10:31:16 -04:00
Nick Mathewson
7ba849349a
Update version to 0.4.3.6.
2020-07-09 10:31:09 -04:00
Nick Mathewson
70161785f9
Merge branch 'maint-0.4.2' into maint-0.4.3
...
`-s ours` to avoid version bump.
2020-07-09 10:30:46 -04:00
Nick Mathewson
5aaecf6d07
Update version to 0.4.2.8.
2020-07-09 10:30:37 -04:00
Nick Mathewson
78285594f5
Merge branch 'maint-0.3.5' into maint-0.4.2
...
`-s ours` to avoid version bump.
2020-07-09 10:30:03 -04:00
Nick Mathewson
0bb227d170
bump to 0.3.5.11
2020-07-09 10:28:21 -04:00
Nick Mathewson
5b6cd566be
copy changelogs and releasenotes for today's releases
2020-07-09 10:25:36 -04:00
George Kadianakis
b1a32761be
Merge branch 'maint-0.4.4'
2020-07-09 17:08:34 +03:00
George Kadianakis
e500ea2eae
Merge branch 'tor-github/pr/1989' into maint-0.4.4
2020-07-09 17:08:07 +03:00
Nick Mathewson
be6b30e642
Merge branch 'maint-0.4.4'
2020-07-09 09:59:54 -04:00
Nick Mathewson
8dd89e4330
Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4
2020-07-09 09:59:45 -04:00
Nick Mathewson
af08dad6d1
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-09 09:28:53 -04:00
Nick Mathewson
283ce30c53
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-09 09:28:53 -04:00