summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas2011-09-28 17:56:12 +0200
committerNiklas2011-09-28 17:56:12 +0200
commit38b1c442b31c7e8f38d232c30e7941b75b1eebbb (patch)
treeb5c5bf89a834b81d747e43211547c58e8a8669e0
parentadded a select field to the manual conf gui. also fixed some bugs in the ip4_... (diff)
downloadfbgui-38b1c442b31c7e8f38d232c30e7941b75b1eebbb.tar.gz
fbgui-38b1c442b31c7e8f38d232c30e7941b75b1eebbb.tar.xz
fbgui-38b1c442b31c7e8f38d232c30e7941b75b1eebbb.zip
added some more initial parameters
-rw-r--r--LogReceiver/ndgui.cpp2
-rw-r--r--LogReceiver/networkdiscovery.cpp30
-rw-r--r--LogReceiver/networkdiscovery.h4
3 files changed, 12 insertions, 24 deletions
diff --git a/LogReceiver/ndgui.cpp b/LogReceiver/ndgui.cpp
index 26e924c..cb2a2f9 100644
--- a/LogReceiver/ndgui.cpp
+++ b/LogReceiver/ndgui.cpp
@@ -38,7 +38,7 @@ ndgui::~ndgui() {
void ndgui::startNetworkDiscovery(){
if(!_started) {
_started = true;
- networkDiscovery.initAndRun("/var/tmp/qt_c_socket_custom");
+ networkDiscovery.initAndRun("209.85.148.105", true,"/var/tmp/qt_c_socket_custom");
}
else {
qDebug() << "NetworkDiscovery already started";
diff --git a/LogReceiver/networkdiscovery.cpp b/LogReceiver/networkdiscovery.cpp
index 7255095..1677573 100644
--- a/LogReceiver/networkdiscovery.cpp
+++ b/LogReceiver/networkdiscovery.cpp
@@ -11,10 +11,11 @@ NetworkDiscovery::~NetworkDiscovery() {
}
-void NetworkDiscovery::initAndRun(QString serverPath, QString pathToExe,
+void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice,QString serverPath, QString pathToExe,
QStringList* args) {
- _userChoice = true;
+ _serverIp = serverIp;
+ _userChoice = userChoice;
_blocked = false;
if (serverPath != DEFAULT_QTSOCKETADDRESS) {
@@ -86,24 +87,8 @@ int NetworkDiscovery::ip4_replaceDefaultRoute(QString ifName, QString gateway, i
}
int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
- //QJson::Parser parser;
- //bool ok;
-
- //QVariantMap result = parser.parse(, &ok);
- //if(!ok) {
- // error
- //return -1;
- //}
QList<QString> dns;
dns.append(result["dns"].toString());
- qDebug() << result["ifname"].toString();
- qDebug() << result["ipaddr"].toString();
- qDebug() << result["netmask"].toString();
- qDebug() << result["broadcast"].toString();
- qDebug() << result["gateway"].toString();
- qDebug() << dns;
-
-
networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
result["ipaddr"].toString(),
result["netmask"].toString(),
@@ -117,12 +102,13 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
qDebug() << "set man conf. test connectivity";
- if (!checkConnectivityViaTcp(QString("74.125.39.99"))) {
+ if (!checkConnectivityViaTcp(_serverIp)) {
qDebug() << "no connectivity. reset conf.";
interfaceconfiguration * ifc = _ifcMap.value(result["ifname"].toString(), NULL);
if(ifc != NULL) {
- QList<QString> dns = ifc->getDnsservers().trimmed().split(" ");
- networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
+ dns.clear();
+ dns = ifc->getDnsservers().trimmed().split(" ");
+ networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
ifc->getIpAddress(),
ifc->getNetmask(),
ifc->getBroadcast(),
@@ -264,7 +250,7 @@ bool NetworkDiscovery::checkConnectivity(QString ifName) {
qDebug() << networkManager.replaceDefaultRoute(ifName,
ifConf->getGateway(), 0, AF_INET);
- if (checkConnectivityViaTcp("209.85.148.105")) {
+ if (checkConnectivityViaTcp(_serverIp)) {
qDebug() << "internet: check passed! for interface" << ifName;
emit
updateStatusLabel(ifName, "connection possible");
diff --git a/LogReceiver/networkdiscovery.h b/LogReceiver/networkdiscovery.h
index 5e79887..cf09d58 100644
--- a/LogReceiver/networkdiscovery.h
+++ b/LogReceiver/networkdiscovery.h
@@ -43,7 +43,8 @@ public:
NetworkDiscovery(QObject *parent=0);
~NetworkDiscovery();
- void initAndRun(QString serverPath = DEFAULT_QTSOCKETADDRESS,
+ void initAndRun(QString serverIp, bool userChoice,
+ QString serverPath = DEFAULT_QTSOCKETADDRESS,
QString pathToExe = DEFAULT_PATHTODHCPCDEXE,
QStringList* args = NULL);
int replaceDefaultRoute(QString &ifName, QString &gateway, int af, int mss);
@@ -85,6 +86,7 @@ private:
NetworkManager networkManager;
bool _userChoice;
bool _blocked;
+ QString _serverIp;
QMap<QString, interfaceconfiguration*> _ifcMap;