/etc/scion/hosts and /etc/resolv.conf

README.md

@@ -261,8 +261,8 @@ attempt to get network information in the following order until it succeeds:
 - For debugging: Check for local topology file (if file name is given)
 - For debugging: Check for bootstrap server address (if address is given)
 - For debugging: Check for DNS NAPTR record (if record entry name is given)
-- Check search domain (as given in /etc/resolv.conf) for topology server 
 - Check for to daemon
+- Check search domain (as given in /etc/resolv.conf) for topology server
 
 The reason that the daemon is checked last is that it has a default setting (`localhost:30255`) 
 while the other options are skipped if no property or environment variable is defined. 

src/main/java/org/scion/ScionService.java

@@ -163,25 +163,27 @@ static ScionService defaultService() {
         return defaultService;
       }
 
-      // TODO try local daemon before trying discovery service
-      if (ScionUtil.getPropertyOrEnv(
-          PROPERTY_USE_OS_SEARCH_DOMAINS,
-          ENV_USE_OS_SEARCH_DOMAINS,
-          DEFAULT_USE_OS_SEARCH_DOMAINS)) {
-        String dnsResolver = DNSHelper.searchForDiscoveryService();
-        defaultService = new ScionService(dnsResolver, Mode.BOOTSTRAP_SERVER_IP);
-        return defaultService;
-      }
-
       // try daemon
       String daemon = ScionUtil.getPropertyOrEnv(PROPERTY_DAEMON, ENV_DAEMON, DEFAULT_DAEMON);
       try {
         defaultService = new ScionService(daemon, Mode.DAEMON);
         return defaultService;
       } catch (ScionRuntimeException e) {
-        throw new ScionRuntimeException(
-            "Could not connect to daemon, DNS or bootstrap resource.", e);
+        LOG.info(e.getMessage());
+        // Ignore!
+      }
+
+      // try normal network
+      if (ScionUtil.getPropertyOrEnv(
+              PROPERTY_USE_OS_SEARCH_DOMAINS,
+              ENV_USE_OS_SEARCH_DOMAINS,
+              DEFAULT_USE_OS_SEARCH_DOMAINS)) {
+        String dnsResolver = DNSHelper.searchForDiscoveryService();
+        defaultService = new ScionService(dnsResolver, Mode.BOOTSTRAP_SERVER_IP);
+        return defaultService;
       }
+      throw new ScionRuntimeException(
+              "Could not connect to daemon, DNS or bootstrap resource.");
     }
   }