X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=plink.c;h=891e7d501bf8fc8cf08973e2c138144c2c41be04;hb=958be97ce76eb774408b2e32cbb1c2afb80026d7;hp=047414ada559e818664ba871b17908b89363c6d7;hpb=466b1c82d5db5d2f71daf7e2f0a450c9ff9cadd6;p=PuTTY.git

diff --git a/plink.c b/plink.c
index 047414ad..891e7d50 100644
--- a/plink.c
+++ b/plink.c
@@ -679,21 +679,26 @@ int main(int argc, char **argv)
 		socket = sklist[i];
 		wp = (WPARAM) socket;
 		if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+                    static const struct { int bit, mask; } eventtypes[] = {
+                        {FD_CONNECT_BIT, FD_CONNECT},
+                        {FD_READ_BIT, FD_READ},
+                        {FD_CLOSE_BIT, FD_CLOSE},
+                        {FD_OOB_BIT, FD_OOB},
+                        {FD_WRITE_BIT, FD_WRITE},
+                        {FD_ACCEPT_BIT, FD_ACCEPT},
+                    };
+                    int e;
+
 		    noise_ultralight(socket);
 		    noise_ultralight(things.lNetworkEvents);
-		    if (things.lNetworkEvents & FD_CONNECT)
-			connopen &= select_result(wp, (LPARAM) FD_CONNECT);
-		    if (things.lNetworkEvents & FD_READ)
-			connopen &= select_result(wp, (LPARAM) FD_READ);
-		    if (things.lNetworkEvents & FD_CLOSE)
-			connopen &= select_result(wp, (LPARAM) FD_CLOSE);
-		    if (things.lNetworkEvents & FD_OOB)
-			connopen &= select_result(wp, (LPARAM) FD_OOB);
-		    if (things.lNetworkEvents & FD_WRITE)
-			connopen &= select_result(wp, (LPARAM) FD_WRITE);
-    		    if (things.lNetworkEvents & FD_ACCEPT)
-			connopen &= select_result(wp, (LPARAM) FD_ACCEPT);
 
+                    for (e = 0; e < lenof(eventtypes); e++)
+                        if (things.lNetworkEvents & eventtypes[e].mask) {
+                            LPARAM lp;
+                            int err = things.iErrorCode[eventtypes[e].bit];
+                            lp = WSAMAKESELECTREPLY(eventtypes[e].mask, err);
+                            connopen &= select_result(wp, lp);
+                        }
 		}
 	    }
 	} else if (n == 1) {