Diff: WIZnetInterface/Socket/Socket.cpp

Revision:

7:7c67a8922ec5

Parent:

0:b72d22e10709

--- a/WIZnetInterface/Socket/Socket.cpp	Fri Apr 24 08:19:14 2015 +0000
+++ b/WIZnetInterface/Socket/Socket.cpp	Sun May 31 10:06:41 2015 +0000
@@ -1,40 +1,49 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
-#include "Socket.h"
-
-Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1500) {
-    eth = WIZnet_Chip::getInstance();
-    if (eth == NULL) {
-        error("Socket constructor error: no W5500 instance available!\r\n");
-    }       
-}
-
-void Socket::set_blocking(bool blocking, unsigned int timeout) {
-    _blocking = blocking;
-    _timeout = timeout;
-}
-
-int Socket::close() {
-    return (eth->close(_sock_fd)) ? 0 : -1;
-}
-
-Socket::~Socket() {
-    close(); //Don't want to leak
-}
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "Socket.h"
 
+Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1500)
+{
+    eth = WIZnet_Chip::getInstance();
+    if (eth == NULL) {
+        error("Socket constructor error: no W5500 instance available!\r\n");
+    }
+}
+
+void Socket::set_blocking(bool blocking, unsigned int timeout)
+{
+    _blocking = blocking;
+    _timeout = timeout;
+}
+
+int Socket::close()
+{
+    // add this code refer from EthernetInterface.
+    // update by Patrick Pollet
+    int res;
+    res = eth->close(_sock_fd);
+    _sock_fd = -1;
+    return (res)? 0: -1;
+}
+
+Socket::~Socket()
+{
+    close(); //Don't want to leak
+}
+