make the powerdns-luabackend.lua example script somewhat more functional with 4.0

diff --git a/modules/luabackend/test/powerdns-luabackend.lua b/modules/luabackend/test/powerdns-luabackend.lua
index 6ee9d94f31914c7ca3b558a75ebdcd82b8420acc..586dbbd18641186b257c26021e9d1d326f7eee7d 100644 (file)
--- a/modules/luabackend/test/powerdns-luabackend.lua
+++ b/modules/luabackend/test/powerdns-luabackend.lua
@@ -5,6 +5,7 @@ local pairs = pairs
 local type = type
 
 local log_error = log_error
+local log_debug = log_debug
 local dnspacket = dnspacket
 
 
@@ -13,33 +14,35 @@ local domains_name = {}
 local records = {}
 
 
-domains_name["test.com"] = {domain_id = 11, name = "test.com", type = "NATIVE", soa = { hostmaster = "ahu.test.com", nameserver = "ns1.test.com", serial = 2005092501, refresh = 28800, retry = 7200, expire = 604800, default_ttl = 86400, ttl = 3600 } }
-domains_id["11"] = domains_name["test.com"] 
+domains_name["test.com."] = {domain_id = 11, name = "test.com.", type = "NATIVE", soa = { hostmaster = "ahu.test.com.", nameserver = "ns1.test.com.", serial = 2005092501, refresh = 28800, retry = 7200, expire = 604800, default_ttl = 86400, ttl = 3600 } }
+domains_id["11"] = domains_name["test.com."]
 
 
-records["test.com"] = { 
-    {domain_id = 11, name = "test.com", type = "NS", ttl = 120, content = "ns1.test.com"},
-    {domain_id = 11, name = "test.com", type = "NS", ttl = 120, content = "ns2.test.com"},
+records["test.com."] = { 
+    {domain_id = 11, name = "test.com.", type = "SOA", ttl = 36000, content = "ns1.test.com. ahu.test.com. 2005092501 7200 3600 1209600 3600"},
+    {domain_id = 11, name = "test.com.", type = "NS", ttl = 120, content = "ns1.test.com."},
+    {domain_id = 11, name = "test.com.", type = "NS", ttl = 120, content = "ns2.test.com."},
 }
-records["ns1.test.com"] = {
-    {domain_id = 11, name = "ns1.test.com", type = "A", ttl = 120, content = "10.11.12.14"},
-    {domain_id = 11, name = "ns1.test.com", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:9"}
+records["ns1.test.com."] = {
+    {domain_id = 11, name = "ns1.test.com.", type = "A", ttl = 120, content = "10.11.12.14"},
+    {domain_id = 11, name = "ns1.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:9"}
 }
-records["ns2.test.com"] = {
-    {domain_id = 11, name = "ns2.test.com", type = "A", ttl = 120, content = "10.11.12.15"},
-    {domain_id = 11, name = "ns2.test.com", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:10"}
+records["ns2.test.com."] = {
+    {domain_id = 11, name = "ns2.test.com.", type = "A", ttl = 120, content = "10.11.12.15"},
+    {domain_id = 11, name = "ns2.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:10"}
 }
 
-records["www.test.com"] = { {domain_id = 11, name = "www.test.com", type = "CNAME", ttl = 120, content = "host.test.com"} }
-records["host.test.com"] = {
-    {domain_id = 11, name = "host.test.com", type = "A", ttl = 120, content = "10.11.12.13"},
-    {domain_id = 11, name = "host.test.com", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:8"}
+records["www.test.com."] = {
+    {domain_id = 11, name = "www.test.com.", type = "CNAME", ttl = 120, content = "host.test.com."} }
+records["host.test.com."] = {
+    {domain_id = 11, name = "host.test.com.", type = "A", ttl = 120, content = "10.11.12.13"},
+    {domain_id = 11, name = "host.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:8"}
 }
 
 
 
 function list(target, domain_id)
-    logger(log_error, "(l_list)", "target:", target, " domain_id:", domain_id )
+    logger(log_debug, "(l_list)", "target:", target, " domain_id:", domain_id )
     
     return false
 end
@@ -48,7 +51,7 @@ local size, c, r, n, nn, q_type, q_name, domainid
 local remote_ip, remote_port, local_ip
 
 function lookup(qtype, qname, domain_id)
---    logger(log_error, "(l_lookup)", "qtype:", qtype, " qname:", qname, " domain_id:", domain_id )
+    logger(log_debug, "(l_lookup)", "qtype:", qtype, " qname:", qname, " domain_id:", domain_id )
     q_type = qtype
     q_name = qname
     domainid = domain_id
@@ -58,55 +61,55 @@ function lookup(qtype, qname, domain_id)
     c = 0
     size = 0
 
-    remote_ip, remote_port, local_ip = dnspacket()
---    logger(log_error, "(l_lookup) dnspacket", "remote:", remote_ip, " port:", remote_port, " local:", local_ip)
+    -- remote_ip, remote_port, local_ip = dnspacket()
+    -- logger(log_debug, "(l_lookup) dnspacket", "remote:", remote_ip, " port:", remote_port, " local:", local_ip)
 
     if type(r) == "table" then
        size = #r
     end
---    logger(log_error, "(l_lookup)", "size:", size)
+    logger(log_debug, "(l_lookup)", "size:", size)
 end
 
 function get()
---    logger(log_error, "(l_get) BEGIN")
+    logger(log_debug, "(l_get) begin")
 
     while c < size do
        c = c + 1
        if (q_type == "ANY" or q_type == r[c]["type"]) then 
---         for kk,vv in pairs(r[c]) do
---             logger(log_error, kk, type(vv), vv)
---         end
+           for kk,vv in pairs(r[c]) do
+               logger(log_debug, "(l_get) ", kk, type(vv), vv)
+           end
+            logger(log_debug, "(l_get) end: success")
            return r[c]
        end
     end
 
---    logger(log_error, "(l_get) END")
+    logger(log_debug, "(l_get) end: not found")
     return false
 end
 
 local k,v,kk,vv
 
 function getsoa(name)
---    logger(log_error, "(l_getsoa) BEGIN", "name:", name)
+    logger(log_debug, "(l_getsoa) begin", "name:", name)
 
     r = domains_name[name]
     if type(r) == "table" then
---     logger(log_error, type(r), type(r["soa"]))
+       logger(log_debug, "(l_getsoa) end: ", type(r), type(r["soa"]))
        return r["soa"] 
     end
     
---    logger(log_error, "(l_getsoa) END NOT FOUND")
+    logger(log_debug, "(l_getsoa) end: not found")
 end
 
-logger(log_error, "powerdns-luabackend starting up!")
+logger(log_debug, "the powerdns-luabackend is starting up!")
 
+--for k,v in pairs(QTypes) do
+--    logger(log_debug, k, v)
+--end
 
-for k,v in pairs(QTypes) do
---    logger(log_error, k, v)
-end
-
-for k,v in pairs(records) do
-    for kk,vv in pairs(v) do
---     logger(log_error, kk, type(vv), vv["type"])
-    end
-end
+--for k,v in pairs(records) do
+--    for kk,vv in pairs(v) do
+--     logger(log_debug, kk, type(vv), vv["type"])
+--    end
+--end