extmod/modlwip: Fix error codes for duplicate calls to connect().

pfalcon · pfalcon · commit 5da8de2b66d3 · 2017-06-04T12:30:41.000+03:00
If socket is already connected, POSIX requires returning EISCONN. If connection was requested, but not yet complete (for non-blocking socket), error code is EALREADY. http://pubs.opengroup.org/onlinepubs/7908799/xns/connect.html
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -800,9 +800,9 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
         case MOD_NETWORK_SOCK_STREAM: {
             if (socket->state != STATE_NEW) {
                 if (socket->state == STATE_CONNECTED) {
-                    mp_raise_OSError(MP_EALREADY);
+                    mp_raise_OSError(MP_EISCONN);
                 } else {
-                    mp_raise_OSError(MP_EINPROGRESS);
+                    mp_raise_OSError(MP_EALREADY);
                 }
             }
             // Register our receive callback.
diff --git a/py/mperrno.h b/py/mperrno.h
@@ -73,6 +73,7 @@
 #define MP_ECONNABORTED     (103) // Software caused connection abort
 #define MP_ECONNRESET       (104) // Connection reset by peer
 #define MP_ENOBUFS          (105) // No buffer space available
+#define MP_EISCONN          (106) // Transport endpoint is already connected
 #define MP_ENOTCONN         (107) // Transport endpoint is not connected
 #define MP_ETIMEDOUT        (110) // Connection timed out
 #define MP_ECONNREFUSED     (111) // Connection refused
@@ -127,6 +128,7 @@
 #define MP_ECONNABORTED     ECONNABORTED
 #define MP_ECONNRESET       ECONNRESET
 #define MP_ENOBUFS          ENOBUFS
+#define MP_EISCONN          EISCONN
 #define MP_ENOTCONN         ENOTCONN
 #define MP_ETIMEDOUT        ETIMEDOUT
 #define MP_ECONNREFUSED     ECONNREFUSED

Original file line number	Diff line number	Diff line change
`@@ -800,9 +800,9 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {`
`800`	`800`	`case MOD_NETWORK_SOCK_STREAM: {`
`801`	`801`	`if (socket->state != STATE_NEW) {`
`802`	`802`	`if (socket->state == STATE_CONNECTED) {`
`803`		`- mp_raise_OSError(MP_EALREADY);`
	`803`	`+ mp_raise_OSError(MP_EISCONN);`
`804`	`804`	`} else {`
`805`		`- mp_raise_OSError(MP_EINPROGRESS);`
	`805`	`+ mp_raise_OSError(MP_EALREADY);`
`806`	`806`	`}`
`807`	`807`	`}`
`808`	`808`	`// Register our receive callback.`