sauvegarde

mainwindow.cpp

@@ -9,6 +9,7 @@
 #include <kcombobox.h>
 #include <signal.h>
 #include <QTextStream>
+#include <QHostInfo>
 
 using namespace std;
 
@@ -348,9 +349,9 @@ void MainWindow::populateList(QString server, uint port)
 	info(DEBUGMACRO, "port: " + QString::number(port) + " - server: " + server);
 	if (server.isEmpty())
 	{
-	ui->listWidget->clear();
-	ui->treeWidget->clear();
-	return;
+		ui->listWidget->clear();
+		ui->treeWidget->clear();
+		return;
 	}
 	if ((server != this->connexion.server))
 	{
@@ -763,30 +764,41 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
 }
 
 // validate address server
-uint MainWindow::validateServer(QString server)
+uint MainWindow::validateServer(QString *server)
 {
 	QString cmd;
 	QStringList param;
 	QString line;
 	QProcess * myProcess;
 	QStringList responseList;
+	QFile fileHandle("/etc/hosts");
 
-	uint ipversion;
+	uint ipversion = 0;
 	int answerFound = 0;
 	int queryPos = 0;
+	QHostAddress serverAddress;
 
 	info(DEBUGMACRO, "ValidateServer() => Validating server address");
-
-	ipversion = whatIpVersion(server);
+	ipversion = whatIpVersion(*server);
 
 	if (ipversion == 0)					// not an Ip address, perhaps a server name
 	{
+
+		serverAddress = searchHosts(*server);
+		if (!serverAddress.isNull())
+		{
+			server->clear();
+			server->append(serverAddress.toString());
+		}
+
+
+
 		info(DEBUGMACRO, "Digging server name");
 
 		cmd = "dig";
-		param << server.trimmed() ;
+		param << server->trimmed() ;
 		param << "A";				// IP V4 query
-		param << server.trimmed() ;
+		param << server->trimmed() ;
 		param << "AAAA";				// IP V6 query
 
 		info(DEBUGMACRO, cmd + " " + param.join(" "));
@@ -807,7 +819,7 @@ uint MainWindow::validateServer(QString server)
 					break;
 				}else
 				{
-					answerFound = line.indexOf(";; ANSWER SECTION:") +19;
+					answerFound = line.indexOf(";; ANSWER SECTION:") + 19;
 					info(DEBUGMACRO, "Position of answer line is : " + QString::number(answerFound));
 
 					if (answerFound != -1)
@@ -837,10 +849,9 @@ uint MainWindow::validateServer(QString server)
 	}
 	info(DEBUGMACRO, "Returning ip version: " + QString::number(ipversion));
 	return ipversion;
-
-	return 0;
 }
 
+
 // slot activated when button connection is clicked
 void MainWindow::on_connectButton_clicked()
 {