| -rw-r--r-- | noncore/net/opietooth/manager/rfcommhelper.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/noncore/net/opietooth/manager/rfcommhelper.cpp b/noncore/net/opietooth/manager/rfcommhelper.cpp index 0769da2..36e9086 100644 --- a/noncore/net/opietooth/manager/rfcommhelper.cpp +++ b/noncore/net/opietooth/manager/rfcommhelper.cpp @@ -46,6 +46,4 @@ bool RfCommHelper::attach( const QString& bd_addr, int port ) { bool ok = false; - while (!ok ) { - if (i == 4) break; + for (i = 0; i < 5 && !ok; i++) { ok = connect( i, bd_addr, port ); - i++; } @@ -85,3 +83,3 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) { sprintf( dev, "%d", devi ); - execlp( "rfcomm", "rfcomm", dev, bdaddr.latin1(), por, NULL ); + execlp( "rfcomm", "rfcomm", "connect", dev, bdaddr.latin1(), por, NULL ); char resultByte = 1; @@ -115,3 +113,2 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) { continue; // the other process is not yet ready? - break; @@ -129,5 +126,7 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) { timeout.tv_usec = 0; - + printf("do select\n"); sel = select( m_in2out[0]+1, &fds, NULL, NULL, &timeout ); - if ( sel ) + printf("Check select\n"); + if ( sel > 0) + { if (FD_ISSET(m_in2out[0], &fds ) ) { @@ -136,4 +135,6 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) { buf[0] = 0; + printf("read output\n"); len = read( m_in2out[0], buf, sizeof(buf) ); if ( len > 0 ) { + printf("%s", buf); QCString string( buf ); @@ -146,6 +147,6 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) { // now parese it + } }else {// time out - // 5 seconds without input check terminate? - // - ; + terminate = true; + printf("terminate\n"); } |