Merge branch 'fix_dns_ipv4_ipv6'

luvit · Jun 12, 2012 · 4c3a883 · 4c3a883
2 parents b9e78d7 + 2f653ef
commit 4c3a883
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/lib/luvit/dns.lua b/lib/luvit/dns.lua
@@ -105,16 +105,22 @@ function dns.lookup(domain, family, callback)
   end)
 end
 
-function dns.isIp(ip)
-  return native.dnsIsIp(ip)
+function dns.isIP(ip)
+  print('dns.isIP is deprecated, use net.isIP')
+  local net = require('net')
+  return net.isIP(ip)
 end
 
-function dns.isIpV4(ip)
-  return native.dnsIsIpV4(ip)
+function dns.isIPv4(ip)
+  print('dns.isIPv4 is deprecated, use net.isIPv4')
+  local net = require('net')
+  return net.isIPv4(ip)
 end
 
-function dns.isIpV6(ip)
-  return native.dnsIsIpV6(ip)
+function dns.isIPv6(ip)
+  print('dns.isIPv6 is deprecated, use net.isIPv6')
+  local net = require('net')
+  return net.isIPv6(ip)
 end
 
 return dns
diff --git a/lib/luvit/net.lua b/lib/luvit/net.lua
@@ -16,6 +16,7 @@ limitations under the License.
 
 --]]
 
+local native = require('uv_native')
 local dns = require('dns')
 local Tcp = require('uv').Tcp
 local Timer = require('uv').Timer
@@ -374,4 +375,16 @@ net.createServer = function(connectionCallback)
   return Server:new(connectionCallback)
 end
 
+net.isIP = function(ip)
+  return native.dnsIsIp(ip)
+end
+
+net.isIPv4 = function(ip)
+  return native.dnsIsIpV4(ip)
+end
+
+net.isIPv6 = function(ip)
+  return native.dnsIsIpV6(ip)
+end
+
 return net
diff --git a/tests/test-dns.lua b/tests/test-dns.lua
@@ -19,6 +19,7 @@ limitations under the License.
 require("helper")
 
 local dns = require('dns')
+local net = require('net')
 
 dns.resolve4('www.google.com', function(err, addresses)
   assert(type(err) == 'nil')
@@ -106,10 +107,18 @@ dns.lookup('::1', function(err, ip, family)
   assert(type(family) == 'number')
 end)
 
-assert(dns.isIp('127.0.0.1') == 4)
-assert(dns.isIp('::1') == 6)
-assert(dns.isIp('bogus_ip') == 0)
-assert(dns.isIpV4('127.0.0.1') == 4)
-assert(dns.isIpV4('::1') == 0)
-assert(dns.isIpV6('127.0.0.1') == 0)
-assert(dns.isIpV6('::1') == 6)
+assert(net.isIP('127.0.0.1') == 4)
+assert(net.isIP('::1') == 6)
+assert(net.isIP('bogus_ip') == 0)
+assert(net.isIPv4('127.0.0.1') == 4)
+assert(net.isIPv4('::1') == 0)
+assert(net.isIPv6('127.0.0.1') == 0)
+assert(net.isIPv6('::1') == 6)
+
+assert(dns.isIP('127.0.0.1') == 4)
+assert(dns.isIP('::1') == 6)
+assert(dns.isIP('bogus_ip') == 0)
+assert(dns.isIPv4('127.0.0.1') == 4)
+assert(dns.isIPv4('::1') == 0)
+assert(dns.isIPv6('127.0.0.1') == 0)
+assert(dns.isIPv6('::1') == 6)