November 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b Merge: 9e2608b 0493db4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 15:29:39 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13296 | 5 +++++ src/or/config.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --cc src/or/config.c index 39b85aa,9e05087..89ea586 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,25 -794,25 +856,25 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " ++ "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/maint-0.2.5] Remove turtles as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit b6e7b8c88cb50a122992a963ef0882ca9b963609 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:49:11 2014 -0500 Remove turtles as a directory authority (#13296) --- src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 126b1c5..9e05087 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -796,9 +796,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Tonga orport=443 bridge no-v2 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.5] Add changes file for #13926
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 0493db4adb88b830b4339d320b96a88fc27a01bb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 12 19:12:18 2014 +0100 Add changes file for #13926 --- changes/bug13296 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug13296 b/changes/bug13296 new file mode 100644 index 0000000..d6fe038 --- /dev/null +++ b/changes/bug13296 @@ -0,0 +1,5 @@ + o Directory authority changes: + - Remove turtles as a directory authority. + - Add longclaw as a new (v3) directory authority. This implements + ticket 13296. This keeps the directory authority count at 9. +

1 0

[tor/maint-0.2.5] Add longclaw as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit ad448c6405b02e72bc5145b82705733c53861a19 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:48:56 2014 -0500 Add longclaw as a directory authority (#13296) --- src/or/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 919dd27..126b1c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -813,6 +813,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "Faravahar orport=443 no-v2 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 no-v2 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/maint-0.2.4] Add longclaw as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit ad448c6405b02e72bc5145b82705733c53861a19 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:48:56 2014 -0500 Add longclaw as a directory authority (#13296) --- src/or/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 919dd27..126b1c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -813,6 +813,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "Faravahar orport=443 no-v2 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 no-v2 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/maint-0.2.4] Remove turtles as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit b6e7b8c88cb50a122992a963ef0882ca9b963609 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:49:11 2014 -0500 Remove turtles as a directory authority (#13296) --- src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 126b1c5..9e05087 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -796,9 +796,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Tonga orport=443 bridge no-v2 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.4] Add changes file for #13926
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 0493db4adb88b830b4339d320b96a88fc27a01bb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 12 19:12:18 2014 +0100 Add changes file for #13926 --- changes/bug13296 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug13296 b/changes/bug13296 new file mode 100644 index 0000000..d6fe038 --- /dev/null +++ b/changes/bug13296 @@ -0,0 +1,5 @@ + o Directory authority changes: + - Remove turtles as a directory authority. + - Add longclaw as a new (v3) directory authority. This implements + ticket 13296. This keeps the directory authority count at 9. +

1 0

[tor-messenger-build/master] Add a script to clean obsolete build files and docker images
by boklm＠torproject.org 12 Nov '14

12 Nov '14

commit 87fc563253e0d09fb23c4942158b5fb6ec832490 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 12 19:59:33 2014 +0100 Add a script to clean obsolete build files and docker images The script can be run with 'make clean-old'. It needs to compute all current filenames and docker image names (which themself depend on sha256sum of a lot of things), so it takes some time to run. --- Makefile | 3 ++ projects/docker-image/config | 3 +- rbm.conf | 4 ++ tools/clean-old | 106 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ef012f..50dc2f0 100644 --- a/Makefile +++ b/Makefile @@ -14,3 +14,6 @@ submodule-update: fetch: $(rbm) fetch +clean-old: submodule-update + ./tools/clean-old + diff --git a/projects/docker-image/config b/projects/docker-image/config index 82e45c8..b84de53 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -1,6 +1,7 @@ filename: '[% sha256(c("pre")).substr(0, 12) %]' remote_docker: 1 -docker_save_image: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]:[% c("filename") %]' +docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]' +docker_save_image: '[% c("docker_image_prefix") %]:[% c("filename") %]' pkg_type: build distributions: diff --git a/rbm.conf b/rbm.conf index 483fe58..ce4c16e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -31,6 +31,10 @@ var: %] build: [% c("build", { filename => 'f', output_dir => '/out' }) %] + input_files_list: | + [% FOREACH file IN c("input_files_by_name").keys.sort -%] + [% c("input_files_by_name/" _ file) %] + [% END -%] targets: notarget: linux-x86_64 diff --git a/tools/clean-old b/tools/clean-old new file mode 100755 index 0000000..e3be7fa --- /dev/null +++ b/tools/clean-old @@ -0,0 +1,106 @@ +#!/usr/bin/perl -w +use strict; +use Cwd qw(getcwd); +use IO::CaptureOutput qw(capture_exec); +use FindBin; + +my $rbm = "$FindBin::Bin/../rbm/rbm"; +my $projects_dir = "$FindBin::Bin/../projects"; +my @targets = qw(linux-x86_64 linux-i686 windows-i686 osx-x86_64); +my @sig_ext = qw(.sig .gpg .asc); +my $docker_image_prefix = docker_image_prefix(); + +sub clean_project_build_files { + my ($project) = @_; + my $old_cwd = getcwd; + chdir "$FindBin::Bin/../out/$project"; + my @files = grep { -f $_ } glob '*'; + chdir $old_cwd; + my %keep_files; + foreach my $target (@targets) { + my ($out, $err, $success) = capture_exec($rbm, + 'showconf', $project, 'filename', "--target=$target"); + return unless $success; + chomp $out; + $keep_files{$out} = 1; + ($out, $err, $success) = capture_exec($rbm, + 'showconf', $project, 'var/input_files_list', "--target=$target"); + next unless $success; + my @input_files = split("\n", $out); + foreach my $input_file (@input_files) { + chomp $input_file; + next unless $input_file; + $keep_files{$input_file} = 1; + foreach my $ext (qw(sig gpg asc)) { + $keep_files{"$input_file.$ext"} = 1; + } + } + } + foreach my $file (@files) { + next if $keep_files{$file}; + print "Removing $file\n"; + unlink "$FindBin::Bin/../out/$project/$file"; + } +} + +sub clean_build_files { + chdir $projects_dir; + foreach my $project (glob '*') { + next if $project eq 'docker-image'; + next unless -f "$project/config"; + print "Cleaning project: $project\n"; + clean_project_build_files($project); + } +} + +sub docker_image_prefix { + my ($out, $err, $success) = capture_exec($rbm, 'showconf', 'docker-image', + 'docker_image_prefix'); + die "Cannot get docker image prefix" unless $success; + chomp $out; + return $out; +} + +sub remove_docker_image { + my ($image_name) = @_; + my $image = "$docker_image_prefix:$image_name"; + print "Removing docker image $image\n"; + my ($out, $err, $success) = capture_exec('docker', 'rmi', '-f', $image); + if (!$success) { + print STDERR "Error removing docker image $image\n"; + return; + } + unlink "$FindBin::Bin/../out/docker-image/$image_name"; +} + +sub clean_docker_images { + chdir "$FindBin::Bin/../out/docker-image" or return; + print "Cleaning docker images\n"; + my @docker_files = grep { -f $_ } glob '*'; + my %keep_docker_files; + chdir $projects_dir; + foreach my $project (glob '*') { + next if $project eq 'docker-image'; + next unless -f "$project/config"; + foreach my $target (@targets) { + my ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, + 'remote_docker', "--target=$target"); + next unless $success; + chomp $out; + next unless $out; + ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, + 'docker_image', "--target=$target"); + next unless $success; + chomp $out; + my (undef, $image_file) = split(':', $out); + $keep_docker_files{$image_file} = 1; + } + } + foreach my $docker_file (@docker_files) { + next if $keep_docker_files{$docker_file}; + remove_docker_image($docker_file); + } +} + +clean_build_files; +clean_docker_images;

