net/p910nd/patches/200-p910nd.patch

   1 Index: p910nd-0.7/p910nd.c
   2 ===================================================================
   3 --- p910nd-0.7.orig/p910nd.c    2007-09-02 15:17:23.000000000 +0200
   4 +++ p910nd-0.7/p910nd.c 2007-09-02 15:17:23.000000000 +0200
   5 @@ -73,8 +73,7 @@
   6  #else
   7  #define                LOCKFILE        "/var/lock/subsys/p910%cd"
   8  #endif
   9 -#define                PRINTERFILE     "/dev/lp%c"
  10 -#define                LOGOPTS         LOG_ERR
  11 +#define                PRINTERFILE     "/dev/printers/%c"
  12
  13  static char    *progname;
  14  static char    version[] = "p910nd Version 0.7";
  15 @@ -93,9 +92,9 @@
  16         fprintf(stdout, "%s \n", version);
  17  }
  18
  19 -FILE *open_printer(int lpnumber)
  20 +int open_printer(int lpnumber)
  21  {
  22 -       FILE            *f;
  23 +       int             lp;
  24         char            lpname[sizeof(PRINTERFILE)];
  25
  26  #ifdef TESTING
  27 @@ -105,12 +104,16 @@
  28  #endif
  29         if (device == 0)
  30                 device = lpname;
  31 -       if ((f = fopen(device, bidir ? "w+" : "w")) == NULL)
  32 +       if ((lp = open(device, bidir ? O_RDWR : O_WRONLY)) == -1)
  33         {
  34 -               syslog(LOGOPTS, "%s: %m\n", device);
  35 -               exit(1);
  36 +               syslog(LOG_ERR, "%s: %m\n", device);
  37 +
  38 +               /* fallback to /dev/null if device is not available
  39 +                * otherwise windows spooler will screw up
  40 +                */
  41 +               lp = open("/dev/null", bidir ? O_RDWR : O_WRONLY);
  42         }
  43 -       return (f);
  44 +       return (lp);
  45  }
  46
  47  int get_lock(int lpnumber)
  48 @@ -121,7 +124,7 @@
  49         (void)snprintf(lockname, sizeof(lockname), LOCKFILE, lpnumber);
  50         if ((lockfd = open(lockname, O_CREAT|O_RDWR)) < 0)
  51         {
  52 -               syslog(LOGOPTS, "%s: %m\n", lockname);
  53 +               syslog(LOG_ERR, "%s: %m\n", lockname);
  54                 return (0);
  55         }
  56         memset(&lplock, 0, sizeof(lplock));
  57 @@ -129,7 +132,7 @@
  58         lplock.l_pid = getpid();
  59         if (fcntl(lockfd, F_SETLKW, &lplock) < 0)
  60         {
  61 -               syslog(LOGOPTS, "%s: %m\n", lockname);
  62 +               syslog(LOG_ERR, "%s: %m\n", lockname);
  63                 return (0);
  64         }
  65         return (1);
  66 @@ -141,24 +144,36 @@
  67                 (void)close(lockfd);
  68  }
  69
  70 +ssize_t safe_write(int fd, char *buf, size_t count)
  71 +{
  72 +       size_t offset = 0;
  73 +
  74 +       while (offset < count) {
  75 +               ssize_t n = write(fd, buf + offset, count - offset);
  76 +
  77 +               if (n < 0 && errno != EINTR)
  78 +                       return n;
  79 +
  80 +               if (n > 0)
  81 +                       offset += n;
  82 +       }
  83 +
  84 +       return offset;
  85 +}
  86 +
  87  /* Copy network socket to FILE f until EOS */
  88 -int copy_stream(int fd, FILE *f)
  89 +int copy_stream(int fd, int lp)
  90  {
  91 -       int             nread;
  92 +       int             nread, rcvd = 0, sent = 0;
  93         char            buffer[8192];
  94
  95         if (bidir) {
  96 -               FILE    *nf;
  97 -
  98 -               if ((nf = fdopen(fd, "w")) == NULL) {
  99 -                       syslog(LOGOPTS, "fdopen: %m\n");
 100 -               }
 101                 for (;;) {
 102                         fd_set  readfds;
 103                         int result;
 104 -                       int maxfd = fileno(f) > fd ? fileno(f) : fd;
 105 +                       int maxfd = lp > fd ? lp : fd;
 106                         FD_ZERO(&readfds);
 107 -                       FD_SET(fileno(f), &readfds);
 108 +                       FD_SET(lp, &readfds);
 109                         FD_SET(fd, &readfds);
 110                         result = select(maxfd + 1, &readfds, 0, 0, 0);
 111                         if (result < 0)
 112 @@ -169,43 +184,54 @@
 113                                 nread = read(fd, buffer, sizeof(buffer));
 114                                 if (nread <= 0)
 115                                         break;
 116 -                               (void)fwrite(buffer, sizeof(char), nread, f);
 117 +                               if (safe_write(lp, buffer, nread) < 0) {
 118 +                                       syslog(LOG_ERR, "write: %m\n");
 119 +                                       break;
 120 +                               }
 121 +                               rcvd += nread;
 122                         }
 123 -                       if (FD_ISSET(fileno(f), &readfds)) {
 124 -                               nread = read(fileno(f), buffer, sizeof(buffer));
 125 -                               if (nread > 0 && nf != NULL) {
 126 -                                       (void)fwrite(buffer, sizeof(char), nread, nf);
 127 -                                       (void)fflush(nf);
 128 +                       if (FD_ISSET(lp, &readfds)) {
 129 +                               nread = read(lp, buffer, sizeof(buffer));
 130 +                               if (nread > 0) {
 131 +                                       safe_write(fd, buffer, nread);
 132 +                                       sent += nread;
 133                                 }
 134                         }
 135                 }
 136 -               (void)fflush(f);
 137 -               (void)fclose(nf);
 138 +               syslog(LOG_NOTICE, "Finished job: %d bytes received, %d bytes sent\n",
 139 +                       rcvd, sent);
 140                 return (0);
 141         } else {
 142 -               while ((nread = read(fd, buffer, sizeof(buffer))) > 0)
 143 -                       (void)fwrite(buffer, sizeof(char), nread, f);
 144 -               (void)fflush(f);
 145 +               while ((nread = read(fd, buffer, sizeof(buffer))) > 0) {
 146 +                       if (safe_write(lp, buffer, nread) < 0) {
 147 +                               syslog(LOG_ERR, "write: %m\n");
 148 +                               break;
 149 +                       }
 150 +                       rcvd += nread;
 151 +               }
 152 +               syslog(LOG_NOTICE, "Finished job: %d bytes received\n", rcvd);
 153                 return (nread);
 154         }
 155  }
 156
 157  void one_job(int lpnumber)
 158  {
 159 -       FILE            *f;
 160 +       int             lp;
 161         struct sockaddr_in      client;
 162         socklen_t       clientlen = sizeof(client);
 163
 164         if (getpeername(0, (struct sockaddr*) &client, &clientlen) >= 0)
 165 -               syslog(LOGOPTS, "Connection from %s port %hu\n",
 166 +               syslog(LOG_NOTICE, "Connection from %s port %hu\n",
 167                         inet_ntoa(client.sin_addr),
 168                         ntohs(client.sin_port));
 169         if (get_lock(lpnumber) == 0)
 170                 return;
 171 -       f = open_printer(lpnumber);
 172 -       if (copy_stream(0, f) < 0)
 173 -               syslog(LOGOPTS, "copy_stream: %m\n");
 174 -       fclose(f);
 175 +       if ((lp = open_printer(lpnumber)) != -1)
 176 +       {
 177 +               if (copy_stream(0, lp) < 0)
 178 +                       syslog(LOG_ERR, "copy_stream: %m\n");
 179 +               close(lp);
 180 +       }
 181         free_lock();
 182  }
 183
 184 @@ -215,7 +241,7 @@
 185  #ifdef USE_GETPROTOBYNAME
 186         struct protoent *proto;
 187  #endif
 188 -       int             netfd, fd, one = 1;
 189 +       int             netfd, fd, lp, one = 1;
 190         socklen_t       clientlen;
 191         struct sockaddr_in      netaddr, client;
 192         char            pidfilename[sizeof(PIDFILE)];
 193 @@ -225,7 +251,7 @@
 194         switch (fork())
 195         {
 196         case -1:
 197 -               syslog(LOGOPTS, "fork: %m\n");
 198 +               syslog(LOG_ERR, "fork: %m\n");
 199                 exit (1);
 200         case 0:         /* child */
 201                 break;
 202 @@ -236,14 +262,14 @@
 203         resourcelimit.rlim_max = 0;
 204         if (getrlimit(RLIMIT_NOFILE, &resourcelimit) < 0)
 205         {
 206 -               syslog(LOGOPTS, "getrlimit: %m\n");
 207 +               syslog(LOG_ERR, "getrlimit: %m\n");
 208                 exit(1);
 209         }
 210         for (fd = 0; fd < resourcelimit.rlim_max; ++fd)
 211                 (void)close(fd);
 212         if (setsid() < 0)
 213         {
 214 -               syslog(LOGOPTS, "setsid: %m\n");
 215 +               syslog(LOG_ERR, "setsid: %m\n");
 216                 exit(1);
 217         }
 218         (void)chdir("/");
 219 @@ -254,7 +280,7 @@
 220         (void)snprintf(pidfilename, sizeof(pidfilename), PIDFILE, lpnumber);
 221         if ((f = fopen(pidfilename, "w")) == NULL)
 222         {
 223 -               syslog(LOGOPTS, "%s: %m\n", pidfilename);
 224 +               syslog(LOG_ERR, "%s: %m\n", pidfilename);
 225                 exit(1);
 226         }
 227         (void)fprintf(f, "%d\n", getpid());
 228 @@ -262,11 +288,10 @@
 229         if (get_lock(lpnumber) == 0)
 230                 exit(1);
 231  #endif
 232 -       f = open_printer(lpnumber);
 233  #ifdef USE_GETPROTOBYNAME
 234         if ((proto = getprotobyname("tcp")) == NULL)
 235         {
 236 -               syslog(LOGOPTS, "Cannot find protocol for TCP!\n");
 237 +               syslog(LOG_ERR, "Cannot find protocol for TCP!\n");
 238                 exit(1);
 239         }
 240         if ((netfd = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
 241 @@ -274,12 +299,12 @@
 242         if ((netfd = socket(AF_INET, SOCK_STREAM, IPPROTO_IP)) < 0)
 243  #endif
 244         {
 245 -               syslog(LOGOPTS, "socket: %m\n");
 246 +               syslog(LOG_ERR, "socket: %m\n");
 247                 exit(1);
 248         }
 249         if (setsockopt(netfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
 250         {
 251 -               syslog(LOGOPTS, "setsocketopt: %m\n");
 252 +               syslog(LOG_ERR, "setsocketopt: %m\n");
 253                 exit(1);
 254         }
 255         netaddr.sin_port = htons(BASEPORT + lpnumber - '0');
 256 @@ -287,12 +312,12 @@
 257         memset(netaddr.sin_zero, 0, sizeof(netaddr.sin_zero));
 258         if (bind(netfd, (struct sockaddr*) &netaddr, sizeof(netaddr)) < 0)
 259         {
 260 -               syslog(LOGOPTS, "bind: %m\n");
 261 +               syslog(LOG_ERR, "bind: %m\n");
 262                 exit(1);
 263         }
 264         if (listen(netfd, 5) < 0)
 265         {
 266 -               syslog(LOGOPTS, "listen: %m\n");
 267 +               syslog(LOG_ERR, "listen: %m\n");
 268                 exit(1);
 269         }
 270         clientlen = sizeof(client);
 271 @@ -302,22 +327,26 @@
 272  #ifdef USE_LIBWRAP
 273                 if (hosts_ctl("p910nd", STRING_UNKNOWN,
 274                         inet_ntoa(client.sin_addr), STRING_UNKNOWN) == 0) {
 275 -                       syslog(LOGOPTS, "Connection from %s port %hd rejected\n",
 276 +                       syslog(LOG_ERR, "Connection from %s port %hu rejected\n",
 277                                 inet_ntoa(client.sin_addr),
 278                                 ntohs(client.sin_port));
 279                         close(fd);
 280                         continue;
 281                 }
 282  #endif
 283 -               syslog(LOGOPTS, "Connection from %s port %hd accepted\n",
 284 +               syslog(LOG_NOTICE, "Connection from %s port %hu accepted\n",
 285                         inet_ntoa(client.sin_addr),
 286                         ntohs(client.sin_port));
 287                 /*write(fd, "Printing", 8);*/
 288 -               if (copy_stream(fd, f) < 0)
 289 -                       syslog(LOGOPTS, "copy_stream: %m\n");
 290 +               if ((lp = open_printer(lpnumber)) != -1)
 291 +               {
 292 +                       if (copy_stream(fd, lp) < 0)
 293 +                               syslog(LOG_ERR, "copy_stream: %m\n");
 294 +                       close(lp);
 295 +               }
 296                 (void)close(fd);
 297         }
 298 -       syslog(LOGOPTS, "accept: %m\n");
 299 +       syslog(LOG_ERR, "accept: %m\n");
 300         free_lock();
 301         exit(1);
 302  }
 303 @@ -338,7 +367,7 @@
 304         if (getsockname(0, (struct sockaddr*) &bind_addr, &ba_len) == 0)
 305                 return (0);             /* under inetd */
 306         if (errno != ENOTSOCK)          /* strange... */
 307 -               syslog(LOGOPTS, "getsockname: %m\n");
 308 +               syslog(LOG_ERR, "getsockname: %m\n");
 309         return (1);
 310  }
 311