X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=b913009369ba6029fcdf4fa8378c9d926e30dd10;hp=ef2c64caced7aaef2751d6fa0233e0b33346dfae;hb=68ae99f74f658df5eb53c7ef0127a210e3defd5e;hpb=6acf01b71c38441686d6167617feee86a2960d62

diff --git a/fd.c b/fd.c
index ef2c64ca..b9130093 100644
--- a/fd.c
+++ b/fd.c
@@ -64,7 +64,8 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
 		err = errno;
 	} while (ret < 0 && err == EINTR);
 	if (ret < 0)
-		PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+		PARA_CRIT_LOG("select error: %s, max_fileno: %d\n",
+			strerror(err), n);
 	return ret;
 }
 
@@ -99,6 +100,20 @@ int mark_fd_nonblock(int fd)
 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
+
+	if (fd < 0 || fd >= FD_SETSIZE) {
+		PARA_EMERG_LOG("fatal: tried to add invalid fd %d\n", fd);
+		exit(EXIT_FAILURE);
+	}
+#if 0
+	{
+		int flags = fcntl(fd, F_GETFL);
+		if (!(flags & O_NONBLOCK)) {
+			PARA_EMERG_LOG("fd %d is a blocking file descriptor\n", fd);
+			exit(EXIT_FAILURE);
+		}
+	}
+#endif
 	FD_SET(fd, fds);
 	*max_fileno = PARA_MAX(*max_fileno, fd);
 }