2 files changed, 99 insertions, 3 deletions

diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index f780235..9cb56ce 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -6,48 +6,49 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** 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.
 **
 **********************************************************************/
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/qpeapplication.h>
 #include <qtopia/global.h>
 #include <qtopia/version.h>
+#include <qtopia/config.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qcstring.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #ifdef Q_WS_QWS
 #include <qcopchannel_qws.h>
 #endif
 
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE
 #endif
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/types.h>
 #endif
 
 #if defined(_OS_LINUX_)
@@ -59,59 +60,63 @@
 //#define INSECURE
 
 const int block_size = 51200;
 
 QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
         const char* name )
     : QServerSocket( port, 1, parent, name ),
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
         qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
         desktopChannel = new QCopChannel( "QPE/Desktop", this );
         connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)),
                  this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
         cardChannel = new QCopChannel( "QPE/Card", this );
         connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)),
                  this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
 #endif
     }
     sendSync = FALSE;
     openConnections.setAutoDelete( TRUE );
+    authorizeConnections();
 }
 
 QCopBridge::~QCopBridge()
 {
 #ifndef QT_NO_COP
     delete desktopChannel;
 #endif
 }
 
 void QCopBridge::authorizeConnections()
 {
+    Config cfg("Security");
+    cfg.setGroup("SyncMode");
+    m_mode = Mode(cfg.readNumEntry("Mode", Sharp ));
     QListIterator<QCopBridgePI> it(openConnections);
     while ( it.current() ) {
         if ( !it.current()->verifyAuthorised() ) {
             disconnect ( it.current(), SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
             openConnections.removeRef( it.current() );
         } else
             ++it;
     }
 }
 
 void QCopBridge::newConnection( int socket )
 {
     QCopBridgePI *pi = new QCopBridgePI( socket, this );
     openConnections.append( pi );
     connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
 
     /* ### libqtopia merge FIXME */
 #if 0
     QPEApplication::setTempScreenSaverMode( QPEApplication::DisableSuspend );
 #endif
 #ifndef QT_NO_COP
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
 
@@ -131,54 +136,140 @@ void QCopBridge::closed( QCopBridgePI *pi )
         QPEApplication::setTempScreenSaverMode( QPEApplication::Enable );
 #endif
 #ifndef QT_NO_COP
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 #endif
     }
 }
 
 void QCopBridge::closeOpenConnections()
 {
     QCopBridgePI *pi;
     for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() )
         pi->close();
 }
 
 
 void QCopBridge::desktopMessage( const QCString &command, const QByteArray &data )
 {
     if ( command == "startSync()" ) {
         // we need to buffer it a bit
         sendSync = TRUE;
         startTimer( 20000 );
     }
 
+    if ( m_mode & Qtopia1_7 ) {
+        // send the command to all open connections
+        QCopBridgePI *pi;
+        for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) {
+            pi->sendDesktopMessage( command, data );
+        }
+    }
+    if ( m_mode & Sharp )
+        sendDesktopMessageOld( command, data );
+}
+
+#ifndef OPIE_NO_OLD_SYNC_CODE
+/*
+ * Old compat mode
+ */
+void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArray& args) {
+    command.stripWhiteSpace();
+
+    int paren = command.find( "(" );
+    if ( paren <= 0 ) {
+        qDebug("DesktopMessage: bad qcop syntax");
+        return;
+    }
+
+    QString params = command.mid( paren + 1 );
+    if ( params[params.length()-1] != ')' ) {
+        qDebug("DesktopMessage: bad qcop syntax");
+        return;
+    }
+
+    params.truncate( params.length()-1 );
+
+    QStringList paramList = QStringList::split( ",", params );
+    QString data;
+    if ( paramList.count() ) {
+        QDataStream stream( args, IO_ReadOnly );
+        for ( QStringList::Iterator it = paramList.begin(); it != paramList.end(); ++it ) {
+            QString str;
+            if ( *it == "QString" ) {
+                stream >> str;
+            } else if ( *it == "QCString" ) {
+                QCString cstr;
+                stream >> cstr;
+                str = QString::fromLocal8Bit( cstr );
+            } else if ( *it == "int" ) {
+                int i;
+                stream >> i;
+                str = QString::number( i );
+            } else if ( *it == "bool" ) {
+                int i;
+                stream >> i;
+                str = QString::number( i );
+            } else {
+                qDebug(" cannot route the argument type %s throught the qcop bridge", (*it).latin1() );
+                return;
+            }
+            QString estr;
+            for (int i=0; i<(int)str.length(); i++) {
+                QChar ch = str[i];
+                if ( ch.row() )
+                    goto quick;
+                switch (ch.cell()) {
+                    case '&':
+                        estr.append( "&amp;" );
+                        break;
+                    case ' ':
+                        estr.append( "&0x20;" );
+                        break;
+                    case '\n':
+                        estr.append( "&0x0d;" );
+                        break;
+                    case '\r':
+                        estr.append( "&0x0a;" );
+                        break;
+                    default: quick:
+                        estr.append(ch);
+                }
+            }
+            data += " " + estr;
+        }
+    }
+    QString sendCommand = QString(command.data()) + data;
+
+
     // send the command to all open connections
     QCopBridgePI *pi;
-    for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) {
-        pi->sendDesktopMessage( command, data );
-    }
+    for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() )
+        pi->sendDesktopMessage( sendCommand );
+
 }