1 0

[tor/master] Disallow "*/maskbits" as an address pattern.
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit ecd16edafe5afbf00c5775d9f41457d4b015dc2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 15:59:04 2014 -0500 Disallow "*/maskbits" as an address pattern. Fixes bug 7484. We've had this bug back in a8eaa79e031ee04d44 in 0.0.2pre14, when we first started allowing address masks. --- changes/bug7484 | 4 ++++ src/common/address.c | 5 +++++ src/test/test_addr.c | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug7484 b/changes/bug7484 new file mode 100644 index 0000000..647992a --- /dev/null +++ b/changes/bug7484 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Stop allowing invalid address patterns containing both a wildcard + address and a bit prefix length. This affects all our + address-range parsing code. Fixes bug 7484; bugfix on 0.0.2pre14. diff --git a/src/common/address.c b/src/common/address.c index b9f2d93..be41cc7 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -714,6 +714,11 @@ tor_addr_parse_mask_ports(const char *s, /* XXXX_IP6 is this really what we want? */ bits = 96 + bits%32; /* map v4-mapped masks onto 96-128 bits */ } + if (any_flag) { + log_warn(LD_GENERAL, + "Found bit prefix with wildcard address; rejecting"); + goto err; + } } else { /* pick an appropriate mask, as none was given */ if (any_flag) bits = 0; /* This is okay whether it's V6 or V4 (FIX V4-mapped V6!) */ diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 79ddd95..7c289c3 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -646,7 +646,6 @@ test_addr_ip6_helpers(void) test_assert(r == -1); r=tor_addr_parse_mask_ports("*6",0,&t1, &mask, NULL, NULL); test_assert(r == -1); -#if 0 /* Try a mask with a wildcard. */ r=tor_addr_parse_mask_ports("*/16",0,&t1, &mask, NULL, NULL); test_assert(r == -1); @@ -656,7 +655,6 @@ test_addr_ip6_helpers(void) r=tor_addr_parse_mask_ports("*6/30",TAPMP_EXTENDED_STAR, &t1, &mask, NULL, NULL); test_assert(r == -1); -#endif /* Basic mask tests*/ r=tor_addr_parse_mask_ports("1.1.2.2/31",0,&t1, &mask, NULL, NULL); test_assert(r == AF_INET);

1 0

