refactor(settings): do not read address from old settings

src/lib/server/Config.cpp

@@ -471,6 +471,17 @@ void Config::readSectionOptions(ConfigReadContext &s)
   addOption("", kOptionClipboardSharing, Settings::value(Settings::Server::EnableClipboard).toBool());
   addOption("", kOptionClipboardSharingSize, Settings::value(Settings::Server::ClipboardSize).toUInt() * 1024);
 
+  if (const auto address = Settings::value(Settings::Core::Interface).toString(); !address.isEmpty()) {
+    m_deskflowAddress = NetworkAddress(address.toStdString(), Settings::value(Settings::Core::Port).toInt());
+  } else {
+    m_deskflowAddress = NetworkAddress(Settings::value(Settings::Core::Port).toInt());
+  }
+  try {
+    m_deskflowAddress.resolve();
+  } catch (SocketAddressException &e) {
+    throw ServerConfigReadException(s, std::string("invalid address argument ") + e.what());
+  }
+
   std::string line;
   while (s.readLine(line)) {
     // check for end of section
@@ -491,28 +502,9 @@ void Config::readSectionOptions(ConfigReadContext &s)
     ++i;
     s.parseNameWithArgs("value", line, ",;\n", i, value, valueArgs);
 
-    bool handled = true;
-
     if (m_oldNames.contains(name))
       continue;
 
-    if (name == "address") {
-      try {
-        m_deskflowAddress = NetworkAddress(value, kDefaultPort);
-        m_deskflowAddress.resolve();
-      } catch (SocketAddressException &e) {
-        throw ServerConfigReadException(s, std::string("invalid address argument ") + e.what());
-      }
-    } else {
-      handled = false;
-    }
-
-    if (handled) {
-      // make sure handled options aren't followed by more values
-      if (i < line.size() && (line[i] == ',' || line[i] == ';')) {
-        throw ServerConfigReadException(s, std::string("too many arguments for: ").append(name));
-      }
-    } else {
     // make filter rule
     InputFilter::Rule rule(parseCondition(s, name, nameArgs));
 
@@ -549,8 +541,6 @@ void Config::readSectionOptions(ConfigReadContext &s)
     // add rule
     m_inputFilter.addFilterRule(rule);
   }
-  }
-
   throw ServerConfigReadException(s, "unexpected end of options section");
 }
 

src/lib/server/Config.h

@@ -432,7 +432,8 @@ private:
       QStringLiteral("relativeMouseMoves"),
       QStringLiteral("win32KeepForeground"),
       QStringLiteral("disableLockToScreen"),
-      QStringLiteral("defaultLockToScreenState")
+      QStringLiteral("defaultLockToScreenState"),
+      QStringLiteral("address")
   };
 };