summaryrefslogtreecommitdiffstats
path: root/src/fbgui/networkdiscovery.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/fbgui/networkdiscovery.cpp')
-rw-r--r--src/fbgui/networkdiscovery.cpp147
1 files changed, 73 insertions, 74 deletions
diff --git a/src/fbgui/networkdiscovery.cpp b/src/fbgui/networkdiscovery.cpp
index 132429c..a347adb 100644
--- a/src/fbgui/networkdiscovery.cpp
+++ b/src/fbgui/networkdiscovery.cpp
@@ -16,6 +16,13 @@
#include "networkdiscovery.h"
+#include <log4cxx/logger.h>
+#include "qlog4cxx.h"
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+LoggerPtr ndcLogger(Logger::getLogger("fbgui.nd.core"));
+
@@ -109,8 +116,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
emit updateStatus("try to create server socket");
if (!_server->listen(serverPath)) {
// emit signal to the gui that a critial error occoured
- qxtLog->debug() << _tag << " Unable to start server: "
- << _server->errorString();
+ LOG4CXX_DEBUG(ndcLogger, _tag << " Unable to start server: " << _server->errorString());
emit
abortBoot("Unable to start server: " + _server->errorString());
return;
@@ -122,8 +128,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
emit updateStatus("check if cdhcpcd is available");
QFileInfo fInfo(_pathToDhcpcdExe);
if (!fInfo.exists()) {
- qxtLog->debug() << _tag
- << " could not find customdhcpcd exe. Please check the path to this file.";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " could not find customdhcpcd exe. Please check the path to this file.");
emit abortBoot(
"could not find customdhcpcd exe. Please check the path to this file.");
return;
@@ -133,7 +138,7 @@ void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp
connect(this, SIGNAL(readyForRun()), this, SLOT(slotReadyForRun()));
if (args != NULL && !args->isEmpty()) {
- qxtLog->debug() << _tag << "added additional args";
+ LOG4CXX_DEBUG(ndcLogger, _tag << "added additional args");
_dhcpcdArguments.append(*args);
}
emit updateStatus("start mainwork");
@@ -179,21 +184,21 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
if (nIList.size() > 0) {
foreach(QNetworkInterface nI, nIList)
{
- qxtLog->debug() << _tag << "found Interface:" << nI.humanReadableName();
+ LOG4CXX_DEBUG(ndcLogger, _tag << "found Interface:" << nI.humanReadableName());
if ((nI.flags() & QNetworkInterface::CanBroadcast)) {
- qxtLog->debug() << _tag << " flags: can broadcast ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: can broadcast ");
}
if ((nI.flags() & QNetworkInterface::IsLoopBack)) {
- qxtLog->debug() << _tag << " flags: is LoopBack ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is LoopBack ");
}
if ((nI.flags() & QNetworkInterface::IsPointToPoint)) {
- qxtLog->debug() << _tag << " flags: is Point to Point ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Point to Point ");
}
if ((nI.flags() & QNetworkInterface::IsRunning)) {
- qxtLog->debug() << _tag << " flags: is Running ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Running ");
}
if ((nI.flags() & QNetworkInterface::IsUp)) {
- qxtLog->debug() << _tag << " flags: is Up ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Up ");
}
if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
@@ -207,7 +212,7 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
}
else if (!(nI.flags() & QNetworkInterface::IsUp)) {
_networkManager->bringInterfaceUP(nI.humanReadableName());
- qxtLog->debug() << _tag << " interface is down, try to bring up: " << nI.humanReadableName() ;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " interface is down, try to bring up: " << nI.humanReadableName() );
_ifDownList.append(nI.humanReadableName());
}
else if (!(nI.flags() & QNetworkInterface::IsRunning)) {
@@ -215,7 +220,7 @@ void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
}
}
} else {
- qxtLog->debug() << _tag << " no interfaces found! ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " no interfaces found! ");
}
}
@@ -232,22 +237,21 @@ void NetworkDiscovery::getListOfNetworkInterfaces() {
if (nIList.size() > 0) {
foreach(QNetworkInterface nI, nIList)
{
- qxtLog->debug() << _tag << "found Interface:"
- << nI.humanReadableName();
+ LOG4CXX_DEBUG(ndcLogger, _tag << "found Interface:" << nI.humanReadableName());
if ((nI.flags() & QNetworkInterface::CanBroadcast)) {
- qxtLog->debug() << _tag << " flags: can broadcast ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: can broadcast ");
}
if ((nI.flags() & QNetworkInterface::IsLoopBack)) {
- qxtLog->debug() << _tag << " flags: is LoopBack ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is LoopBack ");
}
if ((nI.flags() & QNetworkInterface::IsPointToPoint)) {
- qxtLog->debug() << _tag << " flags: is Point to Point ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Point to Point ");
}
if ((nI.flags() & QNetworkInterface::IsRunning)) {
- qxtLog->debug() << _tag << " flags: is Running ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Running ");
}
if ((nI.flags() & QNetworkInterface::IsUp)) {
- qxtLog->debug() << _tag << " flags: is Up ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " flags: is Up ");
}
if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
|| nI.flags() & QNetworkInterface::IsLoopBack)
@@ -263,7 +267,7 @@ void NetworkDiscovery::getListOfNetworkInterfaces() {
}
}
} else {
- qxtLog->debug() << _tag << " no interfaces found! ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " no interfaces found! ");
}
}
@@ -304,17 +308,17 @@ void NetworkDiscovery::checkForIsRunning() {
void NetworkDiscovery::slotReadyForRun() {
if (_ifUpList.size() > 0) {
foreach(QString i, _ifUpList) {
- qxtLog->debug() << _tag << " emit addInterface : " << i;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " emit addInterface : " << i);
emit addInterface(i);
}
_numberOfProcesses = _ifUpList.size();
emit updateStatus("start dhcp client for each interface");
runDHCPCD( _ifUpList);
} else {
- qxtLog->debug() << _tag << " list is empty. Have not found usable interface. ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " list is empty. Have not found usable interface. ");
emit
foreach(QString i, _ifDownList) {
- qxtLog->debug() << _tag << " " << i << " is not in running state. (check cable)";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << i << " is not in running state. (check cable)");
}
abortBoot("All interfaces are not usable. (e.g. please check if all network cables are plugged in. Read the log for more informations.)");
return;
@@ -349,7 +353,7 @@ void NetworkDiscovery::runDHCPCD(QString interface) {
_dhcpcdArguments.append(interface);
QProcess * p = new QProcess(this);
- qxtLog->debug() << _tag << " start cdhcpcd with arguments: " << _dhcpcdArguments;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " start cdhcpcd with arguments: " << _dhcpcdArguments.join(", "));
_clientProcessToIfNameMap.insert(p, interface);
p->start(_pathToDhcpcdExe, _dhcpcdArguments);
@@ -370,7 +374,7 @@ void NetworkDiscovery::runDHCPCD(QString interface) {
void NetworkDiscovery::handleProcessStarted() {
QProcess* p = qobject_cast<QProcess *> (QObject::sender());
QString ifName = _clientProcessToIfNameMap.value(p, "ifName");
- qxtLog->debug() << _tag << " process started for interface: " << ifName;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " process started for interface: " << ifName);
}
@@ -410,18 +414,15 @@ void NetworkDiscovery::handleProcessFinished(int exitCode,
_numberOfProcesses = _numberOfProcesses - 1;
if (!_blocked) { //_blocked becomes true, if _userChoice is false and we already found a usable interface
if (ifName.compare("ifName") == 0) {
- qxtLog->debug() << _tag << " haven't found process!";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " haven't found process!");
} else {
- qxtLog->debug() << _tag << " process for interface " << ifName
- << " finished " << " exit code: " << exitCode
- << " exit status " << exitStatus;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " process for interface " << ifName << " finished " << " exit code: " << exitCode << " exit status " << exitStatus);
if (exitCode > 0) {
- qxtLog->debug() << _tag << " process exited unexpected: "
- << p->errorString();
+ LOG4CXX_DEBUG(ndcLogger, _tag << " process exited unexpected: " << p->errorString());
emit updateIfStatus(ifName, "process exited unexpected"
+ p->errorString());
} else {
- qxtLog->debug() << _tag << " process normal exit ";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " process normal exit ");
emit
changeProgressBarValue(ifName, 100);
emit
@@ -447,7 +448,7 @@ void NetworkDiscovery::handleProcessFinished(int exitCode,
}
}
} else {
- qxtLog->debug() << _tag << " already blocked";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " already blocked");
emit updateIfStatus(ifName, "finished DHCP");
}
}
@@ -485,17 +486,17 @@ bool NetworkDiscovery::checkConnectivity(QString ifName) {
ifConf->readConfigOutOfFile(pathToGatewayFile);
// replace default route
- qxtLog->debug() << _tag << "replace default route";
+ LOG4CXX_DEBUG(ndcLogger, _tag << "replace default route");
_networkManager->replaceDefaultRoute(ifName,
ifConf->getGateway(), mss, AF_INET);
if (checkConnectivityViaTcp(_serverIp)) {
- qxtLog->debug() << _tag << " passed connectivity check! for interface " << ifName;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " passed connectivity check! for interface " << ifName);
emit
updateIfStatus(ifName, "connection possible");
return true;
} else {
- qxtLog->debug() << _tag << " failed connectivity check! for interface " << ifName;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " failed connectivity check! for interface " << ifName);
emit
updateIfStatus(ifName, "connection not possible");
return false;
@@ -523,14 +524,14 @@ bool NetworkDiscovery::checkConnectivityViaTcp() {
*/
bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
// check connectivity via tcp connection
- qxtLog->debug() << _tag << " check connectivity to server: " << server;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " check connectivity to server: " << server);
// do host lookup
//QHostInfo hostInfo = QHostInfo::fromName(server);
QTcpSocket *tcpSocket = new QTcpSocket(this);
- //qxtLog->debug() << _tag << " hostInfo first address: " << hostInfo.addresses().first().toString(); //hostInfo.addresses().first()
+ //LOG4CXX_DEBUG(ndcLogger, _tag << " hostInfo first address: " << hostInfo.addresses().first().toString()); //hostInfo.addresses().first()
tcpSocket->connectToHost(server, 80);
if (!tcpSocket->waitForConnected(500)) {
- qxtLog->debug() << _tag << tcpSocket->errorString();
+ LOG4CXX_DEBUG(ndcLogger, _tag << tcpSocket->errorString());
_errorStr += tcpSocket->errorString();
return false;
} else {
@@ -548,12 +549,12 @@ bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
* a client
*/
void NetworkDiscovery::handleNewInput(QLocalSocket * client) {
- qxtLog->debug() << _tag << "last read before exit";
+ LOG4CXX_DEBUG(ndcLogger, _tag << "last read before exit");
while (client->canReadLine()) {
QString data(client->readLine());
data = data.trimmed();
- qxtLog->debug() << _tag << data;
+ LOG4CXX_DEBUG(ndcLogger, _tag << data);
QStringList lines = data.split("\n");
for (int i = 0; i < lines.length(); i++) {
@@ -612,7 +613,7 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) {
QString msg = logMsg.section(";", 3, 3);
int st = s_state.trimmed().toInt();
int sst = s_subState.trimmed().toInt();
- //qxtLog->debug() << _tag << logMsg;
+ //LOG4CXX_DEBUG(ndcLogger, _tag << logMsg);
if (_ifNameToClient.size() < _numberOfProcesses && !_ifNameToClient.contains(
interface)) {
@@ -624,60 +625,60 @@ void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) {
switch (sst) {
case DHCP_DISCOVER:
emit changeProgressBarValue(interface, 10);
- qxtLog->debug() << _tag << " " << interface << " send discover";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " send discover");
break;
case DHCP_OFFER:
emit changeProgressBarValue(interface, 20);
- qxtLog->debug() << _tag << " " << interface << " got offer";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " got offer");
break;
case DHCP_REQUEST:
emit changeProgressBarValue(interface, 30);
- qxtLog->debug() << _tag << " " << interface << " send request";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " send request");
break;
case DHCP_ACK:
emit changeProgressBarValue(interface, 40);
- qxtLog->debug() << _tag << " " << interface << " ack";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " ack");
break;
case DHCP_NAK:
emit changeProgressBarValue(interface, 40);
- qxtLog->debug() << _tag << " " << interface << " nak";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " nak");
break;
case DHCPCD_ARP_TEST:
emit changeProgressBarValue(interface, 50);
- qxtLog->debug() << _tag << " " << interface << " do arp test";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " do arp test");
break;
case DHCP_DECLINE:
emit changeProgressBarValue(interface, 60);
break;
case DHCP_RELEASE:
- qxtLog->debug() << _tag << " " << interface << " release";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " release");
break;
case DHCP_INFORM:
break;
case DHCPCD_CONFIGURE:
emit changeProgressBarValue(interface, 70);
- qxtLog->debug() << _tag << " " << interface << " do configure interface";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " do configure interface");
break;
case DHCPCD_WRITE:
emit changeProgressBarValue(interface, 80);
- qxtLog->debug() << _tag << " " << interface << " write conf file";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " write conf file");
break;
case DHCPCD_EXIT:
emit changeProgressBarValue(interface, 100);
- qxtLog->debug() << _tag << " " << interface << " exiting";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << interface << " exiting");
break;
case DHCPCD_LOG:
- qxtLog->debug() << _tag << " received dhcpcd log: " << msg;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " received dhcpcd log: " << msg);
default:
- qxtLog->debug() << _tag << " received unknown substatus: " << msg;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " received unknown substatus: " << msg);
break;
}
break;
case LOG_ERR:
- qxtLog->debug() << _tag << " received error: " << msg;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " received error: " << msg);
break;
default:
- qxtLog->debug() << _tag << " " << logMsg;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " " << logMsg);
break;
}
}
@@ -721,10 +722,10 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
result["broadcast"].toString(), result["gateway"].toString(), 0,
AF_INET, "/etc/", dns);
- qxtLog->debug() << _tag << " set man conf. and check connectivity";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " set man conf. and check connectivity");
if (!checkConnectivityViaTcp(_serverIp)) {
- qxtLog->debug() << _tag << " no connectivity. reset conf.";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " no connectivity. reset conf.");
interfaceconfiguration * ifc = _ifcMap.value(
result["ifname"].toString(), NULL);
if (ifc != NULL) {
@@ -738,7 +739,7 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
return 0;
}
- qxtLog->debug() << _tag << " emit signal continueBootWithoutCheck(" << result["ifname"].toString() << ")";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " emit signal continueBootWithoutCheck(" << result["ifname"].toString() << ")");
emit
continueBootWithoutCheck(result["ifname"].toString());
return 0;
@@ -762,7 +763,7 @@ QString NetworkDiscovery::getGatewayForInterface(QString ifName) {
return ifConf->getGateway();
}
else {
- qxtLog->debug() << _tag << " could not find interface configuration";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " could not find interface configuration");
return "";
}
@@ -786,12 +787,12 @@ QString NetworkDiscovery::readLogFile() {
}
}
else {
- qxtLog->debug() << _tag << " could not open log file";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " could not open log file");
retval = "could not open log file";
}
}
else {
- qxtLog->debug() << _tag << " log file does not exist at: " << _pathToLogFile;
+ LOG4CXX_DEBUG(ndcLogger, _tag << " log file does not exist at: " << _pathToLogFile);
retval = " log file does not exist at: " + _pathToLogFile;
}
return retval;
@@ -801,12 +802,12 @@ QString NetworkDiscovery::readLogFile() {
/**/
void NetworkDiscovery::killDHCPCD() {
- qxtLog->debug() << " kill cdhcpcd processes";
+ LOG4CXX_DEBUG(ndcLogger, " kill cdhcpcd processes");
QProcess * p = new QProcess(this);
p->start("killall cdhcpcd");
p->waitForFinished();
if (p->exitCode() > 0)
- qxtLog->debug() << _tag << " [tryAgain] " << p->errorString();
+ LOG4CXX_DEBUG(ndcLogger, _tag << " [tryAgain] " << p->errorString());
delete p;
}
@@ -875,7 +876,7 @@ QVariantMap NetworkDiscovery::getInterfaceConfig(QString ifName) {
* connects the client readyRead signal with the handleNewInput slot.
*/
void NetworkDiscovery::handleNewConnection() {
- qxtLog->debug() << _tag << " New Connection arrived";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " New Connection arrived");
/*QLocalSocket **/
_client = _server->nextPendingConnection();
@@ -895,7 +896,7 @@ void NetworkDiscovery::handleClientDisconnect() {
QLocalSocket * client = _clients.value(socket);
- qxtLog->debug() << _tag << " disconnect client";
+ LOG4CXX_DEBUG(ndcLogger, _tag << " disconnect client");
handleNewInput(client);
client->deleteLater();
}
@@ -951,7 +952,7 @@ QString NetworkDiscovery::GetErrorStr() {
*/
bool NetworkDiscovery::checkCarrierState(QString interface) {
- qxtLog->debug() << _tag << "check carrier state for interface " << interface;
+ LOG4CXX_DEBUG(ndcLogger, _tag << "check carrier state for interface " << interface);
QByteArray ba = interface.toAscii();
const char * iface = ba.data();
@@ -968,21 +969,19 @@ bool NetworkDiscovery::checkCarrierState(QString interface) {
int v = value.toInt(pok);
if (*pok) {
if (v == 1) {
- qxtLog->debug()
- << "carrier is 1. Cable is plugged. return true";
+ LOG4CXX_DEBUG(ndcLogger, "carrier is 1. Cable is plugged. return true");
return true;
} else {
- qxtLog->debug()
- << "carrier is 0. Cable is unplugged. return false";
+ LOG4CXX_DEBUG(ndcLogger, "carrier is 0. Cable is unplugged. return false");
return false;
}
} else {
- qxtLog->debug() << _tag << "conversion error";
+ LOG4CXX_DEBUG(ndcLogger, _tag << "conversion error");
}
}
}
} else {
- qxtLog->debug() << _tag << "attrlist is Null";
+ LOG4CXX_DEBUG(ndcLogger, _tag << "attrlist is Null");
}
sysfs_close_class_device(class_device);
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-23 13:49:14 +0200