net.adns: Some cleanup, happens to also make it compatible with libevent

diff --git a/net/adns.lua b/net/adns.lua
index c9cb9476a17eea1af38b4b3f084bfee4ac23398a..d6beffbbedca121f9ac7234b5be83857e1c3845f 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -43,33 +43,32 @@ function cancel(handle, call_handler)
 end
 
 function new_async_socket(sock, resolver)
-       local newconn, peername = {}, "<unknown>";
+       local peername = "<unknown>";
        local listener = {};
+       local handler = {};
        function listener.onincoming(conn, data)
-               dns.feed(sock, data);
+               dns.feed(handler, data);
        end
        function listener.ondisconnect(conn, err)
                log("warn", "DNS socket for %s disconnected: %s", peername, err);
                local servers = resolver.server;
-               if resolver.socketset[newconn.handler] == resolver.best_server and resolver.best_server == #servers then
+               if resolver.socketset[conn] == resolver.best_server and resolver.best_server == #servers then
                        log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]);
                end
                
                resolver:servfail(conn); -- Let the magic commence
        end
-       newconn.handler, newconn._socket = server.wrapclient(sock, "dns", 53, listener);
-       if not newconn.handler then
+       handler = server.wrapclient(sock, "dns", 53, listener);
+       if not handler then
                log("warn", "handler is nil");
        end
-       if not newconn._socket then
-               log("warn", "socket is nil");
-       end
-       newconn.handler.settimeout = function () end
-       newconn.handler.setsockname = function (_, ...) return sock:setsockname(...); end
-       newconn.handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _.setsend(sock.send); return ret; end
-       newconn.handler.connect = function (_, ...) return sock:connect(...) end        
-       newconn.handler.send = function (_, data) _.write(_, data); return _.sendbuffer(); end  
-       return newconn.handler;
+       
+       handler.settimeout = function () end
+       handler.setsockname = function (_, ...) return sock:setsockname(...); end
+       handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _:set_send(sock.send); return ret; end
+       handler.connect = function (_, ...) return sock:connect(...) end        
+       handler.send = function (_, data) _:write(data);  return _.sendbuffer and _.sendbuffer(); end   
+       return handler;
 end
 
 dns:socket_wrapper_set(new_async_socket);