diff options
Diffstat (limited to 'LogReceiver')
-rw-r--r-- | LogReceiver/LogReceiver.pro | 8 | ||||
-rw-r--r-- | LogReceiver/html/networkdiscovery.html | 4 | ||||
-rw-r--r-- | LogReceiver/networkdiscovery.cpp | 4 | ||||
-rw-r--r-- | LogReceiver/networkdiscovery.h | 4 | ||||
-rw-r--r-- | LogReceiver/networkmanager.cpp (renamed from LogReceiver/routemanager.cpp) | 19 | ||||
-rw-r--r-- | LogReceiver/networkmanager.h (renamed from LogReceiver/routemanager.h) | 14 |
6 files changed, 28 insertions, 25 deletions
diff --git a/LogReceiver/LogReceiver.pro b/LogReceiver/LogReceiver.pro index eaa7001..1bba39d 100644 --- a/LogReceiver/LogReceiver.pro +++ b/LogReceiver/LogReceiver.pro @@ -7,12 +7,12 @@ LIBS += -lsysfs \ -L/home/niklas/fbgui/customdhcpcd/src/build \ -llibcustomdhcpcd INCLUDEPATH += /home/niklas/fbgui/customdhcpcd/src -HEADERS += networkdiscovery.h \ - routemanager.h \ +HEADERS += networkmanager.h \ + networkdiscovery.h \ interfaceconfiguration.h \ ndgui.h -SOURCES += networkdiscovery.cpp \ - routemanager.cpp \ +SOURCES += networkmanager.cpp \ + networkdiscovery.cpp \ interfaceconfiguration.cpp \ ndgui.cpp \ main.cpp diff --git a/LogReceiver/html/networkdiscovery.html b/LogReceiver/html/networkdiscovery.html index 600674a..c24c86b 100644 --- a/LogReceiver/html/networkdiscovery.html +++ b/LogReceiver/html/networkdiscovery.html @@ -11,7 +11,9 @@ var abortBootDialog = function (m) { $("#nd_abort_boot_msg").html(m); $("#nd_abort_boot_dialog").dialog( - { buttons: { "Show Log": function() {fbgui.showLog(); + { buttons: { "Manual Configure": function() { + $(this).dialog("close");}, + "Show Log": function() {fbgui.showLog(); $(this).dialog("close");}, "Restart": function() {fbgui.restartSystem(); $(this).dialog("close"); }, diff --git a/LogReceiver/networkdiscovery.cpp b/LogReceiver/networkdiscovery.cpp index cd77ee1..303ffe7 100644 --- a/LogReceiver/networkdiscovery.cpp +++ b/LogReceiver/networkdiscovery.cpp @@ -80,7 +80,7 @@ void NetworkDiscovery::initAndRun(QString serverPath, QString pathToExe, } int NetworkDiscovery::replaceDefaultRoute(QString &ifName, QString &gateway, int af, int mss) { - rm.replaceDefaultRoute(ifName, gateway, mss, AF_INET); + networkManager.replaceDefaultRoute(ifName, gateway, mss, AF_INET); } QList<QString> NetworkDiscovery::getListOfNetworkInterfaces() { @@ -195,7 +195,7 @@ bool NetworkDiscovery::checkConnectivity(QString ifName) { ifConf.readConfigOutOfFile(pathToGatewayFile); // replace default route - qDebug() << rm.replaceDefaultRoute(ifName, ifConf.getGateway(), 0, AF_INET); + qDebug() << networkManager.replaceDefaultRoute(ifName, ifConf.getGateway(), 0, AF_INET); // check connectivity via tcp connection QTcpSocket *tcpSocket = new QTcpSocket(this); diff --git a/LogReceiver/networkdiscovery.h b/LogReceiver/networkdiscovery.h index 9a1441d..6efd926 100644 --- a/LogReceiver/networkdiscovery.h +++ b/LogReceiver/networkdiscovery.h @@ -14,7 +14,7 @@ #include <sysfs/libsysfs.h> #include "interfaceconfiguration.h" -#include "routemanager.h" +#include "networkmanager.h" //#include <qlocalserver.h> //#include <qlocalsocket.h> #include "status.h" @@ -79,7 +79,7 @@ private: QNetworkConfigurationManager configurationManager; QNetworkAccessManager *accessManager; int numberOfProcesses; - routemanager rm; + NetworkManager networkManager; bool _userChoice; bool _blocked; diff --git a/LogReceiver/routemanager.cpp b/LogReceiver/networkmanager.cpp index aa12fa3..9edcf5e 100644 --- a/LogReceiver/routemanager.cpp +++ b/LogReceiver/networkmanager.cpp @@ -1,18 +1,18 @@ /* - * routemanager.cpp + * networkmanager.cpp * * Created on: Sep 5, 2011 * Author: niklas */ -#include "routemanager.h" +#include "networkmanager.h" -routemanager::routemanager() { +NetworkManager::NetworkManager() { // TODO Auto-generated constructor stub } -routemanager::~routemanager() { +NetworkManager::~NetworkManager() { // TODO Auto-generated destructor stub } @@ -39,7 +39,7 @@ routemanager::~routemanager() { * return -1 if an error happened. * return 0 if everything was ok. */ -int routemanager::replaceDefaultRoute(QString ifname, QString gateway, +int NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss, int af) { struct nl_cache *cache; struct nl_handle* rtsock; @@ -100,7 +100,7 @@ int routemanager::replaceDefaultRoute(QString ifname, QString gateway, * 0 if everything is ok * else an error */ -int routemanager::bringInterfaceUpDown(QString ifname, bool up) { +int NetworkManager::bringInterfaceUpDown(QString ifname, bool up) { struct nl_cache *cache; struct nl_handle* rtsock; struct rtnl_link* request = NULL; @@ -131,12 +131,13 @@ int routemanager::bringInterfaceUpDown(QString ifname, bool up) { old = rtnl_link_get_by_name(cache,ifn); if (old) { qDebug() << "change link"; - rtnl_link_change(rtsock, old, request, 0); + retval = rtnl_link_change(rtsock, old, request, 0); } else { qDebug() << "change failed"; + retval = -1; + qDebug() << "return value:" << retval << ":" << strerror(-retval); } - retval = 0; rtnl_link_put(old); rtnl_link_put(request); @@ -174,4 +175,4 @@ int routemanager::bringInterfaceUpDown(QString ifname, bool up) { * return 1 if an error happened. * return 0 if everything was ok. */ -int routemanager::doRoute(QString ifName, QString destination, QString gateway, int af, int action) {return 0;} +int NetworkManager::doRoute(QString ifName, QString destination, QString gateway, int af, int action) {return 0;} diff --git a/LogReceiver/routemanager.h b/LogReceiver/networkmanager.h index fc26145..edcce28 100644 --- a/LogReceiver/routemanager.h +++ b/LogReceiver/networkmanager.h @@ -1,12 +1,12 @@ /* - * routemanager.h + * networkmanager.h * * Created on: Sep 5, 2011 * Author: niklas */ -#ifndef ROUTEMANAGER_H_ -#define ROUTEMANAGER_H_ +#ifndef NETWORKMANAGER_H_ +#define NETWORKMANAGER_H_ #include <arpa/inet.h> #include <interface.h> @@ -19,12 +19,12 @@ #include <errno.h> #include <QtCore> -class routemanager: public QObject { +class NetworkManager: public QObject { Q_OBJECT public: - routemanager(); - virtual ~routemanager(); + NetworkManager(); + virtual ~NetworkManager(); int doRoute(QString ifName, QString destination, QString gateway, int af, @@ -37,4 +37,4 @@ private: }; -#endif /* ROUTEMANAGER_H_ */ +#endif /* NETWORKMANAGER_H_ */ |