session_transfer(): Do not write the data into input descriptors!

[inetdmx.git] / inetdmx.c

diff --git a/inetdmx.c b/inetdmx.c
index 0c5d89a..c6d961b 100644 (file)
--- a/inetdmx.c
+++ b/inetdmx.c
@@ -321,7 +321,7 @@ static void session_transfer(
 {
 struct pollfd pollfdi[2];
 int pollfdo[2];
-const char *pollfdi_name[2];
+const char *pollfd_name[2];
 int fdi,fdo;
 
        pollfdi[0].fd=conn0_fdin;
@@ -330,18 +330,18 @@ int fdi,fdo;
        pollfdi[1].events=POLLIN;
        pollfdo[0]=conn0_fdout;
        pollfdo[1]=conn1_fdout;
-       pollfdi_name[0]=conn0_name;
-       pollfdi_name[1]=conn1_name;
+       pollfd_name[0]=conn0_name;
+       pollfd_name[1]=conn1_name;
        for (;;) {
                if (0>=poll(pollfdi,G_N_ELEMENTS(pollfdi),-1))
-                       fatal("poll(%s socket,%s socket): %m",pollfdi_name[0],pollfdi_name[1]);
+                       fatal("poll(%s socket,%s socket): %m",pollfd_name[0],pollfd_name[1]);
                for (fdi=0;fdi<G_N_ELEMENTS(pollfdi);fdi++)
                        if (0
                                        ||   pollfdi[fdi].revents & (POLLERR|POLLHUP|POLLNVAL)
                                        || ((pollfdi[fdi].revents & POLLIN) && !(pollfdi[fdi].events & POLLIN))
                                        )
                                fatal("poll(%s socket): revents=0x%X (events=0x%X)",
-                                               pollfdi_name[fdi],(unsigned)pollfdi[fdi].revents,
+                                               pollfd_name[fdi],(unsigned)pollfdi[fdi].revents,
                                                (unsigned)pollfdi[fdi].events);
                for (fdi=0;fdi<G_N_ELEMENTS(pollfdi);fdi++) {
                        for (;;) {
@@ -349,26 +349,26 @@ int fdi,fdo;
                                char buf[SESSION_BUFFER_SIZE];
 
                                if (fcntl(pollfdi[fdi].fd,F_SETFL,O_NONBLOCK))
-                                       fatal("fcntl(%s socket,F_SETFL,O_NONBLOCK): %m",pollfdi_name[fdi]);
+                                       fatal("fcntl(%s socket,F_SETFL,O_NONBLOCK): %m",pollfd_name[fdi]);
                                got=read(pollfdi[fdi].fd,buf,sizeof(buf));
                                if (got<0) {
                                        if (errno==EAGAIN)
                                                break;
-                                       fatal("read(%s socket): %m",pollfdi_name[fdi]);
+                                       fatal("read(%s socket): %m",pollfd_name[fdi]);
                                        }
                                if (got==0) {
                                        lock_close();
                                        exit(EXIT_SUCCESS);
                                        }
-                               for (fdo=0;fdo<G_N_ELEMENTS(pollfdi);fdo++) {
+                               for (fdo=0;fdo<G_N_ELEMENTS(pollfdo);fdo++) {
                                        if (fdi==fdo)
                                                continue;
-                                       if (fcntl(pollfdi[fdo].fd,F_SETFL,0 /* !O_NONBLOCK */))
+                                       if (fcntl(pollfdo[fdo],F_SETFL,0 /* !O_NONBLOCK */))
                                                fatal("fcntl(%s socket,F_SETFL,0 /* !O_NONBLOCK */): %m",
-                                                               pollfdi_name[fdo]);
-                                       if (got!=write(pollfdi[fdo].fd,buf,got))
+                                                               pollfd_name[fdo]);
+                                       if (got!=write(pollfdo[fdo],buf,got))
                                                fatal("write(%s socket,%ld): %m",
-                                                               pollfdi_name[fdo],(long)got);
+                                                               pollfd_name[fdo],(long)got);
                                        }
                                }
                        }