@@ -335,21 +335,7 @@ void WiFiClient::setTimeout(uint32_t seconds)
335
335
{
336
336
_lastReadTimeout = Client::getTimeout ();
337
337
_lastWriteTimeout = _lastReadTimeout;
338
- Client::setTimeout (seconds * 1000 ); // This should be here?
339
338
_timeout = seconds * 1000 ;
340
-
341
- // if(fd() >= 0) {
342
- // struct timeval tv;
343
- // tv.tv_sec = seconds;
344
- // tv.tv_usec = 0;
345
- // if(setSocketOption(SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)) < 0) {
346
- // return -1;
347
- // }
348
- // return setSocketOption(SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
349
- // }
350
- // else {
351
- // return 0;
352
- // }
353
339
}
354
340
355
341
int WiFiClient::setOption (int option, int *value)
@@ -422,10 +408,10 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size)
422
408
423
409
if (_lastWriteTimeout != _timeout){
424
410
if (fd () >= 0 ){
425
- struct timeval tv ;
426
- tv .tv_sec = _timeout/1000 ;
427
- tv .tv_usec = 0 ;
428
- if (setSocketOption (SO_SNDTIMEO, (char *)&tv , sizeof (struct timeval )) >= 0 )
411
+ struct timeval timeout_tv ;
412
+ timeout_tv .tv_sec = _timeout/1000 ;
413
+ timeout_tv .tv_usec = 0 ;
414
+ if (setSocketOption (SO_SNDTIMEO, (char *)&timeout_tv , sizeof (struct timeval )) >= 0 )
429
415
{
430
416
_lastWriteTimeout = _timeout;
431
417
}
@@ -493,10 +479,10 @@ int WiFiClient::read(uint8_t *buf, size_t size)
493
479
{
494
480
if (_lastReadTimeout != _timeout){
495
481
if (fd () >= 0 ){
496
- struct timeval tv ;
497
- tv .tv_sec = _timeout/1000 ;
498
- tv .tv_usec = 0 ;
499
- if (setSocketOption (SO_RCVTIMEO, (char *)&tv , sizeof (struct timeval )) >= 0 )
482
+ struct timeval timeout_tv ;
483
+ timeout_tv .tv_sec = _timeout/1000 ;
484
+ timeout_tv .tv_usec = 0 ;
485
+ if (setSocketOption (SO_RCVTIMEO, (char *)&timeout_tv , sizeof (struct timeval )) >= 0 )
500
486
{
501
487
_lastReadTimeout = _timeout;
502
488
}
0 commit comments