Merge pull request #5 from Menduist/master

Add AAAA support & update nimble package structure

dnsclient.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.0.3"
+version       = "0.1.0"
 author        = "Huy Doan"
 description   = "Simple DNS Client & Library"
 license       = "MIT"
@@ -9,6 +9,7 @@ installExt    = @["nim"]
 bin           = @["dnsclient"]
 
 
+
 # Dependencies
 
 requires "nim >= 0.20.0"

src/dnsclient.nim

@@ -3,7 +3,7 @@
 # Simple DNS client
 
 import strutils, streams, net, nativesockets, endians
-import private/[protocol, records, types]
+import dnsclientpkg/[protocol, records, types]
 
 export records, types, TimeoutError
 

src/private/protocol.nim → src/dnsclientpkg/protocol.nim

@@ -118,6 +118,8 @@ proc parseRR(data: StringStream): ResourceRecord =
   case kind
   of A:
     result = ARecord(name: name, kind: kind)
+  of AAAA:
+    result = AAAARecord(name: name, kind: kind)
   of CNAME:
     result = CNAMERecord(name: name, kind: kind)
   of HINFO:

src/dnsclientpkg/records.nim

@@ -0,0 +1,3 @@
+import streams, strutils, types, utils
+
+include records/[a, aaaa, cname, hinfo, mb, minfo, mr, mx, ns, ptrr, soa, srv, txt]

src/dnsclientpkg/records/aaaa.nim

@@ -0,0 +1,8 @@
+type AAAARecord* = ref object of ResourceRecord
+  address_v6*: array[16, uint8]
+
+method toString*(r: AAAARecord): string = ipv6ToString(r.address_v6)
+
+method parse*(r: AAAARecord, data: StringStream) =
+  for i in 0..<16:
+    r.address_v6[i] = data.readUInt8()

src/private/utils.nim → src/dnsclientpkg/utils.nim

@@ -52,3 +52,10 @@ proc getName*(data: StringStream): string =
 proc ipv4ToString*(ip: int32): string =
   let arr = cast[array[4, uint8]](ip)
   arr.join(".")
+
+proc ipv6ToString*(ip6: array[16, uint8]): string =
+  for i in 0..<8:
+    result &= ":"
+    result &= ip6[i * 2].toHex()
+    result &= ip6[i * 2 + 1].toHex()
+  result.removePrefix(":")

tests/test1.nim

@@ -15,6 +15,12 @@ test "query A":
   let rr = ARecord(resp.answers[0])
   assert rr.toString() == "8.8.8.8"
 
+test "query AAAA":
+  let resp = client.sendQuery("google.fr", AAAA)
+  assert resp.answers[0].kind == AAAA
+  let rr = AAAARecord(resp.answers[0])
+  #assert rr.toString() == "0000:0000:0000:0000:0000:0000:0000:0001" ??
+
 test "query TXT":
   let resp = client.sendQuery("txt.example.huy.im", TXT)
   assert resp.answers[0].kind == TXT
@@ -41,4 +47,4 @@ test "query SRV":
   assert rr.priority == 10
   assert rr.weight == 15
   assert rr.port == 25
-  assert rr.target == "smtp.yandex.ru"
+  assert rr.target == "smtp.yandex.ru"