David Goulet
a8b8a1ee99
addr: Only attempt Address resolution on non parsable lines
...
In get_address_from_config(), we would attempt to resolve an Address line that
is not from the requested family but that line could be a valid address from
another family (v4 vs v6).
This makes it that we don't attempt to resolve a valid address from another
family.
Found with unit test config/find_my_address_mixed.
Fixed in #33235
Related to #33233
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 12:05:56 -04:00
David Goulet
89c26f4cfd
test: Mixed unit tests for find_my_address()
...
This unit tests validates the use of IPv4 _and_ IPv6 together as in multiple
option Address lines both addresses and hostnames.
Closes #33235
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 12:04:18 -04:00
Nick Mathewson
39830b6408
Downgrade "Bug: No entry found in extrainfo map" message.
...
This is not actually a bug! It can happen for a bunch of reasons,
which all boil down to "trying to add an extrainfo for which we no
longer have the corresponding routerinfo".
Fixes #16016 ; bugfix on 0.2.6.3-alpha.
2020-06-30 11:54:13 -04:00
Nick Mathewson
2238b6320b
Refactor reachability test logging: log exactly what we launch.
...
Previously we had two chains of logic for reachability tests: one
for launching them, and one for telling the user that we had
launched them. Now, we simply have the launch code inform the user:
this way, we can't get out of sync.
Closes ticket 34137.
2020-06-30 11:12:46 -04:00
Alexander Færøy
322abd4fd9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:23:41 +00:00
Alexander Færøy
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:23:41 +00:00
Alexander Færøy
9638c6d7a7
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:23:41 +00:00
Alexander Færøy
081d84c1de
Merge branch 'maint-0.4.4'
2020-06-30 14:23:41 +00:00
Alexander Færøy
8697205be4
Merge branch 'tor-github/pr/1909' into maint-0.3.5
2020-06-30 14:23:17 +00:00
David Goulet
fe6b049651
test: Unit tests for find_my_address() IPv6
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 10:22:01 -04:00
Alexander Færøy
0d5152fc53
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:19:44 +00:00
Alexander Færøy
90c313e87c
Merge branch 'maint-0.4.4'
2020-06-30 14:19:44 +00:00
Alexander Færøy
5a38c73f70
Merge branch 'tor-github/pr/1887' into maint-0.4.3
2020-06-30 14:19:28 +00:00
Alexander Færøy
bb5745d656
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:16:16 +00:00
Alexander Færøy
8f2571b233
Merge branch 'maint-0.4.4'
2020-06-30 14:16:16 +00:00
Alexander Færøy
fb46d1bb34
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:16:16 +00:00
Alexander Færøy
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
Alexander Færøy
572cf774b9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:03:04 +00:00
Alexander Færøy
5e1c0c7dbb
Merge branch 'maint-0.4.4'
2020-06-30 14:03:04 +00:00
Alexander Færøy
38f3cf4103
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:03:04 +00:00
Alexander Færøy
c9c4a3d0f6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:03:04 +00:00
David Goulet
faba6909f8
test: Rename function to be IPv4 specific
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 09:56:14 -04:00
Alexander Færøy
8444fbe904
Merge branch 'tor-github/pr/1793' into maint-0.3.5
2020-06-30 13:55:39 +00:00
Alexander Færøy
aced9be224
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:48:49 +00:00
Alexander Færøy
be7386a654
Merge branch 'maint-0.4.4'
2020-06-30 13:48:49 +00:00
Alexander Færøy
2042ebe88e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:48:49 +00:00
Alexander Færøy
483082b57b
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:48:49 +00:00
Alexander Færøy
c3ad2a1d23
Merge branch 'tor-github/pr/1785' into maint-0.3.5
2020-06-30 13:47:55 +00:00
Alexander Færøy
21cf91ee2c
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:37:20 +00:00
Alexander Færøy
9e4b47233b
Merge branch 'maint-0.4.4'
2020-06-30 13:37:20 +00:00
Alexander Færøy
c57896a76e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:37:20 +00:00
Alexander Færøy
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
Alexander Færøy
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
Alexander Færøy
96876d3ad7
Merge branch 'tor-github/pr/1940'
2020-06-30 01:22:44 +00:00
Nick Mathewson
feddba6f8b
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:57:50 -04:00
Nick Mathewson
86aa84e634
Merge branch 'maint-0.4.4'
2020-06-29 13:57:50 -04:00
Nick Mathewson
eef77227ef
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:57:41 -04:00
Nick Mathewson
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
Nick Mathewson
b2ce815bd8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:56:16 -04:00
Nick Mathewson
5b47a58d16
Merge branch 'maint-0.4.4'
2020-06-29 13:56:16 -04:00
Nick Mathewson
d124cfc058
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:56:04 -04:00
Nick Mathewson
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
Nick Mathewson
9e85515f83
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:48:32 -04:00
Nick Mathewson
def7844c4f
Merge branch 'maint-0.4.4'
2020-06-29 13:48:32 -04:00
Nick Mathewson
31bdfd4920
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
Nick Mathewson
6fb31bb34a
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:58:50 -04:00
Nick Mathewson
6b71cc64cf
Merge branch 'maint-0.4.4'
2020-06-29 12:58:50 -04:00
Nick Mathewson
f862971d04
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
