Diff: UIPServer.cpp

Revision:

4:d774541a34da

Parent:

2:049ce85163c5

Child:

8:4acb22344932

--- a/UIPServer.cpp	Sat Dec 20 11:10:40 2014 +0000
+++ b/UIPServer.cpp	Sun Mar 08 20:26:56 2015 +0000
@@ -1,109 +1,92 @@
-/*
- UIPServer.cpp - Arduino implementation of a uIP wrapper class.
- Copyright (c) 2013 Norbert Truchsess <norbert.truchsess@t-online.de>
- All rights reserved.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include "UIPEthernet.h"
-#include "UIPServer.h"
-extern "C"
-{
-#include  "utility/uip-conf.h"
-}
-/**
- * @brief
- * @note
- * @param
- * @retval
- */
-UIPServer::UIPServer(uint16_t port) :
-    _port(htons(port)) {
-    UIPEthernet.set_uip_callback(&UIPClient::uip_callback);
-}
-
-/**
- * @brief
- * @note
- * @param
- * @retval
- */
-UIPClient UIPServer::available(void) {
-    UIPEthernet.tick();
-
-    uip_userdata_t*     u;
-    for(uint8_t sock = 0; sock < UIP_CONNS; sock++) {
-        struct uip_conn*    conn = &uip_conns[sock];
-        if(conn->lport == _port && (u = (uip_userdata_t*)conn->appstate.user)) {
-            if(UIPClient::_available(u))
-                return UIPClient(conn);
-        }
-    }
-
-    uip_userdata_closed_t **     cc = &UIPClient::closed_conns[0];
-    for(uint8_t i = 0; i < UIP_CONNS; i++) {
-        if(*cc && (*cc)->lport == _port) {
-            if((*cc)->packets_in[0] == NOBLOCK) {
-                free(*cc);
-                *cc = NULL;
-            }
-            else
-                return UIPClient(*cc);
-        }
-
-        cc++;
-    }
-
-    return UIPClient();
-}
-
-/**
- * @brief
- * @note
- * @param
- * @retval
- */
-void UIPServer::begin(void) {
-    uip_listen(_port);
-    UIPEthernet.tick();
-}
-
-/**
- * @brief
- * @note
- * @param
- * @retval
- */
-size_t UIPServer::write(uint8_t c) {
-    return write(&c, 1);
-}
-
-/**
- * @brief
- * @note
- * @param
- * @retval
- */
-size_t UIPServer::write(const uint8_t* buf, size_t size) {
-    size_t  ret = 0;
-    for(int sock = 0; sock < UIP_CONNS; sock++) {
-        struct uip_conn*    conn = &uip_conns[sock];
-        if(conn->lport == _port && (conn->tcpstateflags != UIP_CLOSE))
-            ret = UIPClient::_write(conn, buf, size);
-    }
-
-    return ret;
-}
-
-
+/*
+ UIPServer.cpp - Arduino implementation of a uIP wrapper class.
+ Copyright (c) 2013 Norbert Truchsess <norbert.truchsess@t-online.de>
+ All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include "UIPEthernet.h"
+#include "UIPServer.h"
+extern "C"
+{
+#include "utility/uip-conf.h"
+}
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+UIPServer::UIPServer(uint16_t port) :
+    _port(htons(port))
+{ }
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+UIPClient UIPServer::available(void) {
+    UIPEthernet.tick();
+    for(uip_userdata_t * data = &UIPClient::all_data[0]; data < &UIPClient::all_data[UIP_CONNS]; data++) {
+        if
+        (
+            data->packets_in[0] != NOBLOCK
+        &&  (
+                ((data->state & UIP_CLIENT_CONNECTED) && uip_conns[data->state & UIP_CLIENT_SOCKETS].lport == _port)
+            ||  ((data->state & UIP_CLIENT_REMOTECLOSED) && ((uip_userdata_closed_t*)data)->lport == _port)
+            )
+        ) return UIPClient(data);
+    }
+
+    return UIPClient();
+}
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+void UIPServer::begin(void) {
+    uip_listen(_port);
+    UIPEthernet.tick();
+}
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+size_t UIPServer::write(uint8_t c) {
+    return write(&c, 1);
+}
+
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+size_t UIPServer::write(const uint8_t* buf, size_t size) {
+    size_t  ret = 0;
+    for(uip_userdata_t * data = &UIPClient::all_data[0]; data < &UIPClient::all_data[UIP_CONNS]; data++) {
+        if((data->state & UIP_CLIENT_CONNECTED) && uip_conns[data->state & UIP_CLIENT_SOCKETS].lport == _port)
+            ret += UIPClient::_write(data, buf, size);
+    }
+
+    return ret;
+}