X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=blobdiff_plain;f=backends%2Finnduct.c;h=a5bb448e3e81add5319fb0d917918c85ce4f6b6f;hp=7fa943d638c4852364c0bc5bef3b9a7608b4b9c3;hb=8b7074062790fe3362d1fa7ca28bf68d84820e03;hpb=55cb8dcfa035728631492596baa74844d98c20d0 diff --git a/backends/innduct.c b/backends/innduct.c index 7fa943d..a5bb448 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -145,6 +145,29 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct. * */ +/*============================== PROGRAM ==============================*/ + +#define _GNU_SOURCE + +#include "config.h" +#include "storage.h" +#include "nntp.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include /*----- general definitions, probably best not changed -----*/ @@ -156,12 +179,54 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct. #define INNDCOMMCHILD_ESTATUS_FAIL 6 #define INNDCOMMCHILD_ESTATUS_NONESUCH 7 +/*----- doubly linked lists -----*/ + +#define ISNODE(T) struct { T *succ, *pred; } node +#define DEFLIST(T) typedef struct { T *head, *tail, *tp; int count; } T##List + +#define NODE(n) ((struct node*)&(n)->node) + +#define LIST_ADDHEAD(l,n) \ + (list_addhead((struct list*)&(l), NODE((n))), (void)(l).count++) +#define LIST_ADDTAIL(l,n) \ + (list_addtail((struct list*)&(l), NODE((n))), (void)(l).count++) + +#define LIST_REMHEAD(l) \ + ((l).count ? ((l).count--, (void*)list_remhead((struct list*)&(l))) : 0) +#define LIST_REMTAIL(l) \ + ((l).count ? ((l).count--, (void*)list_remtail((struct list*)&(l))) : 0) +#define LIST_REMOVE(l,n) \ + (list_remove(NODE((n))), (void)(l).count--) +#define LIST_INSERT(l,n,pred) \ + (list_insert((struct list*)&(l), NODE((n)), NODE((pred))), (void)(l).count++) + +/*----- type predeclarations -----*/ + +typedef struct Conn Conn; +typedef struct Article Article; +typedef enum StateMachineState StateMachineState; + +DEFLIST(Conn); +DEFLIST(Article); + +/*----- function predeclarations -----*/ + +static void conn_check_work(Conn *conn); + +static int filemon_init(void); +static void filemon_setfile(int mainfeed_fd, const char *mainfeed_path); +static void filemon_callback(void); + +static void conn_assign_one_article(ConnList *connlist, Conn **last_assigned); +static void statemc_setstate(StateMachineState newsms, int periods, + const char *forlog, const char *why); +static void check_master_queue(void); /*----- configuration options -----*/ static char *sitename, *feedfile; static const char *remote_host; -static int quiet_multiple=0; +static int quiet_multiple=0, become_daemon=1; static int max_connections=10, max_queue_per_conn=200; @@ -179,28 +244,6 @@ static double nocheck_decay; /* computed in main from _articles */ static int nocheck, nocheck_reported; -/*----- doubly linked lists -----*/ - -#define ISNODE(T) T *next, *back; -#define LIST(T) struct { T *head, *tail, *tailpred; int count; } - -#define NODE(n) ((struct node*)&(n)->head) - -#define LIST_ADDHEAD(l,n) \ - (list_addhead((struct list*)&(l), NODE((n))), (void)(l).count++) -#define LIST_ADDTAIL(l,n) \ - (list_addtail((struct list*)&(l), NODE((n))), (void)(l).count++) - -#define LIST_REMHEAD(l) \ - ((l).count ? ((l).count--, (void*)list_remhead((struct list*)&(l))) : 0) -#define LIST_REMTAIL(l) \ - ((l).count ? ((l).count--, (void*)list_remtail((struct list*)&(l))) : 0) -#define LIST_REMOVE(l,n) \ - (list_remove(NODE((n))), (void)(l).count--) -#define LIST_INSERT(l,n,pred) \ - (list_insert((struct list*)&(l), NODE((n)), NODE((pred))), (void)(l).count++) - - /*----- statistics -----*/ typedef enum { /* in queue in conn->sent */ @@ -228,7 +271,7 @@ typedef enum { /* in queue in conn->sent */ , counts[art_Unsolicited] x typedef enum { -#define RC_INDEX(x) RCI_##x +#define RC_INDEX(x) RCI_##x, RESULT_COUNTS(RC_INDEX, RC_INDEX) RCI_max } ResultCountIndex; @@ -239,7 +282,7 @@ typedef enum { #define CONNIOVS 128 typedef enum { - xk_Malloc, xk_Const, xk_Artdata; + xk_Malloc, xk_Const, xk_Artdata } XmitKind; typedef struct { @@ -253,16 +296,6 @@ typedef struct { /*----- core operational data structure types -----*/ -struct Article { - ArtState state; - int midlen; - InputFile *ipf; - TOKEN token; - off_t offset; - int blanklen; - char messageid[1]; -}; - typedef struct InputFile { /* This is an instance of struct oop_readable */ struct oop_readable readable; /* first */ @@ -280,6 +313,17 @@ typedef struct InputFile { char path[]; } InputFile; +struct Article { + ISNODE(Article); + ArtState state; + int midlen; + InputFile *ipf; + TOKEN token; + off_t offset; + int blanklen; + char messageid[1]; +}; + #define SMS_LIST(X) \ X(NORMAL) \ X(FLUSHING) \ @@ -288,10 +332,10 @@ typedef struct InputFile { X(DROPPING) \ X(DROPPED) -typedef enum { +enum StateMachineState { #define SMS_DEF_ENUM(s) sm_##s, SMS_LIST(SMS_DEF_ENUM) -} StateMachineState; +}; static const char *sms_names[]= { #define SMS_DEF_NAME(s) #s , @@ -302,8 +346,8 @@ static const char *sms_names[]= { struct Conn { ISNODE(Conn); int fd, max_queue, stream; - LIST(Article) queue; /* not yet told peer, or CHECK said send it */ - LIST(Article) sent; /* offered/transmitted - in xmit or waiting reply */ + ArticleList queue; /* not yet told peer, or CHECK said send it */ + ArticleList sent; /* offered/transmitted - in xmit or waiting reply */ struct iovec xmit[CONNIOVS]; XmitDetails xmitd[CONNIOVS]; int xmitu; @@ -312,9 +356,11 @@ struct Conn { /*----- operational variables -----*/ -static int nconns; -static LIST(Conn) idle, working, full; -static LIST(Article) *queue; +static oop_source *loop; + +static int nconns, until_connect; +static ConnList idle, working, full; +static ArticleList queue; static char *path_lock, *path_flushing, *path_defer; @@ -327,21 +373,74 @@ static InputFile *main_input_file, *flushing_input_file, *backlog_input_file; static int sm_period_counter; -/*----- function predeclarations -----*/ +/*========== logging ==========*/ -static void conn_check_work(Conn *conn); +static void logcore(int sysloglevel, const char *fmt, ...) + __attribute__((__format__(printf,2,3))); +static void logcore(int sysloglevel, const char *fmt, ...) { + va_list al; + va_start(al,fmt); + if (become_daemon) { + vsyslog(sysloglevel,fmt,al); + } else { + vfprintf(stderr,fmt,al); + putc('\n',stderr); + } + va_end(al); +} -static int filemon_init(void); -static void filemon_setfile(int mainfeed_fd, const char *mainfeed_path); -static void filemon_callback(void); +static void logv(int sysloglevel, const char *pfx, int errnoval, + int exitstatus, const char *fmt, va_list al) + __attribute__((__format__(printf,5,0))); +static void logv(int sysloglevel, const char *pfx, int errnoval, + int exitstatus, const char *fmt, va_list al) { + char msgbuf[256]; + vsnprintf(msgbuf,sizeof(msgbuf), fmt,al); + msgbuf[sizeof(msgbuf)-1]= 0; + + if (sysloglevel >= LOG_ERR && (errnoval==EACCES || errnoval==EPERM)) + sysloglevel= LOG_ERR; /* run by wrong user, probably */ + + logcore(sysloglevel, "<%s>%s: %s%s%s", + sitename, pfx, msgbuf, + errnoval>=0 ? ": " : "", + errnoval>=0 ? strerror(errnoval) : ""); +} + +#define logwrap(fn, pfx, sysloglevel, err, estatus) \ + static void fn(const char *fmt, ...) \ + __attribute__((__format__(printf,1,2))); \ + static void fn(const char *fmt, ...) { \ + va_list al; \ + va_start(al,fmt); \ + logv(sysloglevel, pfx, err, estatus, fmt, al); \ + } + +logwrap(sysdie, " critical", LOG_CRIT, errno, 16); +logwrap(die, " critical", LOG_CRIT, -1, 16); + +logwrap(sysfatal, " fatal", LOG_ERR, errno, 12); +logwrap(fatal, " fatal", LOG_ERR, -1, 12); + +logwrap(syswarn, " warning", LOG_WARNING, errno, 0); +logwrap(warn, " warning", LOG_WARNING, -1, 0); + +logwrap(notice, "", LOG_NOTICE, -1, 0); +logwrap(info, " info", LOG_INFO, -1, 0); +logwrap(debug, " debug", LOG_DEBUG, -1, 0); -static void statemc_setstate(StateMachineState newsms, int periods, - const char *forlog, const char *why); /*========== utility functions etc. ==========*/ static void perhaps_close(int *fd) { if (*fd) { close(*fd); fd=0; } } +static void *xmalloc(size_t sz) { + if (!sz) return 0; + void *r= malloc(sz); + if (r) return r; + sysdie("malloc (%ld bytes) failed", (unsigned long)sz); +} + static pid_t xfork(const char *what) { pid_t child; @@ -383,7 +482,7 @@ static void report_child_status(const char *what, int status) { static int xwaitpid(pid_t *pid, const char *what) { int status; - r= kill(*pid, SIGKILL); + int r= kill(*pid, SIGKILL); if (r) sysdie("cannot kill %s child", what); pid_t got= waitpid(*pid, &status, WNOHANG); @@ -407,17 +506,18 @@ static void check_isreg(const struct stat *stab, const char *path, } static void xfstat(int fd, struct stat *stab_r, const char *what) { - int r= fstab(path, stab); - if (r) sysdie("could not fstat %s %s", what, path); + int r= fstab(fd, stab_r); + if (r) sysdie("could not fstat %s", what); } -static void xfstat_isreg(int fd, struct stat *stab_r, const char *what) { +static void xfstat_isreg(int fd, struct stat *stab_r, + const char *path, const char *what) { xfstat(fd, stab_r, what); - check_isreg(stab, path, what); + check_isreg(stab_r, path, what); } static void xlstat_isreg(const char *path, struct stat *stab, - int *enoent_r /* 0 means ENOENT is fatal */ + int *enoent_r /* 0 means ENOENT is fatal */, const char *what) { int r= lstat(path, stab); if (r) { @@ -428,6 +528,13 @@ static void xlstat_isreg(const char *path, struct stat *stab, check_isreg(stab, path, what); } +static void setnonblock(int fd, int nonblocking) { + int r= fcntl(fd, F_GETFL); if (r<0) sysdie("setnonblocking fcntl F_GETFL"); + if (nonblocking) r |= O_NONBLOCK; + else r &= ~O_NONBLOCK; + r= fcntl(fd, F_SETFL, r); if (r<0) sysdie("setnonblocking fcntl F_SETFL"); +} + static int samefile(const struct stat *a, const struct stat *b) { assert(S_ISREG(a->st_mode)); assert(S_ISREG(b->st_mode)); @@ -435,63 +542,6 @@ static int samefile(const struct stat *a, const struct stat *b) { a->st_dev == b->st_dev); } -/*========== logging ==========*/ - -static void logcore(int sysloglevel, const char *fmt, ...) - __attribute__((printf,2,3)) -static void logcore(int sysloglevel, const char *fmt, ...) { - va_list al; - va_start(al,fmt); - if (become_daemon) { - vsyslog(sysloglevel,fmt,al); - } else { - vfprintf(stderr,fmt,al); - putc('\n',stderr); - } - va_end(al); -} - -static void logv(int sysloglevel, const char *pfx, int errnoval, - int exitstatus, const char *fmt, va_list al) - __attribute__((printf,4,0)) -static void logv(int sysloglevel, const char *pfx, int errnoval, - int exitstatus, const char *fmt, va_list al) { - char msgbuf[256]; - vsnprintf(msgbuf,sizeof(msgbuf), fmt,al); - msgbuf[sizeof(msgbuf)-1]= 0; - - if (sysloglevel >= LOG_ERR && (errnoval==EACCES || errnoval==EPERM)) - sysloglevel= LOG_ERR; /* run by wrong user, probably */ - - logcore(sysloglevel, "<%s>%s: %s%s%s", - sitename, pfx, msgbuf, - errnoval>=0 ? ": " : "", - errnoval>=0 ? strerror(errnoval) : ""); -} - -#define logwrap(fn, pfx, sysloglevel, errno, estatus) \ - static void fn(const char *fmt, ...) \ - __attribute__((printf,1,2)); \ - static void fn(const char *fmt, ...) { \ - va_list al; \ - va_start(al,fmt); \ - logv(sysloglevel, pfx, errno, estatus, fmt, al); \ - } - -logwrap(sysdie, " critical", LOG_CRIT, errno, 16); -logwrap(die, " critical", LOG_CRIT, -1, 16); - -logwrap(sysfatal, " fatal", LOG_ERR, errno, 12); -logwrap(fatal, " fatal", LOG_ERR, -1, 12); - -logwrap(syswarn, " warning", LOG_WARN, errno, 0); -logwrap(warn, " warning", LOG_WARN, -1, 0); - -logwrap(notice, "", LOG_NOTICE, -1, 0); -logwrap(info, " info", LOG_INFO, -1, 0); -logwrap(debug, " debug", LOG_DEBUG, -1, 0); - - /*========== making new connections ==========*/ static int connecting_sockets[2]= {-1,-1}; @@ -505,7 +555,7 @@ static void connect_attempt_discard(void) { perhaps_close(&connecting_sockets[1]); if (connecting_child) { - r= kill(connecting_child, SIGTERM); + int r= kill(connecting_child, SIGTERM); if (r) syswarn("failed to kill connecting child"); int status= xwaitpid(&connecting_child, "connect"); @@ -528,7 +578,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { conn= xmalloc(sizeof(*conn)); memset(conn,0,sizeof(*conn)); - DECL_MSG_CMSG(msg); + PREP_DECL_MSG_CMSG(msg); struct cmsghdr *h= 0; ssize_t rs= recvmsg(fd, &msg, MSG_DONTWAIT); if (rs >= 0) h= CMSG_FIRSTHDR(&msg); @@ -539,11 +589,11 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { assert(got==connecting_child); connecting_child= 0; if (WIFEXITED(status) && - (WEXITSTATUS(status) != 0 + (WEXITSTATUS(status) != 0 && WEXITSTATUS(status) != CONNCHILD_ESTATUS_STREAM && WEXITSTATUS(status) != CONNCHILD_ESTATUS_NOSTREAM)) { /* child already reported the problem */ - } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALARM) { + } else if (WIFSIGNALED(status) && WTERMSIG(status) == SIGALRM) { warn("connect: connection attempt timed out"); } else if (!WIFEXITED(status)) { report_child_status("connect", status); @@ -553,7 +603,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { /* child is still running apparently, report the socket problem */ if (rs < 0) syswarn("connect: read from child socket failed"); - else if (e == OOP_EXCEPTIONN) + else if (e == OOP_EXCEPTION) warn("connect: unexpected exception on child socket"); else warn("connect: unexpected EOF on child socket"); @@ -568,13 +618,14 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { } CHK(level, SOL_SOCKET); CHK(type, SCM_RIGHTS); - CHK(len, CMSG_LEN(sizeof(conn-b>fd))); + CHK(len, CMSG_LEN(sizeof(conn->fd))); #undef CHK - if (CMSG_NXTHDR,&msg,h) { die("connect: child sent many cmsgs"); goto x; } + if (CMSG_NXTHDR(&msg,h)) { die("connect: child sent many cmsgs"); goto x; } 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"); assert(got == connecting_child); @@ -589,7 +640,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { fatal("connect: child gave unexpected exit status %d", es); } - set nonblocking; + setnonblocking(conn->fd, 1); /* Phew! */ LIST_ADDHEAD(idle, conn); @@ -613,7 +664,7 @@ static void connect_start(void) { notice("starting connection attempt"); - r= socketpair(AF_UNIX, SOCK_STREAM, 0, connecting_sockets); + int r= socketpair(AF_UNIX, SOCK_STREAM, 0, connecting_sockets); if (r) { syswarn("connect: cannot create socketpair for child"); goto x; } connecting_child= xfork("connection"); @@ -655,11 +706,11 @@ static void connect_start(void) { fatal("connect: response to MODE STREAM is too long: %.100s...", remote_host, buf); } - l--; if (l>0 && buf[1-]=='\r') l--; + l--; if (l>0 && buf[l-1]=='\r') l--; buf[l]= 0; char *ep; int rcode= strtoul(buf,&ep,10); - if (ep != buf[3]) { + if (ep != &buf[3]) { sanitise_inplace(buf); fatal("connect: bad response to MODE STREAM: %.50s", buf); } @@ -697,7 +748,7 @@ static void connect_start(void) { if (r) sysdie("connect: close child socket in parent"); on_fd_read_except(connecting_sockets[0], connchild_event); - return OOP_CONTINUE; + return; x: connect_attempt_discard(); @@ -716,9 +767,9 @@ static void check_master_queue(void) { conn_assign_one_article(&working, &last_assigned); } else if (idle.head) { conn_assign_one_article(&idle, &last_assigned); - } else if (nconns < maxconns && queue.count >= max_queue_per_conn && - !connecting_child && !connect_delay) { - connect_delay= reconnect_delay_periods; + } else if (nconns < max_connections && queue.count >= max_queue_per_conn && + !connecting_child && !until_connect) { + until_connect= reconnect_delay_periods; connect_start(); } else { break; @@ -727,8 +778,7 @@ static void check_master_queue(void) { conn_check_work(last_assigned); } -static void conn_assign_one_article(LIST(Conn) *connlist, - Conn **last_assigned) { +static void conn_assign_one_article(ConnList *connlist, Conn **last_assigned) { Conn *conn= connlist->head; LIST_REMOVE(*connlist, conn); @@ -748,7 +798,7 @@ static int conn_total_queued_articles(Conn *conn) { return conn->sent.count + conn->queue.count; } -static LIST(Conn) *conn_determine_right_list(Conn *conn) { +static ConnList *conn_determine_right_list(Conn *conn) { int inqueue= conn_total_queued_articles(conn); assert(inqueue <= max_queue); if (inqueue == 0) return &idle; @@ -811,7 +861,7 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) { close(conn->fd); free(conn); - connect_delay= reconnect_delay_periods; + until_connect= reconnect_delay_periods; check_master_queue(); } @@ -2165,18 +2215,18 @@ static const char *debug_ipf_path(InputFile *ipf) { EVERY(period, {PERIOD_SECONDS,0}, { debug("PERIOD" - " sms=%s[%d] queue=%d connect_delay=%d" + " sms=%s[%d] queue=%d until_connect=%d" " input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_FMT(flushing) " conns idle=%d working=%d full=%d" " children connecting=%ld inndcomm_child" , - sms_names[sms], sm_period_counter, queue.count, connect_delay, + sms_names[sms], sm_period_counter, queue.count, until_connect, DEBUG_IPF(main), DEBUG_IPF(flushing), DEBUG_IPF(flushing), idle.count, working.count, full.count, (long)connecting_child, (long)inndcomm_child ); - if (connect_delay) connect_delay--; + if (until_connect) until_connect--; poll_backlog_file(); if (!backlog_input_file) close_defer(); /* want to start on a new backlog */ @@ -2370,6 +2420,9 @@ int main(int argc, char **argv) { if (strchr(feedfile, c)) badusage("feed filename may not contain metacharacter %c",c); + loop= oop_sys_new(); + if (!loop) sysdie("could not create liboop event loop"); + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) sysdie("could not ignore SIGPIPE");