[Sks-devel] [PATCH] Use domain names with hkp_address and recon_address

[Kim Minh Kaplan]

I propose the following patch (c77aab222f08 on
http://www.kim-minh.com/hg/sks/).  With it I can put the following in my
sksconf:

    recon_address: keyserver.kim-minh.com
    hkp_address: keyserver.kim-minh.com

and SKS will serve *all* the available addresses for keyserver.kim-minh.com.

Kim Minh.

# HG changeset patch
# User Kim Minh Kaplan <address@hidden>
# Date 1251646824 -7200
# Node ID c77aab222f08dc7469d43eb1b5cc171ca1e997f4
# Parent  d351d05877dca577dce3463675dc9e4e44f973ea
Call Unix.getaddrinfo on both hkp_address and recon_address.

diff -r d351d05877dc -r c77aab222f08 common.ml
--- a/common.ml Sun Aug 30 09:42:49 2009 +0200
+++ b/common.ml Sun Aug 30 17:40:24 2009 +0200
@@ -201,8 +201,10 @@
 let whitespace = Str.regexp "[ \t\n]+"
 let make_addr_list address_string port =
   let addrlist = Str.split whitespace address_string in
-  let f s = Unix.ADDR_INET (Unix.inet_addr_of_string s, port) in
-  List.map ~f addrlist
+  let servname = if port = 0 then "" else (string_of_int port) in
+  let resolver host = List.map ~f:(fun ai -> ai.Unix.ai_addr)
+      (Unix.getaddrinfo host servname [Unix.AI_SOCKTYPE Unix.SOCK_STREAM]) in
+  List.flatten (List.map ~f:resolver addrlist)
 
 let recon_port = !Settings.recon_port 
 let recon_address = !Settings.recon_address
diff -r d351d05877dc -r c77aab222f08 sks.pod
--- a/sks.pod   Sun Aug 30 09:42:49 2009 +0200
+++ b/sks.pod   Sun Aug 30 17:40:24 2009 +0200
@@ -152,7 +152,7 @@
 
 =item -recon_address
 
-Set recon binding address.  Can be a list of whitespace separated IP addresses.
+Set recon binding addresses.  Can be a list of whitespace separated domain 
names.
 
 =item -hkp_port
 
@@ -160,7 +160,7 @@
 
 =item -hkp_address
 
-Set hkp binding address.  Can be a list of whitespace separated IP addresses.
+Set hkp binding addresses.  Can be a list of whitespace separated domain names.
 
 =item -use_port_80