-rw-r--r-- | core/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/launcher/opie-taskbar.control | 2 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 59 |
3 files changed, 49 insertions, 14 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index bae5c51..5b32bc3 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro | |||
@@ -90,25 +90,25 @@ SOURCES = background.cpp \ | |||
90 | ../../rsync/util.c \ | 90 | ../../rsync/util.c \ |
91 | ../../rsync/version.c \ | 91 | ../../rsync/version.c \ |
92 | ../../rsync/whole.c \ | 92 | ../../rsync/whole.c \ |
93 | ../../rsync/qrsync.cpp | 93 | ../../rsync/qrsync.cpp |
94 | INTERFACES= syncdialog.ui | 94 | INTERFACES= syncdialog.ui |
95 | INCLUDEPATH += ../../include | 95 | INCLUDEPATH += ../../include |
96 | DEPENDPATH+= ../../include . | 96 | DEPENDPATH+= ../../include . |
97 | INCLUDEPATH += ../../core/apps/calibrate | 97 | INCLUDEPATH += ../../core/apps/calibrate |
98 | DEPENDPATH+= ../../core/apps/calibrate | 98 | DEPENDPATH+= ../../core/apps/calibrate |
99 | INCLUDEPATH += ../../rsync | 99 | INCLUDEPATH += ../../rsync |
100 | DEPENDPATH+= ../../rsync | 100 | DEPENDPATH+= ../../rsync |
101 | TARGET = qpe | 101 | TARGET = qpe |
102 | LIBS += -lqpe -lcrypt -lopie -luuid | 102 | LIBS += -lqpe -lcrypt -lopie |
103 | 103 | ||
104 | TRANSLATIONS = ../../i18n/de/qpe.ts \ | 104 | TRANSLATIONS = ../../i18n/de/qpe.ts \ |
105 | ../../i18n/en/qpe.ts \ | 105 | ../../i18n/en/qpe.ts \ |
106 | ../../i18n/es/qpe.ts \ | 106 | ../../i18n/es/qpe.ts \ |
107 | ../../i18n/fr/qpe.ts \ | 107 | ../../i18n/fr/qpe.ts \ |
108 | ../../i18n/hu/qpe.ts \ | 108 | ../../i18n/hu/qpe.ts \ |
109 | ../../i18n/ja/qpe.ts \ | 109 | ../../i18n/ja/qpe.ts \ |
110 | ../../i18n/ko/qpe.ts \ | 110 | ../../i18n/ko/qpe.ts \ |
111 | ../../i18n/no/qpe.ts \ | 111 | ../../i18n/no/qpe.ts \ |
112 | ../../i18n/pl/qpe.ts \ | 112 | ../../i18n/pl/qpe.ts \ |
113 | ../../i18n/pt/qpe.ts \ | 113 | ../../i18n/pt/qpe.ts \ |
114 | ../../i18n/pt_BR/qpe.ts \ | 114 | ../../i18n/pt_BR/qpe.ts \ |
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control index ce73d8b..e9338fb 100644 --- a/core/launcher/opie-taskbar.control +++ b/core/launcher/opie-taskbar.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher | 1 | Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher |
2 | Priority: required | 2 | Priority: required |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Maintainer: Project Opie <opie@handhelds.org> | 4 | Maintainer: Project Opie <opie@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.1 | 6 | Version: $QPE_VERSION-$SUB_VERSION.1 |
7 | Depends: qt-embedded (>=$QTE_VERSION), libuuid1 | 7 | Depends: qt-embedded (>=$QTE_VERSION) |
8 | Description: Launcher for Opie | 8 | Description: Launcher for Opie |
9 | The "finder" or "explorer", or whatever you want to call it. | 9 | The "finder" or "explorer", or whatever you want to call it. |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 9d18b7b..a20df2f 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -16,29 +16,33 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #define _XOPEN_SOURCE | 20 | #define _XOPEN_SOURCE |
21 | #include <pwd.h> | 21 | #include <pwd.h> |
22 | #include <sys/types.h> | 22 | #include <sys/types.h> |
23 | #include <unistd.h> | 23 | #include <unistd.h> |
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include <time.h> | 25 | #include <time.h> |
26 | #include <shadow.h> | 26 | #include <shadow.h> |
27 | 27 | ||
28 | #ifndef _OS_LINUX_ | ||
29 | |||
28 | extern "C" { | 30 | extern "C" { |
29 | #include <uuid/uuid.h> | 31 | #include <uuid/uuid.h> |
30 | #define UUID_H_INCLUDED | 32 | #define UUID_H_INCLUDED |
31 | } | 33 | } |
32 | 34 | ||
35 | #endif // not defined linux | ||
36 | |||
33 | #if defined(_OS_LINUX_) | 37 | #if defined(_OS_LINUX_) |
34 | #include <shadow.h> | 38 | #include <shadow.h> |
35 | #endif | 39 | #endif |
36 | 40 | ||
37 | #include <qdir.h> | 41 | #include <qdir.h> |
38 | #include <qfile.h> | 42 | #include <qfile.h> |
39 | #include <qtextstream.h> | 43 | #include <qtextstream.h> |
40 | #include <qdatastream.h> | 44 | #include <qdatastream.h> |
41 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
42 | #include <qstringlist.h> | 46 | #include <qstringlist.h> |
43 | #include <qfileinfo.h> | 47 | #include <qfileinfo.h> |
44 | #include <qregexp.h> | 48 | #include <qregexp.h> |
@@ -67,33 +71,64 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent , | |||
67 | } | 71 | } |
68 | 72 | ||
69 | TransferServer::~TransferServer() | 73 | TransferServer::~TransferServer() |
70 | { | 74 | { |
71 | 75 | ||
72 | } | 76 | } |
73 | 77 | ||
74 | void TransferServer::newConnection( int socket ) | 78 | void TransferServer::newConnection( int socket ) |
75 | { | 79 | { |
76 | (void) new ServerPI( socket, this ); | 80 | (void) new ServerPI( socket, this ); |
77 | } | 81 | } |
78 | 82 | ||
83 | /* | ||
84 | * small class in anonymous namespace | ||
85 | * to generate a QUUid for us | ||
86 | */ | ||
87 | namespace { | ||
88 | struct UidGen { | ||
89 | QString uuid(); | ||
90 | }; | ||
91 | #if defined(_OS_LINUX_) | ||
92 | /* | ||
93 | * linux got a /proc/sys/kernel/random/uuid file | ||
94 | * it'll generate the uuids for us | ||
95 | */ | ||
96 | QString UidGen::uuid() { | ||
97 | QFile file( "/proc/sys/kernel/random/uuid" ); | ||
98 | if (!file.open(IO_ReadOnly ) ) | ||
99 | return QString::null; | ||
100 | |||
101 | QTextStream stream(&file); | ||
102 | |||
103 | return "{" + stream.read().stripWhiteSpace() + "}"; | ||
104 | } | ||
105 | #else | ||
106 | QString UidGen::uuid() { | ||
107 | uuid_t uuid; | ||
108 | uuid_generate( uuid ); | ||
109 | return QUUid( uuid ).toString(); | ||
110 | } | ||
111 | #endif | ||
112 | } | ||
113 | |||
79 | QString SyncAuthentication::serverId() | 114 | QString SyncAuthentication::serverId() |
80 | { | 115 | { |
81 | Config cfg("Security"); | 116 | Config cfg("Security"); |
82 | cfg.setGroup("Sync"); | 117 | cfg.setGroup("Sync"); |
83 | QString r=cfg.readEntry("serverid"); | 118 | QString r=cfg.readEntry("serverid"); |
84 | if ( r.isEmpty() ) { | 119 | if ( r.isEmpty() ) { |
85 | uuid_t uuid; | 120 | UidGen gen; |
86 | uuid_generate( uuid ); | 121 | r = gen.uuid(); |
87 | cfg.writeEntry("serverid",(r = QUuid( uuid ).toString())); | 122 | cfg.writeEntry("serverid", r ); |
88 | } | 123 | } |
89 | return r; | 124 | return r; |
90 | } | 125 | } |
91 | 126 | ||
92 | QString SyncAuthentication::ownerName() | 127 | QString SyncAuthentication::ownerName() |
93 | { | 128 | { |
94 | QString vfilename = Global::applicationFileName("addressbook", | 129 | QString vfilename = Global::applicationFileName("addressbook", |
95 | "businesscard.vcf"); | 130 | "businesscard.vcf"); |
96 | if (QFile::exists(vfilename)) { | 131 | if (QFile::exists(vfilename)) { |
97 | Contact c; | 132 | Contact c; |
98 | c = Contact::readVCard( vfilename )[0]; | 133 | c = Contact::readVCard( vfilename )[0]; |
99 | return c.fullName(); | 134 | return c.fullName(); |
@@ -106,25 +141,25 @@ QString SyncAuthentication::loginName() | |||
106 | { | 141 | { |
107 | struct passwd *pw; | 142 | struct passwd *pw; |
108 | pw = getpwuid( geteuid() ); | 143 | pw = getpwuid( geteuid() ); |
109 | return QString::fromLocal8Bit( pw->pw_name ); | 144 | return QString::fromLocal8Bit( pw->pw_name ); |
110 | } | 145 | } |
111 | 146 | ||
112 | int SyncAuthentication::isAuthorized(QHostAddress peeraddress) | 147 | int SyncAuthentication::isAuthorized(QHostAddress peeraddress) |
113 | { | 148 | { |
114 | Config cfg("Security"); | 149 | Config cfg("Security"); |
115 | cfg.setGroup("Sync"); | 150 | cfg.setGroup("Sync"); |
116 | // QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0"); | 151 | // QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0"); |
117 | uint auth_peer = cfg.readNumEntry("auth_peer",0xc0a80100); | 152 | uint auth_peer = cfg.readNumEntry("auth_peer",0xc0a80100); |
118 | 153 | ||
119 | // QHostAddress allowed; | 154 | // QHostAddress allowed; |
120 | // allowed.setAddress(allowedstr); | 155 | // allowed.setAddress(allowedstr); |
121 | // uint auth_peer = allowed.ip4Addr(); | 156 | // uint auth_peer = allowed.ip4Addr(); |
122 | uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); | 157 | uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); |
123 | uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined | 158 | uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined |
124 | ? 0xffffffff : (((1<<auth_peer_bits)-1)<<(32-auth_peer_bits)); | 159 | ? 0xffffffff : (((1<<auth_peer_bits)-1)<<(32-auth_peer_bits)); |
125 | return (peeraddress.ip4Addr() & mask) == auth_peer; | 160 | return (peeraddress.ip4Addr() & mask) == auth_peer; |
126 | } | 161 | } |
127 | 162 | ||
128 | bool SyncAuthentication::checkUser( const QString& user ) | 163 | bool SyncAuthentication::checkUser( const QString& user ) |
129 | { | 164 | { |
130 | if ( user.isEmpty() ) return FALSE; | 165 | if ( user.isEmpty() ) return FALSE; |
@@ -164,32 +199,32 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
164 | tr("<p>An unauthorized system is requesting access to this device." | 199 | tr("<p>An unauthorized system is requesting access to this device." |
165 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " | 200 | "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " |
166 | "please upgrade."), | 201 | "please upgrade."), |
167 | tr("Deny") ); | 202 | tr("Deny") ); |
168 | denials++; | 203 | denials++; |
169 | lastdenial=now; | 204 | lastdenial=now; |
170 | } | 205 | } |
171 | return FALSE; | 206 | return FALSE; |
172 | } | 207 | } |
173 | 208 | ||
174 | // Second, check sync password... | 209 | // Second, check sync password... |
175 | QString pass = password.left(6); | 210 | QString pass = password.left(6); |
176 | /* old QtopiaDesktops are sending | 211 | /* old QtopiaDesktops are sending |
177 | * rootme newer versions got a Qtopia | 212 | * rootme newer versions got a Qtopia |
178 | * prefixed. Qtopia prefix will suceed | 213 | * prefixed. Qtopia prefix will suceed |
179 | * until the sync software syncs up | 214 | * until the sync software syncs up |
180 | * FIXME | 215 | * FIXME |
181 | */ | 216 | */ |
182 | if ( pass == "rootme" || pass == "Qtopia") { | 217 | if ( pass == "rootme" || pass == "Qtopia") { |
183 | 218 | ||
184 | QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) ); | 219 | QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) ); |
185 | Config cfg("Security"); | 220 | Config cfg("Security"); |
186 | cfg.setGroup("Sync"); | 221 | cfg.setGroup("Sync"); |
187 | QString pwds = cfg.readEntry("Passwords"); | 222 | QString pwds = cfg.readEntry("Passwords"); |
188 | if ( QStringList::split(QChar(' '),pwds).contains(cpassword) ) | 223 | if ( QStringList::split(QChar(' '),pwds).contains(cpassword) ) |
189 | return TRUE; | 224 | return TRUE; |
190 | 225 | ||
191 | // Unrecognized system. Be careful... | 226 | // Unrecognized system. Be careful... |
192 | 227 | ||
193 | if ( (denials > 2 && now < lastdenial+600) | 228 | if ( (denials > 2 && now < lastdenial+600) |
194 | || QMessageBox::warning(0,tr("Sync Connection"), | 229 | || QMessageBox::warning(0,tr("Sync Connection"), |
195 | tr("<p>An unrecognized system is requesting access to this device." | 230 | tr("<p>An unrecognized system is requesting access to this device." |
@@ -215,29 +250,29 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name ) | |||
215 | state = Connected; | 250 | state = Connected; |
216 | 251 | ||
217 | setSocket( socket ); | 252 | setSocket( socket ); |
218 | 253 | ||
219 | peerport = peerPort(); | 254 | peerport = peerPort(); |
220 | peeraddress = peerAddress(); | 255 | peeraddress = peerAddress(); |
221 | 256 | ||
222 | #ifndef INSECURE | 257 | #ifndef INSECURE |
223 | if ( !SyncAuthentication::isAuthorized(peeraddress) ) { | 258 | if ( !SyncAuthentication::isAuthorized(peeraddress) ) { |
224 | state = Forbidden; | 259 | state = Forbidden; |
225 | startTimer( 0 ); | 260 | startTimer( 0 ); |
226 | } else | 261 | } else |
227 | #endif | 262 | #endif |
228 | { | 263 | { |
229 | connect( this, SIGNAL( readyRead() ), SLOT( read() ) ); | 264 | connect( this, SIGNAL( readyRead() ), SLOT( read() ) ); |
230 | connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) ); | 265 | connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) ); |
231 | 266 | ||
232 | passiv = FALSE; | 267 | passiv = FALSE; |
233 | for( int i = 0; i < 4; i++ ) | 268 | for( int i = 0; i < 4; i++ ) |
234 | wait[i] = FALSE; | 269 | wait[i] = FALSE; |
235 | 270 | ||
236 | send( "220 Qtopia " QPE_VERSION " FTP Server" ); | 271 | send( "220 Qtopia " QPE_VERSION " FTP Server" ); |
237 | state = Wait_USER; | 272 | state = Wait_USER; |
238 | 273 | ||
239 | dtp = new ServerDTP( this ); | 274 | dtp = new ServerDTP( this ); |
240 | connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) ); | 275 | connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) ); |
241 | connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) ); | 276 | connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) ); |
242 | connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) ); | 277 | connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) ); |
243 | 278 | ||
@@ -618,25 +653,25 @@ void ServerPI::process( const QString& message ) | |||
618 | if ( !duproc.exec(in, out) ) { | 653 | if ( !duproc.exec(in, out) ) { |
619 | qDebug("du process failed; just sending back 1K"); | 654 | qDebug("du process failed; just sending back 1K"); |
620 | send( "213 1024"); | 655 | send( "213 1024"); |
621 | } | 656 | } |
622 | else { | 657 | else { |
623 | QString size = out.left( out.find("\t") ); | 658 | QString size = out.left( out.find("\t") ); |
624 | int guess = size.toInt()/5; | 659 | int guess = size.toInt()/5; |
625 | if ( filePath.contains("doc") ) | 660 | if ( filePath.contains("doc") ) |
626 | guess *= 1000; | 661 | guess *= 1000; |
627 | qDebug("sending back gzip guess of %d", guess); | 662 | qDebug("sending back gzip guess of %d", guess); |
628 | send( "213 " + QString::number(guess) ); | 663 | send( "213 " + QString::number(guess) ); |
629 | } | 664 | } |
630 | } | 665 | } |
631 | } | 666 | } |
632 | } | 667 | } |
633 | // name list (NLST) | 668 | // name list (NLST) |
634 | else if ( cmd == "NLST" ) { | 669 | else if ( cmd == "NLST" ) { |
635 | send( "502 Command not implemented" ); | 670 | send( "502 Command not implemented" ); |
636 | } | 671 | } |
637 | 672 | ||
638 | // site parameters (SITE) | 673 | // site parameters (SITE) |
639 | else if ( cmd == "SITE" ) { | 674 | else if ( cmd == "SITE" ) { |
640 | send( "502 Command not implemented" ); | 675 | send( "502 Command not implemented" ); |
641 | } | 676 | } |
642 | 677 | ||
@@ -1168,25 +1203,25 @@ void ServerDTP::bytesWritten( int bytes ) | |||
1168 | void ServerDTP::readyRead() | 1203 | void ServerDTP::readyRead() |
1169 | { | 1204 | { |
1170 | // retrieve file mode | 1205 | // retrieve file mode |
1171 | if ( RetrieveFile == mode ) { | 1206 | if ( RetrieveFile == mode ) { |
1172 | QCString s; | 1207 | QCString s; |
1173 | s.resize( bytesAvailable() ); | 1208 | s.resize( bytesAvailable() ); |
1174 | readBlock( s.data(), bytesAvailable() ); | 1209 | readBlock( s.data(), bytesAvailable() ); |
1175 | file.writeBlock( s.data(), s.size() ); | 1210 | file.writeBlock( s.data(), s.size() ); |
1176 | } | 1211 | } |
1177 | else if ( RetrieveGzipFile == mode ) { | 1212 | else if ( RetrieveGzipFile == mode ) { |
1178 | if ( !gzipProc->isRunning() ) | 1213 | if ( !gzipProc->isRunning() ) |
1179 | gzipProc->start(); | 1214 | gzipProc->start(); |
1180 | 1215 | ||
1181 | QByteArray s; | 1216 | QByteArray s; |
1182 | s.resize( bytesAvailable() ); | 1217 | s.resize( bytesAvailable() ); |
1183 | readBlock( s.data(), bytesAvailable() ); | 1218 | readBlock( s.data(), bytesAvailable() ); |
1184 | gzipProc->writeToStdin( s ); | 1219 | gzipProc->writeToStdin( s ); |
1185 | qDebug("wrote %d bytes to ungzip ", s.size() ); | 1220 | qDebug("wrote %d bytes to ungzip ", s.size() ); |
1186 | } | 1221 | } |
1187 | // retrieve buffer mode | 1222 | // retrieve buffer mode |
1188 | else if ( RetrieveBuffer == mode ) { | 1223 | else if ( RetrieveBuffer == mode ) { |
1189 | QCString s; | 1224 | QCString s; |
1190 | s.resize( bytesAvailable() ); | 1225 | s.resize( bytesAvailable() ); |
1191 | readBlock( s.data(), bytesAvailable() ); | 1226 | readBlock( s.data(), bytesAvailable() ); |
1192 | buf.writeBlock( s.data(), s.size() ); | 1227 | buf.writeBlock( s.data(), s.size() ); |
@@ -1251,25 +1286,25 @@ void ServerDTP::sendGzipFile( const QString &fn, | |||
1251 | { | 1286 | { |
1252 | mode = SendGzipFile; | 1287 | mode = SendGzipFile; |
1253 | file.setName( fn ); | 1288 | file.setName( fn ); |
1254 | 1289 | ||
1255 | QStringList args = "tar"; | 1290 | QStringList args = "tar"; |
1256 | args += "-cv"; | 1291 | args += "-cv"; |
1257 | args += archiveTargets; | 1292 | args += archiveTargets; |
1258 | qDebug("sendGzipFile %s", args.join(" ").latin1() ); | 1293 | qDebug("sendGzipFile %s", args.join(" ").latin1() ); |
1259 | createTargzProc->setArguments( args ); | 1294 | createTargzProc->setArguments( args ); |
1260 | connect( createTargzProc, | 1295 | connect( createTargzProc, |
1261 | SIGNAL( readyReadStdout() ), SLOT( gzipTarBlock() ) ); | 1296 | SIGNAL( readyReadStdout() ), SLOT( gzipTarBlock() ) ); |
1262 | 1297 | ||
1263 | gzipProc->setArguments( "gzip" ); | 1298 | gzipProc->setArguments( "gzip" ); |
1264 | connect( gzipProc, SIGNAL( readyReadStdout() ), | 1299 | connect( gzipProc, SIGNAL( readyReadStdout() ), |
1265 | SLOT( writeTargzBlock() ) ); | 1300 | SLOT( writeTargzBlock() ) ); |
1266 | } | 1301 | } |
1267 | 1302 | ||
1268 | void ServerDTP::gunzipDone() | 1303 | void ServerDTP::gunzipDone() |
1269 | { | 1304 | { |
1270 | qDebug("gunzipDone"); | 1305 | qDebug("gunzipDone"); |
1271 | disconnect( gzipProc, SIGNAL( processExited() ), | 1306 | disconnect( gzipProc, SIGNAL( processExited() ), |
1272 | this, SLOT( gunzipDone() ) ); | 1307 | this, SLOT( gunzipDone() ) ); |
1273 | retrieveTargzProc->closeStdin(); | 1308 | retrieveTargzProc->closeStdin(); |
1274 | disconnect( gzipProc, SIGNAL( readyReadStdout() ), | 1309 | disconnect( gzipProc, SIGNAL( readyReadStdout() ), |
1275 | this, SLOT( tarExtractBlock() ) ); | 1310 | this, SLOT( tarExtractBlock() ) ); |
@@ -1297,25 +1332,25 @@ void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT | |||
1297 | void ServerDTP::retrieveFile( const QString fn ) | 1332 | void ServerDTP::retrieveFile( const QString fn ) |
1298 | { | 1333 | { |
1299 | file.setName( fn ); | 1334 | file.setName( fn ); |
1300 | mode = RetrieveFile; | 1335 | mode = RetrieveFile; |
1301 | } | 1336 | } |
1302 | 1337 | ||
1303 | void ServerDTP::retrieveGzipFile( const QString &fn ) | 1338 | void ServerDTP::retrieveGzipFile( const QString &fn ) |
1304 | { | 1339 | { |
1305 | qDebug("retrieveGzipFile %s", fn.latin1()); | 1340 | qDebug("retrieveGzipFile %s", fn.latin1()); |
1306 | file.setName( fn ); | 1341 | file.setName( fn ); |
1307 | mode = RetrieveGzipFile; | 1342 | mode = RetrieveGzipFile; |
1308 | 1343 | ||
1309 | gzipProc->setArguments( "gunzip" ); | 1344 | gzipProc->setArguments( "gunzip" ); |
1310 | connect( gzipProc, SIGNAL( readyReadStdout() ), | 1345 | connect( gzipProc, SIGNAL( readyReadStdout() ), |
1311 | SLOT( tarExtractBlock() ) ); | 1346 | SLOT( tarExtractBlock() ) ); |
1312 | connect( gzipProc, SIGNAL( processExited() ), | 1347 | connect( gzipProc, SIGNAL( processExited() ), |
1313 | SLOT( gunzipDone() ) ); | 1348 | SLOT( gunzipDone() ) ); |
1314 | } | 1349 | } |
1315 | 1350 | ||
1316 | void ServerDTP::retrieveGzipFile( const QString &fn, const QHostAddress& host, Q_UINT16 port ) | 1351 | void ServerDTP::retrieveGzipFile( const QString &fn, const QHostAddress& host, Q_UINT16 port ) |
1317 | { | 1352 | { |
1318 | retrieveGzipFile( fn ); | 1353 | retrieveGzipFile( fn ); |
1319 | connectToHost( host.toString(), port ); | 1354 | connectToHost( host.toString(), port ); |
1320 | } | 1355 | } |
1321 | 1356 | ||