Changeset 238 in flair-src for trunk/lib/FlairSensorActuator/src/TargetEthController.cpp
- Timestamp:
- 05/15/18 16:41:02 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSensorActuator/src/TargetEthController.cpp
r214 r238 59 59 // socket to be closed by the client 60 60 controlSocket->RecvMessage(msg.buffer, msg.bufferSize); 61 delete controlSocket; 61 62 } 62 63 … … 65 66 SafeStop(); 66 67 Join(); 68 delete dataSocket; 69 delete listeningSocket; 67 70 } 68 71 … … 202 205 203 206 bool TargetEthController::ProcessMessage(Message *msg) { 204 return !(controlSocket->SendMessage(msg->buffer, msg->bufferSize, 0) < 0);207 return !(controlSocket->SendMessage(msg->buffer, msg->bufferSize, TIME_INFINITE) < 0); 205 208 } 206 209 … … 234 237 bool connectionAccepted = false; 235 238 while (!connectionAccepted) { 236 controlSocket = listeningSocket->Accept(10); 237 if (controlSocket == nullptr) { 238 // Timeout (or error btw) 239 try { 240 controlSocket = listeningSocket->Accept(100000000); 241 } catch (std::logic_error &e) { 242 Thread::Err(e.what()); 243 return false; 244 } catch (std::runtime_error e) { 245 // timeout 239 246 if (ToBeStopped()) 240 247 return false; 248 } 249 if (controlSocket == nullptr) { 250 return false; 241 251 } else 242 252 connectionAccepted = true; … … 248 258 while (!axisNumberRead) { 249 259 try { 250 axisNumber = controlSocket->ReadUInt32(10 );260 axisNumber = controlSocket->ReadUInt32(100000000); 251 261 // Thread::Info("Debug: axisNumber %d\n", axisNumber); 252 262 axisNumberRead = true; … … 260 270 while (!bitsPerAxisRead) { 261 271 try { 262 bitsPerAxis = controlSocket->ReadUInt32(10 );272 bitsPerAxis = controlSocket->ReadUInt32(100000000); 263 273 // Thread::Info("Debug: bits per axis %d\n", bitsPerAxis); 264 274 bitsPerAxisRead = true; … … 276 286 while (!stringSizeRead) { 277 287 try { 278 stringSize = controlSocket->ReadUInt32(10 );288 stringSize = controlSocket->ReadUInt32(100000000); 279 289 stringSizeRead = true; 280 290 } catch (std::runtime_error e) { … … 288 298 while (!axisNameRead) { 289 299 try { 290 axisName[i] = controlSocket->ReadString(stringSize, 10 );300 axisName[i] = controlSocket->ReadString(stringSize, 100000000); 291 301 axisNameRead = true; 292 302 } catch (std::runtime_error e) { … … 303 313 while (!buttonNumberRead) { 304 314 try { 305 buttonNumber = controlSocket->ReadUInt32(10 );315 buttonNumber = controlSocket->ReadUInt32(100000000); 306 316 buttonNumberRead = true; 307 317 } catch (std::runtime_error e) { … … 319 329 while (!stringSizeRead) { 320 330 try { 321 stringSize = controlSocket->ReadUInt32(10 );331 stringSize = controlSocket->ReadUInt32(100000000); 322 332 stringSizeRead = true; 323 333 } catch (std::runtime_error e) { … … 331 341 while (!buttonNameRead) { 332 342 try { 333 buttonName[i] = controlSocket->ReadString(stringSize, 10 );343 buttonName[i] = controlSocket->ReadString(stringSize, 10000000); 334 344 buttonNameRead = true; 335 345 } catch (std::runtime_error e) {
Note:
See TracChangeset
for help on using the changeset viewer.