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
7 #define LOCKFILE "/var/lock/subsys/p910%cd"
9 -#define PRINTERFILE "/dev/lp%c"
10 -#define LOGOPTS LOG_ERR
11 +#define PRINTERFILE "/dev/printers/%c"
13 static char *progname;
14 static char version[] = "p910nd Version 0.7";
16 fprintf(stdout, "%s \n", version);
19 -FILE *open_printer(int lpnumber)
20 +int open_printer(int lpnumber)
24 char lpname[sizeof(PRINTERFILE)];
31 - if ((f = fopen(device, bidir ? "w+" : "w")) == NULL)
32 + if ((lp = open(device, bidir ? O_RDWR : O_WRONLY)) == -1)
34 - syslog(LOGOPTS, "%s: %m\n", device);
36 + syslog(LOG_ERR, "%s: %m\n", device);
38 + /* fallback to /dev/null if device is not available
39 + * otherwise windows spooler will screw up
41 + lp = open("/dev/null", bidir ? O_RDWR : O_WRONLY);
47 int get_lock(int lpnumber)
49 (void)snprintf(lockname, sizeof(lockname), LOCKFILE, lpnumber);
50 if ((lockfd = open(lockname, O_CREAT|O_RDWR)) < 0)
52 - syslog(LOGOPTS, "%s: %m\n", lockname);
53 + syslog(LOG_ERR, "%s: %m\n", lockname);
56 memset(&lplock, 0, sizeof(lplock));
58 lplock.l_pid = getpid();
59 if (fcntl(lockfd, F_SETLKW, &lplock) < 0)
61 - syslog(LOGOPTS, "%s: %m\n", lockname);
62 + syslog(LOG_ERR, "%s: %m\n", lockname);
70 +ssize_t safe_write(int fd, char *buf, size_t count)
74 + while (offset < count) {
75 + ssize_t n = write(fd, buf + offset, count - offset);
77 + if (n < 0 && errno != EINTR)
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)
92 + int nread, rcvd = 0, sent = 0;
98 - if ((nf = fdopen(fd, "w")) == NULL) {
99 - syslog(LOGOPTS, "fdopen: %m\n");
104 - int maxfd = fileno(f) > fd ? fileno(f) : fd;
105 + int maxfd = lp > fd ? lp : fd;
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);
112 @@ -169,43 +184,54 @@
113 nread = read(fd, buffer, sizeof(buffer));
116 - (void)fwrite(buffer, sizeof(char), nread, f);
117 + if (safe_write(lp, buffer, nread) < 0) {
118 + syslog(LOG_ERR, "write: %m\n");
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);
128 + if (FD_ISSET(lp, &readfds)) {
129 + nread = read(lp, buffer, sizeof(buffer));
131 + safe_write(fd, buffer, nread);
138 + syslog(LOG_NOTICE, "Finished job: %d bytes received, %d bytes sent\n",
142 - while ((nread = read(fd, buffer, sizeof(buffer))) > 0)
143 - (void)fwrite(buffer, sizeof(char), nread, 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");
152 + syslog(LOG_NOTICE, "Finished job: %d bytes received\n", rcvd);
157 void one_job(int lpnumber)
161 struct sockaddr_in client;
162 socklen_t clientlen = sizeof(client);
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)
171 - f = open_printer(lpnumber);
172 - if (copy_stream(0, f) < 0)
173 - syslog(LOGOPTS, "copy_stream: %m\n");
175 + if ((lp = open_printer(lpnumber)) != -1)
177 + if (copy_stream(0, lp) < 0)
178 + syslog(LOG_ERR, "copy_stream: %m\n");
185 #ifdef USE_GETPROTOBYNAME
186 struct protoent *proto;
188 - int netfd, fd, one = 1;
189 + int netfd, fd, lp, one = 1;
191 struct sockaddr_in netaddr, client;
192 char pidfilename[sizeof(PIDFILE)];
197 - syslog(LOGOPTS, "fork: %m\n");
198 + syslog(LOG_ERR, "fork: %m\n");
202 @@ -236,14 +262,14 @@
203 resourcelimit.rlim_max = 0;
204 if (getrlimit(RLIMIT_NOFILE, &resourcelimit) < 0)
206 - syslog(LOGOPTS, "getrlimit: %m\n");
207 + syslog(LOG_ERR, "getrlimit: %m\n");
210 for (fd = 0; fd < resourcelimit.rlim_max; ++fd)
214 - syslog(LOGOPTS, "setsid: %m\n");
215 + syslog(LOG_ERR, "setsid: %m\n");
220 (void)snprintf(pidfilename, sizeof(pidfilename), PIDFILE, lpnumber);
221 if ((f = fopen(pidfilename, "w")) == NULL)
223 - syslog(LOGOPTS, "%s: %m\n", pidfilename);
224 + syslog(LOG_ERR, "%s: %m\n", pidfilename);
227 (void)fprintf(f, "%d\n", getpid());
228 @@ -262,11 +288,10 @@
229 if (get_lock(lpnumber) == 0)
232 - f = open_printer(lpnumber);
233 #ifdef USE_GETPROTOBYNAME
234 if ((proto = getprotobyname("tcp")) == NULL)
236 - syslog(LOGOPTS, "Cannot find protocol for TCP!\n");
237 + syslog(LOG_ERR, "Cannot find protocol for TCP!\n");
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)
245 - syslog(LOGOPTS, "socket: %m\n");
246 + syslog(LOG_ERR, "socket: %m\n");
249 if (setsockopt(netfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
251 - syslog(LOGOPTS, "setsocketopt: %m\n");
252 + syslog(LOG_ERR, "setsocketopt: %m\n");
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)
260 - syslog(LOGOPTS, "bind: %m\n");
261 + syslog(LOG_ERR, "bind: %m\n");
264 if (listen(netfd, 5) < 0)
266 - syslog(LOGOPTS, "listen: %m\n");
267 + syslog(LOG_ERR, "listen: %m\n");
270 clientlen = sizeof(client);
271 @@ -302,22 +327,26 @@
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));
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)
292 + if (copy_stream(fd, lp) < 0)
293 + syslog(LOG_ERR, "copy_stream: %m\n");
298 - syslog(LOGOPTS, "accept: %m\n");
299 + syslog(LOG_ERR, "accept: %m\n");
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");