* with GPLv3. If not then please let me know. -Ian Jackson.)
*/
-/*
- * todo
- *
- * don't mind reconnecting if we just disconnected due to idle
- * some weird disconnection event still investigating
- */
-
/*
* Newsfeeds file entries should look like this:
* host.name.of.site[/exclude,exclude,...]\
#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
#define NORET __attribute__((__noreturn__))
-#define NEW(ptr) ((ptr)= zxmalloc(sizeof(*(ptr))))
-#define NEW_DECL(type,ptr) type ptr = zxmalloc(sizeof(*(ptr)))
+#define NEW(ptr) ((ptr)= zmmalloc(sizeof(*(ptr))))
+#define NEW_DECL(type,ptr) type ptr = zmmalloc(sizeof(*(ptr)))
#define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
static const char *sitename, *remote_host;
static const char *feedfile, *path_run, *path_cli, *path_cli_dir;
static int quiet_multiple=0;
-static int become_daemon=1, try_filemon=1;
+static int interactive=0, try_filemon=1;
static int try_stream=1;
static int port=119;
static const char *inndconffile;
static int max_connections=10;
static int max_queue_per_conn=200;
static int target_max_feedfile_size=100000;
-static int period_seconds=60;
+static int period_seconds=30;
static int filepoll_seconds=5;
static int max_queue_per_ipf=-1;
ISNODE(Conn);
int fd; /* may be 0, meaning closed (during construction/destruction) */
oop_read *rd; /* likewise */
+ int oopwriting; /* since on_fd is not idempotent */
int max_queue, stream;
const char *quitting;
int since_activity; /* periods */
static pid_t self_pid;
static int *lowvol_perperiod;
static int lowvol_circptr;
-static int lowvol_total;
+static int lowvol_total; /* does not include current period */
/* statemc_init initialises */
static StateMachineState sms;
static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
static void logcore(int sysloglevel, const char *fmt, ...) {
VA;
- if (become_daemon) {
+ if (interactive < 2) {
vsyslog(sysloglevel,fmt,al);
} else {
if (self_pid) fprintf(stderr,"[%lu] ",(unsigned long)self_pid);
const char *fmt, va_list al) PRINTF(5,0);
static void logv(int sysloglevel, const char *pfx, int errnoval,
const char *fmt, va_list al) {
- char msgbuf[1024]; /* NB do not call xvasprintf here or you'll recurse */
+ char msgbuf[1024]; /* NB do not call mvasprintf here or you'll recurse */
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
va_end(al); \
}
-diewrap(sysdie, " critical", LOG_CRIT, errno, 16);
-diewrap(die, " critical", LOG_CRIT, -1, 16);
+#define INNLOGWRAP_DECLARE(fn, pfx, sysloglevel) \
+ static void duct_log_##fn(int errval, const char *fmt, va_list al, int l) { \
+ logv(sysloglevel, pfx, errnoval ? errnoval : -1, fmt, al); \
+ }
+#define INNLOGWRAP_CALL(fn, pfx, sysloglevel) \
+ fn##_set_handlers(1, duct_log_##fn);
+
+
+static int innduct_fatal_cleanup(void) { return 12; } /* used for libinn die */
+
+/* We want to extend the set of logging functions from inn, and we
+ * want to prepend the site name to all our messages. */
+
+diewrap(syscrash, " critical", LOG_CRIT, errno, 16);
+diewrap(crash, " critical", LOG_CRIT, -1, 16);
-diewrap(sysfatal, " fatal", LOG_ERR, errno, 12);
-diewrap(fatal, " fatal", LOG_ERR, -1, 12);
+diewrap(sysfatal, " fatal", LOG_ERR, errno, 12);
+diewrap(fatal, " fatal", LOG_ERR, -1, 12);
-logwrap(syswarn, " warning", LOG_WARNING, errno);
-logwrap(warn, " warning", LOG_WARNING, -1);
+#define INNLOGWRAPS \
+ INNLOGWRAP(warn, " warning", LOG_WARNING, errno) \
+ INNLOGWRAP(notice, " notice", LOG_NOTICE, -1)
+INNLOGWRAPS(INNLOGWRAP_DECLARE)
-logwrap(notice, " notice", LOG_NOTICE, -1);
-logwrap(info, " info", LOG_INFO, -1);
-logwrap(debug, " debug", LOG_DEBUG, -1);
+logwrap(info, " info", LOG_INFO, -1);
+logwrap(debug, " debug", LOG_DEBUG, -1);
/*========== utility functions etc. ==========*/
-static char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
-static char *xvasprintf(const char *fmt, va_list al) {
+/* error trapping wrappers are called mfoo rather than the more
+ * conventional xfoo because we don't want to clash with the existing
+ * xfoo functions in INN libs which use different error handlers
+ */
+
+static char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0);
+static char *mvasprintf(const char *fmt, va_list al) {
char *str;
int rc= vasprintf(&str,fmt,al);
- if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
+ if (rc<0) sysfatal("vasprintf(\"%s\",...) failed", fmt);
return str;
}
-static char *xasprintf(const char *fmt, ...) PRINTF(1,2);
-static char *xasprintf(const char *fmt, ...) {
+static char *masprintf(const char *fmt, ...) PRINTF(1,2);
+static char *masprintf(const char *fmt, ...) {
VA;
- char *str= xvasprintf(fmt,al);
+ char *str= mvasprintf(fmt,al);
va_end(al);
return str;
}
*fd=0;
return r;
}
-static void xclose(int fd, const char *what, const char *what2) {
+static void mclose(int fd, const char *what, const char *what2) {
int r= close(fd);
- if (r) sysdie("close %s%s",what,what2?what2:"");
+ if (r) syscrash("close %s%s",what,what2?what2:"");
}
-static void xclose_perhaps(int *fd, const char *what, const char *what2) {
+static void mclose_perhaps(int *fd, const char *what, const char *what2) {
if (*fd <= 0) return;
- xclose(*fd,what,what2);
+ mclose(*fd,what,what2);
*fd=0;
}
-static pid_t xfork(const char *what) {
+static pid_t mfork(const char *what) {
pid_t child;
child= fork();
}
}
-static int xwaitpid(pid_t *pid, const char *what) {
+static int mwaitpid(pid_t *pid, const char *what) {
int status;
int r= kill(*pid, SIGKILL);
- if (r) sysdie("cannot kill %s child", what);
+ if (r) syscrash("cannot kill %s child", what);
pid_t got= waitpid(*pid, &status, 0);
- if (got==-1) sysdie("cannot reap %s child", what);
- if (got==0) die("cannot reap %s child", what);
+ if (got==-1) syscrash("cannot reap %s child", what);
+ if (got==0) crash("cannot reap %s child", what);
*pid= 0;
return status;
}
-static void *zxmalloc(size_t sz) {
- void *p= xmalloc(sz);
+static void *mmalloc(size_t sz) {
+ void *p= malloc(sz);
+ if (!p) sysfatal("unable to malloc %lu bytes",(unsigned long)sz);
+ return p;
+}
+
+static void *zmmalloc(size_t sz) {
+ void *p= mmalloc(sz);
memset(p,0,sz);
return p;
}
-static void xunlink(const char *path, const char *what) {
+static void munlink(const char *path, const char *what) {
int r= unlink(path);
- if (r) sysdie("can't unlink %s %s", path, what);
+ if (r) syscrash("can't unlink %s %s", path, what);
}
-static time_t xtime(void) {
+static time_t mtime(void) {
time_t now= time(0);
- if (now==-1) sysdie("time(2) failed");
+ if (now==-1) syscrash("time(2) failed");
return now;
}
-static void xsigaction(int signo, const struct sigaction *sa) {
+static void msigaction(int signo, const struct sigaction *sa) {
int r= sigaction(signo,sa,0);
- if (r) sysdie("sigaction failed for \"%s\"", strsignal(signo));
+ if (r) syscrash("sigaction failed for \"%s\"", strsignal(signo));
}
-static void xsigsetdefault(int signo) {
+static void msigsetdefault(int signo) {
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= SIG_DFL;
- xsigaction(signo,&sa);
+ msigaction(signo,&sa);
}
-static void xgettimeofday(struct timeval *tv_r) {
+static void mgettimeofday(struct timeval *tv_r) {
int r= gettimeofday(tv_r,0);
- if (r) sysdie("gettimeofday(2) failed");
+ if (r) syscrash("gettimeofday(2) failed");
}
-static void xsetnonblock(int fd, int nonblocking) {
+static void msetnonblock(int fd, int nonblocking) {
int errnoval= oop_fd_nonblock(fd, nonblocking);
- if (errnoval) { errno= errnoval; sysdie("setnonblocking"); }
+ if (errnoval) { errno= errnoval; syscrash("setnonblocking"); }
}
static void check_isreg(const struct stat *stab, const char *path,
const char *what) {
if (!S_ISREG(stab->st_mode))
- die("%s %s not a plain file (mode 0%lo)",
- what, path, (unsigned long)stab->st_mode);
+ crash("%s %s not a plain file (mode 0%lo)",
+ what, path, (unsigned long)stab->st_mode);
}
-static void xfstat(int fd, struct stat *stab_r, const char *what) {
+static void mfstat(int fd, struct stat *stab_r, const char *what) {
int r= fstat(fd, stab_r);
- if (r) sysdie("could not fstat %s", what);
+ if (r) syscrash("could not fstat %s", what);
}
-static void xfstat_isreg(int fd, struct stat *stab_r,
+static void mfstat_isreg(int fd, struct stat *stab_r,
const char *path, const char *what) {
- xfstat(fd, stab_r, what);
+ mfstat(fd, stab_r, what);
check_isreg(stab_r, path, what);
}
-static void xlstat_isreg(const char *path, struct stat *stab,
+static void mlstat_isreg(const char *path, struct stat *stab,
int *enoent_r /* 0 means ENOENT is fatal */,
const char *what) {
int r= lstat(path, stab);
if (r) {
if (errno==ENOENT && enoent_r) { *enoent_r=1; return; }
- sysdie("could not lstat %s %s", what, path);
+ syscrash("could not lstat %s %s", what, path);
}
if (enoent_r) *enoent_r= 0;
check_isreg(stab, path, what);
r= listen(cli_master, 5);
if (r) NOCLI("listen to cli master socket");
- xsetnonblock(cli_master, 1);
+ msetnonblock(cli_master, 1);
loop->on_fd(loop, cli_master, OOP_READ, cli_master_readable, 0);
info("cli ready, listening on %s", path_cli);
return;
nocli:
- xclose_perhaps(&cli_master, "cli master",0);
+ mclose_perhaps(&cli_master, "cli master",0);
return;
}
LIST_REMOVE(conns,conn);
- char *m= xvasprintf(fmt,al);
+ char *m= mvasprintf(fmt,al);
warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
static void check_idle_conns(void) {
Conn *conn;
- int verylowvol= lowvol_perperiod[lowvol_circptr];
+ int volthisperiod= lowvol_perperiod[lowvol_circptr];
lowvol_circptr++;
lowvol_circptr %= lowvol_periods;
+ lowvol_total += volthisperiod;
lowvol_total -= lowvol_perperiod[lowvol_circptr];
lowvol_perperiod[lowvol_circptr]= 0;
}
conn= LIST_HEAD(conns);
- if (!verylowvol &&
+ if (!volthisperiod &&
conns.count==1 &&
- lowvol_total+verylowvol < lowvol_thresh &&
+ lowvol_total < lowvol_thresh &&
!conn_busy(conn))
conn_idle_close(conn, "low volume");
}
static void connect_attempt_discard(void) {
if (connecting_child) {
- int status= xwaitpid(&connecting_child, "connect");
+ int status= mwaitpid(&connecting_child, "connect");
if (!(WIFEXITED(status) ||
(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)))
report_child_status("connect", status);
}
if (connecting_fdpass_sock) {
cancel_fd_read_except(connecting_fdpass_sock);
- xclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
+ mclose_perhaps(&connecting_fdpass_sock, "connecting fdpass socket",0);
}
}
struct cmsghdr *h= 0;
if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
if (!h) {
- int status= xwaitpid(&connecting_child, "connect child (broken)");
+ int status= mwaitpid(&connecting_child, "connect child (broken)");
if (WIFEXITED(status)) {
if (WEXITSTATUS(status) != 0 &&
goto x;
}
-#define CHK(field, val) \
- if (h->cmsg_##field != val) { \
- die("connect: child sent cmsg with cmsg_" #field "=%d, expected %d", \
- h->cmsg_##field, val); \
- goto x; \
+#define CHK(field, val) \
+ if (h->cmsg_##field != val) { \
+ crash("connect: child sent cmsg with cmsg_" #field "=%d, expected %d", \
+ h->cmsg_##field, val); \
+ goto x; \
}
CHK(level, SOL_SOCKET);
CHK(type, SCM_RIGHTS);
CHK(len, CMSG_LEN(sizeof(conn->fd)));
#undef CHK
- if (CMSG_NXTHDR(&msg,h)) die("connect: child sent many cmsgs");
+ if (CMSG_NXTHDR(&msg,h)) crash("connect: child sent many cmsgs");
memcpy(&conn->fd, CMSG_DATA(h), sizeof(conn->fd));
int status;
pid_t got= waitpid(connecting_child, &status, 0);
- if (got==-1) sysdie("connect: real wait for child");
+ if (got==-1) syscrash("connect: real wait for child");
assert(got == connecting_child);
connecting_child= 0;
loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
conn->rd= oop_rd_new_fd(loop,conn->fd, 0, 0); /* sets nonblocking, too */
- if (!conn->fd) die("oop_rd_new_fd conn failed (fd=%d)",conn->fd);
+ if (!conn->fd) crash("oop_rd_new_fd conn failed (fd=%d)",conn->fd);
int r= oop_rd_read(conn->rd, &peer_rd_style, NNTP_STRLEN,
&peer_rd_ok, conn,
&peer_rd_err, conn);
- if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
+ if (r) syscrash("oop_rd_read for peer (fd=%d)",conn->fd);
LIST_ADDHEAD(conns, conn);
notice("C%d (now %d) connected %s",
int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
if (r) { syswarn("connect: cannot create socketpair for child"); return; }
- connecting_child= xfork("connection");
+ connecting_child= mfork("connection");
if (!connecting_child) {
FILE *cn_from, *cn_to;
char buf[NNTP_STRLEN+100];
int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
- xclose(socks[0], "(in child) parent's connection fdpass socket",0);
+ mclose(socks[0], "(in child) parent's connection fdpass socket",0);
alarm(connection_setup_timeout);
if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
msg.msg_controllen= cmsg->cmsg_len;
r= sendmsg(socks[1], &msg, 0);
- if (r<0) sysdie("sendmsg failed for new connection");
- if (r!=1) die("sendmsg for new connection gave wrong result %d",r);
+ if (r<0) syscrash("sendmsg failed for new connection");
+ if (r!=1) crash("sendmsg for new connection gave wrong result %d",r);
_exit(exitstatus);
}
- xclose(socks[1], "connecting fdpass child's socket",0);
+ mclose(socks[1], "connecting fdpass child's socket",0);
connecting_fdpass_sock= socks[0];
- xsetnonblock(connecting_fdpass_sock, 1);
+ msetnonblock(connecting_fdpass_sock, 1);
on_fd_read_except(connecting_fdpass_sock, connchild_event);
if (!conns.count)
conn_make_some_xmits(conn);
if (!conn->xmitu) {
loop->cancel_fd(loop, conn->fd, OOP_WRITE);
+ conn->oopwriting= 0;
return;
}
void *rp= conn_write_some_xmits(conn);
if (rp==OOP_CONTINUE) {
- loop->on_fd(loop, conn->fd, OOP_WRITE, conn_writeable, conn);
+ if (!conn->oopwriting) {
+ loop->on_fd(loop, conn->fd, OOP_WRITE, conn_writeable, conn);
+ conn->oopwriting= 1;
+ }
return;
} else if (rp==OOP_HALT) {
return;
int r= pwrite(ipf->fd, spaces, w, art->offset);
if (r==-1) {
if (errno==EINTR) continue;
- sysdie("failed to blank entry for %s (length %d at offset %lu) in %s",
- art->messageid, art->blanklen,
- (unsigned long)art->offset, ipf->path);
+ syscrash("failed to blank entry for %s (length %d at offset %lu) in %s",
+ art->messageid, art->blanklen,
+ (unsigned long)art->offset, ipf->path);
}
assert(r>=0 && r<=w);
art->blanklen -= w;
}
assert(fd>0);
- InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1);
+ InputFile *ipf= mmalloc(sizeof(*ipf) + strlen(path) + 1);
memset(ipf,0,sizeof(*ipf));
ipf->fd= fd;
assert(!ipf->filemon); /* must have had inputfile_reading_stop */
assert(!ipf->rd); /* must have had inputfile_reading_stop */
assert(!ipf->inprogress); /* no dangling pointers pointing here */
- xclose_perhaps(&ipf->fd, "input file ", ipf->path);
+ mclose_perhaps(&ipf->fd, "input file ", ipf->path);
}
ipf->readcount_err++;
if (ipf->readcount_err > max_bad_data_initial +
(ipf->readcount_ok+ipf->readcount_blank) / max_bad_data_ratio)
- die("too much garbage in input file! (%d errs, %d ok, %d blank)",
- ipf->readcount_err, ipf->readcount_ok, ipf->readcount_blank);
+ crash("too much garbage in input file! (%d errs, %d ok, %d blank)",
+ ipf->readcount_err, ipf->readcount_ok, ipf->readcount_blank);
return OOP_CONTINUE;
}
InputFile *ipf= ipf_v;
assert(ev == OOP_RD_SYSTEM);
errno= errnoval;
- sysdie("error reading input file: %s, offset %lu",
- ipf->path, (unsigned long)ipf->offset);
+ syscrash("error reading input file: %s, offset %lu",
+ ipf->path, (unsigned long)ipf->offset);
}
static void *feedfile_got_article(oop_source *lp, oop_read *rd,
ipf->readcount_ok++;
- art= xmalloc(sizeof(*art) - 1 + midlen + 1);
+ art= mmalloc(sizeof(*art) - 1 + midlen + 1);
memset(art,0,sizeof(*art));
art->state= art_Unchecked;
art->midlen= midlen;
int wd= pf->wd;
debug("filemon inotify stopfile %p wd=%d", ipf, wd);
int r= inotify_rm_watch(filemon_inotify_fd, wd);
- if (r) sysdie("inotify_rm_watch");
+ if (r) syscrash("inotify_rm_watch");
filemon_inotify_wd2ipf[wd]= 0;
}
int r= read(filemon_inotify_fd, &iev, sizeof(iev));
if (r==-1) {
if (isewouldblock(errno)) break;
- sysdie("read from inotify master");
+ syscrash("read from inotify master");
} else if (r==sizeof(iev)) {
assert(iev.wd >= 0 && iev.wd < filemon_inotify_wdmax);
} else {
- die("inotify read %d bytes wanted struct of %d", r, (int)sizeof(iev));
+ crash("inotify read %d bytes wanted struct of %d", r, (int)sizeof(iev));
}
InputFile *ipf= filemon_inotify_wd2ipf[iev.wd];
/*debug("filemon inotify readable read %p wd=%d", ipf, iev.wd);*/
syswarn("filemon/inotify: inotify_init failed");
return 0;
}
- xsetnonblock(filemon_inotify_fd, 1);
+ msetnonblock(filemon_inotify_fd, 1);
loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable, 0);
debug("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd);
int r= oop_rd_read(ipf->rd, &feedfile_rdstyle, MAX_LINE_FEEDFILE,
feedfile_got_article,ipf, feedfile_read_err, ipf);
- if (r) sysdie("unable start reading feedfile %s",ipf->path);
+ if (r) syscrash("unable start reading feedfile %s",ipf->path);
ipf->paused= 0;
}
sysfatal("fcntl F_SETLK lockfile %s", path_lock);
}
- xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
+ mfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
int lock_noent;
- xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
+ mlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
if (!lock_noent && samefile(&stab, &stabf))
break;
- xclose(lockfd, "stale lockfile ", path_lock);
+ mclose(lockfd, "stale lockfile ", path_lock);
}
FILE *lockfile= fdopen(lockfd, "w");
- if (!lockfile) sysdie("fdopen lockfile");
+ if (!lockfile) syscrash("fdopen lockfile");
int r= ftruncate(lockfd, 0);
- if (r) sysdie("truncate lockfile to write new info");
+ if (r) syscrash("truncate lockfile to write new info");
if (fprintf(lockfile, "pid %ld\nsite %s\nfeedfile %s\nfqdn %s\n",
(unsigned long)self_pid,
search_backlog_file();
int defer_noent;
- xlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
+ mlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
if (defer_noent) {
debug("startup: ductdefer ENOENT");
} else {
open_defer(); /* so that we will later close it and rename it */
break;
case 2:
- xunlink(path_defer, "stale defer file link"
+ munlink(path_defer, "stale defer file link"
" (presumably hardlink to backlog file)");
break;
default:
- die("defer file %s has unexpected link count %d",
- path_defer, stabdefer.st_nlink);
+ crash("defer file %s has unexpected link count %d",
+ path_defer, stabdefer.st_nlink);
}
}
int noent_f;
InputFile *file_d= open_input_file(path_flushing);
- if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
+ if (file_d) mfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
- xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
+ mlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
if (!noent_f && file_d && samefile(&stab_f, &stab_d)) {
debug("startup: F==D => Hardlinked");
- xunlink(feedfile, "feed file (during startup)"); /* => Moved */
+ munlink(feedfile, "feed file (during startup)"); /* => Moved */
noent_f= 1;
}
startup_set_input_file(file_d);
flushing_input_file= main_input_file;
main_input_file= open_input_file(feedfile);
- if (!main_input_file) die("feedfile vanished during startup");
+ if (!main_input_file) crash("feedfile vanished during startup");
SMS(SEPARATED, max_separated_periods,
"found both old and current feed files");
} else {
debug("startup: F exists, D ENOENT => Normal");
InputFile *file_f= open_input_file(feedfile);
- if (!file_f) die("feed file vanished during startup");
+ if (!file_f) crash("feed file vanished during startup");
startup_set_input_file(file_f);
SMS(NORMAL, spontaneous_flush_periods, "normal startup");
}
feedfile, path_flushing);
/* => Hardlinked */
- xunlink(feedfile, "old feedfile link");
+ munlink(feedfile, "old feedfile link");
/* => Moved */
spawn_inndcomm_flush(why); /* => Flushing FLUSHING */
#define CNT(art,rc) (ipf->counts[art_##art][RC_##rc])
char *inprog= completed
- ? xasprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
- : xasprintf(" inprogress=%ld", ipf->inprogress);
+ ? masprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
+ : masprintf(" inprogress=%ld", ipf->inprogress);
char *autodefer= ipf->autodefer >= 0
- ? xasprintf(" autodeferred=%ld", ipf->autodefer)
- : xasprintf("%s","");
+ ? masprintf(" autodeferred=%ld", ipf->autodefer)
+ : masprintf("%s","");
info("%s %s%s read=%d (+bl=%d,+err=%d)%s%s"
" missing=%d offered=%d (ch=%d,nc=%d) accepted=%d (ch=%d,nc=%d)"
close_input_file(ipf);
if (unlink(ipf->path)) {
if (errno != ENOENT)
- sysdie("could not unlink processed backlog file %s", ipf->path);
+ syscrash("could not unlink processed backlog file %s", ipf->path);
warn("backlog file %s vanished while we were reading it"
" so we couldn't remove it (but it's done now, anyway)",
ipf->path);
close_defer();
- xunlink(path_flushing, "old flushing file");
+ munlink(path_flushing, "old flushing file");
close_input_file(flushing_input_file);
free(flushing_input_file);
/* truncate away any half-written records */
- xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
+ mfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
if (stab.st_size > LONG_MAX)
- die("defer file %s size is far too large", path_defer);
+ crash("defer file %s size is far too large", path_defer);
if (!stab.st_size)
return;
for (;;) {
if (!truncto) break; /* was only (if anything) one half-truncated record */
if (fseek(defer, truncto-1, SEEK_SET) < 0)
- sysdie("seek in defer file %s while truncating partial", path_defer);
+ syscrash("seek in defer file %s while truncating partial", path_defer);
int r= getc(defer);
if (r==EOF) {
if (ferror(defer))
- sysdie("failed read from defer file %s", path_defer);
+ syscrash("failed read from defer file %s", path_defer);
else
- die("defer file %s shrank while we were checking it!", path_defer);
+ crash("defer file %s shrank while we were checking it!", path_defer);
}
if (r=='\n') break;
truncto--;
if (fflush(defer))
sysfatal("could not flush defer file %s", path_defer);
if (ftruncate(fileno(defer), truncto))
- sysdie("could not truncate defer file %s", path_defer);
+ syscrash("could not truncate defer file %s", path_defer);
} else {
info("continuing existing defer file %s (%ld bytes)",
path_defer, orgsize);
}
if (fseek(defer, truncto, SEEK_SET))
- sysdie("could not seek to new end of defer file %s", path_defer);
+ syscrash("could not seek to new end of defer file %s", path_defer);
}
static void close_defer(void) {
return;
struct stat stab;
- xfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
+ mfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
if (fclose(defer)) sysfatal("could not close defer file %s", path_defer);
defer= 0;
- time_t now= xtime();
+ time_t now= mtime();
- char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile,
+ char *backlog= masprintf("%s_backlog_%lu.%lu", feedfile,
(unsigned long)now,
(unsigned long)stab.st_ino);
if (link(path_defer, backlog))
sysfatal("could not install defer file %s as backlog file %s",
- path_defer, backlog);
+ path_defer, backlog);
if (unlink(path_defer))
- sysdie("could not unlink old defer link %s to backlog file %s",
- path_defer, backlog);
+ syscrash("could not unlink old defer link %s to backlog file %s",
+ path_defer, backlog);
free(backlog);
case GLOB_NOMATCH: /* fall through */
break;
default:
- sysdie("glob expansion of backlog pattern %s gave unexpected"
- " nonzero (error?) return value %d", globpat_backlog, r);
+ syscrash("glob expansion of backlog pattern %s gave unexpected"
+ " nonzero (error?) return value %d", globpat_backlog, r);
}
if (!oldest_path) {
if (r && errno!=ENOENT)
syswarn("failed to unlink cli socket for old feed");
- xunlink(path_lock, "lockfile for old feed");
+ munlink(path_lock, "lockfile for old feed");
exit(4);
}
until_backlog_nextscan= backlog_spontrescan_periods;
goto xfree;
}
- now= xtime();
+ now= mtime();
double age= difftime(now, oldest_mtime);
long age_deficiency= (backlog_retry_minperiods * period_seconds) - age;
static sig_atomic_t terminate_sig_flag;
static void raise_default(int signo) {
- xsigsetdefault(signo);
+ msigsetdefault(signo);
raise(signo);
abort();
}
assert(fd=signal_self_pipe[0]);
char buf[PIPE_BUF];
int r= read(signal_self_pipe[0], buf, sizeof(buf));
- if (r<0 && !isewouldblock(errno)) sysdie("failed to read signal self pipe");
- if (r==0) die("eof on signal self pipe");
+ if (r<0 && !isewouldblock(errno))
+ syscrash("failed to read signal self pipe");
+ if (r==0) crash("eof on signal self pipe");
if (terminate_sig_flag) {
preterminate();
notice("terminating (%s)", strsignal(terminate_sig_flag));
static void init_signals(void) {
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
- sysdie("could not ignore SIGPIPE");
+ syscrash("could not ignore SIGPIPE");
if (pipe(signal_self_pipe)) sysfatal("create self-pipe for signals");
- xsetnonblock(signal_self_pipe[0],1);
- xsetnonblock(signal_self_pipe[1],1);
+ msetnonblock(signal_self_pipe[0],1);
+ msetnonblock(signal_self_pipe[1],1);
struct sigaction sa;
memset(&sa,0,sizeof(sa));
sa.sa_handler= sigarrived_handler;
sa.sa_flags= SA_RESTART;
- xsigaction(SIGTERM,&sa);
- xsigaction(SIGINT,&sa);
+ msigaction(SIGTERM,&sa);
+ msigaction(SIGINT,&sa);
on_fd_read_except(signal_self_pipe[0], sigarrived_event);
}
static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
assert(inndcomm_child);
assert(fd == inndcomm_sentinel_fd);
- int status= xwaitpid(&inndcomm_child, "inndcomm");
+ int status= mwaitpid(&inndcomm_child, "inndcomm");
inndcomm_child= 0;
cancel_fd_read_except(fd);
- xclose_perhaps(&fd, "inndcomm sentinel pipe",0);
+ mclose_perhaps(&fd, "inndcomm sentinel pipe",0);
inndcomm_sentinel_fd= 0;
assert(!flushing_input_file);
main_input_file= open_input_file(feedfile);
if (!main_input_file)
- die("flush succeeded but feedfile %s does not exist!"
- " (this probably means feedfile does not correspond"
- " to site %s in newsfeeds)", feedfile, sitename);
+ crash("flush succeeded but feedfile %s does not exist!"
+ " (this probably means feedfile does not correspond"
+ " to site %s in newsfeeds)", feedfile, sitename);
if (flushing_input_file) {
SMS(SEPARATED, max_separated_periods, "flush complete");
if (pipe(pipefds)) sysfatal("create pipe for inndcomm child sentinel");
- inndcomm_child= xfork("inndcomm child");
+ inndcomm_child= mfork("inndcomm child");
if (!inndcomm_child) {
const char *flushargv[2]= { sitename, 0 };
char *reply;
int r;
- xclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
+ mclose(pipefds[0], "(in child) inndcomm sentinel parent's end",0);
/* parent spots the autoclose of pipefds[1] when we die or exit */
if (simulate_flush>=0) {
simulate_flush= -1;
- xclose(pipefds[1], "inndcomm sentinel child's end",0);
+ mclose(pipefds[1], "inndcomm sentinel child's end",0);
inndcomm_sentinel_fd= pipefds[0];
assert(inndcomm_sentinel_fd);
on_fd_read_except(inndcomm_sentinel_fd, inndcomm_event);
static void postfork_inputfile(InputFile *ipf) {
if (!ipf) return;
- xclose(ipf->fd, "(in child) input file ", ipf->path);
+ mclose(ipf->fd, "(in child) input file ", ipf->path);
}
static void postfork_stdio(FILE *f, const char *what, const char *what2) {
/* we have no stdio streams that are buffered long-term */
if (!f) return;
- if (fclose(f)) sysdie("(in child) close %s%s", what, what2?what2:0);
+ if (fclose(f)) syscrash("(in child) close %s%s", what, what2?what2:0);
}
static void postfork(void) {
in_child= 1;
- xsigsetdefault(SIGTERM);
- xsigsetdefault(SIGINT);
- xsigsetdefault(SIGPIPE);
+ msigsetdefault(SIGTERM);
+ msigsetdefault(SIGINT);
+ msigsetdefault(SIGPIPE);
if (terminate_sig_flag) raise(terminate_sig_flag);
postfork_inputfile(main_input_file);
static void *every_happens(oop_source *lp, struct timeval base, void *e_v) {
Every *e= e_v;
e->f();
- if (!e->fixed_rate) xgettimeofday(&base);
+ if (!e->fixed_rate) mgettimeofday(&base);
every_schedule(e, base);
return OOP_CONTINUE;
}
e->fixed_rate= fixed_rate;
e->f= f;
struct timeval now;
- xgettimeofday(&now);
+ mgettimeofday(&now);
every_schedule(e, now);
}
}
static char *debug_report_ipf(InputFile *ipf) {
- if (!ipf) return xasprintf("none");
+ if (!ipf) return masprintf("none");
const char *slash= strrchr(ipf->path,'/');
const char *path= slash ? slash+1 : ipf->path;
- return xasprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
+ return masprintf("%p/%s:queue=%d,ip=%ld,autodef=%ld,off=%ld,fd=%d%s%s%s",
ipf, path,
ipf->queue.count, ipf->inprogress, ipf->autodefer,
(long)ipf->offset, ipf->fd,
DUMPV("%d", , cli_master);
fprintf(f,"\n");
- fprintf(f,"lowvol ");
+ fprintf(f,"lowvol");
DUMPV("%d", , lowvol_circptr);
DUMPV("%d", , lowvol_total);
fprintf(f,":");
const XmitDetails *xd= &conn->xmitd[i];
char *dinfo;
switch (xd->kind) {
- case xk_Const: dinfo= xasprintf("Const"); break;
- case xk_Artdata: dinfo= xasprintf("A%p", xd->info.sm_art); break;
+ case xk_Const: dinfo= masprintf("Const"); break;
+ case xk_Artdata: dinfo= masprintf("A%p", xd->info.sm_art); break;
default:
abort();
}
static void vbadusage(const char *fmt, va_list al) NORET_PRINTF(1,0);
static void vbadusage(const char *fmt, va_list al) {
- char *m= xvasprintf(fmt,al);
+ char *m= mvasprintf(fmt,al);
fprintf(stderr, "bad usage: %s\n"
"say --help for help, or read the manpage\n",
m);
- if (become_daemon)
- syslog(LOG_CRIT,"innduct: invoked with bad usage: %s",m);
+ if (interactive < 2)
+ syslog(LOG_CRASH,"innduct: invoked with bad usage: %s",m);
exit(8);
}
const Option *o;
for (o=options; o->shrt || o->lng; o++) {
char shrt[2] = { o->shrt, 0 };
- char *optspec= xasprintf("%s%s%s%s%s",
+ char *optspec= masprintf("%s%s%s%s%s",
o->shrt ? "-" : "", shrt,
o->shrt && o->lng ? "|" : "",
DELIMPERHAPS("--", o->lng));
static const Option innduct_options[]= {
{'f',"feedfile", "F", &feedfile, op_string },
{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
-{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
+{0,"no-daemon", 0, &interactive, op_setint, 1 },
+{0,"interactive", 0, &interactive, op_setint, 2 },
{0,"no-streaming", 0, &try_stream, op_setint, 0 },
{0,"no-filemon", 0, &try_filemon, op_setint, 0 },
{'C',"inndconf", "F", &inndconffile, op_string },
}
int main(int argc, char **argv) {
+ /* set up libinn logging */
+ error_program_name= "innduct";
+ message_fatal_cleanup= innduct_fatal_cleanup;
+ INNLOGWRAPS(INNLOGWRAP_CALL)
+
if (!argv[1]) {
printusage(stderr);
exit(8);
/* defaults */
int r= innconf_read(inndconffile);
- if (!r) badusage("could not read inn.conf (more info on stderr)");
+ if (!r) badusage("could not read inn.conf");
if (!remote_host) remote_host= sitename;
if (!feedfile) feedfile= sitename;
if (!feedfile[0]) badusage("feed filename, if specified, must be nonempty");
if (path_ends_slash(feedfile))
- feedfile= xasprintf("%s%s", feedfile, sitename);
+ feedfile= masprintf("%s%s", feedfile, sitename);
if (feedfile[0] != '/')
- feedfile= xasprintf("%s/%s", innconf->pathoutgoing, feedfile);
+ feedfile= masprintf("%s/%s", innconf->pathoutgoing, feedfile);
if (!path_cli) {
path_cli_dir= "innduct";
} else if (!path_cli[0] || !strcmp(path_cli,"none")) {
path_cli= 0; /* ok, don't then */
} else if (path_ends_slash(path_cli)) {
- path_cli_dir= xasprintf("%.*s", strlen(path_cli)-1, path_cli);
+ path_cli_dir= masprintf("%.*s", strlen(path_cli)-1, path_cli);
}
if (path_cli_dir)
- path_cli= xasprintf("%s/%s", path_cli_dir, sitename);
+ path_cli= masprintf("%s/%s", path_cli_dir, sitename);
if (max_queue_per_ipf<0)
max_queue_per_ipf= max_queue_per_conn * 2;
lowvol_perperiod[i]= lowvol_thresh;
lowvol_total += lowvol_thresh;
}
+ lowvol_total -= lowvol_thresh;
/* set things up */
- path_lock= xasprintf("%s_lock", feedfile);
- path_flushing= xasprintf("%s_flushing", feedfile);
- path_defer= xasprintf("%s_defer", feedfile);
- path_dump= xasprintf("%s_dump", feedfile);
- globpat_backlog= xasprintf("%s_backlog*", feedfile);
+ path_lock= masprintf("%s_lock", feedfile);
+ path_flushing= masprintf("%s_flushing", feedfile);
+ path_defer= masprintf("%s_defer", feedfile);
+ path_dump= masprintf("%s_dump", feedfile);
+ globpat_backlog= masprintf("%s_backlog*", feedfile);
oop_source_sys *sysloop= oop_sys_new();
- if (!sysloop) sysdie("could not create liboop event loop");
+ if (!sysloop) syscrash("could not create liboop event loop");
loop= (oop_source*)sysloop;
LIST_INIT(conns);
- if (become_daemon) {
+ if (interactive < 1) {
int i;
for (i=3; i<255; i++)
/* do this now before we open syslog, etc. */
close(i);
+ }
+
+ if (interactive < 2)
openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS);
+ if (interactive < 1) {
int null= open("/dev/null",O_RDWR);
if (null<0) sysfatal("failed to open /dev/null");
dup2(null,0);
dup2(null,1);
dup2(null,2);
- xclose(null, "/dev/null original fd",0);
+ mclose(null, "/dev/null original fd",0);
- pid_t child1= xfork("daemonise first fork");
+ pid_t child1= mfork("daemonise first fork");
if (child1) _exit(0);
pid_t sid= setsid();
if (sid == -1) sysfatal("setsid failed");
- pid_t child2= xfork("daemonise second fork");
+ pid_t child2= mfork("daemonise second fork");
if (child2) _exit(0);
}
self_pid= getpid();
- if (self_pid==-1) sysdie("getpid");
+ if (self_pid==-1) syscrash("getpid");
r= chdir(path_run);
- if (r) sysdie("could not chdir to pathrun %s", path_run);
+ if (r) sysfatal("could not chdir to pathrun %s", path_run);
statemc_lock();
int val= 1;
r= SMsetup(SM_PREOPEN, &val); if (!r) warn("SMsetup SM_PREOPEN failed");
- r= SMinit(); if (!r) die("storage manager initialisation (SMinit) failed");
+ r= SMinit(); if (!r) fatal("storage manager initialisation (SMinit) failed");
- if (!become_daemon)
+ if (interactive >= 2)
cli_stdio();
cli_init();
void *run= oop_sys_run(sysloop);
assert(run == OOP_ERROR);
- sysdie("event loop failed");
+ syscrash("event loop failed");
}
~ian / inn-innduct.git / blobdiff