network changes

2 files changed, 19 insertions, 5 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index b2f5332..6a5c062 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -34,19 +34,18 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
    	ComboNtpSrv->insertItem( ntpSrvs.readEntry("name") );
   }
   if ( srvCount==0 ) ComboNtpSrv->insertItem(tr("time.fu-berlin.de"));
 
 	Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
-// 	_maxOffset = cfg.readNumEntry("maxOffset",5);
-//  _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
 	SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",41) );
 	SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",42) );
   ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
 
   ntpTimer = new QTimer(this);
+  processTimer = new QTimer(this);
 	ntpTimer->start(SpinBoxNtpDelay->value()*1000*60);
 
  	ntpProcess = new OProcess( );
   connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ),
   					SLOT(slotNtpDelayChanged(int)) );
 
@@ -113,12 +112,15 @@ void Ntp::slotRunNtp()
   	   	case QMessageBox::Cancel: return;
     	  default: return;
       }
   }
 	TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
   ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
+  connect( processTimer, SIGNAL( timeout() ), SLOT(slotTimeoutNtpProcess()) );
+	processTimer->start(2*1000*60, true);
+ 	
 	ntpProcess->clearArguments();
 	*ntpProcess << "ntpdate" << getNtpServer();
 	bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntpdate");
      ntpOutPut( tr("Error while executing ntpdate"));
@@ -135,14 +137,20 @@ void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
 	        ntpOutPut(lineStr);
          	_ntpOutput += lineStr;
   }
   lineStrOld = lineStr;
 }
 
-void  Ntp::ntpFinished(OProcess*)
+void  Ntp::ntpFinished(OProcess *p)
 {
+	if (!p->normalExit())
+ 	{
+    slotProbeNtpServer();
+   	return;
+  }
+	processTimer->stop();
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lastLookup = cfg.readNumEntry("time",0);
   int lookupCount = cfg.readNumEntry("count",-1);
   int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
   cfg.writeEntry("time", time);
@@ -258,13 +266,12 @@ void Ntp::slotCheckNtp(int i)
 	  preditctTime();
 		ButtonSetTime->setText( tr("Set predicted time") );
   	if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer());
   	connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
 	  connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
   }
-//	ntpTimer->start(SpinBoxNtpDelay->value()*1000*60);
 }
 
 void Ntp::slotProbeNtpServer()
 {
 	ntpSock->connectToHost( getNtpServer() ,123);
 }
@@ -276,6 +283,12 @@ void Ntp::slotNtpDelayChanged(int delay)
 
 void Ntp::ntpOutPut(QString out)
 {
 	MultiLineEditntpOutPut->append(out);
   MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
 }
+
+void Ntp::slotTimeoutNtpProcess()
+{
+	ntpProcess->kill();
+	slotProbeNtpServer();
+}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index c78dc55..d166973 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -22,13 +22,13 @@ protected:
 
 private:
 		QString _ntpOutput;
    	float _shiftPerSec;
     int _lookupDiff;
     OProcess *ntpProcess;
-    QTimer *ntpTimer;
+    QTimer *ntpTimer, *processTimer;
     QSocket *ntpSock;
 
    	float getTimeShift();
 	  void readLookups();
 	  void ntpOutPut(QString);
    	bool ntpDelayElapsed();
@@ -39,9 +39,10 @@ private slots:
     void ntpFinished(OProcess*);
 	  void preditctTime();
 	  void slotCheckNtp(int);
 	  void setPredictTime();
 	  void slotProbeNtpServer();
 	  void slotNtpDelayChanged(int);
+	  void slotTimeoutNtpProcess();
 };
 
 #endif