merge branch into master

This commit is contained in:
xueyan hu
2021-12-28 10:43:59 +08:00
parent 3c56b33156
commit fff9034e0e
8 changed files with 37 additions and 7 deletions

View File

@@ -67,7 +67,7 @@ bool NetworkManager::restart(QString& err_info)
QProcess* myProcess = new QProcess;
QString inface = JsonObject::Instance()->interfaceName();
QString pwd = JsonObject::Instance()->passWord();
QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface);
QString cmd = QString("echo %1 | sudo -S rcnetwork restart %2").arg(pwd).arg(inface);
QStringList args;
args << "-c" << cmd;
connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater()));
@@ -206,6 +206,32 @@ bool NetworkManager::setDefaultGateway(const QString& gw, QString& err_info)
}
bool NetworkManager::checkPassWord(const QString &pwd,QString& err_info)
{
QProcess* myProcess = new QProcess;
//QString pwd = JsonObject::Instance()->passWord();
QString cmd = QString("echo %1 | sudo -S -k whoami").arg(pwd);
QStringList args;
args << "-c" << cmd;
connect(myProcess, SIGNAL(finished(int)), myProcess, SLOT(deleteLater()));
//qDebug()<<args;
myProcess->start("/bin/sh", args);
if (!myProcess->waitForFinished()) {
err_info.append("failed...\n");
return false;
}
if (myProcess->exitCode() == 0) {
err_info.append("success...\n");
return true;
}
else {
err_info.append(myProcess->readAllStandardError());
return false;
}
}
bool NetworkManager::setIpRouteList(const QList<QStringList>& list, QString& err_info)
{