-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 30 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/device.h | 12 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/lib.pro | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 99 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 29 |
5 files changed, 127 insertions, 48 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index e3d7f3b..5234996 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -2,5 +2,5 @@ | |||
2 | #include <signal.h> | 2 | #include <signal.h> |
3 | 3 | ||
4 | #include "kprocess.h" | 4 | #include <opie/oprocess.h> |
5 | 5 | ||
6 | #include "device.h" | 6 | #include "device.h" |
@@ -41,15 +41,15 @@ void Device::attach(){ | |||
41 | m_output.resize(0); | 41 | m_output.resize(0); |
42 | qWarning("new process to create" ); | 42 | qWarning("new process to create" ); |
43 | m_process = new KProcess(); | 43 | m_process = new OProcess(); |
44 | *m_process << "hciattach"; | 44 | *m_process << "hciattach"; |
45 | *m_process << "-p"; | 45 | *m_process << "-p"; |
46 | *m_process << m_device << m_mode; | 46 | *m_process << m_device << m_mode; |
47 | connect(m_process, SIGNAL( processExited(KProcess*) ), | 47 | connect(m_process, SIGNAL( processExited(OProcess*) ), |
48 | this, SLOT( slotExited(KProcess* ) ) ); | 48 | this, SLOT( slotExited(OProcess* ) ) ); |
49 | connect(m_process, SIGNAL( receivedStdout(KProcess*, char*, int) ), | 49 | connect(m_process, SIGNAL( receivedStdout(OProcess*, char*, int) ), |
50 | this, SLOT(slotStdOut(KProcess*,char*,int ) ) ); | 50 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); |
51 | connect(m_process, SIGNAL(receivedStderr(KProcess*, char*, int ) ), | 51 | connect(m_process, SIGNAL(receivedStderr(OProcess*, char*, int ) ), |
52 | this, SLOT(slotStdErr(KProcess*,char*,int) ) ); | 52 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); |
53 | if(!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput ) ){ | 53 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
54 | qWarning("Could not start" ); | 54 | qWarning("Could not start" ); |
55 | delete m_process; | 55 | delete m_process; |
@@ -75,5 +75,5 @@ QString Device::devName()const { | |||
75 | return QString::fromLatin1("hci0"); | 75 | return QString::fromLatin1("hci0"); |
76 | }; | 76 | }; |
77 | void Device::slotExited( KProcess* proc) | 77 | void Device::slotExited( OProcess* proc) |
78 | { | 78 | { |
79 | qWarning("prcess exited" ); | 79 | qWarning("prcess exited" ); |
@@ -89,9 +89,9 @@ void Device::slotExited( KProcess* proc) | |||
89 | // and call hciconfig hci0 up | 89 | // and call hciconfig hci0 up |
90 | // FIXME hardcoded to hci0 now :( | 90 | // FIXME hardcoded to hci0 now :( |
91 | m_hci = new KProcess( ); | 91 | m_hci = new OProcess( ); |
92 | *m_hci << "hciconfig"; | 92 | *m_hci << "hciconfig"; |
93 | *m_hci << "hci0 up"; | 93 | *m_hci << "hci0 up"; |
94 | connect(m_hci, SIGNAL( processExited(KProcess*) ), | 94 | connect(m_hci, SIGNAL( processExited(OProcess*) ), |
95 | this, SLOT( slotExited(KProcess* ) ) ); | 95 | this, SLOT( slotExited(OProcess* ) ) ); |
96 | if(!m_hci->start() ){ | 96 | if(!m_hci->start() ){ |
97 | qWarning("could not start" ); | 97 | qWarning("could not start" ); |
@@ -126,5 +126,5 @@ void Device::slotExited( KProcess* proc) | |||
126 | } | 126 | } |
127 | } | 127 | } |
128 | void Device::slotStdOut(KProcess* proc, char* chars, int len) | 128 | void Device::slotStdOut(OProcess* proc, char* chars, int len) |
129 | { | 129 | { |
130 | qWarning("std out" ); | 130 | qWarning("std out" ); |
@@ -137,5 +137,5 @@ void Device::slotStdOut(KProcess* proc, char* chars, int len) | |||
137 | } | 137 | } |
138 | } | 138 | } |
139 | void Device::slotStdErr(KProcess*, char*, int ) | 139 | void Device::slotStdErr(OProcess*, char*, int ) |
140 | { | 140 | { |
141 | qWarning("std err" ); | 141 | qWarning("std err" ); |
diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h index 8498b14..c0e2658 100644 --- a/noncore/net/opietooth/lib/device.h +++ b/noncore/net/opietooth/lib/device.h | |||
@@ -9,5 +9,5 @@ | |||
9 | #include <sys/types.h> | 9 | #include <sys/types.h> |
10 | 10 | ||
11 | class KProcess; | 11 | class OProcess; |
12 | namespace OpieTooth { | 12 | namespace OpieTooth { |
13 | /** | 13 | /** |
@@ -66,7 +66,7 @@ namespace OpieTooth { | |||
66 | void device(const QString& device, bool up ); | 66 | void device(const QString& device, bool up ); |
67 | private slots: | 67 | private slots: |
68 | virtual void slotExited( KProcess* ); | 68 | virtual void slotExited( OProcess* ); |
69 | virtual void slotStdOut(KProcess*, char*, int ); | 69 | virtual void slotStdOut(OProcess*, char*, int ); |
70 | virtual void slotStdErr(KProcess*, char*, int ); | 70 | virtual void slotStdErr(OProcess*, char*, int ); |
71 | private: | 71 | private: |
72 | class Private; | 72 | class Private; |
@@ -74,6 +74,6 @@ namespace OpieTooth { | |||
74 | QString m_device; | 74 | QString m_device; |
75 | bool m_attached:1; | 75 | bool m_attached:1; |
76 | KProcess* m_hci; | 76 | OProcess* m_hci; |
77 | KProcess* m_process; | 77 | OProcess* m_process; |
78 | QString m_devId; | 78 | QString m_devId; |
79 | QString m_mode; | 79 | QString m_mode; |
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro index a70c7ab..f2cde06 100644 --- a/noncore/net/opietooth/lib/lib.pro +++ b/noncore/net/opietooth/lib/lib.pro | |||
@@ -1,8 +1,9 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = kprocctrl.h kprocess.h device.h manager.h remotedevice.h services.h | 3 | HEADERS = device.h manager.h remotedevice.h services.h |
4 | SOURCES = kprocctrl.cpp kprocess.cpp device.cc manager.cc remotedevice.cc services.cc | 4 | SOURCES = device.cc manager.cc remotedevice.cc services.cc |
5 | TARGET = opietooth | 5 | TARGET = opietooth |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 7 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
8 | LIBS = -lopie | ||
8 | #VERSION = 0.0.0 | 9 | #VERSION = 0.0.0 |
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 882af81..eeeab19 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -1,2 +1,3 @@ | |||
1 | #include <opie/oprocess.h> | ||
1 | 2 | ||
2 | #include "manager.h" | 3 | #include "manager.h" |
@@ -5,24 +6,29 @@ | |||
5 | using namespace OpieTooth; | 6 | using namespace OpieTooth; |
6 | 7 | ||
7 | Manager::Manager( const QString& ) | 8 | Manager::Manager( const QString& dev ) |
8 | : QObject() | 9 | : QObject() |
9 | { | 10 | { |
10 | 11 | m_device = dev; | |
12 | m_hcitool = 0; | ||
13 | m_sdp = 0; | ||
11 | } | 14 | } |
12 | Manager::Manager( Device* dev ) | 15 | Manager::Manager( Device* dev ) |
13 | : QObject() | 16 | : QObject() |
14 | { | 17 | { |
15 | 18 | m_hcitool = 0; | |
19 | m_sdp = 0; | ||
16 | } | 20 | } |
17 | Manager::Manager() | 21 | Manager::Manager() |
18 | : QObject() | 22 | : QObject() |
19 | { | 23 | { |
20 | 24 | m_hcitool = 0; | |
25 | m_sdp = 0; | ||
21 | } | 26 | } |
22 | Manager::~Manager(){ | 27 | Manager::~Manager(){ |
23 | 28 | delete m_hcitool; | |
29 | delete m_sdp; | ||
24 | } | 30 | } |
25 | void Manager::setDevice( const QString& dev ){ | 31 | void Manager::setDevice( const QString& dev ){ |
26 | 32 | m_device = dev; | |
27 | } | 33 | } |
28 | void Manager::setDevice( Device* dev ){ | 34 | void Manager::setDevice( Device* dev ){ |
@@ -30,4 +36,13 @@ void Manager::setDevice( Device* dev ){ | |||
30 | } | 36 | } |
31 | void Manager::isConnected( const QString& device ){ | 37 | void Manager::isConnected( const QString& device ){ |
38 | OProcess* l2ping = new OProcess(); | ||
39 | l2ping->setName( device.latin1() ); | ||
40 | *l2ping << "l2ping" << "-c1" << device; | ||
41 | connect(l2ping, SIGNAL(processExited(OProcess* ) ), | ||
42 | this, SLOT(slotProcessExited(OProcess*) ) ); | ||
43 | if (!l2ping->start() ) { | ||
44 | emit connected( device, false ); | ||
45 | delete l2ping; | ||
46 | } | ||
32 | 47 | ||
33 | } | 48 | } |
@@ -45,25 +60,75 @@ void Manager::searchDevices(Device* d ){ | |||
45 | } | 60 | } |
46 | void Manager::addService(const QString& name ){ | 61 | void Manager::addService(const QString& name ){ |
47 | 62 | OProcess proc; | |
48 | } | 63 | proc << "sdptool" << "add" << name; |
49 | void Manager::addServices(const QStringList& ){ | 64 | bool bo = true; |
50 | 65 | if (!proc.start(OProcess::DontCare ) ) | |
66 | bo = false; | ||
67 | emit addedService( name, bo ); | ||
68 | } | ||
69 | void Manager::addServices(const QStringList& list){ | ||
70 | QStringList::ConstIterator it; | ||
71 | for (it = list.begin(); it != list.end(); ++it ) | ||
72 | addService( (*it) ); | ||
51 | } | 73 | } |
52 | void Manager::removeService( const QString& name ){ | 74 | void Manager::removeService( const QString& name ){ |
53 | 75 | OProcess prc; | |
54 | } | 76 | prc << "sdptool" << "del" << name; |
55 | void Manager::removeServices( const QStringList& ){ | 77 | bool bo = true; |
56 | 78 | if (!prc.start(OProcess::DontCare ) ) | |
79 | bo = false; | ||
80 | emit removedService( name, bo ); | ||
81 | } | ||
82 | void Manager::removeServices( const QStringList& list){ | ||
83 | QStringList::ConstIterator it; | ||
84 | for (it = list.begin(); it != list.end(); ++it ) | ||
85 | removeService( (*it) ); | ||
57 | } | 86 | } |
58 | void Manager::searchServices( const QString& remDevice ){ | 87 | void Manager::searchServices( const QString& remDevice ){ |
88 | OProcess *m_sdp =new OProcess(); | ||
89 | *m_sdp << "sdptool" << "browse" << remDevice; | ||
90 | m_sdp->setName( remDevice.latin1() ); | ||
91 | connect(m_sdp, SIGNAL(processExited(OProcess*) ), | ||
92 | this, SLOT(slotSDPExited(OProcess* ) ) ); | ||
93 | connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | ||
94 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | ||
95 | if (!m_sdp->start() ) { | ||
96 | delete m_sdp; | ||
97 | Services::ValueList list; | ||
98 | emit foundServices( remDevice, list ); | ||
99 | } | ||
100 | } | ||
101 | void Manager::searchServices( const RemoteDevices& dev){ | ||
102 | searchServices( dev.mac() ); | ||
103 | } | ||
104 | QString Manager::toDevice( const QString& mac ){ | ||
59 | 105 | ||
60 | } | 106 | } |
61 | void Manager::searchServices( const RemoteDevices& ){ | 107 | QString Manager::toMac( const QString &device ){ |
62 | 108 | ||
63 | } | 109 | } |
64 | QString Manager::toDevice( const QString& mac ){ | 110 | void Manager::slotProcessExited(OProcess* proc ) { |
111 | bool conn= false; | ||
112 | if (proc->normalExit() && proc->exitStatus() == 0 ) | ||
113 | conn = true; | ||
65 | 114 | ||
115 | QString name = QString::fromLatin1(proc->name() ); | ||
116 | emit connected( name, conn ); | ||
117 | delete proc; | ||
66 | } | 118 | } |
67 | QString Manager::toMac( const QString &device ){ | 119 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) |
120 | { | ||
121 | QCString str(ch, len+1 ); | ||
122 | QMap<QString, QString>::Iterator it; | ||
123 | it = m_out.find(proc->name() ); | ||
124 | if ( it != m_out.end() ) { | ||
125 | QString string = it.data(); | ||
126 | string.append( str ); | ||
127 | m_out.replace( proc->name(), string ); | ||
128 | } | ||
68 | 129 | ||
69 | } | 130 | } |
131 | void Manager::slotSDPExited( OProcess* proc) | ||
132 | { | ||
133 | delete proc; | ||
134 | } | ||
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index 6c5e27f..03375c5 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h | |||
@@ -5,4 +5,5 @@ | |||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qmap.h> | ||
7 | #include <qvaluelist.h> | 8 | #include <qvaluelist.h> |
8 | 9 | ||
@@ -10,4 +11,5 @@ | |||
10 | #include "services.h" | 11 | #include "services.h" |
11 | 12 | ||
13 | class OProcess; | ||
12 | namespace OpieTooth { | 14 | namespace OpieTooth { |
13 | class Device; | 15 | class Device; |
@@ -15,5 +17,5 @@ namespace OpieTooth { | |||
15 | * with Manager you can control the things you | 17 | * with Manager you can control the things you |
16 | * could do from command line in a OO and asynchronus | 18 | * could do from command line in a OO and asynchronus |
17 | * way. | 19 | * way. |
18 | */ | 20 | */ |
19 | class Manager : public QObject { | 21 | class Manager : public QObject { |
@@ -28,5 +30,5 @@ Q_OBJECT | |||
28 | * @param dev The Device to be managed | 30 | * @param dev The Device to be managed |
29 | * We don't care of Device so you need to delete it | 31 | * We don't care of Device so you need to delete it |
30 | */ | 32 | */ |
31 | Manager( Device* dev ); | 33 | Manager( Device* dev ); |
32 | /** | 34 | /** |
@@ -49,5 +51,6 @@ Q_OBJECT | |||
49 | * If device is empty it will take the currently managed | 51 | * If device is empty it will take the currently managed |
50 | * device and see if it's up | 52 | * device and see if it's up |
51 | * for Remote devices it will ping and see | 53 | * for Remote devices it will ping and see. |
54 | * @param either mac or hciX | ||
52 | */ | 55 | */ |
53 | void isConnected(const QString& device= QString::null ); | 56 | void isConnected(const QString& device= QString::null ); |
@@ -57,6 +60,6 @@ Q_OBJECT | |||
57 | void isConnected(Device *dev ); | 60 | void isConnected(Device *dev ); |
58 | 61 | ||
59 | /** this search for devices reachable from the | 62 | /** this searchs for devices reachable from the |
60 | * currently managed device | 63 | * currently managed device |
61 | * or from device if @param device is not empty | 64 | * or from device if @param device is not empty |
62 | */ | 65 | */ |
@@ -90,5 +93,5 @@ Q_OBJECT | |||
90 | /** | 93 | /** |
91 | * search for services on a remote device | 94 | * search for services on a remote device |
92 | * | 95 | * |
93 | */ | 96 | */ |
94 | void searchServices( const QString& remDevice ); | 97 | void searchServices( const QString& remDevice ); |
@@ -104,8 +107,18 @@ Q_OBJECT | |||
104 | // the first device is the device which you access | 107 | // the first device is the device which you access |
105 | void connected( const QString& device, bool connected ); | 108 | void connected( const QString& device, bool connected ); |
106 | void addedService( const QString& device, const QString& service, bool added ); | 109 | void addedService( const QString& service, bool added ); |
107 | void removedService( const QString& device, const QString& service, bool removed ); | 110 | void removedService( const QString& service, bool removed ); |
108 | void foundServices( const QString& device, Services::ValueList ); | 111 | void foundServices( const QString& device, Services::ValueList ); |
109 | void foundDevices( const QString& device, RemoteDevices::ValueList ); | 112 | void foundDevices( const QString& device, RemoteDevices::ValueList ); |
113 | void foundNothing( const QString& device ); | ||
114 | private slots: | ||
115 | void slotProcessExited(OProcess* ); | ||
116 | void slotSDPExited(OProcess*); | ||
117 | void slotSDPOut(OProcess*, char*, int); | ||
118 | private: | ||
119 | OProcess *m_hcitool; | ||
120 | OProcess *m_sdp; // not only one | ||
121 | QString m_device; | ||
122 | QMap<QString, QString> m_out; | ||
110 | }; | 123 | }; |
111 | }; | 124 | }; |