summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-28 14:50:19 (UTC)
committer zecke <zecke>2003-08-28 14:50:19 (UTC)
commit225fa91f6d57f211d53ec686518ca15fc5278d21 (patch) (side-by-side diff)
tree3b7f3bc38693383b45027115efac1176ed5cd1b0
parent704de5567caccd769c693676a55a4af45c85e044 (diff)
downloadopie-225fa91f6d57f211d53ec686518ca15fc5278d21.zip
opie-225fa91f6d57f211d53ec686518ca15fc5278d21.tar.gz
opie-225fa91f6d57f211d53ec686518ca15fc5278d21.tar.bz2
Use old Opie changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/transferserver.cpp2153
1 files changed, 1072 insertions, 1081 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 0337a94..371400e 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -8,1417 +8,1408 @@
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
-#define _XOPEN_SOURCE
+//#define _XOPEN_SOURCE
+
+#include <qtopia/global.h>
+#include <qtopia/qpeapplication.h>
+
+#ifndef Q_OS_WIN32
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <time.h>
#include <shadow.h>
+#include <crypt.h>
-/* we need the _OS_LINUX stuff first ! */
-#include <qglobal.h>
-
-#ifndef _OS_LINUX_
-
-extern "C"
-{
-#include <uuid/uuid.h>
-#define UUID_H_INCLUDED
-}
+#else
+#include <stdlib.h>
+#include <time.h>
+#endif
-#endif // not defined linux
#if defined(_OS_LINUX_)
#include <shadow.h>
#endif
#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qdatastream.h>
#include <qmessagebox.h>
#include <qstringlist.h>
#include <qfileinfo.h>
-#include <qregexp.h>
-//#include <qpe/qcopchannel_qws.h>
-#include <qpe/process.h>
-#include <qpe/global.h>
-#include <qpe/config.h>
-#include <qpe/contact.h>
-#include <qpe/quuid.h>
-#include <qpe/version.h>
-#include <qpe/qcopenvelope_qws.h>
+#include <qregexp.h>
+//#include <qtopia/qcopchannel_qws.h>
+#include <qtopia/process.h>
+#include <qtopia/global.h>
+#include <qtopia/config.h>
+#include <qtopia/private/contact.h>
+#include <qtopia/quuid.h>
+#include <qtopia/version.h>
+#ifdef Q_WS_QWS
+#include <qtopia/qcopenvelope_qws.h>
+#endif
+
+#include "launcherglobal.h"
#include "transferserver.h"
-#include <opie/oprocess.h>
+#include <qtopia/qprocess.h>
const int block_size = 51200;
-TransferServer::TransferServer( Q_UINT16 port, QObject *parent ,
- const char* name )
- : QServerSocket( port, 1, parent, name )
+TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
+ const char* name)
+ : QServerSocket( port, 1, parent, name )
{
- if ( !ok() )
- qWarning( "Failed to bind to port %d", port );
+ connections.setAutoDelete( TRUE );
+ if ( !ok() )
+ qWarning( "Failed to bind to port %d", port );
}
-TransferServer::~TransferServer()
+void TransferServer::authorizeConnections()
{
+ QListIterator<ServerPI> it(connections);
+ while ( it.current() ) {
+ if ( !it.current()->verifyAuthorised() ) {
+ disconnect( it.current(), SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
+ connections.removeRef( it.current() );
+ } else
+ ++it;
+ }
}
-void TransferServer::newConnection( int socket )
+void TransferServer::closed(ServerPI *item)
{
- (void) new ServerPI( socket, this );
+ connections.removeRef(item);
}
-/*
- * small class in anonymous namespace
- * to generate a QUUid for us
- */
-namespace
-{
-struct UidGen
-{
- QString uuid();
-};
-#if !defined(_OS_LINUX_)
-
-QString UidGen::uuid()
+TransferServer::~TransferServer()
{
- uuid_t uuid;
- uuid_generate( uuid );
- return QUUid( uuid ).toString();
}
-#else
-/*
-* linux got a /proc/sys/kernel/random/uuid file
-* it'll generate the uuids for us
-*/
-QString UidGen::uuid()
-{
- QFile file( "/proc/sys/kernel/random/uuid" );
- if (!file.open(IO_ReadOnly ) )
- return QString::null;
- QTextStream stream(&file);
-
- return "{" + stream.read().stripWhiteSpace() + "}";
-}
-#endif
+void TransferServer::newConnection( int socket )
+{
+ ServerPI *ptr = new ServerPI( socket, this );
+ connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
+ connections.append( ptr );
}
QString SyncAuthentication::serverId()
{
- Config cfg("Security");
- cfg.setGroup("Sync");
- QString r = cfg.readEntry("serverid");
- if ( r.isEmpty() ) {
- UidGen gen;
- r = gen.uuid();
- cfg.writeEntry("serverid", r );
- }
- return r;
+ Config cfg("Security");
+ cfg.setGroup("Sync");
+ QString r = cfg.readEntry("serverid");
+
+ if ( r.isEmpty() ) {
+ r = Opie::Global::uuid();
+ cfg.writeEntry("serverid", r );
+ }
+ return r;
}
QString SyncAuthentication::ownerName()
{
- QString vfilename = Global::applicationFileName("addressbook",
- "businesscard.vcf");
- if (QFile::exists(vfilename)) {
- Contact c;
- c = Contact::readVCard( vfilename )[0];
- return c.fullName();
- }
-
- return "";
+ QString vfilename = Global::applicationFileName("addressbook",
+ "businesscard.vcf");
+ if (QFile::exists(vfilename)) {
+ Contact c;
+ c = Contact::readVCard( vfilename )[0];
+ return c.fullName();
+ }
+
+ return QString::null;
}
QString SyncAuthentication::loginName()
{
- struct passwd *pw;
- pw = getpwuid( geteuid() );
- return QString::fromLocal8Bit( pw->pw_name );
+ struct passwd *pw = 0L;
+#ifndef Q_OS_WIN32
+ pw = getpwuid( geteuid() );
+ return QString::fromLocal8Bit( pw->pw_name );
+#else
+ //### revise
+ return QString();
+#endif
}
int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
{
- Config cfg("Security");
+ Config cfg("Security");
cfg.setGroup("Sync");
// QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
// QHostAddress allowed;
// allowed.setAddress(allowedstr);
// uint auth_peer = allowed.ip4Addr();
uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
+
return (peeraddress.ip4Addr() & mask) == auth_peer;
}
bool SyncAuthentication::checkUser( const QString& user )
{
- if ( user.isEmpty() )
- return FALSE;
- QString euser = loginName();
- return user == euser;
+ if ( user.isEmpty() ) return FALSE;
+ QString euser = loginName();
+ return user == euser;
}
bool SyncAuthentication::checkPassword( const QString& password )
{
#ifdef ALLOW_UNIX_USER_FTP
- // First, check system password...
+ // First, check system password...
- struct passwd *pw = 0;
- struct spwd *spw = 0;
+ struct passwd *pw = 0;
+ struct spwd *spw = 0;
- pw = getpwuid( geteuid() );
- spw = getspnam( pw->pw_name );
+ pw = getpwuid( geteuid() );
+ spw = getspnam( pw->pw_name );
- QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
- if ( cpwd == "x" && spw )
- cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
+ QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
+ if ( cpwd == "x" && spw )
+ cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
- // Note: some systems use more than crypt for passwords.
- QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
- if ( cpwd == cpassword )
- return TRUE;
+ // Note: some systems use more than crypt for passwords.
+ QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
+ if ( cpwd == cpassword )
+ return TRUE;
#endif
- static int lastdenial = 0;
- static int denials = 0;
- int now = time(0);
-
- // Detect old Qtopia Desktop (no password)
- if ( password.isEmpty() ) {
- if ( denials < 1 || now > lastdenial + 600 ) {
- QMessageBox::warning( 0, tr("Sync Connection"),
- tr("<p>An unauthorized system is requesting access to this device."
- "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
- "please upgrade."),
- tr("Deny") );
- denials++;
- lastdenial = now;
- }
- return FALSE;
+ static int lastdenial=0;
+ static int denials=0;
+ int now = time(0);
+
+ // Detect old Qtopia Desktop (no password)
+ if ( password.isEmpty() ) {
+ if ( denials < 1 || now > lastdenial+600 ) {
+ QMessageBox unauth(
+ tr("Sync Connection"),
+ tr("<p>An unauthorized system is requesting access to this device."
+ "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
+ "please upgrade."),
+ QMessageBox::Warning,
+ QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+ 0, QString::null, TRUE, WStyle_StaysOnTop);
+ unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
+ unauth.exec();
+
+ denials++;
+ lastdenial=now;
}
+ return FALSE;
+ }
- // Second, check sync password...
- QString pass = password.left(6);
- /* old QtopiaDesktops are sending
- * rootme newer versions got a Qtopia
- * prefixed. Qtopia prefix will suceed
- * until the sync software syncs up
- * FIXME
- */
- if ( pass == "rootme" || pass == "Qtopia") {
-
- QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) );
- Config cfg("Security");
- cfg.setGroup("Sync");
- QString pwds = cfg.readEntry("Passwords");
- if ( QStringList::split(QChar(' '), pwds).contains(cpassword) )
- return TRUE;
-
- // Unrecognized system. Be careful...
-
- if ( (denials > 2 && now < lastdenial + 600)
- || QMessageBox::warning(0, tr("Sync Connection"),
- tr("<p>An unrecognized system is requesting access to this device."
- "<p>If you have just initiated a Sync for the first time, this is normal."),
- tr("Allow"), tr("Deny"), 0, 1, 1 ) == 1 ) {
- denials++;
- lastdenial = now;
- return FALSE;
- }
- else {
- denials = 0;
- cfg.writeEntry("Passwords", pwds + " " + cpassword);
- return TRUE;
- }
+ // Second, check sync password...
+
+ static int lock=0;
+ if ( lock ) return FALSE;
+
+ ++lock;
+ if ( password.left(6) == "Qtopia" ) {
+ Config cfg( QPEApplication::qpeDir()+"/etc/Security.conf", Config::File );
+ cfg.setGroup("Sync");
+ QStringList pwds = cfg.readListEntry("Passwords",' ');
+ for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
+#ifndef Q_OS_WIN32
+ QString cpassword = QString::fromLocal8Bit(
+ crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
+#else
+ // ### revise
+ QString cpassword("");
+#endif
+ if ( *it == cpassword ) {
+ lock--;
+ return TRUE;
+ }
+ }
+
+ // Unrecognized system. Be careful...
+ QMessageBox unrecbox(
+ tr("Sync Connection"),
+ tr( "<p>An unrecognized system is requesting access to this device."
+ "<p>If you have just initiated a Sync for the first time, this is normal."),
+ QMessageBox::Warning,
+ QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
+ 0, QString::null, TRUE, WStyle_StaysOnTop);
+ unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
+ unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
+
+ if ( (denials > 2 && now < lastdenial+600)
+ || unrecbox.exec() != QMessageBox::Yes)
+ {
+ denials++;
+ lastdenial=now;
+ lock--;
+ return FALSE;
+ } else {
+ const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
+ char salt[2];
+ salt[0]= salty[rand() % (sizeof(salty)-1)];
+ salt[1]= salty[rand() % (sizeof(salty)-1)];
+#ifndef Q_OS_WIN32
+ QString cpassword = QString::fromLocal8Bit(
+ crypt( password.mid(8).local8Bit(), salt ) );
+#else
+ //### revise
+ QString cpassword("");
+#endif
+ denials=0;
+ pwds.prepend(cpassword);
+ cfg.writeEntry("Passwords",pwds,' ');
+ lock--;
+ return TRUE;
}
+ }
+ lock--;
- return FALSE;
+ return FALSE;
}
-ServerPI::ServerPI( int socket, QObject *parent , const char* name )
- : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 )
+
+ServerPI::ServerPI( int socket, QObject *parent, const char* name )
+ : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ),
+ storFileSize(-1)
{
- state = Connected;
+ state = Connected;
- setSocket( socket );
+ setSocket( socket );
- peerport = peerPort();
- peeraddress = peerAddress();
+ peerport = peerPort();
+ peeraddress = peerAddress();
#ifndef INSECURE
-
- if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
- state = Forbidden;
- startTimer( 0 );
- }
- else
+ if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
+ state = Forbidden;
+ startTimer( 0 );
+ } else
#endif
- {
- connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
- connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
+ {
+ connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
+ connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
- passiv = FALSE;
- for ( int i = 0; i < 4; i++ )
- wait[i] = FALSE;
+ passiv = FALSE;
+ for( int i = 0; i < 4; i++ )
+ wait[i] = FALSE;
- send( "220 Qtopia " QPE_VERSION " FTP Server" );
- state = Wait_USER;
+ send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
+ state = Wait_USER;
- dtp = new ServerDTP( this );
- connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
- connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
- connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
+ dtp = new ServerDTP( this );
+ connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
+ connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
+ connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
- directory = QDir::currentDirPath();
+ directory = QDir::currentDirPath();
- static int p = 1024;
+ static int p = 1024;
- while ( !serversocket || !serversocket->ok() ) {
- delete serversocket;
- serversocket = new ServerSocket( ++p, this );
- }
- connect( serversocket, SIGNAL( newIncomming( int ) ),
- SLOT( newConnection( int ) ) );
+ while ( !serversocket || !serversocket->ok() ) {
+ delete serversocket;
+ serversocket = new ServerSocket( ++p, this );
}
+ connect( serversocket, SIGNAL( newIncomming( int ) ),
+ SLOT( newConnection( int ) ) );
+ }
}
ServerPI::~ServerPI()
{
+ close();
+ dtp->close();
+ delete dtp;
+ delete serversocket;
+}
+
+bool ServerPI::verifyAuthorised()
+{
+ if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
+ state = Forbidden;
+ return FALSE;
+ }
+ return TRUE;
}
void ServerPI::connectionClosed()
{
- // qDebug( "Debug: Connection closed" );
- delete this;
+ // qDebug( "Debug: Connection closed" );
+ emit connectionClosed(this);
}
void ServerPI::send( const QString& msg )
{
- QTextStream os( this );
- os << msg << endl;
- //qDebug( "Reply: %s", msg.latin1() );
+ QTextStream os( this );
+ os << msg << endl;
+ //qDebug( "Reply: %s", msg.latin1() );
}
void ServerPI::read()
{
- while ( canReadLine() )
- process( readLine().stripWhiteSpace() );
+ while ( canReadLine() )
+ process( readLine().stripWhiteSpace() );
}
bool ServerPI::checkReadFile( const QString& file )
{
- QString filename;
+ QString filename;
- if ( file[0] != "/" )
- filename = directory.path() + "/" + file;
- else
- filename = file;
+ if ( file[0] != "/" )
+ filename = directory.path() + "/" + file;
+ else
+ filename = file;
- QFileInfo fi( filename );
- return ( fi.exists() && fi.isReadable() );
+ QFileInfo fi( filename );
+ return ( fi.exists() && fi.isReadable() );
}
bool ServerPI::checkWriteFile( const QString& file )
{
- QString filename;
+ QString filename;
- if ( file[0] != "/" )
- filename = directory.path() + "/" + file;
- else
- filename = file;
+ if ( file[0] != "/" )
+ filename = directory.path() + "/" + file;
+ else
+ filename = file;
- QFileInfo fi( filename );
+ QFileInfo fi( filename );
- if ( fi.exists() )
- if ( !QFile( filename ).remove() )
- return FALSE;
- return TRUE;
+ if ( fi.exists() )
+ if ( !QFile( filename ).remove() )
+ return FALSE;
+ return TRUE;
}
void ServerPI::process( const QString& message )
{
- //qDebug( "Command: %s", message.latin1() );
-
- // split message using "," as separator
- QStringList msg = QStringList::split( " ", message );
- if ( msg.isEmpty() )
- return ;
-
- // command token
- QString cmd = msg[0].upper();
-
- // argument token
- QString arg;
- if ( msg.count() >= 2 )
- arg = msg[1];
-
- // full argument string
- QString args;
- if ( msg.count() >= 2 ) {
- QStringList copy( msg );
- // FIXME: for Qt3
- // copy.pop_front()
- copy.remove( copy.begin() );
- args = copy.join( " " );
+ //qDebug( "Command: %s", message.latin1() );
+
+ // split message using "," as separator
+ QStringList msg = QStringList::split( " ", message );
+ if ( msg.isEmpty() ) return;
+
+ // command token
+ QString cmd = msg[0].upper();
+
+ // argument token
+ QString arg;
+ if ( msg.count() >= 2 )
+ arg = msg[1];
+
+ // full argument string
+ QString args;
+ if ( msg.count() >= 2 ) {
+ QStringList copy( msg );
+ // FIXME: for Qt3
+ // copy.pop_front()
+ copy.remove( copy.begin() );
+ args = copy.join( " " );
+ }
+
+ //qDebug( "args: %s", args.latin1() );
+
+ // we always respond to QUIT, regardless of state
+ if ( cmd == "QUIT" ) {
+ send( "211 Good bye!" ); // No tr
+ close();
+ return;
+ }
+
+ // connected to client
+ if ( Connected == state )
+ return;
+
+ // waiting for user name
+ if ( Wait_USER == state ) {
+
+ if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
+ send( "530 Please login with USER and PASS" ); // No tr
+ return;
+ }
+ send( "331 User name ok, need password" ); // No tr
+ state = Wait_PASS;
+ return;
+ }
+
+ // waiting for password
+ if ( Wait_PASS == state ) {
+
+ if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
+ send( "530 Please login with USER and PASS" ); // No tr
+ return;
+ }
+ send( "230 User logged in, proceed" ); // No tr
+ state = Ready;
+ return;
+ }
+
+ // ACCESS CONTROL COMMANDS
+
+ // Only an ALLO sent immediately before STOR is valid.
+ if ( cmd != "STOR" )
+ storFileSize = -1;
+
+ // account (ACCT)
+ if ( cmd == "ACCT" ) {
+ // even wu-ftp does not support it
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // change working directory (CWD)
+ else if ( cmd == "CWD" ) {
+
+ if ( !args.isEmpty() ) {
+ if ( directory.cd( args, TRUE ) )
+ send( "250 Requested file action okay, completed" ); // No tr
+ else
+ send( "550 Requested action not taken" ); // No tr
}
+ else
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ }
- //qDebug( "args: %s", args.latin1() );
-
- // we always respond to QUIT, regardless of state
- if ( cmd == "QUIT" ) {
- send( "211 Good bye!" );
- delete this;
- return ;
- }
-
- // connected to client
- if ( Connected == state )
- return ;
-
- // waiting for user name
- if ( Wait_USER == state ) {
-
- if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
- send( "530 Please login with USER and PASS" );
- return ;
- }
- send( "331 User name ok, need password" );
- state = Wait_PASS;
- return ;
- }
-
- // waiting for password
- if ( Wait_PASS == state ) {
-
- if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
- send( "530 Please login with USER and PASS" );
- return ;
- }
- send( "230 User logged in, proceed" );
- state = Ready;
- return ;
- }
-
- // ACCESS CONTROL COMMANDS
-
-
- // account (ACCT)
- if ( cmd == "ACCT" ) {
- // even wu-ftp does not support it
- send( "502 Command not implemented" );
- }
-
- // change working directory (CWD)
- else if ( cmd == "CWD" ) {
-
- if ( !args.isEmpty() ) {
- if ( directory.cd( args, TRUE ) )
- send( "250 Requested file action okay, completed" );
- else
- send( "550 Requested action not taken" );
- }
- else
- send( "500 Syntax error, command unrecognized" );
- }
-
- // change to parent directory (CDUP)
- else if ( cmd == "CDUP" ) {
- if ( directory.cdUp() )
- send( "250 Requested file action okay, completed" );
- else
- send( "550 Requested action not taken" );
- }
-
- // structure mount (SMNT)
- else if ( cmd == "SMNT" ) {
- // even wu-ftp does not support it
- send( "502 Command not implemented" );
- }
-
- // reinitialize (REIN)
- else if ( cmd == "REIN" ) {
- // even wu-ftp does not support it
- send( "502 Command not implemented" );
- }
-
-
- // TRANSFER PARAMETER COMMANDS
+ // change to parent directory (CDUP)
+ else if ( cmd == "CDUP" ) {
+ if ( directory.cdUp() )
+ send( "250 Requested file action okay, completed" ); // No tr
+ else
+ send( "550 Requested action not taken" ); // No tr
+ }
+ // structure mount (SMNT)
+ else if ( cmd == "SMNT" ) {
+ // even wu-ftp does not support it
+ send( "502 Command not implemented" ); // No tr
+ }
- // data port (PORT)
- else if ( cmd == "PORT" ) {
- if ( parsePort( arg ) )
- send( "200 Command okay" );
- else
- send( "500 Syntax error, command unrecognized" );
- }
+ // reinitialize (REIN)
+ else if ( cmd == "REIN" ) {
+ // even wu-ftp does not support it
+ send( "502 Command not implemented" ); // No tr
+ }
- // passive (PASV)
- else if ( cmd == "PASV" ) {
- passiv = TRUE;
- send( "227 Entering Passive Mode ("
- + address().toString().replace( QRegExp( "\\." ), "," ) + ","
- + QString::number( ( serversocket->port() ) >> 8 ) + ","
- + QString::number( ( serversocket->port() ) & 0xFF ) + ")" );
- }
- // representation type (TYPE)
- else if ( cmd == "TYPE" ) {
- if ( arg.upper() == "A" || arg.upper() == "I" )
- send( "200 Command okay" );
- else
- send( "504 Command not implemented for that parameter" );
- }
+ // TRANSFER PARAMETER COMMANDS
- // file structure (STRU)
- else if ( cmd == "STRU" ) {
- if ( arg.upper() == "F" )
- send( "200 Command okay" );
- else
- send( "504 Command not implemented for that parameter" );
- }
-
- // transfer mode (MODE)
- else if ( cmd == "MODE" ) {
- if ( arg.upper() == "S" )
- send( "200 Command okay" );
- else
- send( "504 Command not implemented for that parameter" );
- }
+ // data port (PORT)
+ else if ( cmd == "PORT" ) {
+ if ( parsePort( arg ) )
+ send( "200 Command okay" ); // No tr
+ else
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ }
+
+ // passive (PASV)
+ else if ( cmd == "PASV" ) {
+ passiv = TRUE;
+ send( "227 Entering Passive Mode (" // No tr
+ + address().toString().replace( QRegExp( "\\." ), "," ) + ","
+ + QString::number( ( serversocket->port() ) >> 8 ) + ","
+ + QString::number( ( serversocket->port() ) & 0xFF ) +")" );
+ }
+
+ // representation type (TYPE)
+ else if ( cmd == "TYPE" ) {
+ if ( arg.upper() == "A" || arg.upper() == "I" )
+ send( "200 Command okay" ); // No tr
+ else
+ send( "504 Command not implemented for that parameter" ); // No tr
+ }
- // FTP SERVICE COMMANDS
+ // file structure (STRU)
+ else if ( cmd == "STRU" ) {
+ if ( arg.upper() == "F" )
+ send( "200 Command okay" ); // No tr
+ else
+ send( "504 Command not implemented for that parameter" ); // No tr
+ }
+ // transfer mode (MODE)
+ else if ( cmd == "MODE" ) {
+ if ( arg.upper() == "S" )
+ send( "200 Command okay" ); // No tr
+ else
+ send( "504 Command not implemented for that parameter" ); // No tr
+ }
- // retrieve (RETR)
- else if ( cmd == "RETR" )
- if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
- || backupRestoreGzip( absFilePath( args ) ) ) {
- send( "150 File status okay" );
- sendFile( absFilePath( args ) );
- }
- else {
- qDebug("550 Requested action not taken");
- send( "550 Requested action not taken" );
- }
- // store (STOR)
- else if ( cmd == "STOR" )
- if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
- send( "150 File status okay" );
- retrieveFile( absFilePath( args ) );
- }
- else
- send( "550 Requested action not taken" );
+ // FTP SERVICE COMMANDS
- // store unique (STOU)
- else if ( cmd == "STOU" ) {
- send( "502 Command not implemented" );
- }
- // append (APPE)
- else if ( cmd == "APPE" ) {
- send( "502 Command not implemented" );
+ // retrieve (RETR)
+ else if ( cmd == "RETR" )
+ if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
+ || backupRestoreGzip( absFilePath( args ) ) ) {
+ send( "150 File status okay" ); // No tr
+ sendFile( absFilePath( args ) );
}
-
- // allocate (ALLO)
- else if ( cmd == "ALLO" ) {
- send( "200 Command okay" );
+ else {
+ qDebug("550 Requested action not taken");
+ send( "550 Requested action not taken" ); // No tr
}
- // restart (REST)
- else if ( cmd == "REST" ) {
- send( "502 Command not implemented" );
+ // store (STOR)
+ else if ( cmd == "STOR" )
+ if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
+ send( "150 File status okay" ); // No tr
+ retrieveFile( absFilePath( args ) );
}
-
- // rename from (RNFR)
- else if ( cmd == "RNFR" ) {
- renameFrom = QString::null;
- if ( args.isEmpty() )
- send( "500 Syntax error, command unrecognized" );
- else {
- QFile file( absFilePath( args ) );
- if ( file.exists() ) {
- send( "350 File exists, ready for destination name" );
- renameFrom = absFilePath( args );
- }
- else
- send( "550 Requested action not taken" );
- }
- }
-
- // rename to (RNTO)
- else if ( cmd == "RNTO" ) {
- if ( lastCommand != "RNFR" )
- send( "503 Bad sequence of commands" );
- else if ( args.isEmpty() )
- send( "500 Syntax error, command unrecognized" );
- else {
- QDir dir( absFilePath( args ) );
- if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
- send( "250 Requested file action okay, completed." );
- else
- send( "550 Requested action not taken" );
- }
+ else
+ send( "550 Requested action not taken" ); // No tr
+
+ // store unique (STOU)
+ else if ( cmd == "STOU" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // append (APPE)
+ else if ( cmd == "APPE" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // allocate (ALLO)
+ else if ( cmd == "ALLO" ) {
+ storFileSize = args.toInt();
+ send( "200 Command okay" ); // No tr
+ }
+
+ // restart (REST)
+ else if ( cmd == "REST" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // rename from (RNFR)
+ else if ( cmd == "RNFR" ) {
+ renameFrom = QString::null;
+ if ( args.isEmpty() )
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ else {
+ QFile file( absFilePath( args ) );
+ if ( file.exists() ) {
+ send( "350 File exists, ready for destination name" ); // No tr
+ renameFrom = absFilePath( args );
+ }
+ else
+ send( "550 Requested action not taken" ); // No tr
+ }
+ }
+
+ // rename to (RNTO)
+ else if ( cmd == "RNTO" ) {
+ if ( lastCommand != "RNFR" )
+ send( "503 Bad sequence of commands" ); // No tr
+ else if ( args.isEmpty() )
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ else {
+ QDir dir( absFilePath( args ) );
+ if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
+ send( "250 Requested file action okay, completed." ); // No tr
+ else
+ send( "550 Requested action not taken" ); // No tr
}
+ }
- // abort (ABOR)
- else if ( cmd.contains( "ABOR" ) ) {
- dtp->close();
- if ( dtp->dtpMode() != ServerDTP::Idle )
- send( "426 Connection closed; transfer aborted" );
- else
- send( "226 Closing data connection" );
- }
+ // abort (ABOR)
+ else if ( cmd.contains( "ABOR" ) ) {
+ dtp->close();
+ if ( dtp->dtpMode() != ServerDTP::Idle )
+ send( "426 Connection closed; transfer aborted" ); // No tr
+ else
+ send( "226 Closing data connection" ); // No tr
+ }
- // delete (DELE)
- else if ( cmd == "DELE" ) {
- if ( args.isEmpty() )
- send( "500 Syntax error, command unrecognized" );
- else {
- QFile file( absFilePath( args ) ) ;
- if ( file.remove() ) {
- send( "250 Requested file action okay, completed" );
- QCopEnvelope e("QPE/System", "linkChanged(QString)" );
- e << file.name();
- }
- else {
- send( "550 Requested action not taken" );
- }
- }
+ // delete (DELE)
+ else if ( cmd == "DELE" ) {
+ if ( args.isEmpty() )
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ else {
+ QFile file( absFilePath( args ) ) ;
+ if ( file.remove() ) {
+ send( "250 Requested file action okay, completed" ); // No tr
+ QCopEnvelope e("QPE/System", "linkChanged(QString)" );
+ e << file.name();
+ } else {
+ send( "550 Requested action not taken" ); // No tr
+ }
+ }
+ }
+
+ // remove directory (RMD)
+ else if ( cmd == "RMD" ) {
+ if ( args.isEmpty() )
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ else {
+ QDir dir;
+ if ( dir.rmdir( absFilePath( args ), TRUE ) )
+ send( "250 Requested file action okay, completed" ); // No tr
+ else
+ send( "550 Requested action not taken" ); // No tr
}
+ }
- // remove directory (RMD)
- else if ( cmd == "RMD" ) {
- if ( args.isEmpty() )
- send( "500 Syntax error, command unrecognized" );
- else {
- QDir dir;
- if ( dir.rmdir( absFilePath( args ), TRUE ) )
- send( "250 Requested file action okay, completed" );
- else
- send( "550 Requested action not taken" );
- }
+ // make directory (MKD)
+ else if ( cmd == "MKD" ) {
+ if ( args.isEmpty() ) {
+ qDebug(" Error: no arg");
+ send( "500 Syntax error, command unrecognized" ); // No tr
}
-
- // make directory (MKD)
- else if ( cmd == "MKD" ) {
- if ( args.isEmpty() ) {
- qDebug(" Error: no arg");
- send( "500 Syntax error, command unrecognized" );
- }
- else {
- QDir dir;
- if ( dir.mkdir( absFilePath( args ), TRUE ) )
- send( "250 Requested file action okay, completed." );
- else
- send( "550 Requested action not taken" );
+ else {
+ QDir dir;
+ if ( dir.mkdir( absFilePath( args ), TRUE ) )
+ send( "250 Requested file action okay, completed." ); // No tr
+ else
+ send( "550 Requested action not taken" ); // No tr
+ }
+ }
+
+ // print working directory (PWD)
+ else if ( cmd == "PWD" ) {
+ send( "257 \"" + directory.path() +"\"" );
+ }
+
+ // list (LIST)
+ else if ( cmd == "LIST" ) {
+ if ( sendList( absFilePath( args ) ) )
+ send( "150 File status okay" ); // No tr
+ else
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ }
+
+ // size (SIZE)
+ else if ( cmd == "SIZE" ) {
+ QString filePath = absFilePath( args );
+ QFileInfo fi( filePath );
+ bool gzipfile = backupRestoreGzip( filePath );
+ if ( !fi.exists() && !gzipfile )
+ send( "500 Syntax error, command unrecognized" ); // No tr
+ else {
+ if ( !gzipfile )
+ send( "213 " + QString::number( fi.size() ) );
+ else {
+ Process duproc( QString("du") );
+ duproc.addArgument("-s");
+ QString in, out;
+ if ( !duproc.exec(in, out) ) {
+ qDebug("du process failed; just sending back 1K");
+ send( "213 1024");
}
- }
-
- // print working directory (PWD)
- else if ( cmd == "PWD" ) {
- send( "257 \"" + directory.path() + "\"" );
- }
-
- // list (LIST)
- else if ( cmd == "LIST" ) {
- if ( sendList( absFilePath( args ) ) )
- send( "150 File status okay" );
- else
- send( "500 Syntax error, command unrecognized" );
- }
-
- // size (SIZE)
- else if ( cmd == "SIZE" ) {
- QString filePath = absFilePath( args );
- QFileInfo fi( filePath );
- bool gzipfile = backupRestoreGzip( filePath );
- if ( !fi.exists() && !gzipfile )
- send( "500 Syntax error, command unrecognized" );
else {
- if ( !gzipfile )
- send( "213 " + QString::number( fi.size() ) );
- else {
- Process duproc( QString("du") );
- duproc.addArgument("-s");
- QString in, out;
- if ( !duproc.exec(in, out) ) {
- qDebug("du process failed; just sending back 1K");
- send( "213 1024");
- }
- else {
- QString size = out.left( out.find("\t") );
- int guess = size.toInt() / 5;
- if ( filePath.contains("doc") )
- guess *= 1000;
- qDebug("sending back gzip guess of %d", guess);
- send( "213 " + QString::number(guess) );
- }
- }
+ QString size = out.left( out.find("\t") );
+ int guess = size.toInt()/5;
+ if ( filePath.contains("doc") ) // No tr
+ guess *= 1000;
+ qDebug("sending back gzip guess of %d", guess);
+ send( "213 " + QString::number(guess) );
}
- }
- // name list (NLST)
- else if ( cmd == "NLST" ) {
- send( "502 Command not implemented" );
- }
-
- // site parameters (SITE)
- else if ( cmd == "SITE" ) {
- send( "502 Command not implemented" );
- }
-
- // system (SYST)
- else if ( cmd == "SYST" ) {
- send( "215 UNIX Type: L8" );
- }
-
- // status (STAT)
- else if ( cmd == "STAT" ) {
- send( "502 Command not implemented" );
- }
-
- // help (HELP )
- else if ( cmd == "HELP" ) {
- send( "502 Command not implemented" );
- }
-
- // noop (NOOP)
- else if ( cmd == "NOOP" ) {
- send( "200 Command okay" );
- }
-
- // not implemented
- else
- send( "502 Command not implemented" );
-
- lastCommand = cmd;
+ }
+ }
+ }
+ // name list (NLST)
+ else if ( cmd == "NLST" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // site parameters (SITE)
+ else if ( cmd == "SITE" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // system (SYST)
+ else if ( cmd == "SYST" ) {
+ send( "215 UNIX Type: L8" ); // No tr
+ }
+
+ // status (STAT)
+ else if ( cmd == "STAT" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // help (HELP )
+ else if ( cmd == "HELP" ) {
+ send( "502 Command not implemented" ); // No tr
+ }
+
+ // noop (NOOP)
+ else if ( cmd == "NOOP" ) {
+ send( "200 Command okay" ); // No tr
+ }
+
+ // not implemented
+ else
+ send( "502 Command not implemented" ); // No tr
+
+ lastCommand = cmd;
}
bool ServerPI::backupRestoreGzip( const QString &file )
{
- return (file.find( "backup" ) != -1 &&
- file.findRev( ".tgz" ) == (int)file.length() - 4 );
+ return (file.find( "backup" ) != -1 && // No tr
+ file.findRev( ".tgz" ) == (int)file.length()-4 );
}
bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
{
- if ( file.find( "backup" ) != -1 &&
- file.findRev( ".tgz" ) == (int)file.length() - 4 ) {
- QFileInfo info( file );
- targets = info.dirPath( TRUE );
- qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
- targets.join(" ").latin1() );
- return true;
- }
- return false;
+ if ( file.find( "backup" ) != -1 && // No tr
+ file.findRev( ".tgz" ) == (int)file.length()-4 ) {
+ QFileInfo info( file );
+ targets = info.dirPath( TRUE );
+ qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
+ targets.join(" ").latin1() );
+ return true;
+ }
+ return false;
}
void ServerPI::sendFile( const QString& file )
{
- if ( passiv ) {
- wait[SendFile] = TRUE;
- waitfile = file;
- if ( waitsocket )
- newConnection( waitsocket );
- }
- else {
- QStringList targets;
- if ( backupRestoreGzip( file, targets ) )
- dtp->sendGzipFile( file, targets, peeraddress, peerport );
- else
- dtp->sendFile( file, peeraddress, peerport );
- }
+ if ( passiv ) {
+ wait[SendFile] = TRUE;
+ waitfile = file;
+ if ( waitsocket )
+ newConnection( waitsocket );
+ }
+ else {
+ QStringList targets;
+ if ( backupRestoreGzip( file, targets ) )
+ dtp->sendGzipFile( file, targets, peeraddress, peerport );
+ else dtp->sendFile( file, peeraddress, peerport );
+ }
}
void ServerPI::retrieveFile( const QString& file )
{
- if ( passiv ) {
- wait[RetrieveFile] = TRUE;
- waitfile = file;
- if ( waitsocket )
- newConnection( waitsocket );
- }
- else {
- QStringList targets;
- if ( backupRestoreGzip( file, targets ) )
- dtp->retrieveGzipFile( file, peeraddress, peerport );
- else
- dtp->retrieveFile( file, peeraddress, peerport );
- }
+ if ( passiv ) {
+ wait[RetrieveFile] = TRUE;
+ waitfile = file;
+ if ( waitsocket )
+ newConnection( waitsocket );
+ }
+ else {
+ QStringList targets;
+ if ( backupRestoreGzip( file, targets ) )
+ dtp->retrieveGzipFile( file, peeraddress, peerport );
+ else
+ dtp->retrieveFile( file, peeraddress, peerport, storFileSize );
+ }
}
bool ServerPI::parsePort( const QString& pp )
{
- QStringList p = QStringList::split( ",", pp );
- if ( p.count() != 6 )
- return FALSE;
-
- // h1,h2,h3,h4,p1,p2
- peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
- ( p[2].toInt() << 8 ) + p[3].toInt() );
- peerport = ( p[4].toInt() << 8 ) + p[5].toInt();
- return TRUE;
+ QStringList p = QStringList::split( ",", pp );
+ if ( p.count() != 6 ) return FALSE;
+
+ // h1,h2,h3,h4,p1,p2
+ peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
+ ( p[2].toInt() << 8 ) + p[3].toInt() );
+ peerport = ( p[4].toInt() << 8 ) + p[5].toInt();
+ return TRUE;
}
void ServerPI::dtpCompleted()
{
- send( "226 Closing data connection, file transfer successful" );
- if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) {
- QString fn = dtp->fileName();
- if ( fn.right(8) == ".desktop" && fn.find("/Documents/") >= 0 ) {
- QCopEnvelope e("QPE/System", "linkChanged(QString)" );
- e << fn;
- }
- }
- waitsocket = 0;
- dtp->close();
+ send( "226 Closing data connection, file transfer successful" ); // No tr
+ if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) {
+ QString fn = dtp->fileName();
+ if ( fn.right(8)==".desktop" && fn.find("/Documents/")>=0 ) {
+ QCopEnvelope e("QPE/System", "linkChanged(QString)" );
+ e << fn;
+ }
+ }
+ waitsocket = 0;
+ dtp->close();
+ storFileSize = -1;
}
void ServerPI::dtpFailed()
{
- dtp->close();
- waitsocket = 0;
- send( "451 Requested action aborted: local error in processing" );
+ dtp->close();
+ waitsocket = 0;
+ send( "451 Requested action aborted: local error in processing" ); // No tr
+ storFileSize = -1;
}
void ServerPI::dtpError( int )
{
- dtp->close();
- waitsocket = 0;
- send( "451 Requested action aborted: local error in processing" );
+ dtp->close();
+ waitsocket = 0;
+ send( "451 Requested action aborted: local error in processing" ); // No tr
+ storFileSize = -1;
}
bool ServerPI::sendList( const QString& arg )
{
- QByteArray listing;
- QBuffer buffer( listing );
-
- if ( !buffer.open( IO_WriteOnly ) )
- return FALSE;
-
- QTextStream ts( &buffer );
- QString fn = arg;
-
- if ( fn.isEmpty() )
- fn = directory.path();
-
- QFileInfo fi( fn );
- if ( !fi.exists() )
- return FALSE;
-
- // return file listing
- if ( fi.isFile() ) {
- ts << fileListing( &fi ) << endl;
- }
-
- // return directory listing
- else if ( fi.isDir() ) {
- QDir dir( fn );
- const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
+ QByteArray listing;
+ QBuffer buffer( listing );
- QFileInfoListIterator it( *list );
- QFileInfo *info;
-
- unsigned long total = 0;
- while ( ( info = it.current() ) ) {
- if ( info->fileName() != "." && info->fileName() != ".." )
- total += info->size();
- ++it;
- }
-
- ts << "total " << QString::number( total / 1024 ) << endl;
-
- it.toFirst();
- while ( ( info = it.current() ) ) {
- if ( info->fileName() == "." || info->fileName() == ".." ) {
- ++it;
- continue;
- }
- ts << fileListing( info ) << endl;
- ++it;
- }
- }
+ if ( !buffer.open( IO_WriteOnly ) )
+ return FALSE;
- if ( passiv ) {
- waitarray = buffer.buffer();
- wait[SendByteArray] = TRUE;
- if ( waitsocket )
- newConnection( waitsocket );
- }
- else
- dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
- return TRUE;
+ QTextStream ts( &buffer );
+ QString fn = arg;
+
+ if ( fn.isEmpty() )
+ fn = directory.path();
+
+ QFileInfo fi( fn );
+ if ( !fi.exists() ) return FALSE;
+
+ // return file listing
+ if ( fi.isFile() ) {
+ ts << fileListing( &fi ) << endl;
+ }
+
+ // return directory listing
+ else if ( fi.isDir() ) {
+ QDir dir( fn );
+ const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
+
+ QFileInfoListIterator it( *list );
+ QFileInfo *info;
+
+ unsigned long total = 0;
+ while ( ( info = it.current() ) ) {
+ if ( info->fileName() != "." && info->fileName() != ".." )
+ total += info->size();
+ ++it;
+ }
+
+ ts << "total " << QString::number( total / 1024 ) << endl; // No tr
+
+ it.toFirst();
+ while ( ( info = it.current() ) ) {
+ if ( info->fileName() == "." || info->fileName() == ".." ) {
+ ++it;
+ continue;
+ }
+ ts << fileListing( info ) << endl;
+ ++it;
+ }
+ }
+
+ if ( passiv ) {
+ waitarray = buffer.buffer();
+ wait[SendByteArray] = TRUE;
+ if ( waitsocket )
+ newConnection( waitsocket );
+ }
+ else
+ dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
+ return TRUE;
}
QString ServerPI::fileListing( QFileInfo *info )
{
- if ( !info )
- return QString::null;
- QString s;
-
- // type char
- if ( info->isDir() )
- s += "d";
- else if ( info->isSymLink() )
- s += "l";
- else
- s += "-";
-
- // permisson string
- s += permissionString( info ) + " ";
-
- // number of hardlinks
- int subdirs = 1;
-
- if ( info->isDir() )
- subdirs = 2;
- // FIXME : this is to slow
- //if ( info->isDir() )
- //subdirs = QDir( info->absFilePath() ).entryList( QDir::Dirs ).count();
-
- s += QString::number( subdirs ).rightJustify( 3, ' ', TRUE ) + " ";
-
- // owner
- s += info->owner().leftJustify( 8, ' ', TRUE ) + " ";
-
- // group
- s += info->group().leftJustify( 8, ' ', TRUE ) + " ";
-
- // file size in bytes
- s += QString::number( info->size() ).rightJustify( 9, ' ', TRUE ) + " ";
-
- // last modified date
- QDate date = info->lastModified().date();
- QTime time = info->lastModified().time();
- s += date.monthName( date.month() ) + " "
- + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
- + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
- + QString::number( time.minute() ).rightJustify( 2, '0', TRUE ) + " ";
-
- // file name
- s += info->fileName();
-
- return s;
+ if ( !info ) return QString::null;
+ QString s;
+
+ // type char
+ if ( info->isDir() )
+ s += "d";
+ else if ( info->isSymLink() )
+ s += "l";
+ else
+ s += "-";
+
+ // permisson string
+ s += permissionString( info ) + " ";
+
+ // number of hardlinks
+ int subdirs = 1;
+
+ if ( info->isDir() )
+ subdirs = 2;
+ // FIXME : this is to slow
+ //if ( info->isDir() )
+ //subdirs = QDir( info->absFilePath() ).entryList( QDir::Dirs ).count();
+
+ s += QString::number( subdirs ).rightJustify( 3, ' ', TRUE ) + " ";
+
+ // owner
+ QString o = info->owner();
+ if ( o.isEmpty() )
+ o = QString::number(info->ownerId());
+ s += o.leftJustify( 8, ' ', TRUE ) + " ";
+
+ // group
+ QString g = info->group();
+ if ( g.isEmpty() )
+ g = QString::number(info->groupId());
+ s += g.leftJustify( 8, ' ', TRUE ) + " ";
+
+ // file size in bytes
+ s += QString::number( info->size() ).rightJustify( 9, ' ', TRUE ) + " ";
+
+ // last modified date
+ QDate date = info->lastModified().date();
+ QTime time = info->lastModified().time();
+ s += date.monthName( date.month() ) + " "
+ + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
+ + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
+ + QString::number( time.minute() ).rightJustify( 2,'0', TRUE ) + " ";
+
+ // file name
+ s += info->fileName();
+
+ return s;
}
QString ServerPI::permissionString( QFileInfo *info )
{
- if ( !info )
- return QString( "---------" );
- QString s;
-
- // user
- if ( info->permission( QFileInfo::ReadUser ) )
- s += "r";
- else
- s += "-";
- if ( info->permission( QFileInfo::WriteUser ) )
- s += "w";
- else
- s += "-";
- if ( info->permission( QFileInfo::ExeUser ) )
- s += "x";
- else
- s += "-";
-
- // group
- if ( info->permission( QFileInfo::ReadGroup ) )
- s += "r";
- else
- s += "-";
- if ( info->permission( QFileInfo::WriteGroup ) )
- s += "w";
- else
- s += "-";
- if ( info->permission( QFileInfo::ExeGroup ) )
- s += "x";
- else
- s += "-";
-
- // exec
- if ( info->permission( QFileInfo::ReadOther ) )
- s += "r";
- else
- s += "-";
- if ( info->permission( QFileInfo::WriteOther ) )
- s += "w";
- else
- s += "-";
- if ( info->permission( QFileInfo::ExeOther ) )
- s += "x";
- else
- s += "-";
-
- return s;
+ if ( !info ) return QString( "---------" );
+ QString s;
+
+ // user
+ if ( info->permission( QFileInfo::ReadUser ) ) s += "r";
+ else s += "-";
+ if ( info->permission( QFileInfo::WriteUser ) ) s += "w";
+ else s += "-";
+ if ( info->permission( QFileInfo::ExeUser ) ) s += "x";
+ else s += "-";
+
+ // group
+ if ( info->permission( QFileInfo::ReadGroup ) ) s += "r";
+ else s += "-";
+ if ( info->permission( QFileInfo::WriteGroup ) )s += "w";
+ else s += "-";
+ if ( info->permission( QFileInfo::ExeGroup ) ) s += "x";
+ else s += "-";
+
+ // exec
+ if ( info->permission( QFileInfo::ReadOther ) ) s += "r";
+ else s += "-";
+ if ( info->permission( QFileInfo::WriteOther ) ) s += "w";
+ else s += "-";
+ if ( info->permission( QFileInfo::ExeOther ) ) s += "x";
+ else s += "-";
+
+ return s;
}
void ServerPI::newConnection( int socket )
{
- //qDebug( "New incomming connection" );
-
- if ( !passiv )
- return ;
-
- if ( wait[SendFile] ) {
- QStringList targets;
- if ( backupRestoreGzip( waitfile, targets ) )
- dtp->sendGzipFile( waitfile, targets );
- else
- dtp->sendFile( waitfile );
- dtp->setSocket( socket );
- }
- else if ( wait[RetrieveFile] ) {
- qDebug("check retrieve file");
- if ( backupRestoreGzip( waitfile ) )
- dtp->retrieveGzipFile( waitfile );
- else
- dtp->retrieveFile( waitfile );
- dtp->setSocket( socket );
- }
- else if ( wait[SendByteArray] ) {
- dtp->sendByteArray( waitarray );
- dtp->setSocket( socket );
- }
- else if ( wait[RetrieveByteArray] ) {
- qDebug("retrieve byte array");
- dtp->retrieveByteArray();
- dtp->setSocket( socket );
- }
- else
- waitsocket = socket;
+ //qDebug( "New incomming connection" );
+
+ if ( !passiv ) return;
- for ( int i = 0; i < 4; i++ )
- wait[i] = FALSE;
+ if ( wait[SendFile] ) {
+ QStringList targets;
+ if ( backupRestoreGzip( waitfile, targets ) )
+ dtp->sendGzipFile( waitfile, targets );
+ else
+ dtp->sendFile( waitfile );
+ dtp->setSocket( socket );
+ }
+ else if ( wait[RetrieveFile] ) {
+ qDebug("check retrieve file");
+ if ( backupRestoreGzip( waitfile ) )
+ dtp->retrieveGzipFile( waitfile );
+ else
+ dtp->retrieveFile( waitfile, storFileSize );
+ dtp->setSocket( socket );
+ }
+ else if ( wait[SendByteArray] ) {
+ dtp->sendByteArray( waitarray );
+ dtp->setSocket( socket );
+ }
+ else if ( wait[RetrieveByteArray] ) {
+ qDebug("retrieve byte array");
+ dtp->retrieveByteArray();
+ dtp->setSocket( socket );
+ }
+ else
+ waitsocket = socket;
+
+ for( int i = 0; i < 4; i++ )
+ wait[i] = FALSE;
}
QString ServerPI::absFilePath( const QString& file )
{
- if ( file.isEmpty() )
- return file;
+ if ( file.isEmpty() ) return file;
- QString filepath( file );
- if ( file[0] != "/" )
- filepath = directory.path() + "/" + file;
+ QString filepath( file );
+ if ( file[0] != "/" )
+ filepath = directory.path() + "/" + file;
- return filepath;
+ return filepath;
}
void ServerPI::timerEvent( QTimerEvent * )
{
- connectionClosed();
+ connectionClosed();
}
ServerDTP::ServerDTP( QObject *parent, const char* name)
- : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
- retrieveTargzProc( 0 ), gzipProc( 0 )
+ : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
+ retrieveTargzProc( 0 )
{
- connect( this, SIGNAL( connected() ), SLOT( connected() ) );
- connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
- connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
- connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
-
- gzipProc = new OProcess( this, "gzipProc" );
-
- createTargzProc = new OProcess( QString("tar"), this, "createTargzProc");
- createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
- connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) );
-
- QStringList args = "tar";
- args += "-xv";
- retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" );
- retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
- connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
- SIGNAL( completed() ) );
- connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
- SLOT( extractTarDone() ) );
+ connect( this, SIGNAL( connected() ), SLOT( connected() ) );
+ connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
+ connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
+ connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
+
+ createTargzProc = new QProcess( QString("tar"), this, "createTargzProc"); // No tr
+ createTargzProc->setCommunication( QProcess::Stdout );
+ createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
+ connect( createTargzProc, SIGNAL( processExited() ), SLOT( targzDone() ) );
+
+ retrieveTargzProc = new QProcess( this, "retrieveTargzProc" );
+ retrieveTargzProc->setCommunication( QProcess::Stdin );
+ retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
+ connect( retrieveTargzProc, SIGNAL( processExited() ),
+ SIGNAL( completed() ) );
+ connect( retrieveTargzProc, SIGNAL( processExited() ),
+ SLOT( extractTarDone() ) );
}
ServerDTP::~ServerDTP()
{
- buf.close();
+ buf.close();
+ if ( RetrieveFile == mode && file.isOpen() ) {
+ // We're being shutdown before the client closed.
+ file.close();
+ if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
+ qDebug( "STOR incomplete" );
+ file.remove();
+ }
+ } else {
file.close();
- createTargzProc->kill();
+ }
+ createTargzProc->kill();
}
void ServerDTP::extractTarDone()
{
- qDebug("extract done");
+ qDebug("extract done");
#ifndef QT_NO_COP
-
- QCopEnvelope e( "QPE/Desktop", "restoreDone(QString)" );
- e << file.name();
+ QCopEnvelope e( "QPE/System", "restoreDone(QString)" );
+ e << file.name();
#endif
}
void ServerDTP::connected()
{
- // send file mode
- switch ( mode ) {
- case SendFile :
- if ( !file.exists() || !file.open( IO_ReadOnly) ) {
- emit failed();
- mode = Idle;
- return ;
- }
-
- //qDebug( "Debug: Sending file '%s'", file.name().latin1() );
-
- bytes_written = 0;
- if ( file.size() == 0 ) {
- //make sure it doesn't hang on empty files
- file.close();
- emit completed();
- mode = Idle;
- }
- else {
-
- if ( !file.atEnd() ) {
- QCString s;
- s.resize( block_size );
- int bytes = file.readBlock( s.data(), block_size );
- writeBlock( s.data(), bytes );
- }
- }
- break;
- case SendGzipFile:
- if ( createTargzProc->isRunning() ) {
- // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY
- qWarning("Previous tar --gzip process is still running; killing it...");
- createTargzProc->kill();
- }
-
- bytes_written = 0;
- qDebug("==>start send tar process");
- if ( !createTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdout) )
- qWarning("Error starting %s or %s",
- createTargzProc->args()[0].data(),
- gzipProc->args()[0].data());
- break;
- case SendBuffer:
- if ( !buf.open( IO_ReadOnly) ) {
- emit failed();
- mode = Idle;
- return ;
- }
-
- // qDebug( "Debug: Sending byte array" );
- bytes_written = 0;
- while ( !buf.atEnd() )
- putch( buf.getch() );
- buf.close();
- break;
- case RetrieveFile:
- // retrieve file mode
- if ( file.exists() && !file.remove() ) {
- emit failed();
- mode = Idle;
- return ;
- }
-
- if ( !file.open( IO_WriteOnly) ) {
- emit failed();
- mode = Idle;
- return ;
- }
- // qDebug( "Debug: Retrieving file %s", file.name().latin1() );
- break;
- case RetrieveGzipFile:
- qDebug("=-> starting tar process to receive .tgz file");
- break;
- case RetrieveBuffer:
- // retrieve buffer mode
- if ( !buf.open( IO_WriteOnly) ) {
- emit failed();
- mode = Idle;
- return ;
- }
- // qDebug( "Debug: Retrieving byte array" );
- break;
- case Idle:
- qDebug("connection established but mode set to Idle; BUG!");
- break;
- }
+ // send file mode
+ switch ( mode ) {
+ case SendFile :
+ if ( !file.exists() || !file.open( IO_ReadOnly) ) {
+ emit failed();
+ mode = Idle;
+ return;
+ }
+
+ //qDebug( "Debug: Sending file '%s'", file.name().latin1() );
+
+ bytes_written = 0;
+ if ( file.size() == 0 ) {
+ //make sure it doesn't hang on empty files
+ file.close();
+ emit completed();
+ mode = Idle;
+ } else {
+ // Don't write more if there is plenty buffered already.
+ if ( bytesToWrite() <= block_size && !file.atEnd() ) {
+ QCString s;
+ s.resize( block_size );
+ int bytes = file.readBlock( s.data(), block_size );
+ writeBlock( s.data(), bytes );
+ }
+ }
+ break;
+ case SendGzipFile:
+ if ( createTargzProc->isRunning() ) {
+ // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY
+ qWarning("Previous tar --gzip process is still running; killing it...");
+ createTargzProc->kill();
+ }
+
+ bytes_written = 0;
+ qDebug("==>start send tar process");
+ if ( !createTargzProc->start() )
+ qWarning("Error starting %s",
+ createTargzProc->arguments().join(" ").latin1());
+ break;
+ case SendBuffer:
+ if ( !buf.open( IO_ReadOnly) ) {
+ emit failed();
+ mode = Idle;
+ return;
+ }
+
+ // qDebug( "Debug: Sending byte array" );
+ bytes_written = 0;
+ while( !buf.atEnd() )
+ putch( buf.getch() );
+ buf.close();
+ break;
+ case RetrieveFile:
+ // retrieve file mode
+ if ( file.exists() && !file.remove() ) {
+ emit failed();
+ mode = Idle;
+ return;
+ }
+
+ if ( !file.open( IO_WriteOnly) ) {
+ emit failed();
+ mode = Idle;
+ return;
+ }
+ // qDebug( "Debug: Retrieving file %s", file.name().latin1() );
+ break;
+ case RetrieveGzipFile:
+ qDebug("=-> starting tar process to receive .tgz file");
+ break;
+ case RetrieveBuffer:
+ // retrieve buffer mode
+ if ( !buf.open( IO_WriteOnly) ) {
+ emit failed();
+ mode = Idle;
+ return;
+ }
+ // qDebug( "Debug: Retrieving byte array" );
+ break;
+ case Idle:
+ qDebug("connection established but mode set to Idle; BUG!");
+ break;
+ }
}
void ServerDTP::connectionClosed()
{
- //qDebug( "Debug: Data connection closed %ld bytes written", bytes_written );
-
- // send file mode
- if ( SendFile == mode ) {
- if ( bytes_written == file.size() )
- emit completed();
- else
- emit failed();
- }
+ //qDebug( "Debug: Data connection closed %ld bytes written", bytes_written );
- // send buffer mode
- else if ( SendBuffer == mode ) {
- if ( bytes_written == buf.size() )
- emit completed();
- else
- emit failed();
- }
+ // send file mode
+ if ( SendFile == mode ) {
+ if ( bytes_written == file.size() )
+ emit completed();
+ else
+ emit failed();
+ }
- // retrieve file mode
- else if ( RetrieveFile == mode ) {
- file.close();
- emit completed();
- }
+ // send buffer mode
+ else if ( SendBuffer == mode ) {
+ if ( bytes_written == buf.size() )
+ emit completed();
+ else
+ emit failed();
+ }
- else if ( RetrieveGzipFile == mode ) {
- qDebug("Done writing ungzip file; closing input");
- gzipProc->flushStdin();
- gzipProc->closeStdin();
- }
+ // retrieve file mode
+ else if ( RetrieveFile == mode ) {
+ file.close();
+ if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
+ qDebug( "STOR incomplete" );
+ file.remove();
+ emit failed();
+ } else {
+ emit completed();
+ }
+ }
+
+ else if ( RetrieveGzipFile == mode ) {
+ qDebug("Done writing ungzip file; closing input");
+ retrieveTargzProc->flushStdin();
+ retrieveTargzProc->closeStdin();
+ }
- // retrieve buffer mode
- else if ( RetrieveBuffer == mode ) {
- buf.close();
- emit completed();
- }
+ // retrieve buffer mode
+ else if ( RetrieveBuffer == mode ) {
+ buf.close();
+ emit completed();
+ }
- mode = Idle;
+ mode = Idle;
}
void ServerDTP::bytesWritten( int bytes )
{
- bytes_written += bytes;
+ bytes_written += bytes;
- // send file mode
- if ( SendFile == mode ) {
+ // send file mode
+ if ( SendFile == mode ) {
- if ( bytes_written == file.size() ) {
- // qDebug( "Debug: Sending complete: %d bytes", file.size() );
- file.close();
- emit completed();
- mode = Idle;
- }
- else if ( !file.atEnd() ) {
- QCString s;
- s.resize( block_size );
- int bytes = file.readBlock( s.data(), block_size );
- writeBlock( s.data(), bytes );
- }
+ if ( bytes_written == file.size() ) {
+ // qDebug( "Debug: Sending complete: %d bytes", file.size() );
+ file.close();
+ emit completed();
+ mode = Idle;
+ }
+ else if( !file.atEnd() ) {
+ QCString s;
+ s.resize( block_size );
+ int bytes = file.readBlock( s.data(), block_size );
+ writeBlock( s.data(), bytes );
}
+ }
- // send buffer mode
- if ( SendBuffer == mode ) {
+ // send buffer mode
+ if ( SendBuffer == mode ) {
- if ( bytes_written == buf.size() ) {
- // qDebug( "Debug: Sending complete: %d bytes", buf.size() );
- emit completed();
- mode = Idle;
- }
+ if ( bytes_written == buf.size() ) {
+ // qDebug( "Debug: Sending complete: %d bytes", buf.size() );
+ emit completed();
+ mode = Idle;
}
+ }
}
void ServerDTP::readyRead()
{
- // retrieve file mode
- if ( RetrieveFile == mode ) {
- QCString s;
- s.resize( bytesAvailable() );
- readBlock( s.data(), bytesAvailable() );
- file.writeBlock( s.data(), s.size() );
- }
- else if ( RetrieveGzipFile == mode ) {
- if ( !gzipProc->isRunning() )
- gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout ));
-
- QByteArray s;
- s.resize( bytesAvailable() );
- readBlock( s.data(), bytesAvailable() );
- gzipProc->writeStdin( s.data(), s.size() );
- qDebug("wrote %d bytes to ungzip ", s.size() );
- }
- // retrieve buffer mode
- else if ( RetrieveBuffer == mode ) {
- QCString s;
- s.resize( bytesAvailable() );
- readBlock( s.data(), bytesAvailable() );
- buf.writeBlock( s.data(), s.size() );
- }
+ // retrieve file mode
+ if ( RetrieveFile == mode ) {
+ QCString s;
+ s.resize( bytesAvailable() );
+ readBlock( s.data(), bytesAvailable() );
+ file.writeBlock( s.data(), s.size() );
+ }
+ else if ( RetrieveGzipFile == mode ) {
+ if ( !retrieveTargzProc->isRunning() )
+ retrieveTargzProc->start();
+
+ QByteArray s;
+ s.resize( bytesAvailable() );
+ readBlock( s.data(), bytesAvailable() );
+ retrieveTargzProc->writeToStdin( s );
+ qDebug("wrote %d bytes to ungzip ", s.size() );
+ }
+ // retrieve buffer mode
+ else if ( RetrieveBuffer == mode ) {
+ QCString s;
+ s.resize( bytesAvailable() );
+ readBlock( s.data(), bytesAvailable() );
+ buf.writeBlock( s.data(), s.size() );
+ }
}
-void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
+void ServerDTP::writeTargzBlock()
{
- writeBlock( buffer, buflen );
- qDebug("writeTargzBlock %d", buflen);
- if ( !createTargzProc->isRunning() ) {
- qDebug("tar and gzip done");
- emit completed();
- mode = Idle;
- disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int ) ),
- this, SLOT( writeTargzBlock(OProcess *, char *, int) ) );
- }
+ QByteArray block = createTargzProc->readStdout();
+ writeBlock( block.data(), block.size() );
+ qDebug("writeTargzBlock %d", block.size());
}
void ServerDTP::targzDone()
{
- //qDebug("targz done");
- disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
- this, SLOT( gzipTarBlock(OProcess *, char *, int) ) );
- gzipProc->closeStdin();
-}
-
-void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen)
-{
- //qDebug("gzipTarBlock");
- if ( !gzipProc->isRunning() ) {
- //qDebug("auto start gzip proc");
- gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout ));
- }
- gzipProc->writeStdin( buffer, buflen );
+ qDebug("tar and gzip done");
+ emit completed();
+ mode = Idle;
+ disconnect( createTargzProc, SIGNAL( readyReadStdout() ),
+ this, SLOT( writeTargzBlock() ) );
}
void ServerDTP::sendFile( const QString fn, const QHostAddress& host, Q_UINT16 port )
{
- file.setName( fn );
- mode = SendFile;
- connectToHost( host.toString(), port );
+ file.setName( fn );
+ mode = SendFile;
+ connectToHost( host.toString(), port );
}
void ServerDTP::sendFile( const QString fn )
{
- file.setName( fn );
- mode = SendFile;
+ file.setName( fn );
+ mode = SendFile;
}
void ServerDTP::sendGzipFile( const QString &fn,
- const QStringList &archiveTargets,
- const QHostAddress& host, Q_UINT16 port )
+ const QStringList &archiveTargets,
+ const QHostAddress& host, Q_UINT16 port )
{
- sendGzipFile( fn, archiveTargets );
- connectToHost( host.toString(), port );
+ sendGzipFile( fn, archiveTargets );
+ connectToHost( host.toString(), port );
}
void ServerDTP::sendGzipFile( const QString &fn,
- const QStringList &archiveTargets )
+ const QStringList &archiveTargets )
{
- mode = SendGzipFile;
- file.setName( fn );
-
- QStringList args = "tar";
- args += "-cv";
- args += archiveTargets;
- qDebug("sendGzipFile %s", args.join(" ").latin1() );
- createTargzProc->clearArguments( );
- *createTargzProc << args;
- connect( createTargzProc,
- SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) );
-
- gzipProc->clearArguments( );
- *gzipProc << "gzip";
- connect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
- SLOT( writeTargzBlock(OProcess *, char *, int) ) );
+ mode = SendGzipFile;
+ file.setName( fn );
+
+ QStringList args = "targzip";
+ //args += "-cv";
+ args += archiveTargets;
+ qDebug("sendGzipFile %s", args.join(" ").latin1() );
+ createTargzProc->setArguments( args );
+ connect( createTargzProc,
+ SIGNAL( readyReadStdout() ), SLOT( writeTargzBlock() ) );
}
-void ServerDTP::gunzipDone()
+void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port, int fileSize )
{
- qDebug("gunzipDone");
- disconnect( gzipProc, SIGNAL( processExited() ),
- this, SLOT( gunzipDone() ) );
- retrieveTargzProc->closeStdin();
- disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
- this, SLOT( tarExtractBlock(OProcess *, char *, int) ) );
+ recvFileSize = fileSize;
+ file.setName( fn );
+ mode = RetrieveFile;
+ connectToHost( host.toString(), port );
}
-void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen)
+void ServerDTP::retrieveFile( const QString fn, int fileSize )
{
- qDebug("tarExtractBlock");
- if ( !retrieveTargzProc->isRunning() ) {
- qDebug("auto start ungzip proc");
- if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) )
- qWarning(" failed to start tar -x process");
- }
- retrieveTargzProc->writeStdin( buffer, buflen );
-}
-
-
-void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port )
-{
- file.setName( fn );
- mode = RetrieveFile;
- connectToHost( host.toString(), port );
-}
-
-void ServerDTP::retrieveFile( const QString fn )
-{
- file.setName( fn );
- mode = RetrieveFile;
+ recvFileSize = fileSize;
+ file.setName( fn );
+ mode = RetrieveFile;
}
void ServerDTP::retrieveGzipFile( const QString &fn )
{
- qDebug("retrieveGzipFile %s", fn.latin1());
- file.setName( fn );
- mode = RetrieveGzipFile;
-
- gzipProc->clearArguments();
- *gzipProc << "gunzip";
- connect( gzipProc, SIGNAL( readyReadStdout() ),
- SLOT( tarExtractBlock() ) );
- connect( gzipProc, SIGNAL( processExited() ),
- SLOT( gunzipDone() ) );
+ qDebug("retrieveGzipFile %s", fn.latin1());
+ file.setName( fn );
+ mode = RetrieveGzipFile;
+
+ retrieveTargzProc->setArguments( "targunzip" );
+ connect( retrieveTargzProc, SIGNAL( processExited() ),
+ SLOT( extractTarDone() ) );
}
void ServerDTP::retrieveGzipFile( const QString &fn, const QHostAddress& host, Q_UINT16 port )
{
- retrieveGzipFile( fn );
- connectToHost( host.toString(), port );
+ retrieveGzipFile( fn );
+ connectToHost( host.toString(), port );
}
void ServerDTP::sendByteArray( const QByteArray& array, const QHostAddress& host, Q_UINT16 port )
{
- buf.setBuffer( array );
- mode = SendBuffer;
- connectToHost( host.toString(), port );
+ buf.setBuffer( array );
+ mode = SendBuffer;
+ connectToHost( host.toString(), port );
}
void ServerDTP::sendByteArray( const QByteArray& array )
{
- buf.setBuffer( array );
- mode = SendBuffer;
+ buf.setBuffer( array );
+ mode = SendBuffer;
}
void ServerDTP::retrieveByteArray( const QHostAddress& host, Q_UINT16 port )
{
- buf.setBuffer( QByteArray() );
- mode = RetrieveBuffer;
- connectToHost( host.toString(), port );
+ buf.setBuffer( QByteArray() );
+ mode = RetrieveBuffer;
+ connectToHost( host.toString(), port );
}
void ServerDTP::retrieveByteArray()
{
- buf.setBuffer( QByteArray() );
- mode = RetrieveBuffer;
+ buf.setBuffer( QByteArray() );
+ mode = RetrieveBuffer;
}
void ServerDTP::setSocket( int socket )
{
- QSocket::setSocket( socket );
- connected();
+ QSocket::setSocket( socket );
+ connected();
}