move pingUrl to FlexRouterTunnel, use correct port

bubble-server/src/main/java/bubble/model/device/FlexRouter.java

@@ -2,6 +2,7 @@ package bubble.model.device;
 
 import bubble.model.account.Account;
 import bubble.model.account.HasAccount;
+import bubble.service.device.FlexRouterTunnel;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -85,7 +86,6 @@ public class FlexRouter extends IdentifiableBase implements HasAccount {
     @Transient @Getter @Setter private String auth_token;
     public boolean hasAuthToken () { return !empty(auth_token); }
 
-    public String pingUrl() { return "http://" + localTunnelAddr(getIp()) + ":" + getPort() + "/ping"; }
     public FlexRouterPing pingObject() { return new FlexRouterPing(this); }
 
 }

bubble-server/src/main/java/bubble/service/device/FlexRouterTunnel.java

@@ -68,4 +68,8 @@ public class FlexRouterTunnel {
         return "127" + ip.substring(firstDot);
     }
 
+    public static String tunnelPingUrl(FlexRouter router) {
+        return "http://" + localTunnelAddr(router.getIp()) + ":" + TUNNEL_PORT + "/ping";
+    }
+
 }

bubble-server/src/main/java/bubble/service/device/StandardFlexRouterService.java

@@ -24,8 +24,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
 import static bubble.model.device.FlexRouterPing.MAX_PING_AGE;
-import static bubble.service.device.FlexRouterTunnel.startFlexTunnel;
-import static bubble.service.device.FlexRouterTunnel.stopFlexTunnel;
+import static bubble.service.device.FlexRouterTunnel.*;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.cobbzilla.util.daemon.Await.awaitAll;
@@ -109,7 +108,7 @@ public class StandardFlexRouterService extends SimpleDaemon implements FlexRoute
     }
 
     public static boolean pingFlexRouter(FlexRouter router, FlexRouterDAO flexRouterDAO, HttpClient httpClient) {
-        final String pingUrl = router.pingUrl();
+        final String pingUrl = tunnelPingUrl(router);
         final HttpRequestBean request = new HttpRequestBean(POST, pingUrl);
         final String prefix = "pingRouter(" + router + "): ";
         for (int i=0; i<MAX_PING_TRIES; i++) {