Rudy Raab / WIZ820ioInterface

Revised to prevent DHCPClient::discover from hanging.

Fork of WIZ820ioInterface by ban4jp -

Socket/Socket.cpp@9:c1722862c13b, 2014-08-15 (annotated)

Committer:
rraab
Date:
Fri Aug 15 19:53:25 2014 +0000
Revision:
9:c1722862c13b
Parent:
5:fb15c35d1e28 
Fixed DHCPClient::discover calling rand, which hangs in an infinite loop.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:fb4494783863 1 /* Copyright (C) 2012 mbed.org, MIT License
samux 1:fb4494783863 2 *
samux 1:fb4494783863 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:fb4494783863 4 * and associated documentation files (the "Software"), to deal in the Software without restriction,
samux 1:fb4494783863 5 * including without limitation the rights to use, copy, modify, merge, publish, distribute,
samux 1:fb4494783863 6 * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
samux 1:fb4494783863 7 * furnished to do so, subject to the following conditions:
samux 1:fb4494783863 8 *
samux 1:fb4494783863 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:fb4494783863 10 * substantial portions of the Software.
samux 1:fb4494783863 11 *
samux 1:fb4494783863 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:fb4494783863 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:fb4494783863 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:fb4494783863 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:fb4494783863 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:fb4494783863 17 */
samux 1:fb4494783863 18
samux 1:fb4494783863 19 #include "Socket.h"
samux 1:fb4494783863 20
va009039 5:fb15c35d1e28 21 Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1500) {
va009039 5:fb15c35d1e28 22 eth = WIZ820io::getInstance();
va009039 5:fb15c35d1e28 23 if (eth == NULL) {
va009039 5:fb15c35d1e28 24 error("Socket constructor error: no WIZ8820io instance available!\r\n");
va009039 5:fb15c35d1e28 25 }
samux 1:fb4494783863 26 }
samux 1:fb4494783863 27
samux 1:fb4494783863 28 void Socket::set_blocking(bool blocking, unsigned int timeout) {
samux 1:fb4494783863 29 _blocking = blocking;
samux 1:fb4494783863 30 _timeout = timeout;
samux 1:fb4494783863 31 }
samux 1:fb4494783863 32
samux 1:fb4494783863 33 int Socket::close() {
va009039 5:fb15c35d1e28 34 return (eth->close(_sock_fd)) ? 0 : -1;
samux 1:fb4494783863 35 }
samux 1:fb4494783863 36
samux 1:fb4494783863 37 Socket::~Socket() {
samux 1:fb4494783863 38 close(); //Don't want to leak
samux 1:fb4494783863 39 }