fixes to be able to read the source ip

dns-server/dns-server.dylan

@@ -5,8 +5,11 @@ define class <dns-server> (<filter>)
 end;
 
 define method push-data-aux
-    (input :: <push-input>, node :: <dns-server>, data :: <dns-frame>) => ()
+    (input :: <push-input>, dns :: <dns-server>, data :: <dns-frame>) => ()
   //dbg("received %=\n", data);
+  let remote-ip-c = dns.the-output.connected-input.node.reply-addr;
+  let remote-ip = make(<ipv4-network-order-address>,
+                       address: remote-ip-c);
   if (data.query-or-response == #"query" &
         data.question-count == 1)
     let question = data.questions.first;
@@ -16,13 +19,13 @@ define method push-data-aux
 
     //TODO: check authority!
 
-    dbg("question: ?%s%s\n", dns-query-entry(question.question-type), que);
-    let answers = choose(rcurry(entry-matches?, type, que), node.zone.entries);
+    dbg("%s ?%s%s\n", as(<string>, remote-ip), dns-query-entry(question.question-type), que);
+    let answers = choose(rcurry(entry-matches?, type, que), dns.zone.entries);
 
     dbg("answers: %d\n", answers.size);
-    for (x in answers, i from 0)
-      dbg("answer %d: %=\n", i, x);
-    end;
+    //for (x in answers, i from 0)
+    //  dbg("answer %d: %=\n", i, x);
+    //end;
 
     let d1 = as(<domain-name>, que);
     let quest = dns-question(domainname: d1,
@@ -40,7 +43,7 @@ define method push-data-aux
                         answers: frs);
     quest.parent := res;
     do(method(x) x.parent := res end, frs);
-    push-data(node.the-output, res);
+    push-data(dns.the-output, res);
   else
     format-out("not a question or multiple.\n")
   end;

dns-server/library.dylan

@@ -10,6 +10,7 @@ define library dns-server
   use socket-flow;
   use system;
   use command-line-parser;
+  use network;
 end library;
 
 define module dns-server
@@ -29,4 +30,5 @@ define module dns-server
   use standard-io, import: { *standard-output* };
   use command-line-parser;
   use simple-random;
+  use sockets, import: { <ipv4-network-order-address> };
 end module;

dns-server/zone-reader.dylan

@@ -34,9 +34,9 @@ end;
 define function domain-name-matches? (domain-name :: <string>, question :: <string>) => (res :: <boolean>)
   //dbg("comparing %s with %s\n", domain-name, question);
   if (domain-name[0] == '*')
-    copy-sequence(domain-name, start: 2) = join(copy-sequence(split(question, "."), start: 1), ".");
+    as-lowercase(copy-sequence(domain-name, start: 2)) = as-lowercase(join(copy-sequence(split(question, "."), start: 1), "."));
   else
-    domain-name = question
+    as-lowercase(domain-name) = as-lowercase(question)
   end
 end;
 

socket-flow/library-unix.dylan

@@ -24,5 +24,5 @@ define module socket-flow
   use sockets, import: { interruptible-system-call };
   use dylan-direct-c-ffi;
 
-  export <flow-socket>;
+  export <flow-socket>, reply-addr, reply-port;
 end module;