+#endif
+
 
 void QCopBridge::timerEvent( QTimerEvent * )
 {
     sendSync = FALSE;
     killTimers();
 }
 
 
 QCopBridgePI::QCopBridgePI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name )
 {
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
         state = Forbidden;
         close();
     } else
 #endif
     {
         state = Connected;
@@ -208,55 +299,57 @@ QCopBridgePI::~QCopBridgePI()
 bool QCopBridgePI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
         state = Forbidden;
         return FALSE;
     }
     return TRUE;
 }
 
 void QCopBridgePI::myConnectionClosed()
 {
     emit connectionClosed( this );
 }
 
 void QCopBridgePI::sendDesktopMessage( const QString &msg )
 {
     QString str = "CALL QPE/Desktop " + msg; // No tr
     send ( str );
 }
 
 void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& data )
 {
     if ( !isOpen() ) // eg. Forbidden
         return;
+
     const char hdr[]="CALLB QPE/Desktop ";
     writeBlock(hdr,sizeof(hdr)-1);
     writeBlock(msg,msg.length());
     writeBlock(" ",1);
     QByteArray b64 = Opie::Global::encodeBase64(data);
     writeBlock(b64.data(),b64.size());
     writeBlock("\r\n",2);
+
 }
 
 
 void QCopBridgePI::send( const QString& msg )
 {
     if ( !isOpen() ) // eg. Forbidden
         return;
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "sending qcop message: %s", msg.latin1() );
 }
 
 void QCopBridgePI::read()
 {
     while ( canReadLine() ) {
         timer->start( 300000, TRUE );
         process( readLine().stripWhiteSpace() );
     }
 }
 
 void QCopBridgePI::process( const QString& message )
 {
     //qDebug( "Command: %s", message.latin1() );
 
diff --git a/core/launcher/qcopbridge.h b/core/launcher/qcopbridge.h
index bae3f88..9483d9d 100644
--- a/core/launcher/qcopbridge.h
+++ b/core/launcher/qcopbridge.h
@@ -16,70 +16,73 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __qcopbridge_h__
 #define __qcopbridge_h__
 
 #include <qtopia/global.h>
 #include <qserversocket.h>
 #include <qsocket.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qbuffer.h>
 
 class QFileInfo;
 class QCopBridgePI;
 class QCopChannel;
 class QTimer;
 
 class QCopBridge : public QServerSocket
 {
     Q_OBJECT
 
 public:
+    enum Mode  { Qtopia1_7= 0x01, Sharp = 0x02, Both = Qtopia1_7 | Sharp };
     QCopBridge( Q_UINT16 port, QObject *parent = 0, const char* name = 0 );
     virtual ~QCopBridge();
 
     void newConnection( int socket );
     void closeOpenConnections();
     void authorizeConnections();
 
 public slots:
     void closed( QCopBridgePI *pi );
     void desktopMessage( const QCString &call, const QByteArray & );
 
 signals:
     void connectionClosed( const QHostAddress & );
 
 protected:
     void timerEvent( QTimerEvent * );
+    void sendDesktopMessageOld( const QCString&, const QByteArray& );
 
 private:
     QCopChannel *desktopChannel;
     QCopChannel *cardChannel;
     QList<QCopBridgePI> openConnections;
     bool sendSync;
+    Mode m_mode;
 };
 
 
 class QCopBridgePI : public QSocket
 {
     Q_OBJECT
 
     enum State { Connected, Wait_USER, Wait_PASS, Ready, Forbidden };
 
 public:
     QCopBridgePI( int socket, QObject *parent = 0, const char* name = 0 );
     virtual ~QCopBridgePI();
 
     void sendDesktopMessage( const QString &msg );
     void sendDesktopMessage( const QCString &msg, const QByteArray& );
     void startSync() { sendSync = TRUE; }
     bool verifyAuthorised();
 
 signals:
     void connectionClosed( QCopBridgePI *);
 
 protected slots:
     void read();
     void send( const QString& msg );