diff options
Diffstat (limited to 'src/fbgui/main.cpp')
| -rw-r--r-- | src/fbgui/main.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp index d379c1e..c83dbdc 100644 --- a/src/fbgui/main.cpp +++ b/src/fbgui/main.cpp @@ -39,6 +39,8 @@ void printHelp() { << QObject::tr( "Specify location of the file containing the serial number.") << endl; + qout << "-x, --ssl " << QObject::tr( + "Enables SSL support.") << endl; qout << "-D <level>, --debug=<level> " << QObject::tr("Activate debug mode. [0,1]") << endl; qout << "-h, --help " @@ -92,7 +94,7 @@ int main(int argc, char *argv[]) { // parse command line arguments using getopt QMap<QString, QString> clOpts; int longIndex = 0; - static const char *optString = "c:u:d:s:t:D:hl:nS:p:e:"; + static const char *optString = "c:u:d:s:t:D:hl:nS:p:e:x"; static const struct option longOpts[] = { { "config", required_argument, NULL, 'c' }, { "url", required_argument, NULL, 'u' }, { "download", required_argument, NULL, 'd' }, { "serial", required_argument, NULL, @@ -102,7 +104,7 @@ int main(int argc, char *argv[]) { 'n' }, { "server", required_argument, NULL, 'S' }, { "autoup", no_argument, NULL, 'a' }, { "socketserverpath", required_argument, NULL, 'p' }, { "pathtoexe", - required_argument, NULL, 'e' } }; + "pathtoexe", required_argument, NULL, 'e' }, { "ssl", no_argument, NULL, 'x' } }; int opt = getopt_long(argc, argv, optString, longOpts, &longIndex); while (opt != -1) { switch (opt) { @@ -145,6 +147,9 @@ int main(int argc, char *argv[]) { case 'e': clOpts.insert("pathtoexe", optarg); break; + case 'x': + clOpts.insert("ssl", "ssl"); + break; } opt = getopt_long(argc, argv, optString, longOpts, &longIndex); } @@ -183,14 +188,28 @@ int main(int argc, char *argv[]) { QSettings confFileSettings(configFilePath, QSettings::IniFormat); confFileSettings.setIniCodec("UTF-8"); + // set SSL support + if (clOpts.contains("ssl")) + sslSupport = true; + else if (confFileSettings.contains("default/ssl_support")) + sslSupport = confFileSettings.value("default/ssl_support").toBool(); + else + sslSupport = DEFAULT_SSL_SUPPORT; + // set base URL to be loaded if (clOpts.contains("url")) baseURL = QUrl(clOpts.value("url")); - else if (confFileSettings.contains("default/pbs_url")) + else if (confFileSettings.contains("default/pbs_url")){ baseURL = confFileSettings.value("default/pbs_url").toUrl(); + } else baseURL = DEFAULT_URL; + if(sslSupport) + baseURL.setScheme("https"); + + + // set directory for downloads if (clOpts.contains("downloadDir")) downloadPath = clOpts.value("downloadDir"); @@ -280,6 +299,7 @@ int main(int argc, char *argv[]) { LOG4CXX_DEBUG(logger, "downloadDir : " << downloadPath); LOG4CXX_DEBUG(logger, "trigger: " << fileToTriggerURL); LOG4CXX_DEBUG(logger, "serialLocation: " << serialLocation); + LOG4CXX_DEBUG(logger, "ssl: " << sslSupport); if (clOpts.contains("nd") || confFileSettings.contains("default/nd")) { LOG4CXX_DEBUG(logger, "*******************************************"); LOG4CXX_DEBUG(logger, "Network Discovery activated:"); |