ADD: output pinglog, test DNS and email ping.

[gigi.git] / src / org / cacert / gigi / ping / DNSPinger.java

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index 3dc9ac60a8b51d23e915f28997cf02c1a416e2e7..a611a239bc361d07380473a8105a00010a6ca1ec 100644 (file)
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -6,15 +6,18 @@ import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import org.cacert.gigi.Domain;
+import org.cacert.gigi.User;
+
 public class DNSPinger extends DomainPinger {
 
     @Override
-    public String ping(String domain, String expToken) {
+    public String ping(Domain domain, String expToken, User u) {
         try {
             String[] tokenParts = expToken.split(":", 2);
 
             Process p = Runtime.getRuntime().exec(new String[] {
-                    "dig", "+short", "NS", domain
+                    "dig", "+short", "NS", domain.getSuffix()
             });
             BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
             String line;
@@ -29,7 +32,7 @@ public class DNSPinger extends DomainPinger {
             nameservers:
             for (String NS : nameservers) {
                 String[] call = new String[] {
-                        "dig", "@" + NS, "+short", "TXT", "cacert-" + tokenParts[0] + "." + domain
+                        "dig", "@" + NS, "+short", "TXT", "cacert-" + tokenParts[0] + "." + domain.getSuffix()
                 };
                 System.out.println(Arrays.toString(call));
                 p = Runtime.getRuntime().exec(call);