X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FSSLPinger.java;h=81c739372ca4a2925b2c852f9be92b263d5c9255;hb=44420bae8ce64dc0e03427bdd821c89fc24cd18b;hp=ccb05b84a218761293a76b6ea5ce26a383e41858;hpb=50c8c66dc1d3245e8eaedf17e273f8c0522f1435;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java
index ccb05b84..81c73937 100644
--- a/src/org/cacert/gigi/ping/SSLPinger.java
+++ b/src/org/cacert/gigi/ping/SSLPinger.java
@@ -20,6 +20,9 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLParameters;
 import javax.security.cert.X509Certificate;
 
+import org.cacert.gigi.Domain;
+import org.cacert.gigi.User;
+
 public class SSLPinger extends DomainPinger {
 
     public static final String[] TYPES = new String[] {
@@ -27,18 +30,18 @@ public class SSLPinger extends DomainPinger {
     };
 
     @Override
-    public String ping(String domain, String configuration) {
+    public String ping(Domain domain, String configuration, User u) {
         try {
             SocketChannel sch = SocketChannel.open();
             String[] parts = configuration.split(":", 2);
-            sch.connect(new InetSocketAddress(domain, Integer.parseInt(parts[0])));
+            sch.connect(new InetSocketAddress(domain.getSuffix(), Integer.parseInt(parts[0])));
             if (parts.length == 2) {
                 switch (parts[1]) {
                 case "xmpp":
-                    startXMPP(sch, false, domain);
+                    startXMPP(sch, false, domain.getSuffix());
                     break;
                 case "server-xmpp":
-                    startXMPP(sch, true, domain);
+                    startXMPP(sch, true, domain.getSuffix());
                     break;
                 case "smtp":
                     startSMTP(sch);
@@ -49,7 +52,7 @@ public class SSLPinger extends DomainPinger {
 
                 }
             }
-            return test(sch, domain);
+            return test(sch, domain.getSuffix());
         } catch (IOException e) {
             return "Connecton failed";
         }