2 files changed, 78 insertions, 16 deletions

diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index ef007f5..b8d800a 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -1,71 +1,121 @@
 
 #include "pppdialog.h"
+#include "rfcommhelper.h"
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <opie2/oprocess.h>
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 using namespace OpieTooth;
 
 using namespace Opie::Core;
-PPPDialog::PPPDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
+
+Connection PPPDialog::conns[NCONNECTS];
+
+PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent,  
+    const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
 
     if ( !name )
-        setName( "PPPDialog" );
+        setName( "PPPDialog" );
     setCaption( tr( "ppp connection " ) ) ;
 
     m_device = device;
+    m_port = port;
 
     layout = new QVBoxLayout( this );
 
     QLabel* info = new QLabel( this );
     info->setText( tr("Enter an ppp script name:") );
 
     cmdLine = new QLineEdit( this );
 
     outPut = new QMultiLineEdit( this );
     QFont outPut_font(  outPut->font() );
     outPut_font.setPointSize( 8 );
     outPut->setFont( outPut_font );
     outPut->setWordWrap( QMultiLineEdit::WidgetWidth );
 
     connectButton = new QPushButton( this );
     connectButton->setText( tr( "Connect" ) );
 
     layout->addWidget(info);
     layout->addWidget(cmdLine);
     layout->addWidget(outPut);
     layout->addWidget(connectButton);
 
     connect( connectButton, SIGNAL( clicked() ), this,  SLOT( connectToDevice() ) );
 
+    connect(&PPPDialog::conns[0].proc, 
+                        SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int)),
+            this, SLOT(fillOutPut(Opie::Core::OProcess*, char*, int)));
+    connect( &PPPDialog::conns[0].proc, 
+            SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int)),
+            this,    SLOT(fillErr(Opie::Core::OProcess*, char*, int)));
+    connect( &PPPDialog::conns[0].proc, 
+        SIGNAL(processExited(Opie::Core::OProcess*)),
+        this, SLOT(slotProcessExited(Opie::Core::OProcess*)));
 }
 
 PPPDialog::~PPPDialog() {
 }
 
 void PPPDialog::connectToDevice() {
+    if (PPPDialog::conns[0].proc.isRunning()) {
+        outPut->append(tr("Work in progress"));
+        return;
+    }
     outPut->clear();
+    PPPDialog::conns[0].proc.clearArguments();
     // vom popupmenu beziehen
-    QString connectScript = "/etc/ppp/peers/" + cmdLine->text();
-    OProcess* pppDial = new OProcess();
-    *pppDial << "pppd" << m_device << "call" << connectScript;
-    connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) );
-     if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) {
-        owarn << "could not start" << oendl; 
-        delete pppDial;
+    if (cmdLine->text().isEmpty()) {//Connect by rfcomm
+        PPPDialog::conns[0].proc << "rfcomm" << "connect" 
+            << "0" << m_device << QString::number(m_port);
+    }
+    else {
+        QString connectScript = "/etc/ppp/peers/" + cmdLine->text();
+        PPPDialog::conns[0].proc << "pppd" 
+            << m_device << "call" << connectScript;
+    }
+    if (!PPPDialog::conns[0].proc.start(OProcess::NotifyOnExit, OProcess::All)) {
+        outPut->append(tr("Couldn't start"));
+    }
+    else
+    {
+        PPPDialog::conns[0].proc.resume();
+        outPut->append(tr("Started"));
+        PPPDialog::conns[0].btAddr = m_device;
+        PPPDialog::conns[0].port = m_port;
     }
 }
 
-void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) {
-    QCString str(cha, len );
-    outPut->insertLine( str );
-    delete pppDial;
+void PPPDialog::fillOutPut( OProcess*, char* cha, int len ) {
+    QCString str(cha, len);
+    outPut->append(str);
 }
 
+void PPPDialog::fillErr(OProcess*, char* buf, int len)
+{
+    QCString str(buf, len);
+    outPut->append(str);
+}
+
+void PPPDialog::slotProcessExited(OProcess* proc) {
+    if (proc->normalExit()) {
+        outPut->append( tr("Finished with result ") );
+        outPut->append( QString::number(proc->exitStatus()) );
+    }
+    else
+        outPut->append( tr("Exited abnormally") );
+}
+
+void PPPDialog::closeEvent(QCloseEvent* e)
+{
+    if(PPPDialog::conns[0].proc.isRunning())
+        PPPDialog::conns[0].proc.kill();
+    QDialog::closeEvent(e);
+}
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index 05894e2..565fe1e 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -1,37 +1,49 @@
 #ifndef PPPDIALOG_H
 #define PPPDIALOG_H
 
 
 #include <qdialog.h>
 #include <opie2/oprocess.h>
 
 class QVBoxLayout;
 class QPushButton;
 class QMultiLineEdit;
 class QLineEdit;
-
+#define NCONNECTS 10 //Maximal 
 
 namespace OpieTooth {
+    typedef struct {
+      Opie::Core::OProcess proc; //Connection process
+      QString btAddr; //MAC address
+      int port; //port
+    } Connection;
 
     class PPPDialog : public QDialog {
 
         Q_OBJECT
 
     public:
-        PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0);
+        PPPDialog(const QString& device = 0, int port = 0, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0);
         ~PPPDialog();
 
     private slots:
         void connectToDevice();
         void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len );
+        void fillErr(Opie::Core::OProcess*, char*, int);
+        void slotProcessExited(Opie::Core::OProcess* proc);
+        void closeEvent(QCloseEvent* e);
+    public:
+        //Array of connections indexed by rfcomm device number
+        static Connection conns[NCONNECTS];
     protected:
         QVBoxLayout* layout;
         QLineEdit* cmdLine;
         QPushButton* connectButton;
         QMultiLineEdit* outPut;
 
     private:
         QString m_device;
+        int m_port;
     };
 }
 #endif