Merge pull request #2113 from drouhana/cli-refactor

testnet fixes

daemon/lokinet.cpp

@@ -419,6 +419,8 @@ namespace
         }
       }
 
+      opts.isSNode = options.router;
+
       if (options.generate)
       {
         options.configOnly = true;