summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/rfcommhelper.cpp25
1 files changed, 13 insertions, 12 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
@@ -42,12 +42,10 @@ void RfCommHelper::detach() {
42 close(m_out2in[1] ); 42 close(m_out2in[1] );
43} 43}
44bool RfCommHelper::attach( const QString& bd_addr, int port ) { 44bool RfCommHelper::attach( const QString& bd_addr, int port ) {
45 int i =0; 45 int i = 0;
46 bool ok = false; 46 bool ok = false;
47 while (!ok ) { 47 for (i = 0; i < 5 && !ok; i++) {
48 if (i == 4) break;
49 ok = connect( i, bd_addr, port ); 48 ok = connect( i, bd_addr, port );
50 i++;
51 } 49 }
52 return ok; 50 return ok;
53} 51}
@@ -83,7 +81,7 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) {
83 char dev[15]; 81 char dev[15];
84 sprintf( por, "%d", port ); 82 sprintf( por, "%d", port );
85 sprintf( dev, "%d", devi ); 83 sprintf( dev, "%d", devi );
86 execlp( "rfcomm", "rfcomm", dev, bdaddr.latin1(), por, NULL ); 84 execlp( "rfcomm", "rfcomm", "connect", dev, bdaddr.latin1(), por, NULL );
87 char resultByte = 1; 85 char resultByte = 1;
88 if ( m_fd[1] ) 86 if ( m_fd[1] )
89 write(m_fd[1], &resultByte, 1 ); 87 write(m_fd[1], &resultByte, 1 );
@@ -113,7 +111,6 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) {
113 if ( len == -1 ) 111 if ( len == -1 )
114 if ( (errno == ECHILD ) || (errno == EINTR ) ) 112 if ( (errno == ECHILD ) || (errno == EINTR ) )
115 continue; // the other process is not yet ready? 113 continue; // the other process is not yet ready?
116
117 break; 114 break;
118 } 115 }
119 if ( m_fd[0] ) 116 if ( m_fd[0] )
@@ -127,15 +124,19 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) {
127 FD_SET( m_in2out[0], &fds ); 124 FD_SET( m_in2out[0], &fds );
128 timeout.tv_sec = 5; 125 timeout.tv_sec = 5;
129 timeout.tv_usec = 0; 126 timeout.tv_usec = 0;
130 127 printf("do select\n");
131 sel = select( m_in2out[0]+1, &fds, NULL, NULL, &timeout ); 128 sel = select( m_in2out[0]+1, &fds, NULL, NULL, &timeout );
132 if ( sel ) 129 printf("Check select\n");
130 if ( sel > 0)
131 {
133 if (FD_ISSET(m_in2out[0], &fds ) ) { 132 if (FD_ISSET(m_in2out[0], &fds ) ) {
134 char buf[2048]; 133 char buf[2048];
135 int len; 134 int len;
136 buf[0] = 0; 135 buf[0] = 0;
136 printf("read output\n");
137 len = read( m_in2out[0], buf, sizeof(buf) ); 137 len = read( m_in2out[0], buf, sizeof(buf) );
138 if ( len > 0 ) { 138 if ( len > 0 ) {
139 printf("%s", buf);
139 QCString string( buf ); 140 QCString string( buf );
140 if (string.left(9) == "Connected" ) { 141 if (string.left(9) == "Connected" ) {
141 m_connected = true; 142 m_connected = true;
@@ -144,11 +145,11 @@ bool RfCommHelper::connect(int devi, const QString& bdaddr, int port) {
144 }; 145 };
145 } 146 }
146 // now parese it 147 // now parese it
147 }else {// time out
148 // 5 seconds without input check terminate?
149 //
150 ;
151 } 148 }
149 } else {// time out
150 terminate = true;
151 printf("terminate\n");
152 }
152 } 153 }
153 break; 154 break;
154 } 155 }