summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-24 02:01:08 (UTC)
committer zautrix <zautrix>2005-02-24 02:01:08 (UTC)
commit5af16f69232073d1fa46d2dea3774beaaafb00c5 (patch) (unidiff)
tree0790afdd906df50520ac4415a9d35b95107d4d48
parent513496c67403deb04339cfc87143ed5554720e32 (diff)
downloadkdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.zip
kdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.tar.gz
kdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.tar.bz2
socket fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp94
-rw-r--r--libkdepim/ksyncmanager.h7
2 files changed, 74 insertions, 27 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index d8ca3ba..47d00a4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1067,17 +1067,27 @@ void KSyncManager::syncPi()
1067 commandSocket->readFile( syncFileName() ); 1067 commandSocket->readFile( syncFileName() );
1068} 1068}
1069 1069
1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) 1070void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
1071{ 1071{
1072 //enum { success, errorW, errorR, quiet }; 1072 //enum { success, errorW, errorR, quiet };
1073 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ) { 1073
1074
1075
1076 if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
1077 state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) {
1074 if ( state == KCommandSocket::errorPW ) 1078 if ( state == KCommandSocket::errorPW )
1075 mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); 1079 mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
1076 else 1080 else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
1077 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); 1081 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
1082 else if ( state == KCommandSocket::errorCA )
1083 mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
1084 else if ( state == KCommandSocket::errorFI )
1085 mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
1086 else if ( state == KCommandSocket::errorUN )
1087 mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
1078 delete s; 1088 delete s;
1079 if ( state == KCommandSocket::errorR ) { 1089 if ( state == KCommandSocket::errorR ) {
1080 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); 1090 KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
1081 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); 1091 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
1082 commandSocket->sendStop(); 1092 commandSocket->sendStop();
1083 } 1093 }
@@ -1129,12 +1139,13 @@ void KSyncManager::readFileFromSocket()
1129KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) 1139KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
1130{ 1140{
1131 mPassWord = pw; 1141 mPassWord = pw;
1132 mSocket = 0; 1142 mSocket = 0;
1133 mSyncActionDialog = 0; 1143 mSyncActionDialog = 0;
1134 blockRC = false; 1144 blockRC = false;
1145 mErrorMessage = 0;
1135} 1146}
1136 1147
1137void KServerSocket::newConnection ( int socket ) 1148void KServerSocket::newConnection ( int socket )
1138{ 1149{
1139 // qDebug("KServerSocket:New connection %d ", socket); 1150 // qDebug("KServerSocket:New connection %d ", socket);
1140 if ( mSocket ) { 1151 if ( mSocket ) {
@@ -1147,27 +1158,38 @@ void KServerSocket::newConnection ( int socket )
1147 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); 1158 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
1148 mSocket->setSocket( socket ); 1159 mSocket->setSocket( socket );
1149} 1160}
1150 1161
1151void KServerSocket::discardClient() 1162void KServerSocket::discardClient()
1152{ 1163{
1153 //qDebug(" KServerSocket::discardClient()"); 1164 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1165}
1166void KServerSocket::deleteSocket()
1167{
1168 qDebug("KSS::deleteSocket");
1154 if ( mSocket ) { 1169 if ( mSocket ) {
1155 delete mSocket; 1170 delete mSocket;
1156 mSocket = 0; 1171 mSocket = 0;
1157 } 1172 }
1158 //emit endConnect(); 1173 if ( mErrorMessage )
1174 QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
1159} 1175}
1160void KServerSocket::readClient() 1176void KServerSocket::readClient()
1161{ 1177{
1162 if ( blockRC ) 1178 if ( blockRC )
1163 return; 1179 return;
1164 if ( mSocket == 0 ) { 1180 if ( mSocket == 0 ) {
1165 qDebug("ERROR::KSS::readClient(): mSocket == 0 "); 1181 qDebug("ERROR::KSS::readClient(): mSocket == 0 ");
1166 return; 1182 return;
1167 } 1183 }
1184 if ( mErrorMessage ) {
1185 mErrorMessage = 999;
1186 error_connect("ERROR_UN\r\n\r\n");
1187 return;
1188 }
1189 mErrorMessage = 0;
1168 //qDebug("KServerSocket::readClient()"); 1190 //qDebug("KServerSocket::readClient()");
1169 if ( mSocket->canReadLine() ) { 1191 if ( mSocket->canReadLine() ) {
1170 QString line = mSocket->readLine(); 1192 QString line = mSocket->readLine();
1171 //qDebug("KServerSocket readline: %s ", line.latin1()); 1193 //qDebug("KServerSocket readline: %s ", line.latin1());
1172 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); 1194 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
1173 if ( tokens[0] == "GET" ) { 1195 if ( tokens[0] == "GET" ) {
@@ -1180,44 +1202,51 @@ void KServerSocket::readClient()
1180 } 1202 }
1181 else 1203 else
1182 KSyncManager::mRequestedSyncEvent = QDateTime(); 1204 KSyncManager::mRequestedSyncEvent = QDateTime();
1183 send_file(); 1205 send_file();
1184 } 1206 }
1185 else { 1207 else {
1186 error_connect(); 1208 mErrorMessage = 1;
1187 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); 1209 error_connect("ERROR_PW\r\n\r\n");
1188 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1189 } 1210 }
1190 } 1211 }
1191 if ( tokens[0] == "PUT" ) { 1212 if ( tokens[0] == "PUT" ) {
1192 if ( tokens[1] == mPassWord ) { 1213 if ( tokens[1] == mPassWord ) {
1193 //emit getFile( mSocket ); 1214 //emit getFile( mSocket );
1194 blockRC = true; 1215 blockRC = true;
1195 get_file(); 1216 get_file();
1196 } 1217 }
1197 else { 1218 else {
1198 error_connect(); 1219 mErrorMessage = 2;
1220 error_connect("ERROR_PW\r\n\r\n");
1199 end_connect(); 1221 end_connect();
1200 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
1201 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1202 } 1222 }
1203 } 1223 }
1204 if ( tokens[0] == "STOP" ) { 1224 if ( tokens[0] == "STOP" ) {
1205 //emit endConnect(); 1225 //emit endConnect();
1206 end_connect(); 1226 end_connect();
1207 } 1227 }
1208 } 1228 }
1209} 1229}
1210void KServerSocket::error_connect() 1230void KServerSocket::displayErrorMessage()
1231{
1232 if ( mErrorMessage == 1 )
1233 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
1234 else if ( mErrorMessage == 2 )
1235 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
1236 mErrorMessage = 0;
1237}
1238void KServerSocket::error_connect( QString errmess )
1211{ 1239{
1212 QTextStream os( mSocket ); 1240 QTextStream os( mSocket );
1213 os.setEncoding( QTextStream::Latin1 ); 1241 os.setEncoding( QTextStream::Latin1 );
1214 os << "ERROR_PW\r\n\r\n"; 1242 os << errmess ;
1215 mSocket->close(); 1243 mSocket->close();
1216 if ( mSocket->state() == QSocket::Idle ) 1244 if ( mSocket->state() == QSocket::Idle ) {
1217 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1245 QTimer::singleShot( 0, this , SLOT ( discardClient()));
1246 }
1218} 1247}
1219void KServerSocket::end_connect() 1248void KServerSocket::end_connect()
1220{ 1249{
1221 delete mSyncActionDialog; 1250 delete mSyncActionDialog;
1222 mSyncActionDialog = 0; 1251 mSyncActionDialog = 0;
1223} 1252}
@@ -1233,12 +1262,13 @@ void KServerSocket::send_file()
1233 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); 1262 QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
1234 lay->addWidget( label); 1263 lay->addWidget( label);
1235 lay->setMargin(7); 1264 lay->setMargin(7);
1236 lay->setSpacing(7); 1265 lay->setSpacing(7);
1237 if ( KSyncManager::mRequestedSyncEvent.isValid() ) { 1266 if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
1238 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); 1267 int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
1268 secs = 333;
1239 if ( secs < 0 ) 1269 if ( secs < 0 )
1240 secs = secs * (-1); 1270 secs = secs * (-1);
1241 if ( secs > 30 ) 1271 if ( secs > 30 )
1242 //if ( true ) 1272 //if ( true )
1243 { 1273 {
1244 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); 1274 QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
@@ -1246,13 +1276,16 @@ void KServerSocket::send_file()
1246 label->setAlignment ( Qt::AlignHCenter ); 1276 label->setAlignment ( Qt::AlignHCenter );
1247 lay->addWidget( label); 1277 lay->addWidget( label);
1248 if ( secs > 180 ) 1278 if ( secs > 180 )
1249 { 1279 {
1250 if ( secs > 300 ) { 1280 if ( secs > 300 ) {
1251 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { 1281 if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) {
1252 qDebug("KSS::Sync cancelled ,cs"); 1282 qDebug("KSS::Sync cancelled ,cs");
1283 mErrorMessage = 0;
1284 end_connect();
1285 error_connect("ERROR_CA\r\n\r\n");
1253 return ; 1286 return ;
1254 } 1287 }
1255 } 1288 }
1256 QFont f = label->font(); 1289 QFont f = label->font();
1257 f.setPointSize ( f.pointSize() *2 ); 1290 f.setPointSize ( f.pointSize() *2 );
1258 f. setBold (true ); 1291 f. setBold (true );
@@ -1275,20 +1308,16 @@ void KServerSocket::send_file()
1275 mSyncActionDialog->raise(); 1308 mSyncActionDialog->raise();
1276 emit request_file(); 1309 emit request_file();
1277 qApp->processEvents(); 1310 qApp->processEvents();
1278 QString fileName = mFileName; 1311 QString fileName = mFileName;
1279 QFile file( fileName ); 1312 QFile file( fileName );
1280 if (!file.open( IO_ReadOnly ) ) { 1313 if (!file.open( IO_ReadOnly ) ) {
1281 delete mSyncActionDialog; 1314 mErrorMessage = 0;
1282 mSyncActionDialog = 0; 1315 end_connect();
1283 qDebug("KSS::error open sync file: %s ", fileName.latin1()); 1316 error_connect("ERROR_FI\r\n\r\n");
1284 mSocket->close(); 1317 return ;
1285 if ( mSocket->state() == QSocket::Idle )
1286 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1287 return ;
1288
1289 } 1318 }
1290 mSyncActionDialog->setCaption( i18n("Sending file...") ); 1319 mSyncActionDialog->setCaption( i18n("Sending file...") );
1291 QTextStream ts( &file ); 1320 QTextStream ts( &file );
1292 ts.setEncoding( QTextStream::Latin1 ); 1321 ts.setEncoding( QTextStream::Latin1 );
1293 1322
1294 QTextStream os( mSocket ); 1323 QTextStream os( mSocket );
@@ -1473,14 +1502,29 @@ void KCommandSocket::readFileFromSocket()
1473 //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); 1502 //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
1474 while ( mSocket->canReadLine () ) { 1503 while ( mSocket->canReadLine () ) {
1475 mTime.restart(); 1504 mTime.restart();
1476 QString line = mSocket->readLine (); 1505 QString line = mSocket->readLine ();
1477 if ( mFirstLine ) { 1506 if ( mFirstLine ) {
1478 mFirstLine = false; 1507 mFirstLine = false;
1479 if ( line.left( 8 ) == "ERROR_PW" ) { 1508 if ( line.left( 6 ) == "ERROR_" ) {
1480 mRetVal = errorPW; 1509 if ( line.left( 8 ) == "ERROR_PW" ) {
1510 mRetVal = errorPW;
1511 deleteSocket();
1512 return ;
1513 }
1514 if ( line.left( 8 ) == "ERROR_CA" ) {
1515 mRetVal = errorCA;
1516 deleteSocket();
1517 return ;
1518 }
1519 if ( line.left( 8 ) == "ERROR_FI" ) {
1520 mRetVal = errorFI;
1521 deleteSocket();
1522 return ;
1523 }
1524 mRetVal = errorUN;
1481 deleteSocket(); 1525 deleteSocket();
1482 return ; 1526 return ;
1483 } 1527 }
1484 } 1528 }
1485 mFileString += line; 1529 mFileString += line;
1486 //qDebug("readline: %s ", line.latin1()); 1530 //qDebug("readline: %s ", line.latin1());
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 810a515..bd3ecdc 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -52,33 +52,36 @@ class KServerSocket : public QServerSocket
52 void file_received( bool ); 52 void file_received( bool );
53 void request_file(); 53 void request_file();
54 void saveFile(); 54 void saveFile();
55 void endConnect(); 55 void endConnect();
56 private slots: 56 private slots:
57 void discardClient(); 57 void discardClient();
58 void deleteSocket();
58 void readClient(); 59 void readClient();
60 void displayErrorMessage();
59 void readBackFileFromSocket(); 61 void readBackFileFromSocket();
60 private : 62 private :
63 int mErrorMessage;
61 bool blockRC; 64 bool blockRC;
62 void send_file(); 65 void send_file();
63 void get_file(); 66 void get_file();
64 void end_connect(); 67 void end_connect();
65 void error_connect(); 68 void error_connect( QString );
66 QDialog* mSyncActionDialog; 69 QDialog* mSyncActionDialog;
67 QSocket* mSocket; 70 QSocket* mSocket;
68 QString mPassWord; 71 QString mPassWord;
69 QString mFileName; 72 QString mFileName;
70 QTime piTime; 73 QTime piTime;
71 QString piFileString; 74 QString piFileString;
72}; 75};
73 76
74class KCommandSocket : public QObject 77class KCommandSocket : public QObject
75{ 78{
76 Q_OBJECT 79 Q_OBJECT
77 public: 80 public:
78 enum state { successR, errorR, successW, errorW, errorTO, errorPW,quiet }; 81 enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet };
79 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); 82 KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 );
80 void readFile( QString ); 83 void readFile( QString );
81 void writeFile( QString ); 84 void writeFile( QString );
82 void sendStop(); 85 void sendStop();
83 86
84 private slots : 87 private slots :