no working

4 files changed, 17 insertions, 4 deletions

diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 021a9e3..22a2ac6 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -96,7 +96,7 @@ void fbgui::init() {
 	setWindowTitle("fbgui");
 	setAttribute(Qt::WA_QuitOnClose, true);
 	setWindowFlags(Qt::FramelessWindowHint);
-//	showFullScreen();
+	showFullScreen();
 	this->show();
 }
 //-------------------------------------------------------------------------------------------
diff --git a/src/html/js/networkDiscovery.js b/src/html/js/networkDiscovery.js
index ec7fff6..f26385b 100644
--- a/src/html/js/networkDiscovery.js
+++ b/src/html/js/networkDiscovery.js
@@ -78,7 +78,7 @@ var getInterfaceConf = function (i) {
 
 
 var ip4_manualConfigurationDialog = function () {
-  var jsonArr = "eth0";// fbgui.getManualConfInterfaces();
+  var jsonArr = fbgui.getManualConfInterfaces();
   if(jsonArr == "") {
     var c = "<p>Have not found usable interfaces for manual configuration</p>";
     $("#nd_manual_configuration_dialog").html(c);
diff --git a/src/ndgui.cpp b/src/ndgui.cpp
index ecee5e8..05ceac1 100644
--- a/src/ndgui.cpp
+++ b/src/ndgui.cpp
@@ -258,6 +258,7 @@ QVariantList ndgui::getManualConfInterfaces() {
 /**/
 QVariantMap ndgui::getInterfaceConf(QString ifName) {
 
+  return networkDiscovery.getInterfaceConfig(ifName);
 }
 
 
diff --git a/src/networkdiscovery.cpp b/src/networkdiscovery.cpp
index df1ae3c..75e822b 100644
--- a/src/networkdiscovery.cpp
+++ b/src/networkdiscovery.cpp
@@ -257,6 +257,7 @@ QString NetworkDiscovery::readLogFile() {
 			return retval;
 		}
 	}
+	qxtLog->debug() << _tag << " could not open log file";
 
 }
 
@@ -271,11 +272,11 @@ QString NetworkDiscovery::readLogFile() {
  */
 void NetworkDiscovery::tryAgain() {
 	// kill all cdhcpcd processes
-	qDebug() << " kill cdhcpcd processes";
+	qxtLog->debug() << " kill cdhcpcd processes";
 	QProcess * p = new QProcess(this);
 	p->start("killall cdhcpcd");
 	p->waitForFinished();
-	qDebug() << _tag << "[tryAgain]" << p->errorString();
+	qxtLog->debug() << _tag << "[tryAgain]" << p->errorString();
 	/*
 	foreach(Q_PID pid , _pidsList) {
 		if (kill(pid,SIGKILL) <= -1)
@@ -302,11 +303,21 @@ void NetworkDiscovery::tryAgain() {
 }
 
 
+
 /**/
 QVariantMap NetworkDiscovery::getInterfaceConfig(QString ifName) {
+	QVariantMap jsonObj;
 	QList<QString> dns;
 	interfaceconfiguration * ifc = _ifcMap.value(ifName, NULL);
 	if (ifc != NULL) {
+		jsonObj.insert("ipaddr",ifc->getIpAddress());
+		jsonObj.insert("netmask",ifc->getNetmask());
+		jsonObj.insert("broadcast",ifc->getBroadcast());
+		jsonObj.insert("gateway",ifc->getGateway());
+
+		dns.clear();
+		dns = ifc->getDnsservers().trimmed().split(" ");
+		jsonObj.insert("dns",dns.first());
 //
 //		dns.clear();
 //		dns = ifc->getDnsservers().trimmed().split(" ");
@@ -315,6 +326,7 @@ QVariantMap NetworkDiscovery::getInterfaceConfig(QString ifName) {
 //				//ifc->getGateway(), 0, AF_INET, "/etc/", dns);
 //
 	}
+	return jsonObj;
 }