summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-02 08:57:25 (UTC)
committer mickeyl <mickeyl>2006-05-02 08:57:25 (UTC)
commitd5b6868cb4f99d2c3dc3587115cd37c09e4610eb (patch) (side-by-side diff)
tree1397f12f885c849419e511ad203d19696c4ae07e
parent1295db77f2ab7e9125183e4240de0b92f72940e4 (diff)
downloadopie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.zip
opie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.tar.gz
opie-d5b6868cb4f99d2c3dc3587115cd37c09e4610eb.tar.bz2
bluetooth patches courtesy Dmitriy Korovkin (thanks!):
* When sending data to a device, do service discovery in order to get port number. * Switched to ussp-push for sending. * Clear receivers list on rescan. * Changed the way of window closing in order to shut down IRDA and bluetooth correctly.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/btobex.cpp85
-rw-r--r--core/obex/btobex.h8
-rw-r--r--core/obex/obex.pro4
-rw-r--r--core/obex/obexsend.cpp26
4 files changed, 94 insertions, 29 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index a2866f6..bb5c06d 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -2,2 +2,4 @@
#include "btobex.h"
+#include <manager.h>
+#include <services.h>
@@ -9,4 +11,5 @@
#include <qfileinfo.h>
-
-
+#include <qstring.h>
+#include <qmap.h>
+#include <qmessagebox.h>
@@ -16,2 +19,3 @@ using namespace Opie::Core;
/* TRANSLATOR OpieObex::Obex */
+using namespace OpieTooth;
@@ -28,4 +32,8 @@ BtObex::BtObex( QObject *parent, const char* name )
SLOT(slotError() ) );
+ btManager = NULL;
};
+
BtObex::~BtObex() {
+ if (btManager)
+ delete btManager;
delete m_rec;
@@ -33,2 +41,3 @@ BtObex::~BtObex() {
}
+
void BtObex::receive() {
@@ -70,4 +79,50 @@ void BtObex::send( const QString& fileName, const QString& bdaddr) {
}
+ //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
+ */
+void BtObex::slotFoundServices(const QString&, Services::ValueList svcList)
+{
+ QValueList<OpieTooth::Services>::Iterator it;
+ QMap<int, QString> classList; //The classes list
+ QMap<int, QString>::Iterator classIt; //Iterator in the class list
+ int portNum = -1; //The desired port number
+ odebug << "BtObex slotFoundServices" << oendl;
+ if (svcList.isEmpty()) {
+ QMessageBox::critical(NULL, tr("Object send"), tr("No services found"));
+ emit error(-1);
+ return;
+ }
+ 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(){
@@ -79,12 +134,12 @@ void BtObex::sendNow(){
// OProcess inititialisation
- m_send = new OProcess();
+ m_send = new OProcess(0, "ussp-push");
m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) );
- // obextool push file <bdaddr> [channel]
- // 9 for phones.
- // Palm T3 accepts pictures on 1
- *m_send << "obextool" << "push";
+ // 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 << m_bdaddr << "9";
-
+ *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
+ m_send->setUseShell(true);
+
// connect to slots Exited and and StdOut
@@ -92,7 +147,6 @@ void BtObex::sendNow(){
this, SLOT(slotExited(Opie::Core::OProcess*)) );
- connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int )),
+ connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int)),
this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
-
// now start it
- if (!m_send->start(/*OProcess::NotifyOnExit, OProcess::AllOutput*/ ) ) {
+ if (!m_send->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
m_count = 25;
@@ -108,2 +162,4 @@ void BtObex::sendNow(){
void BtObex::slotExited(OProcess* proc ){
+ odebug << proc->name() << " exited with result "
+ << proc->exitStatus() << oendl;
if (proc == m_rec ) // receive process
@@ -142,3 +198,3 @@ void BtObex::sendEnd() {
emit sent(true);
- }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready
+ }else if (m_send->exitStatus() != 0 ) { // it failed maybe the other side wasn't ready
// let's try it again
@@ -156,3 +212,3 @@ void BtObex::sendEnd() {
// This probably doesn't do anything useful for bt.
-QString BtObex::parseOut( ){
+QString BtObex::parseOut(){
QString path;
@@ -161,2 +217,3 @@ QString BtObex::parseOut( ){
for (it = list.begin(); it != list.end(); ++it ) {
+ odebug << (*it) << oendl;
if ( (*it).startsWith("Wrote" ) ) {
diff --git a/core/obex/btobex.h b/core/obex/btobex.h
index 5ab591c..099f04a 100644
--- a/core/obex/btobex.h
+++ b/core/obex/btobex.h
@@ -6,2 +6,4 @@
#include <qobject.h>
+#include <services.h>
+#include <manager.h>
@@ -9,2 +11,3 @@ namespace Opie {namespace Core {class OProcess;}}
class QCopChannel;
+using namespace OpieTooth;
namespace OpieObex {
@@ -57,2 +60,3 @@ namespace OpieObex {
QString m_bdaddr;
+ int m_port;
Opie::Core::OProcess *m_send;
@@ -60,2 +64,3 @@ namespace OpieObex {
bool m_receive : 1;
+ OpieTooth::Manager* btManager;
void shutDownReceive();
@@ -65,5 +70,6 @@ private slots:
// the process exited
- void slotExited(Opie::Core::OProcess* proc) ;
+ void slotExited(Opie::Core::OProcess*) ;
void slotStdOut(Opie::Core::OProcess*, char*, int);
void slotError();
+ void slotFoundServices(const QString&, Services::ValueList);
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index d6b527c..33cb957 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -7,5 +7,5 @@ DESTDIR = $(OPIEDIR)/plugins/obex
INTERFACES = obexsendbase.ui
-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
+INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher $(OPIEDIR)/noncore/net/opietooth/lib
DEPENDPATH +=
-LIBS += -lqpe -lopiecore2
+LIBS += -lopietooth1 -lqpe -lopiecore2
VERSION = 0.0.3
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 9cd9972..dbbb7b3 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -22,4 +22,4 @@ using namespace Opie::Core;
#include <qlistview.h>
-#include <qtimer.h>
+#include <unistd.h>
/* TRANSLATOR OpieObex::SendWidget */
@@ -85,3 +85,3 @@ bool SendWidget::receiverSelected(int id)
{
- return receivers[id]->pixmap(2);
+ return (bool)(receivers[id]->pixmap(2) != NULL);
}
@@ -143,3 +143,3 @@ void SendWidget::slotStartIrda() {
if ( m_irDaIt == m_irDa.end() ) {
- irdaStatus->setText(tr("complete."));
+ irdaStatus->setText(tr("complete."));
return;
@@ -175,3 +175,3 @@ void SendWidget::slotStartBt() {
if (m_btIt == m_bt.end() ) {
- btStatus->setText(tr("complete."));
+ btStatus->setText(tr("complete."));
return;
@@ -189,3 +189,4 @@ void SendWidget::scan_for_receivers()
{
- //FIXME: Clean ListBox prior to (re)scan
+ receiverList->clear();
+ receivers.clear();
sendButton->setDisabled( true );
@@ -221,5 +222,5 @@ void SendWidget::toggle_receiver(QListViewItem* item)
if(item->pixmap(2))
- item->setPixmap(2,QPixmap());
+ item->setPixmap(2,QPixmap());
else
- item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+ item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
}
@@ -228,10 +229,11 @@ void SendWidget::toggle_receiver(QListViewItem* item)
void SendWidget::closeEvent( QCloseEvent* e) {
- e->accept(); // make sure
- QTimer::singleShot(0, this, SLOT(userDone() ) );
-}
-void SendWidget::userDone() {
+ obexSendBase::closeEvent(e);
QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
- emit done();
}
+
+void SendWidget::userDone() {
+ close();
+}
+
QString SendWidget::file()const {