From b003285b65d6374cd144214b94bcc1bc9041e091 Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 29 Aug 2011 16:54:40 +0200 Subject: tried to fix the message loss problem, but failed. TODO: debug and socket sniffer --- workspace/LogReceiver/LogReceiver | Bin 118177 -> 113415 bytes workspace/LogReceiver/logreceiver.cpp | 25 ------------------------- workspace/LogReceiver/logreceiver.h | 2 -- workspace/customdhcpcd/src/dhcpcd.c | 1 + 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/workspace/LogReceiver/LogReceiver b/workspace/LogReceiver/LogReceiver index bf4036a..7fee3c5 100755 Binary files a/workspace/LogReceiver/LogReceiver and b/workspace/LogReceiver/LogReceiver differ diff --git a/workspace/LogReceiver/logreceiver.cpp b/workspace/LogReceiver/logreceiver.cpp index e0ae336..127d69e 100644 --- a/workspace/LogReceiver/logreceiver.cpp +++ b/workspace/LogReceiver/logreceiver.cpp @@ -274,21 +274,6 @@ void LogReceiver::handleNewInput() { } } - -void LogReceiver::handleNewInput_(QLocalSocket *client) { - - 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); @@ -373,16 +358,6 @@ void LogReceiver::handleProcessFinished(int exitCode, checkInternetConnectionViaTCP(ifName); } } - if (numberOfProcesses == 1) { - QLocalSocket *s; - qDebug() << "try to read socket buffer.."; - foreach(s, clients.keys()) { - if (s->bytesAvailable() > 0) { - qDebug() << "read socket buffer.."; - handleNewInput_(s); - } - } - } numberOfProcesses = numberOfProcesses -1; if (numberOfProcesses <= 0) { emit allProcessesFinished(); diff --git a/workspace/LogReceiver/logreceiver.h b/workspace/LogReceiver/logreceiver.h index e53ad1d..6611d15 100644 --- a/workspace/LogReceiver/logreceiver.h +++ b/workspace/LogReceiver/logreceiver.h @@ -54,8 +54,6 @@ private: QNetworkAccessManager *accessManager; int numberOfProcesses; - - void handleNewInput_(QLocalSocket *s); void runDHCPCD(QList &interfaces); void runDHCPCD(QString interface); QListcheckCarrierState(QList &interfaces); diff --git a/workspace/customdhcpcd/src/dhcpcd.c b/workspace/customdhcpcd/src/dhcpcd.c index 769bf39..f8f003c 100644 --- a/workspace/customdhcpcd/src/dhcpcd.c +++ b/workspace/customdhcpcd/src/dhcpcd.c @@ -665,6 +665,7 @@ abort: free (dhcpcd_skiproutes); #endif + closeQtLoggerSocket(); logger (LOG_INFO, "exiting"); logToQt(LOG_INFO, DHCPCD_EXIT, "exiting due abort"); exit (retval); -- cgit v1.2.3-55-g7522