From f7e6ec2eabf58e2bbde3fb5abe7caf0726a9fc4d Mon Sep 17 00:00:00 2001 From: Luke Dunstan Date: Tue, 11 Aug 2015 22:40:17 +0800 Subject: [PATCH] Don't return an empty label from to_domain_name --- lib/ipaddr.ml | 2 -- lib_test/test_ipaddr.ml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ipaddr.ml b/lib/ipaddr.ml index 064c2d4..bc2f6a0 100644 --- a/lib/ipaddr.ml +++ b/lib/ipaddr.ml @@ -224,7 +224,6 @@ module V4 = struct Int32.to_string (i >! 24); "in-addr"; "arpa"; - ""; ] (* constant *) @@ -674,7 +673,6 @@ module V6 = struct hex_string_of_int32 ((a >|> 28) &&& 0xF_l); "ip6"; "arpa"; - ""; ]) (* constant *) diff --git a/lib_test/test_ipaddr.ml b/lib_test/test_ipaddr.ml index 91bcd0d..21be61f 100644 --- a/lib_test/test_ipaddr.ml +++ b/lib_test/test_ipaddr.ml @@ -285,7 +285,7 @@ module Test_v4 = struct let test_domain_name () = let ip = V4.of_string_exn "128.64.32.16" in - let name = "16.32.64.128.in-addr.arpa." in + let name = "16.32.64.128.in-addr.arpa" in assert_equal ~msg:"domain_name" (String.concat "." (V4.to_domain_name ip)) name @@ -601,7 +601,7 @@ module Test_v6 = struct let test_domain_name () = let ip = V6.of_string_exn "2a00:1450:4009:800::200e" in let name = - "e.0.0.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.0.9.0.0.4.0.5.4.1.0.0.a.2.ip6.arpa." + "e.0.0.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.0.9.0.0.4.0.5.4.1.0.0.a.2.ip6.arpa" in assert_equal ~msg:"domain_name" (String.concat "." (V6.to_domain_name ip)) name