extmod/modlwip: Fixed socket poll in reset state

Fixes #3449
micropython · Nov 22, 2017 · 6b3e0d3 · 6b3e0d3
1 parent d5cf5f7
commit 6b3e0d3
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -1159,19 +1159,25 @@ STATIC mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
         uintptr_t flags = arg;
         ret = 0;
 
-        if (flags & MP_STREAM_POLL_RD && socket->incoming.pbuf != NULL) {
-            ret |= MP_STREAM_POLL_RD;
-        }
-
-        if (flags & MP_STREAM_POLL_WR && tcp_sndbuf(socket->pcb.tcp) > 0) {
-            ret |= MP_STREAM_POLL_WR;
-        }
+        switch (socket->state) {
+        case STATE_NEW:
+        case STATE_CONNECTING:
+            break;
+        case STATE_CONNECTED:
+            if (flags & MP_STREAM_POLL_RD && socket->incoming.pbuf != NULL) {
+                ret |= MP_STREAM_POLL_RD;
+            }
 
-        if (socket->state == STATE_PEER_CLOSED) {
-            // Peer-closed socket is both readable and writable: read will
+            if (flags & MP_STREAM_POLL_WR && tcp_sndbuf(socket->pcb.tcp) > 0) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+            break;
+        default:
+            // Any other state is both readable and writable: read will
             // return EOF, write - error. Without this poll will hang on a
             // socket which was closed by peer.
             ret |= flags & (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR);
+            break;
         }
 
     } else {