Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/isrv_identd.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/isrv_identd.c (modified) (7 diffs)

branches/3.3/mindi-busybox/networking/isrv_identd.c

@@ -19 +19 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 #include "isrv.h"
@@ -26 +27 @@
 typedef struct identd_buf_t {
     int pos;
-    int fd_flag;
-    char buf[64 - 2*sizeof(int)];
+    char buf[64 - sizeof(int)];
 } identd_buf_t;
 
@@ -43 +43 @@
         return peer; /* failure, unregister peer */
 
-    buf->fd_flag = fcntl(fd, F_GETFL) | O_NONBLOCK;
+    ndelay_on(fd);
     isrv_want_rd(state, fd);
     return 0;
@@ -52 +52 @@
     identd_buf_t *buf = *paramp;
     char *cur, *p;
-    int retval = 0; /* session is ok (so far) */
     int sz;
 
     cur = buf->buf + buf->pos;
 
-    if (buf->fd_flag & O_NONBLOCK)
-        fcntl(fd, F_SETFL, buf->fd_flag);
-    sz = safe_read(fd, cur, sizeof(buf->buf) - buf->pos);
+    sz = safe_read(fd, cur, sizeof(buf->buf) - 1 - buf->pos);
 
     if (sz < 0) {
         if (errno != EAGAIN)
-            goto term; /* terminate this session if !EAGAIN */
-        goto ok;
+            goto term;
+        return 0; /* "session is ok" */
     }
 
@@ -72 +69 @@
     if (p)
         *p = '\0';
-    if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
-        goto ok;
+    if (!p && sz)
+        return 0;  /* "session is ok" */
+
     /* Terminate session. If we are in server mode, then
      * fd is still in nonblocking mode - we never block here */
-    if (fd == 0) fd++; /* inetd mode? then write to fd 1 */
+    if (fd == 0)
+        fd++; /* inetd mode? then write to fd 1 */
     fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser);
+    /*
+     * Why bother if we are going to close fd now anyway?
+     * if (server)
+     *  ndelay_off(fd);
+     */
  term:
     free(buf);
-    retval = 1; /* terminate */
- ok:
-    if (buf->fd_flag & O_NONBLOCK)
-        fcntl(fd, F_SETFL, buf->fd_flag & ~O_NONBLOCK);
-    return retval;
+    return 1; /* "terminate" */
 }
 
@@ -96 +96 @@
     identd_buf_t *buf = xzalloc(sizeof(*buf));
     /* buf->pos = 0; - xzalloc did it */
-    /* We do NOT want nonblocking I/O here! */
-    /* buf->fd_flag = 0; - xzalloc did it */
     do
         alarm(TIMEOUT);
+        /* Note: we do NOT want nonblocking I/O here! */
     while (do_rd(0, (void*)&buf) == 0);
 }
@@ -118 +117 @@
     int fd;
 
+    setup_common_bufsiz();
+
     opt = getopt32(argv, "fiwb:", &bind_address);
     strcpy(bogouser, "nobody");
     if (argv[optind])
-        strncpy(bogouser, argv[optind], sizeof(bogouser));
+        strncpy(bogouser, argv[optind], COMMON_BUFSIZE - 1);
 
     /* Daemonize if no -f and no -i and no -w */