Patrick Pollet / EthernetInterfaceW5500

Ethernet interface for W5500 with bug fixed in socket::close()

Fork of EthernetInterfaceW5500 by W5500-Ethernet-Interface Makers

Socket/Socket.cpp@15:fe68ac753657, 2014-08-29 (annotated)

Committer:
ppo
Date:
Fri Aug 29 12:00:38 2014 +0000
Revision:
15:fe68ac753657
Parent:
10:cadac6bcd169 
bug fixed in close(), now socket is really closed

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 */
Bongjun 10:cadac6bcd169 18
samux 1:fb4494783863 19 #include "Socket.h"
samux 1:fb4494783863 20
Bongjun 10:cadac6bcd169 21 Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1500)
Bongjun 10:cadac6bcd169 22 {
Bongjun 10:cadac6bcd169 23 eth = WIZnet_Chip::getInstance();
va009039 5:fb15c35d1e28 24 if (eth == NULL) {
Bongjun 10:cadac6bcd169 25 error("Socket constructor error: no W5500 instance available!\r\n");
Bongjun 10:cadac6bcd169 26 }
samux 1:fb4494783863 27 }
samux 1:fb4494783863 28
Bongjun 10:cadac6bcd169 29 void Socket::set_blocking(bool blocking, unsigned int timeout)
Bongjun 10:cadac6bcd169 30 {
samux 1:fb4494783863 31 _blocking = blocking;
samux 1:fb4494783863 32 _timeout = timeout;
samux 1:fb4494783863 33 }
samux 1:fb4494783863 34
Bongjun 10:cadac6bcd169 35 int Socket::close()
Bongjun 10:cadac6bcd169 36 {
Bongjun 10:cadac6bcd169 37 // add this code refer from EthernetInterface.
ppo 15:fe68ac753657 38 int res;
ppo 15:fe68ac753657 39 res = eth->close(_sock_fd);
Bongjun 10:cadac6bcd169 40 _sock_fd = -1;
ppo 15:fe68ac753657 41 return (res)? 0: -1;
samux 1:fb4494783863 42 }
samux 1:fb4494783863 43
Bongjun 10:cadac6bcd169 44 Socket::~Socket()
Bongjun 10:cadac6bcd169 45 {
samux 1:fb4494783863 46 close(); //Don't want to leak
samux 1:fb4494783863 47 }