From ddac93a94b860c94e6fb893ed5a9c508c19231f1 Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 21 Jul 2011 17:29:53 +0200 Subject: log messages are delivered to qt app. --- workspace/LogReceiver/logreceiver.cpp | 37 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'workspace/LogReceiver/logreceiver.cpp') diff --git a/workspace/LogReceiver/logreceiver.cpp b/workspace/LogReceiver/logreceiver.cpp index f1a20b0..4aeebfc 100644 --- a/workspace/LogReceiver/logreceiver.cpp +++ b/workspace/LogReceiver/logreceiver.cpp @@ -7,6 +7,7 @@ #include #include #include + #include #include "logreceiver.h" #include @@ -50,8 +51,8 @@ LogReceiver::LogReceiver(QWidget *parent) : buildGui(); addInterfacesToGroupBox(interfacesMap); pathToDhcpcdExe = "/home/niklas/fbgui/workspace/customdhcpcd/src/dhcpcd"; - dhcpcdArguments.append("-d"); - //QString ifName(); + //dhcpcdArguments.append("-d"); + QString ifName("eth1"); runDHCPCD(list); @@ -79,7 +80,19 @@ void LogReceiver::handleNewInput() { QLocalSocket * client = clients.value(socket); - QByteArray data = client->readAll(); + QString data(client->readAll()); + + data = data.trimmed(); + + QStringList lines = data.split("\n"); + + for (int i=0; i < lines.length(); i++) { + handleNewInputLine(lines.at(i)); + } +} + +void LogReceiver::handleNewInputLine(QString data) { + QString logMsg(data); QString interface = logMsg.section(";",0,0); QString s_state = logMsg.section(";", 1, 1); @@ -88,16 +101,17 @@ void LogReceiver::handleNewInput() { int pBar = indexToIfaceNameMap.value(interface); - qDebug() << logMsg; + //qDebug() << logMsg; - qDebug() << msg; + //qDebug() << msg; int st = s_state.toInt(); int sst = s_subState.toInt(); switch (st) { - case STAT_OK: - qDebug() << "received stat_ok"; + case LOG_INFO: + qDebug() << "received LOG_INFO"; + qDebug() << sst; switch (sst) { case DHCP_DISCOVER: handleProgress(pBar,10); @@ -126,15 +140,18 @@ void LogReceiver::handleNewInput() { default: break; } + + qDebug() << msg; + break; - case STAT_ERROR: + case LOG_ERR: qDebug() << "received stat_error"; break; default: - qDebug() << "undefined status"; + qDebug() << logMsg; } - statusLabel->setText(logMsg); + //statusLabel->setText(logMsg); } QList LogReceiver::getListOfNetworkInterfaces() { -- cgit v1.2.3-55-g7522