summaryrefslogtreecommitdiff
authorzecke <zecke>2006-05-14 14:34:43 (UTC)
committer zecke <zecke>2006-05-14 14:34:43 (UTC)
commit273ffc42b3f0ce593e0d20874a7f224328416445 (patch) (side-by-side diff)
tree04203fc463a711de981fc40ba390fcec8838d1eb
parent89efebff8f5a00089f02397aa0778dd0dbbacdbb (diff)
downloadopie-273ffc42b3f0ce593e0d20874a7f224328416445.zip
opie-273ffc42b3f0ce593e0d20874a7f224328416445.tar.gz
opie-273ffc42b3f0ce593e0d20874a7f224328416445.tar.bz2
core/obex: Patch from Dmitry Korovkin to use opietooth's OBEX implementation
for sending
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/btobex.cpp87
-rw-r--r--core/obex/btobex.h14
2 files changed, 57 insertions, 44 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index 886f3dc..a5bfe5f 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -1,28 +1,28 @@
#include "btobex.h"
-#include <opietooth/manager.h>
-#include <opietooth/services.h>
+#include <manager.h>
+#include <services.h>
/* OPIE */
#include <opie2/oprocess.h>
#include <opie2/odebug.h>
/* QT */
#include <qfileinfo.h>
#include <qstring.h>
#include <qmap.h>
#include <qmessagebox.h>
using namespace OpieObex;
using namespace Opie::Core;
/* TRANSLATOR OpieObex::Obex */
using namespace OpieTooth;
BtObex::BtObex( QObject *parent, const char* name )
: QObject(parent, name )
{
m_rec = 0;
m_send=0;
m_count = 0;
m_receive = false;
@@ -44,48 +44,56 @@ void BtObex::receive() {
m_outp = QString::null;
m_rec = new OProcess();
// TODO mbhaynie: No idea if this actually works -- maybe opd is better.
*m_rec << "obexftpd" << "-b";
// connect to the necessary slots
connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ),
this, SLOT(slotExited(Opie::Core::OProcess*) ) );
connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
emit done( false );
delete m_rec;
m_rec = 0;
}
}
void BtObex::send( const QString& fileName, const QString& bdaddr) {
// if currently receiving stop it send receive
m_count = 0;
m_file = fileName;
m_bdaddr = bdaddr;
+ if (m_send != 0) {
+ if (m_send->isSending())
+ return;
+ else {
+ delete m_send;
+ m_send = 0;
+ }
+ }
if (m_rec != 0 ) {
if (m_rec->isRunning() ) {
emit error(-1 );
delete m_rec;
m_rec = 0;
}else{
emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
return;
}
}
//Now we need to find out if the OBEX push is supported for this device
//And get the port number
if (!btManager) {
btManager = new Manager("hci0");
connect(btManager,
SIGNAL(foundServices(const QString&, Services::ValueList)),
this, SLOT(slotFoundServices(const QString&, Services::ValueList)));
}
btManager->searchServices(bdaddr);
}
/**
* This function reacts on the service discovery finish
@@ -104,131 +112,132 @@ void BtObex::slotFoundServices(const QString&, Services::ValueList svcList)
}
for (it = svcList.begin(); it != svcList.end(); it++) {
classList = (*it).classIdList();
classIt = classList.begin();
if (classIt == classList.end())
continue;
////We really need symbolic names for service IDs
//Ok, we have found the object push service
if (classIt.key() == 4357) {
portNum = (*it).protocolDescriptorList().last().port();
break;
}
}
if (portNum == -1) {
QMessageBox::critical(NULL, tr("Object send"),
tr("No OBEX Push service"));
emit error(-1);
return;
}
m_port = portNum;
sendNow();
}
void BtObex::sendNow(){
+ QString m_dst = "";
+ int result; //function call result
if ( m_count >= 25 ) { // could not send
emit error(-1 );
emit sent(false);
return;
}
// OProcess inititialisation
- m_send = new OProcess(0, "ussp-push");
- m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) );
-
- // ussp-push --timeo 30 <btaddr:port> file file
- *m_send << "ussp-push" << "--timeo 30";
- *m_send << m_bdaddr + "@" + QString::number(m_port);
- *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
- *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
- m_send->setUseShell(true);
-
+ m_send = new ObexPush();
// connect to slots Exited and and StdOut
- connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ),
- this, SLOT(slotExited(Opie::Core::OProcess*)) );
- connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int)),
- this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
+ connect(m_send, SIGNAL(sendComplete(int)),
+ this, SLOT(slotPushComplete(int)) );
+ connect(m_send, SIGNAL(sendError(int)),
+ this, SLOT(slotPushError(int)) );
+ connect(m_send, SIGNAL(status(QCString&)),
+ this, SLOT(slotPushStatus(QCString&) ) );
+
+ ::sleep(4);
// now start it
- if (!m_send->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
+ result = m_send->send(m_bdaddr, m_port, m_file, m_dst);
+ if (result > 0) //Sending process is actually running
+ return;
+ else if (result < 0) {
m_count = 25;
emit error(-1 );
delete m_send;
m_send=0;
}
// end
m_count++;
emit currentTry( m_count );
}
void BtObex::slotExited(OProcess* proc ){
odebug << proc->name() << " exited with result "
<< proc->exitStatus() << oendl;
if (proc == m_rec ) // receive process
received();
- else if ( proc == m_send )
- sendEnd();
-
}
void BtObex::slotStdOut(OProcess* proc, char* buf, int len){
if ( proc == m_rec ) { // only receive
QByteArray ar( len );
memcpy( ar.data(), buf, len );
m_outp.append( ar );
}
}
+void BtObex::slotPushComplete(int result) {
+ if (result == 0) {
+ delete m_send;
+ m_send=0;
+ emit sent(true);
+ } else { // it failed maybe the other side wasn't ready
+ // let's try it again
+ delete m_send;
+ m_send = 0;
+ sendNow();
+ }
+}
+
+void BtObex::slotPushError(int) {
+ emit error( -1 );
+ delete m_send;
+ m_send = 0;
+}
+
+void BtObex::slotPushStatus(QCString& str) {
+ odebug << str << oendl;
+}
+
void BtObex::received() {
if (m_rec->normalExit() ) {
if ( m_rec->exitStatus() == 0 ) { // we got one
QString filename = parseOut();
emit receivedFile( filename );
}
}else{
emit done(false);
};
delete m_rec;
m_rec = 0;
receive();
}
-void BtObex::sendEnd() {
- if (m_send->normalExit() ) {
- if ( m_send->exitStatus() == 0 ) {
- delete m_send;
- m_send=0;
- emit sent(true);
- }else if (m_send->exitStatus() != 0 ) { // it failed maybe the other side wasn't ready
- // let's try it again
- delete m_send;
- m_send = 0;
- sendNow();
- }
- }else {
- emit error( -1 );
- delete m_send;
- m_send = 0;
- }
-}
-
// This probably doesn't do anything useful for bt.
QString BtObex::parseOut(){
QString path;
QStringList list = QStringList::split("\n", m_outp);
QStringList::Iterator it;
for (it = list.begin(); it != list.end(); ++it ) {
odebug << (*it) << oendl;
if ( (*it).startsWith("Wrote" ) ) {
int pos = (*it).findRev('(' );
if ( pos > 0 ) {
path = (*it).remove( pos, (*it).length() - pos );
path = path.mid(6 );
path = path.stripWhiteSpace();
}
}
}
return path;
}
/**
* when sent is done slotError is called we will start receive again
*/
void BtObex::slotError() {
if ( m_receive )
diff --git a/core/obex/btobex.h b/core/obex/btobex.h
index ba50064..9c1ab70 100644
--- a/core/obex/btobex.h
+++ b/core/obex/btobex.h
@@ -1,32 +1,33 @@
#ifndef OpieBtObex_H
#define OpieBtObex_H
#include <qobject.h>
-#include <opietooth/services.h>
-#include <opietooth/manager.h>
+#include <services.h>
+#include <manager.h>
+#include <obexpush.h>
namespace Opie {namespace Core {class OProcess;}}
class QCopChannel;
using namespace OpieTooth;
namespace OpieObex {
// Maybe this should be derved from Obex.
class BtObex : public QObject {
Q_OBJECT
public:
/**
* BtObex c'tor look
*/
BtObex( QObject *parent, const char* name);
/**
* d'tor
*/
~BtObex();
/** TODO mbhaynie -- Maybe opd would be a better way to receive.
* Starting listening to Bluetooth after enabled by the applet
* a signal gets emitted when received a file
*/
void receive();
void send( const QString&, const QString& );
@@ -38,49 +39,52 @@ namespace OpieObex {
* @param path The path to the received file
*/
void receivedFile( const QString& path);
/**
* error signal if the program couldn't be started or the
* the connection timed out
*/
void error( int );
/**
* The current try to receive data
*/
void currentTry(unsigned int);
/**
* signal sent The file got beamed to the remote location
*/
void sent(bool);
void done(bool);
private:
uint m_count;
QString m_file;
QString m_outp;
QString m_bdaddr;
int m_port;
- Opie::Core::OProcess *m_send;
+ ObexPush* m_send;
Opie::Core::OProcess *m_rec;
bool m_receive : 1;
OpieTooth::Manager* btManager;
void shutDownReceive();
private slots:
+ // Push process slots
+ void slotPushStatus(QCString&);
+ void slotPushComplete(int);
+ void slotPushError(int);
+
// the process exited
void slotExited(Opie::Core::OProcess*) ;
void slotStdOut(Opie::Core::OProcess*, char*, int);
void slotError();
void slotFoundServices(const QString&, Services::ValueList);
private:
void sendNow();
QString parseOut();
void received();
- void sendEnd();
-
};
};
#endif