/*
+ * bugs
+ *
+
+ [740] <sit> info: processed feedfile(null) read=4(+0bl,+6err) offered=5(ch5,nc0) accepted=0(ch0+nc0) unwanted=0(0id+0bd+0nc) rejected=0(0id+0bd+0nc) deferred=0(0id+0bd+0nc) missing=2(0id+2bd+0nc) connretry=0(0id+0bd+0nc)
+
+ (null) ?!
+
+ also unwanted should be nonzero I think
+
+ %d( is too hard to read
+
+ [740] <sit> warning: corrupted file: /home/ian/things/Innfeed/inn2-2.4.5/fee, offset 349: line partially blanked: in ` @050000002D130000006A0000000000000000@ <mi'..
+
+
* todo
* - actually do something with readable on control master
* - option for realsockdir
+ * - option for filepoll
+ * - option for no inotify
* - manpage: document control master stuff
* - manpage: innconf is used for communicating with innd
* - debug this:
#include <glob.h>
#include <time.h>
#include <math.h>
+#include <ctype.h>
#include <oop.h>
#include <oop-read.h>
int count; \
} T##List
-#define NODE(n) (assert((void*)&(n)->list_node == &(n)), &(n)->list_node)
+#define NODE(n) (assert((void*)&(n)->list_node == (n)), &(n)->list_node)
#define LIST_CHECKCANHAVENODE(l,n) \
((void)((n) == ((l).u.for_type))) /* just for the type check */
#define LIST_REMHEAD(l) LIST_REMSOMEHOW((l),list_remhead)
#define LIST_REMTAIL(l) LIST_REMSOMEHOW((l),list_remtail)
-#define LIST_INIT(l) (list_new(&(l).u.li))
+#define LIST_INIT(l) ((l).count=0, list_new(&(l).u.li))
#define LIST_HEAD(l) ((typeof((l).u.for_type))(list_head((struct list*)&(l))))
#define LIST_NEXT(n) ((typeof(n))list_succ(NODE((n))))
#define LIST_BACK(n) ((typeof(n))list_pred(NODE((n))))
static void statemc_start_flush(const char *why); /* Normal => Flushing */
static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */
+static void article_done(Conn *conn, Article *art, int whichcount);
+
static void check_assign_articles(void);
static void queue_check_input_done(void);
static void statemc_check_backlog_done(void);
static void postfork(void);
+static void period(void);
static void open_defer(void);
static void close_defer(void);
art_Unchecked, /* not checked, not sent checking */
art_Wanted, /* checked, wanted sent body as requested */
art_Unsolicited, /* - sent body without check */
- art_MaxState
+ art_MaxState,
} ArtState;
#define RESULT_COUNTS(RCS,RCN) \
RCN(unwanted) \
RCN(rejected) \
RCN(deferred) \
+ RCN(missing) \
RCN(connretry)
-#define RCI_TRIPLE_FMT_BASE "%d(id%d+bd%d+nc%d)"
+#define RCI_TRIPLE_FMT_BASE "%d(%did+%dbd+%dnc)"
#define RCI_TRIPLE_VALS_BASE(counts,x) \
counts[art_Unchecked] x \
+ counts[art_Wanted] x \
struct Article {
ISNODE(Article);
ArtState state;
- int midlen;
+ int midlen, missing;
InputFile *ipf;
TOKEN token;
off_t offset;
static double accept_proportion;
static int nocheck, nocheck_reported;
+/* for simulation, debugging, etc. */
+int simulate_flush= -1;
+
/*========== logging ==========*/
static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
int r= kill(*pid, SIGKILL);
if (r) sysdie("cannot kill %s child", what);
- pid_t got= waitpid(*pid, &status, WNOHANG);
+ 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);
*pid= 0;
return now;
}
+static void xgettimeofday(struct timeval *tv_r) {
+ int r= gettimeofday(tv_r,0);
+ if (r) sysdie("gettimeofday(2) failed");
+}
+
static void xsetnonblock(int fd, int nonblocking) {
int errnoval= oop_fd_nonblock(fd, nonblocking);
if (errnoval) { errno= errnoval; sysdie("setnonblocking"); }
}
static void control_prompt(ControlConn *cc /* may destroy*/) {
- fprintf(cc->out, "%s|", sitename);
+ fprintf(cc->out, "%s| ", sitename);
control_checkouterr(cc);
}
const char *cmd;
void (*f)(ControlConn *cc, const ControlCommand *ccmd,
const char *arg, size_t argsz);
+ void *xdata;
+ int xval;
};
static const ControlCommand control_commands[];
-static void ccmd_help(ControlConn *cc, const ControlCommand *thisccmd,
- const char *arg, size_t argsz) {
+#define CCMD(wh) \
+ static void ccmd_##wh(ControlConn *cc, const ControlCommand *c, \
+ const char *arg, size_t argsz)
+
+CCMD(help) {
fputs("commands:\n", cc->out);
const ControlCommand *ccmd;
for (ccmd=control_commands; ccmd->cmd; ccmd++)
fprintf(cc->out, " %s\n", ccmd->cmd);
}
+CCMD(period) { period(); }
+CCMD(setintarg) { *(int*)c->xdata= atoi(arg); }
+CCMD(setint) { *(int*)c->xdata= c->xval; }
+
static const ControlCommand control_commands[]= {
- { "h", ccmd_help },
+ { "h", ccmd_help },
+ { "p", ccmd_period },
+ { "pretend flush", ccmd_setintarg, &simulate_flush },
+ { "poke sm", ccmd_setint, &sm_period_counter, 1 },
+ { "poke conn", ccmd_setint, &until_connect, 0 },
+ { "poke blscan", ccmd_setint, &until_backlog_nextscan, 0 },
+ { "wedge blscan", ccmd_setint, &until_backlog_nextscan, -1 },
{ 0 }
};
if (memcmp(data, ccmd->cmd, l)) continue;
int argl= (int)recsz - (l+1);
- ccmd->f(cc, ccmd, argl>=0 ? data : 0, argl);
+ ccmd->f(cc, ccmd, argl>=0 ? data+l+1 : 0, argl);
goto prompt;
}
static void vconnfail(Conn *conn, const char *fmt, va_list al) {
int requeue[art_MaxState];
+ memset(requeue,0,sizeof(requeue));
Article *art;
while ((art= LIST_REMHEAD(conn->priority))) LIST_ADDTAIL(queue, art);
static void connect_attempt_discard(void) {
if (connecting_child) {
- int r= kill(connecting_child, SIGTERM);
- if (r) syswarn("failed to kill connecting child");
int status= xwaitpid(&connecting_child, "connect");
-
if (!(WIFEXITED(status) ||
(WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL)))
report_child_status("connect", status);
}
#define PREP_DECL_MSG_CMSG(msg) \
+ char msgbyte= 0; \
+ struct iovec msgiov; \
+ msgiov.iov_base= &msgbyte; \
+ msgiov.iov_len= 1; \
struct msghdr msg; \
memset(&msg,0,sizeof(msg)); \
- char msg##cbuf[CMSG_SPACE(sizeof(fd))]; \
+ char msg##cbuf[CMSG_SPACE(sizeof(int))]; \
+ msg.msg_iov= &msgiov; \
+ msg.msg_iovlen= 1; \
msg.msg_control= msg##cbuf; \
msg.msg_controllen= sizeof(msg##cbuf);
assert(fd == connecting_fdpass_sock);
+ PREP_DECL_MSG_CMSG(msg);
+
+ ssize_t rs= recvmsg(fd, &msg, 0);
+ if (rs<0) {
+ if (isewouldblock(errno)) return OOP_CONTINUE;
+ syswarn("failed to read socket from connecting child");
+ goto x;
+ }
+
conn= xmalloc(sizeof(*conn));
memset(conn,0,sizeof(*conn));
+ LIST_INIT(conn->waiting);
+ LIST_INIT(conn->priority);
+ LIST_INIT(conn->sent);
- PREP_DECL_MSG_CMSG(msg);
struct cmsghdr *h= 0;
- ssize_t rs= recvmsg(fd, &msg, MSG_DONTWAIT);
if (rs >= 0) h= CMSG_FIRSTHDR(&msg);
if (!h) {
- int status;
- pid_t got= waitpid(connecting_child, &status, WNOHANG);
- if (got != -1) {
- assert(got==connecting_child);
- connecting_child= 0;
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status) != 0 &&
- WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
- WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)
- /* child already reported the problem */;
- else
- warn("connect: connection child exited code %d but no cmsg",
+ int status= xwaitpid(&connecting_child, "connect child (broken)");
+
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) != 0 &&
+ WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM &&
+ WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)
+ /* child already reported the problem */;
+ else {
+ if (e == OOP_EXCEPTION)
+ warn("connect: connection child exited code %d but"
+ " unexpected exception on fdpass socket",
WEXITSTATUS(status));
- } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) {
- warn("connect: connection attempt timed out");
- } else {
- report_child_status("connect", status);
+ else
+ warn("connect: connection child exited code %d but"
+ " no cmsg (rs=%d)",
+ WEXITSTATUS(status), (int)rs);
}
+ } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) {
+ warn("connect: connection attempt timed out");
} else {
- /* child is still running apparently, report the socket problem */
- if (rs < 0)
- syswarn("connect: read from fdpass socket failed");
- else if (e == OOP_EXCEPTION)
- warn("connect: unexpected exception on fdpass socket");
- else if (!rs)
- warn("connect: unexpected EOF on fdpass socket");
- else
- fatal("connect: unexpected lack of cmsg from child");
+ report_child_status("connect", status);
}
goto x;
}
}
/* Phew! */
- LIST_INIT(conn->waiting);
- LIST_INIT(conn->priority);
- LIST_INIT(conn->sent);
conn->max_queue= conn->stream ? max_queue_per_conn : 1;
loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
connect_attempt_discard();
check_assign_articles();
- return 0;
+ return OOP_CONTINUE;
x:
conn_dispose(conn);
assert(!connecting_child);
assert(!connecting_fdpass_sock);
- notice("starting connection attempt");
+ info("starting connection attempt");
int socks[2];
int r= socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
alarm(connection_setup_timeout);
if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
- if (buf[0]) fatal("connect: rejected: %s", sanitise(buf));
- else sysfatal("connect: connection attempt failed");
+ int l= strlen(buf);
+ int stripped=0;
+ while (l>0) {
+ unsigned char c= buf[l-1];
+ if (!isspace(c)) break;
+ if (c=='\n' || c=='\r') stripped=1;
+ --l;
+ }
+ if (!buf[0]) {
+ sysfatal("connect: connection attempt failed");
+ } else {
+ buf[l]= 0;
+ fatal("connect: %s: %s", stripped ? "rejected" : "failed",
+ sanitise(buf));
+ }
}
if (NNTPsendpassword((char*)remote_host, cn_from, cn_to) < 0)
sysfatal("connect: authentication failed");
if (try_stream) {
- if (fputs("MODE STREAM\r\n", cn_to) ||
+ if (fputs("MODE STREAM\r\n", cn_to)==EOF ||
fflush(cn_to))
sysfatal("connect: could not send MODE STREAM");
buf[sizeof(buf)-1]= 0;
}
int l= strlen(buf);
assert(l>=1);
- if (buf[-1]!='\n')
+ if (buf[l-1]!='\n')
fatal("connect: response to MODE STREAM is too long: %.100s...",
sanitise(buf));
l--; if (l>0 && buf[l-1]=='\r') l--;
msg.msg_controllen= cmsg->cmsg_len;
r= sendmsg(socks[1], &msg, 0);
- if (r) sysdie("sendmsg failed for new connection");
+ if (r<0) sysdie("sendmsg failed for new connection");
+ if (r!=1) die("sendmsg for new connection gave wrong result %d",r);
_exit(exitstatus);
}
xclose(socks[1], "connecting fdpass child's socket",0);
connecting_fdpass_sock= socks[0];
+ xsetnonblock(connecting_fdpass_sock, 1);
on_fd_read_except(connecting_fdpass_sock, connchild_event);
}
if (!inqueue) use->since_activity= 0; /* reset idle counter */
while (spare>0) {
Article *art= LIST_REMHEAD(queue);
+ if (!art) break;
LIST_ADDTAIL(use->waiting, art);
spare--;
}
ARTHANDLE *artdata= SMretrieve(art->token, RETR_ALL);
+ art->state=
+ art->state == art_Unchecked ? art_Unsolicited :
+ art->state == art_Wanted ? art_Wanted :
+ (abort(),-1);
+
+ if (!artdata) art->missing= 1;
+ art->ipf->counts[art->state][ artdata ? RC_sent : RC_missing ]++;
+
if (conn->stream) {
if (artdata) {
XMIT_LITERAL("TAKETHIS ");
xmit_noalloc(conn, art->messageid, art->midlen);
XMIT_LITERAL("\r\n");
xmit_artbody(conn, artdata);
+ } else {
+ article_done(conn, art, -1);
+ continue;
}
} else {
/* we got 235 from IHAVE */
}
}
- art->state=
- art->state == art_Unchecked ? art_Unsolicited :
- art->state == art_Wanted ? art_Wanted :
- (abort(),-1);
- art->ipf->counts[art->state][RC_sent]++;
LIST_ADDTAIL(conn->sent, art);
} else {
/* check it */
if (conn->stream)
- XMIT_LITERAL("IHAVE ");
- else
XMIT_LITERAL("CHECK ");
+ else
+ XMIT_LITERAL("IHAVE ");
xmit_noalloc(conn, art->messageid, art->midlen);
XMIT_LITERAL("\r\n");
}
static void article_done(Conn *conn, Article *art, int whichcount) {
- art->ipf->counts[art->state][whichcount]++;
+ if (!art->missing) art->ipf->counts[art->state][whichcount]++;
+
if (whichcount == RC_accepted) update_nocheck(1);
else if (whichcount == RC_unwanted) update_nocheck(0);
Article *art;
#define GET_ARTICLE(musthavesent) \
- art= article_reply_check(conn, data, musthavesent, code_streaming, sani); \
+ art= article_reply_check(conn, data, code_streaming, musthavesent, sani); \
if (art) ; else return OOP_CONTINUE /* reply_check has failed the conn */
#define ARTICLE_DEALTWITH(streaming,musthavesent,how) \
}
static InputFile *open_input_file(const char *path) {
- int fd= open(path, O_RDONLY);
+ int fd= open(path, O_RDWR);
if (fd<0) {
if (errno==ENOENT) return 0;
sysfatal("unable to open input file %s", path);
static void *feedfile_got_bad_data(InputFile *ipf, off_t offset,
const char *data, const char *how) {
- warn("corrupted file: %s, offset %lu: %s: %s",
+ warn("corrupted file: %s, offset %lu: %s: in %s",
ipf->path, (unsigned long)offset, how, sanitise(data));
ipf->readcount_err++;
if (ipf->readcount_err > max_bad_data_initial +
abort();
}
}
+ tailing_queue_readable(ipf);
return r;
}
}
}
static void filemon_callback(InputFile *ipf) {
- ipf->readable_callback(loop, &ipf->readable, ipf->readable_callback_user);
+ if (ipf && ipf->readable_callback) /* so filepoll() can be naive */
+ ipf->readable_callback(loop, &ipf->readable, ipf->readable_callback_user);
}
/*---------- interface to start and stop an input file ----------*/
InputFile *file_f= open_input_file(feedfile);
if (!file_f) die("feed file vanished during startup");
startup_set_input_file(file_f);
- SMS(NORMAL, flushfail_retry_periods, "normal startup");
+ SMS(NORMAL, spontaneous_flush_periods, "normal startup");
}
}
}
}
if (periods) {
- info("%s%s[%d] %s",forlog,xtra,periods,why);
+ info("state %s%s[%d] %s",forlog,xtra,periods,why);
} else {
- info("%s%s %s",forlog,xtra,why);
+ info("state %s%s %s",forlog,xtra,why);
}
}
if (sms==sm_DROPPED) {
notice("feed dropped and our work is complete");
- xunlink(path_lock, "lockfile for old feed");
+
+ int r= unlink(path_control);
+ if (r && errno!=ENOENT)
+ syswarn("failed to remove control symlink for old feed");
+
+ xunlink(path_lock, "lockfile for old feed");
exit(4);
}
until_backlog_nextscan= backlog_spontrescan_periods;
goto failed;
case INNDCOMMCHILD_ESTATUS_NONESUCH:
- warn("feed has been dropped by innd, finishing up");
+ notice("feed has been dropped by innd, finishing up");
flushing_input_file= main_input_file;
tailing_queue_readable(flushing_input_file);
/* we probably previously returned EAGAIN from our fake read method
xclose(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) {
+ warn("SIMULATING flush child status %d", simulate_flush);
+ if (simulate_flush>128) raise(simulate_flush-128);
+ else exit(simulate_flush);
+ }
+
alarm(inndcomm_flush_timeout);
r= ICCopen(); if (r) inndcommfail("connect");
r= ICCcommand('f',flushargv,&reply); if (r<0) inndcommfail("transmit");
exit(INNDCOMMCHILD_ESTATUS_FAIL);
}
+ simulate_flush= -1;
+
xclose(pipefds[1], "inndcomm sentinel child's end",0);
inndcomm_sentinel_fd= pipefds[0];
assert(inndcomm_sentinel_fd);
postfork_stdio(defer, "defer file ", path_defer);
}
-#define EVERY(what, interval_sec, interval_usec, body) \
- static struct timeval what##_timeout = { interval_sec, interval_usec }; \
- static void what##_schedule(void); \
- static void *what##_timedout(oop_source *lp, struct timeval tv, void *u) { \
- body; \
- what##_schedule(); \
- return OOP_CONTINUE; \
- } \
- static void what##_schedule(void) { \
- loop->on_time(loop, what##_timeout, what##_timedout, 0); \
- }
+typedef struct Every Every;
+struct Every {
+ struct timeval interval;
+ int fixed_rate;
+ void (*f)(void);
+};
+
+static void every_schedule(Every *e, struct timeval base);
+
+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);
+ every_schedule(e, base);
+ return OOP_CONTINUE;
+}
-EVERY(filepoll, 5,0, ({
- if (main_input_file && main_input_file->readable_callback)
- filemon_callback(main_input_file);
-}));
+static void every_schedule(Every *e, struct timeval base) {
+ struct timeval when;
+ timeradd(&base, &e->interval, &when);
+ loop->on_time(loop, when, every_happens, e);
+}
+
+static void every(int interval, int fixed_rate, void (*f)(void)) {
+ Every *e= xmalloc(sizeof(*e));
+ e->interval.tv_sec= interval;
+ e->interval.tv_usec= 0;
+ e->fixed_rate= fixed_rate;
+ e->f= f;
+ struct timeval now;
+ xgettimeofday(&now);
+ every_schedule(e, now);
+}
+
+static void filepoll(void) {
+ filemon_callback(main_input_file);
+ filemon_callback(flushing_input_file);
+}
static char *debug_report_ipf(InputFile *ipf) {
if (!ipf) return xasprintf("none");
ipf->fd, ipf->rd ? "+" : "");
}
-EVERY(period, -1,0, ({
+static void period(void) {
char *dipf_main= debug_report_ipf(main_input_file);
char *dipf_flushing= debug_report_ipf(flushing_input_file);
char *dipf_backlog= debug_report_ipf(backlog_input_file);
statemc_period_poll();
check_assign_articles();
check_idle_conns();
-}));
+}
/*========== option parsing ==========*/
{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
{0,"no-streaming", 0, &try_stream, op_setint, 0 },
-{0,"inndconf", "F", &inndconffile, op_string },
+{'C',"inndconf", "F", &inndconffile, op_string },
{'P',"port", "PORT", &port, op_integer },
{0,"help", 0, 0, help },
/* defaults */
+ int r= innconf_read(inndconffile);
+ if (!r) badusage("could not read inn.conf (more info on stderr)");
+
if (!remote_host) remote_host= sitename;
if (nocheck_thresh < 0 || nocheck_thresh > 100)
max_bad_data_ratio *= 0.01;
if (!feedfile) {
- innconf_read(inndconffile);
feedfile= xasprintf("%s/%s",innconf->pathoutgoing,sitename);
} else if (!feedfile[0]) {
badusage("feed filename must be nonempty");
if (!filemon_method_init()) {
warn("no file monitoring available, polling");
- filepoll_schedule();
+ every(5,0,filepoll);
}
- period_timeout.tv_sec= period_seconds;
- period_schedule();
+ every(period_seconds,1,period);
statemc_init();
/* let's go */
- void *r= oop_sys_run(sysloop);
- assert(r == OOP_ERROR);
+ void *run= oop_sys_run(sysloop);
+ assert(run == OOP_ERROR);
sysdie("event loop failed");
}
~ian / inn-innduct.git / blobdiff