# HG changeset patch # User Sergey Kandaurov # Date 1446721373 -10800 # Node ID a6764c2a9f122551cc12514bc82782e3cbe2be17 # Parent adc32621fb09e9b31c7857da9fd805c07c2a68b3 Tests: fixed DNS label coding in resolver tests. No actual functional changes. diff --git a/http_resolver.t b/http_resolver.t --- a/http_resolver.t +++ b/http_resolver.t @@ -312,7 +312,7 @@ sub reply_handler { push @rdata, rd_addr($ttl, '127.0.0.1'); } elsif ($name eq 'awide.example.net' && $type == A) { - push @rdata, pack '(w/a*)3x n2N nC4', + push @rdata, pack '(C/a*)3x n2N nC4', ('awide', 'example', 'net'), A, IN, $ttl, 4, (127, 0, 0, 1); @@ -338,7 +338,7 @@ sub reply_handler { my @dname = ('example', 'net'); my $rdlen = length(join '', @dname) + @dname + 1; - push @rdata, pack("n3N n(w/a*)* x", 0xc012, DNAME, IN, $ttl, + push @rdata, pack("n3N n(C/a*)* x", 0xc012, DNAME, IN, $ttl, $rdlen, @dname); # alias.example.com. 3600 IN CNAME alias.example.net. @@ -429,7 +429,7 @@ sub reply_handler { } $len = @name; - pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, + pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, 0, 0, @name, $type, $class) . join('', @rdata); } diff --git a/http_resolver_aaaa.t b/http_resolver_aaaa.t --- a/http_resolver_aaaa.t +++ b/http_resolver_aaaa.t @@ -566,7 +566,7 @@ sub reply_handler { } $len = @name; - pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, + pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, 0, 0, @name, $type, $class) . join('', @rdata); } diff --git a/mail_resolver.t b/mail_resolver.t --- a/mail_resolver.t +++ b/mail_resolver.t @@ -298,7 +298,7 @@ sub reply_handler { } elsif ($port == 8085) { # uncompressed answer - push @rdata, pack("(w/a*)6x n2N n(w/a*)3x", + push @rdata, pack("(C/a*)6x n2N n(C/a*)3x", ('1', '0', '0', '127', 'in-addr', 'arpa'), PTR, IN, $ttl, 15, ('a', 'example', 'net')); @@ -311,7 +311,7 @@ sub reply_handler { } $len = @name; - pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, + pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, 0, 0, @name, $type, $class) . join('', @rdata); } @@ -321,7 +321,7 @@ sub rd_name { @rdname = split /\./, $name; $rdlen = length(join '', @rdname) + @rdname + 1; - pack("n3N n(w/a*)* x", 0xc00c, $type, IN, $ttl, $rdlen, @rdname); + pack("n3N n(C/a*)* x", 0xc00c, $type, IN, $ttl, $rdlen, @rdname); } sub rd_addr { diff --git a/proxy_next_upstream_tries.t b/proxy_next_upstream_tries.t --- a/proxy_next_upstream_tries.t +++ b/proxy_next_upstream_tries.t @@ -220,7 +220,7 @@ sub reply_handler { @rdata = map { rd_addr($ttl, '127.0.0.1') } (1 .. 3) if $type == A; $len = @name; - pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, + pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata, 0, 0, @name, $type, $class) . join('', @rdata); }