diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index 44fae30..6f59ce2 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -93,10 +93,9 @@ QString Netctl::getCmdOutput(const QString cmd) TaskResult process = runTask(cmd); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; - if (process.exitCode != 0) - if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; + if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; - return QTextCodec::codecForMib(106)->toUnicode(process.output); + return QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed(); } @@ -114,15 +113,15 @@ void Netctl::readConfiguration() QSettings settings(fileName, QSettings::IniFormat); settings.beginGroup(QString("Netctl commands")); - configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("/usr/bin/netctl")).toString(); - configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto")).toString(); + configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("/usr/bin/netctl")); + configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto")); settings.endGroup(); settings.beginGroup(QString("External IP")); - configuration[QString("EXTIP4")] = settings.value(QString("EXTIP4"), QString("false")).toString(); - configuration[QString("EXTIP4CMD")] = settings.value(QString("EXTIP4CMD"), QString("curl ip4.telize.com")).toString(); - configuration[QString("EXTIP6")] = settings.value(QString("EXTIP6"), QString("false")).toString(); - configuration[QString("EXTIP6CMD")] = settings.value(QString("EXTIP6CMD"), QString("curl ip6.telize.com")).toString(); + configuration[QString("EXTIP4")] = settings.value(QString("EXTIP4"), QString("false")); + configuration[QString("EXTIP4CMD")] = settings.value(QString("EXTIP4CMD"), QString("curl ip4.telize.com")); + configuration[QString("EXTIP6")] = settings.value(QString("EXTIP6"), QString("false")); + configuration[QString("EXTIP6CMD")] = settings.value(QString("EXTIP6CMD"), QString("curl ip6.telize.com")); settings.endGroup(); } @@ -141,10 +140,7 @@ QString Netctl::getExtIp(const QString cmd) if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd; - // test network connection - if (!isNetworkActive()) return QString("N\\A"); - - return getCmdOutput(cmd).trimmed(); + return getCmdOutput(cmd); } @@ -202,9 +198,9 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet if (debug) qDebug() << PDEBUG; netctlAutoStatus = true; - QString output = getCmdOutput(QString("%1 list").arg(cmdNetctlAuto)).trimmed(); + QString output = getCmdOutput(QString("%1 list").arg(cmdNetctlAuto)); if (output.isEmpty()) { - output = getCmdOutput(QString("%1 list").arg(cmdNetctl)).trimmed(); + output = getCmdOutput(QString("%1 list").arg(cmdNetctl)); netctlAutoStatus = false; } @@ -212,14 +208,10 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet QStringList currentProfiles; QStringList profileList = output.split(QChar('\n')); for (int i=0; i configuration; + QVariantMap configuration; QString getCmdOutput(const QString cmd); void readConfiguration(); };