get rr ip

Author: jperon

ipparse/l3/ip6.moon

@@ -1,12 +1,13 @@
 subclass = require"ipparse".subclass
 IP = require"ipparse.l3.ip"
+Net6 = require"ipparse.l3.ipcalc".Net6
 range = require"ipparse.fun".range
 :concat = table
 
 subclass IP, {
   __name: "IP6"
 
-  get_ip_at: (off) => concat range(off, off+14, 2)\map((i) -> "%x"\format @short i)\toarray!, ":"
+  get_ip_at: (off) => Net6(concat range(off, off+14, 2)\map((i) -> "%x"\format @short i)\toarray!, ":")\ip!
 
   is_fragment: ->  -- TODO: IPv6 defragmentation
 

ipparse/l3/ipcalc.moon

@@ -8,7 +8,8 @@ range, wrap = do
 local Net, Net4, Net6
 
 Net4 = do
-  __tostring = => concat(range(4)\map((i) -> @[i])\toarray!, ".") .. "/#{@mask}"
+  ip4 = => concat range(4)\map((i) -> @[i])\toarray!, "."
+  __tostring = => ip4(@) .. "/#{@mask}"
   mt =
     __index: (k) => @bits >> 8*(4-k) & (1<<8)-1
     __le: (o) =>
@@ -21,19 +22,20 @@ Net4 = do
     mask = tonumber(mask) or 32
     bits = wrap(@gmatch"[^%.]+")\imap((i) => tonumber(@) << 8*(4-i))\reduce (a, b) -> a + b
     bits = bits >> (32-mask) << (32-mask)
-    setmetatable {:bits, :mask, v: 4}, mt
+    setmetatable {:bits, :mask, v: 4, ip: ip4}, mt
 
 
 Net6 = do  -- 128 bits and IPv6 representation make it a bit more complex
-  __repr = =>
+  ip6 = =>
     s = concat range(8)\map((i) -> "%x"\format(@[i]))\toarray!, ":"
     for n = 8, 1, -1
       zeros = ":" .. concat range(n)\map(-> "0")\toarray!, ":"
       s, r = s\gsub zeros, "::", 1
       if r > 0
         s = s\gsub(":::*", "::")\gsub("^0::", "::")\gsub "^::0$", "::"
         break
-    "#{s}/#{@mask}"
+    s
+  __repr = => ip6(@) .. "/#{@mask}"
   mt =
     __index: (k) =>
       @bits[(k-1)//4+1] >> 16*((8-k)%4) & (1<<16)-1
@@ -44,8 +46,8 @@ Net6 = do  -- 128 bits and IPv6 representation make it a bit more complex
       return false if o.mask >= 64 and @bits[1] ~= o.bits[1]
       return false if o.mask < 64 and (@bits[1] >> (64-o.mask) << (64-o.mask)) ~= o.bits[1]
       (@bits[2] >> (128-o.mask) << (128-o.mask)) == o.bits[2]
-    __tostring: __repr, :__repr
-  Net6 = =>
+    __tostring: __repr, :__repr, ip: ip6
+  =>
     @, mask = @match"([^/]*)/?([^/]*)$"
     mask = tonumber(mask) or 128
     address = wrap(@gmatch"([^:]*):?")\toarray!
@@ -68,7 +70,7 @@ Net6 = do  -- 128 bits and IPv6 representation make it a bit more complex
     if mask < 64
       bits[1] = bits[1] >> (64-mask) << (64-mask)
     bits[2] = bits[2] >> (128-mask) << (128-mask)
-    setmetatable {:bits, :mask, v: 6}, mt
+    setmetatable {:bits, :mask, v: 6, ip: ip6}, mt
 
 
 Net = => @match":" and Net6(@) or Net4(@)

ipparse/l7/dns/init.moon

@@ -4,27 +4,13 @@ subclass, Packet = do
 Question = require"ipparse.l7.dns.question"
 RR = require"ipparse.l7.dns.rr"
 
-bidirectional = =>
-  @[@[i]] = i for i = 1, #@
-  @
-
 local DNS
 DNS = subclass Packet, {
   __name: "DNS"
 
   iana_port: 53
 
-  types: bidirectional {
-      "A", "NS", "MD", "MF", "CNAME", "SOA", "MB", "MG", "MR", "NULL",
-      "WKS", "PTR", "HINFO", "MINFO", "MX", "TXT", "RP", "AFSDB", "X25", "ISDN",
-      "RT", "NSAP", "NSAP-PTR", "SIG", "KEY", "PX", "GPOS", "AAAA", "LOC", "NXT",
-      "EID", "NIMLOC", "SRV", "ATMA", "NAPTR", "KX", "CERT", "A6", "DNAME", "SINK",
-      "OPT", "APL", "DS", "SSHFP", "IPSECKEY", "RRSIG", "NSEC", "DNSKEY", "DHCID", "NSEC3",
-      "NSEC3PARAM", "TLSA", "SMIMEA", "HIP", "NINFO", "RKEY", "TALINK", "CDS", "CDNSKEY", "OPENPGPKEY",
-      "CSYNC", "ZONEMD", "SVCB", "HTTPS", "SPF", "EUI48", "EUI64", "TKEY", "TSIG", "IXFR",
-      "AXFR", "MAILB", "MAILA", "ANY", "URI", "CAA", "AVC", "DOA", "AMTRELAY", "TA",
-      "DLV"
-    }
+  types: require"ipparse.l7.dns.types"
 
   _get_id: => @short 0
 

ipparse/l7/dns/rr.moon

@@ -4,6 +4,10 @@ subclass, Packet = do
 map, range = do
   _ = require"ipparse.fun"
   _.map, _.range
+Net6 = require"ipparse.l3.ipcalc".Net6
+A, AAAA = do
+  _ = require"ipparse.l7.dns.types"
+  _.A, _.AAAA
 concat = table.concat
 
 subclass Packet, {
@@ -48,10 +52,28 @@ subclass Packet, {
 
   _get_rdlength: => @short @type_offset+8
 
-  _get_rdata: => range(0, @rdlength-1)\map((off) -> @byte @type_offset+10+off)\toarray!
+  _get_rdoff: => @type_offset + 10
+
+  _get_rdata: =>
+    rdoff = @rdoff
+    range(rdoff, rdoff+@rdlength-1)\map((off) -> @byte off)\toarray!
 
   _get_name: => concat @labels, "."
 
   _get_length: => @type_offset + 10 + @rdlength
+
+  _get_ip4: => concat @rdata, "."
+
+  _get_ip6: =>
+    return nil if @rdlength ~= 16
+    rdoff = @rdoff
+    Net6(concat range(rdoff, rdoff+14, 2)\map((i) -> "%.4x"\format @short i)\toarray!, ":")\ip!
+
+  _get_ip: =>
+    switch @type
+      when AAAA
+        @ip6
+      when A
+        @ip4
 }
 

ipparse/l7/dns/types.moon

@@ -0,0 +1,16 @@
+bidirectional = =>
+  @[@[i]] = i for i = 1, #@
+  @
+
+bidirectional {
+  "A", "NS", "MD", "MF", "CNAME", "SOA", "MB", "MG", "MR", "NULL",
+  "WKS", "PTR", "HINFO", "MINFO", "MX", "TXT", "RP", "AFSDB", "X25", "ISDN",
+  "RT", "NSAP", "NSAP-PTR", "SIG", "KEY", "PX", "GPOS", "AAAA", "LOC", "NXT",
+  "EID", "NIMLOC", "SRV", "ATMA", "NAPTR", "KX", "CERT", "A6", "DNAME", "SINK",
+  "OPT", "APL", "DS", "SSHFP", "IPSECKEY", "RRSIG", "NSEC", "DNSKEY", "DHCID", "NSEC3",
+  "NSEC3PARAM", "TLSA", "SMIMEA", "HIP", "NINFO", "RKEY", "TALINK", "CDS", "CDNSKEY", "OPENPGPKEY",
+  "CSYNC", "ZONEMD", "SVCB", "HTTPS", "SPF", "EUI48", "EUI64", "TKEY", "TSIG", "IXFR",
+  "AXFR", "MAILB", "MAILA", "ANY", "URI", "CAA", "AVC", "DOA", "AMTRELAY", "TA",
+  "DLV"
+}
+

moontastik_lua/ipparse/install.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+NAME=ipparse
+LUA_MODULE_DIR=/lib/modules/lua
+
+mkdir ${LUA_MODULE_DIR}/${NAME} || true
+find . -name \*.lua -exec install -vDm 644 {} ${LUA_MODULE_DIR}/${NAME}/{} \;
+