| -rw-r--r-- | core/obex/btobex.cpp | 2 | ||||
| -rw-r--r-- | core/obex/obex.cpp | 3 | ||||
| -rw-r--r-- | core/obex/obex.h | 3 | ||||
| -rw-r--r-- | core/obex/obexserver.cpp | 24 | ||||
| -rw-r--r-- | core/obex/obexserver.h | 4 |
5 files changed, 21 insertions, 15 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index 212a084..4e078b0 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp @@ -20,97 +20,97 @@ -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The Bluetooth OBEX manipulating class implementation */ #include "btobex.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 ) : ObexBase(parent, name ) { m_rec = 0; m_send=0; btManager = NULL; }; BtObex::~BtObex() { delete btManager; delete m_rec; delete m_send; } void BtObex::receive() { ObexBase::receive(); - m_rec = new ObexServer(); + m_rec = new ObexServer(OBEX_TRANS_BLUETOOTH); odebug << "BT OBEX do receive" << oendl; // TODO mbhaynie: No idea if this actually works -- maybe opd is better. // 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) { ObexBase::send(fileName, bdaddr); // if currently receiving stop it send receive 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); diff --git a/core/obex/obex.cpp b/core/obex/obex.cpp index 95c561a..e4a3c31 100644 --- a/core/obex/obex.cpp +++ b/core/obex/obex.cpp @@ -12,98 +12,97 @@ .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=| MERCHANTABILITY or FITNESS FOR A _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The Infrared OBEX handling class implementation */ #include "obex.h" /* OPIE */ #include <opie2/oprocess.h> #include <opie2/odebug.h> /* QT */ #include <qfileinfo.h> using namespace OpieObex; using namespace Opie::Core; /* TRANSLATOR OpieObex::Obex */ Obex::Obex( QObject *parent, const char* name ) : ObexBase(parent, name ) { m_rec = 0; m_send=0; }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { ObexBase::receive(); - m_rec = new OProcess(); - *m_rec << "irobex_palm3"; + m_rec = new ObexServer(OBEX_TRANS_IRDA); // 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; } } // if currently receiving stop it send receive void Obex::send(const QString& fileName, const QString& addr) { ObexBase::send(fileName, addr); 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; } } sendNow(); } void Obex::sendNow(){ if ( m_count >= 25 ) { // could not send emit error(-1 ); emit sent(false); return; } // OProcess inititialisation m_send = new OProcess(); m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) ); *m_send << "irobex_palm3"; *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); // 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) ) ); diff --git a/core/obex/obex.h b/core/obex/obex.h index 36ff29a..b948ce4 100644 --- a/core/obex/obex.h +++ b/core/obex/obex.h @@ -1,114 +1,115 @@ /* =. This file is part of the OPIE Project .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> .>+-= _;:, .> :=|. This library is free software; you can .> <, > . <= redistribute it and/or modify it under :=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; version 2 of the License. ._= =} : .%+i> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=| MERCHANTABILITY or FITNESS FOR A _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The Infrared OBEX handling class declaration */ #ifndef OpieObex_H #define OpieObex_H #include "obexbase.h" #include <qobject.h> +#include "obexserver.h" namespace Opie {namespace Core {class OProcess;}} class QCopChannel; namespace OpieObex { class Obex : public ObexBase { Q_OBJECT public: /** * Obex c'tor look */ Obex( QObject *parent, const char* name); /** * d'tor */ ~Obex(); /** * Starting listening to irda after enabled by the applet * a signal gets emitted when received a file */ virtual void receive(); virtual void send(const QString& filename, const QString& addr); virtual void setReceiveEnabled( bool = false ); signals: /** * a signal * @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; Opie::Core::OProcess *m_send; - Opie::Core::OProcess *m_rec; + ObexServer* m_rec; //The OBEX server bool m_receive : 1; void shutDownReceive(); private slots: /** * send over palm obex */ //void send(const QString&); // the process exited void slotExited(Opie::Core::OProcess* proc) ; void slotStdOut(Opie::Core::OProcess*, char*, int); virtual void slotError(); private: void sendNow(); QString parseOut(); void received(); void sendEnd(); }; }; #endif diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 95196de..25d8224 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp @@ -3,99 +3,100 @@ .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> .>+-= _;:, .> :=|. This library is free software; you can .> <, > . <= redistribute it and/or modify it under :=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; version 2 of the License. ._= =} : .%+i> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=| MERCHANTABILITY or FITNESS FOR A _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The OBEX server class implementation * Based on OBEX server from GPE (thanks, guys) */ #include "obexserver.h" #include <unistd.h> #include <opie2/odebug.h> #include <sys/types.h> #include <sys/wait.h> #include <errno.h> #include <stdlib.h> #include <stdio.h> #include <fcntl.h> #include <qapplication.h> #include <opie2/oprocctrl.h> #include <qstring.h> #include <qfile.h> using namespace Opie::Core; using namespace Opie::Core::Internal; using namespace OpieObex; -ObexServer::ObexServer() : +ObexServer::ObexServer(int trans) : OProcess(tr("ObexServer"), 0, "ObexServer") { + transport = trans; m_obex = NULL; } ObexServer::~ObexServer() { stop(); } /** * Function handles the file received * @param name the file name * @param data the file data * @param data_len the data length * @return 0 on success -1 on error */ static int file_received(uint8_t* name, const uint8_t* data, size_t data_len) { QString path("/tmp/"); path += (char*)name; QFile out(path); int err = 0; if (!out.open(IO_Raw | IO_ReadWrite | IO_Truncate)) { printf("File %s open error %d\n", (const char*)path, errno); err = -1; goto out; } if (out.writeBlock((const char*)data, data_len) < 0) { printf("File %s write error %d\n", (const char*)path, errno); err = -1; goto out; } out: out.close(); if (err == 0) { printf("Wrote %s (%d bytes)\n", (const char*)path, data_len); fflush(stdout); } return err; } /** * Function handles the situation when the PUT request has been done * @param handle OBEX connection handle * @param object OBEX object itself */ static int put_done(obex_t* handle, obex_object_t* object) { @@ -284,109 +285,112 @@ sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) proto[1] = sdp_list_append(0, &rfcomm_uuid); channel = sdp_data_alloc(SDP_UINT8, &chan); proto[1] = sdp_list_append(proto[1], channel); apseq = sdp_list_append(apseq, proto[1]); sdp_uuid16_create(&obex_uuid, OBEX_UUID); proto[2] = sdp_list_append(0, &obex_uuid); apseq = sdp_list_append(apseq, proto[2]); aproto = sdp_list_append(0, apseq); sdp_set_access_protos(&record, aproto); for (i = 0; i < sizeof(formats); i++) { dtds[i] = &dtd; values[i] = &formats[i]; } sflist = sdp_seq_alloc(dtds, values, sizeof(formats)); sdp_attr_add(&record, SDP_ATTR_SUPPORTED_FORMATS_LIST, sflist); sdp_set_info_attr(&record, name, 0, 0); // connect to the local SDP server, register the service record, and // disconnect lsession = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY); if (lsession == NULL) goto errout; err = sdp_record_register(lsession, &record, 0); if (err) { sdp_close(lsession); lsession = NULL; } errout: sdp_data_free(channel); sdp_list_free(proto[0], 0); sdp_list_free(proto[1], 0); sdp_list_free(proto[2], 0); sdp_list_free(apseq, 0); sdp_list_free(aproto, 0); return lsession; } int ObexServer::initObex(void) { int channel = 10; //Channel on which we do listen if (m_obex) return 0; - m_obex = ::OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0); + m_obex = ::OBEX_Init(transport, obex_event, 0); if (!m_obex) { printf("OBEX initialization error %d\n", errno); return -1; } - ::BtOBEX_ServerRegister(m_obex, NULL, channel); - m_session = addOpushSvc(channel, "OBEX push service"); - if (!m_session) { - printf("OBEX registration error %d\n", errno); - ::OBEX_Cleanup(m_obex); - m_obex = NULL; - return -1; - } + if (transport == OBEX_TRANS_BLUETOOTH) { + ::BtOBEX_ServerRegister(m_obex, NULL, channel); + m_session = addOpushSvc(channel, "OBEX push service"); + if (!m_session) { + printf("OBEX registration error %d\n", errno); + ::OBEX_Cleanup(m_obex); + m_obex = NULL; + return -1; + } + } else if (transport == OBEX_TRANS_IRDA) + ::IrOBEX_ServerRegister(m_obex, "OBEX"); return 0; } bool ObexServer::start(RunMode runmode, Communication comm) { if ( runs ) { return false; // cannot start a process that is already running // or if no executable has been assigned } run_mode = runmode; status = 0; if ( !setupCommunication( comm ) ) qWarning( "Could not setup Communication!" ); // We do this in the parent because if we do it in the child process // gdb gets confused when the application runs from gdb. uid_t uid = getuid(); gid_t gid = getgid(); #ifdef HAVE_INITGROUPS struct passwd *pw = getpwuid( uid ); #endif int fd[ 2 ]; if ( 0 > pipe( fd ) ) { fd[ 0 ] = fd[ 1 ] = 0; // Pipe failed.. continue } runs = true; QApplication::flushX(); // WABA: Note that we use fork() and not vfork() because // vfork() has unclear semantics and is not standardized. pid_ = fork(); if ( 0 == pid_ ) { if ( fd[ 0 ] ) close( fd[ 0 ] ); if ( !runPrivileged() ) { setgid( gid ); #if defined( HAVE_INITGROUPS) diff --git a/core/obex/obexserver.h b/core/obex/obexserver.h index 8567105..28577e2 100644 --- a/core/obex/obexserver.h +++ b/core/obex/obexserver.h @@ -8,76 +8,78 @@ .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; version 2 of the License. ._= =} : .%+i> _;_. .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=| MERCHANTABILITY or FITNESS FOR A _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The OBEX server class declaration * Based on OBEX server from GPE (thanks, guys) */ #ifndef ObexServer_H #define ObexServer_H #include <qobject.h> #include <opie2/oprocess.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> #include <openobex/obex.h> namespace Opie { namespace Core { class OProcess; namespace Internal { class OProcessController; } } }; namespace Opie {namespace Core {class OProcess;}} namespace OpieObex { class ObexServer : public Opie::Core::OProcess { Q_OBJECT + private: + int transport; //The OBEX transport type public: /** * ObexServer constructor */ - ObexServer(); + ObexServer(int trans); /** * */ ~ObexServer(); //Function starts the server process virtual bool start( RunMode runmode = NotifyOnExit, Communication comm = NoCommunication ); //Stop the server process int stop(); protected: //variables obex_t* m_obex; //Obex server handler sdp_session_t* m_session; //SDP session handler; protected: //functions //Funtion initializes obex server return 0 on success and -1 on error int initObex(void); //Function registers an OBEX push service sdp_session_t* addOpushSvc(uint8_t chan, const char* name); signals: protected slots: }; }; #endif |