moved socket from cli to conf

milter-sasl.json

@@ -1,3 +1,4 @@
 {
-  "key": "insert your AES key here"
+  "key": "insert your AES key here",
+  "socket": "inet:4242@localhost"
 }

src/Interface/MainClass.cpp

@@ -41,8 +41,6 @@ int MainClass::main()
     commandLineParser.addOption(&configOption);
     CommandLineOption decryptOption("decrypt", 'd', "Decrypt DATA and exit. Can be specified multiple times. Use - to read from stdin.", "DATA");
     commandLineParser.addOption(&decryptOption);
-    CommandLineOption socketOption("milter", 'm', "Launch milter and specify the socket to listen on (eg: inet:4242@localhost).", "SOCKET");
-    commandLineParser.addOption(&socketOption);
     CommandLineOption helpOption("help", 'h', "Show this help.");
     commandLineParser.addOption(&helpOption);
 
@@ -63,16 +61,14 @@ int MainClass::main()
         std::cerr << "Failed to read configuration file: " << strerror(configResult) << std::endl;
         return EX_NOINPUT;
     }
-    else if (socketOption.isSet())
-    {
-        return launchMilter(socketOption.getValue());
-    }
     else if (decryptOption.isSet())
     {
         return launchDecrypt(decryptOption.getValues());
     }
-
-    return commandLineParser.showHelp(EX_USAGE, true);
+    else
+    {
+        return launchMilter(_defaultSocket);
+    }
 }
 
 sfsistat MainClass::mlfiHeader(SMFICTX *ctx)
@@ -112,6 +108,7 @@ int MainClass::loadConfig(const std::string& filePath)
         Json::Value root;
         reader.parse(stream, root);
         _cryptoBusiness->setKey(root["key"].asString());
+        _defaultSocket = root["socket"].asString();
     }
     return errno;
 }

src/Interface/MainClass.h

@@ -38,6 +38,8 @@ private:
 
     std::shared_ptr<CryptoBusiness> _cryptoBusiness;
 
+    std::string _defaultSocket;
+
     static MainClass* _instance;
 
 };

tests/milter-sasl.json

@@ -1,3 +1,4 @@
 {
-  "key": "x%p~;mZ(A4FG]CDj"
+  "key": "x%p~;mZ(A4FG]CDj",
+  "socket": "inet:4242@localhost"
 }