static unsigned char tokenbuf[4096]; /* Random-ish data for tokens */
static size_t tokenptr = sizeof(tokenbuf); /* Current read position */
-static int randfd; /* File descriptor for random data */
static struct client *dead_clients = 0; /* List of defunct clients */
static struct proxy *dead_proxies = 0; /* List of defunct proxies */
/*----- General utilities -------------------------------------------------*/
-/* Format and log MSG somewhere sensible, at the syslog(3) priority PRIO.
- * Prefix it with a description of the query Q, if non-null.
- */
-void logmsg(const struct query *q, int prio, const char *msg, ...)
+static void vlogmsg(const struct query *q, int prio,
+ const char *msg, va_list *ap)
{
- va_list ap;
dstr d = DSTR_INIT;
time_t t;
struct tm *tm;
char buf[64];
- va_start(ap, msg);
if (q) {
dputsock(&d, q->ao, &q->s[L]);
dstr_puts(&d, " <-> ");
dputsock(&d, q->ao, &q->s[R]);
dstr_puts(&d, ": ");
}
- dstr_vputf(&d, msg, &ap);
- va_end(ap);
+ dstr_vputf(&d, msg, ap);
if (!(flags & F_RUNNING))
moan("%s", d.buf);
dstr_destroy(&d);
}
+/* Format and log MSG somewhere sensible, at the syslog(3) priority PRIO.
+ * Prefix it with a description of the query Q, if non-null.
+ */
+void logmsg(const struct query *q, int prio, const char *msg, ...)
+{
+ va_list ap;
+
+ va_start(ap, msg);
+ vlogmsg(q, prio, msg, &ap);
+ va_end(ap);
+}
+
+/* Format and report MSG as a fatal error, and exit. */
+void fatal(const char *msg, ...)
+{
+ va_list ap;
+
+ va_start(ap, msg);
+ vlogmsg(0, LOG_CRIT, msg, &ap);
+ va_end(ap);
+ exit(1);
+}
+
/* Fix up a socket FD so that it won't bite us. Returns zero on success, or
* nonzero on error.
*/
* from the kernel.
*/
if (tokenptr + TOKENRANDSZ >= sizeof(tokenbuf)) {
- if (read(randfd, tokenbuf, sizeof(tokenbuf)) < sizeof(tokenbuf))
- die(1, "unexpected short read or error from `/dev/urandom'");
+ fill_random(tokenbuf, sizeof(tokenbuf));
tokenptr = 0;
}
if (load_policy_file(policyfile, &policy))
exit(1);
- /* Open the random data source. */
- if ((randfd = open("/dev/urandom", O_RDONLY)) < 0) {
- die(1, "failed to open `/dev/urandom' for reading: %s",
- strerror(errno));
- }
-
/* Set up the I/O event system. */
sel_init(&sel);