[tor/master] Merge remote-tracking branch 'public/bug7484'
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 9b11dc36179e48bd39e57a9f3e0e26a25f50adfa Merge: 4ac5175 ecd16ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:44:57 2014 -0500 Merge remote-tracking branch 'public/bug7484' Conflicts: src/test/test_addr.c changes/bug7484 | 4 ++++ src/common/address.c | 5 +++++ src/test/test_addr.c | 3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index a254a34,7c289c3..c9c47bd --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -618,83 -610,81 +618,82 @@@ test_addr_ip6_helpers(void *arg "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:" "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); /* Try some failing cases. */ r=tor_addr_parse_mask_ports("[fefef::]/112", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[fefe::/112", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[fefe::", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[fefe::X]", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("efef::/112", 0, &t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f::]",0,&t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[::f:f:f:f:f:f:f:f]",0,&t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f:f]",0,&t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[f:f:f:f:f::]/fred",0,&t1,&mask, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("[f:f:f:f:f::]/255.255.0.0", 0,&t1, NULL, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); /* This one will get rejected because it isn't a pure prefix. */ r=tor_addr_parse_mask_ports("1.1.2.3/255.255.64.0",0,&t1, &mask,NULL,NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); /* Test for V4-mapped address with mask < 96. (arguably not valid) */ r=tor_addr_parse_mask_ports("[::ffff:1.1.2.2/33]",0,&t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("1.1.2.2/33",0,&t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); /* Try extended wildcard addresses with out TAPMP_EXTENDED_STAR*/ r=tor_addr_parse_mask_ports("*4",0,&t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("*6",0,&t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_int_op(r, OP_EQ, -1); - #if 0 ++ tt_assert(r == -1); /* Try a mask with a wildcard. */ r=tor_addr_parse_mask_ports("*/16",0,&t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_assert(r == -1); r=tor_addr_parse_mask_ports("*4/16",TAPMP_EXTENDED_STAR, &t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_assert(r == -1); r=tor_addr_parse_mask_ports("*6/30",TAPMP_EXTENDED_STAR, &t1, &mask, NULL, NULL); - test_assert(r == -1); + tt_assert(r == -1); - #endif /* Basic mask tests*/ r=tor_addr_parse_mask_ports("1.1.2.2/31",0,&t1, &mask, NULL, NULL); - test_assert(r == AF_INET); - tt_int_op(mask,==,31); - tt_int_op(tor_addr_family(&t1),==,AF_INET); - tt_int_op(tor_addr_to_ipv4h(&t1),==,0x01010202); + tt_assert(r == AF_INET); + tt_int_op(mask,OP_EQ,31); + tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); + tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0x01010202); r=tor_addr_parse_mask_ports("3.4.16.032:1-2",0,&t1, &mask, &port1, &port2); - test_assert(r == AF_INET); - tt_int_op(mask,==,32); - tt_int_op(tor_addr_family(&t1),==,AF_INET); - tt_int_op(tor_addr_to_ipv4h(&t1),==,0x03041020); - test_assert(port1 == 1); - test_assert(port2 == 2); + tt_assert(r == AF_INET); + tt_int_op(mask,OP_EQ,32); + tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); + tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0x03041020); + tt_assert(port1 == 1); + tt_assert(port2 == 2); r=tor_addr_parse_mask_ports("1.1.2.3/255.255.128.0",0,&t1, &mask,NULL,NULL); - test_assert(r == AF_INET); - tt_int_op(mask,==,17); - tt_int_op(tor_addr_family(&t1),==,AF_INET); - tt_int_op(tor_addr_to_ipv4h(&t1),==,0x01010203); + tt_assert(r == AF_INET); + tt_int_op(mask,OP_EQ,17); + tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); + tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0x01010203); r=tor_addr_parse_mask_ports("[efef::]/112",0,&t1, &mask, &port1, &port2); - test_assert(r == AF_INET6); - test_assert(port1 == 1); - test_assert(port2 == 65535); + tt_assert(r == AF_INET6); + tt_assert(port1 == 1); + tt_assert(port2 == 65535); /* Try regular wildcard behavior without TAPMP_EXTENDED_STAR */ r=tor_addr_parse_mask_ports("*:80-443",0,&t1,&mask,&port1,&port2); - tt_int_op(r,==,AF_INET); /* Old users of this always get inet */ - tt_int_op(tor_addr_family(&t1),==,AF_INET); - tt_int_op(tor_addr_to_ipv4h(&t1),==,0); - tt_int_op(mask,==,0); - tt_int_op(port1,==,80); - tt_int_op(port2,==,443); + tt_int_op(r,OP_EQ,AF_INET); /* Old users of this always get inet */ + tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); + tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0); + tt_int_op(mask,OP_EQ,0); + tt_int_op(port1,OP_EQ,80); + tt_int_op(port2,OP_EQ,443); /* Now try wildcards *with* TAPMP_EXTENDED_STAR */ r=tor_addr_parse_mask_ports("*:8000-9000",TAPMP_EXTENDED_STAR, &t1,&mask,&port1,&port2);

1 0