#define _GNU_SOURCE
+#include "inn/list.h"
#include "config.h"
#include "storage.h"
#include "nntp.h"
+#include "libinn.h"
#include <sys/uio.h>
#include <sys/types.h>
#include <errno.h>
#include <syslog.h>
#include <fcntl.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <stdlib.h>
#include <oop.h>
#include <oop-read.h>
/*----- doubly linked lists -----*/
-#define ISNODE(T) struct { T *succ, *pred; } node
+#define ISNODE(T) struct { T *succ, *pred; } node /* must be at start */
#define DEFLIST(T) typedef struct { T *head, *tail, *tp; int count; } T##List
-#define NODE(n) ((struct node*)&(n)->node)
+#define NODE(n) (assert((void*)&(n)->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_CHECKCANHAVENODE(l,n) \
+ ((void)((n) == ((l).head))) /* just for the type check */
+
+#define LIST_ADDSOMEHOW(l,n,list_addsomehow) \
+ ( LIST_CHECKCANHAVENODE(l,n), \
+ list_addsomehow((struct list*)&(l), NODE((n))), \
+ (void)(l).count++ \
+ )
+
+#define LIST_REMSOMEHOW(l,list_remsomehow) \
+ ( (typeof((l).head)) \
+ ( (l).count \
+ ? ( (l).count--, \
+ list_remsomehow((struct list*)&(l)) ) \
+ : 0 \
+ ) \
+ )
+
+
+#define LIST_ADDHEAD(l,n) LIST_ADDSOMEHOW((l),(n),list_addhead)
+#define LIST_ADDTAIL(l,n) LIST_ADDSOMEHOW((l),(n),list_addtail)
+#define LIST_REMHEAD(l) LIST_REMSOMEHOW((l),list_remhead)
+#define LIST_REMTAIL(l) LIST_REMSOMEHOW((l),list_remtail)
-#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++)
+ ( LIST_CHECKCANHAVENODE(l,n), \
+ list_remove(NODE((n))), \
+ (void)(l).count-- \
+ )
+
+#define LIST_INSERT(l,n,pred) \
+ ( LIST_CHECKCANHAVENODE(l,n), \
+ LIST_CHECKCANHAVENODE(l,pred), \
+ list_insert((struct list*)&(l), NODE((n)), NODE((pred))), \
+ (void)(l).count++ \
+ )
/*----- type predeclarations -----*/
typedef struct Conn Conn;
typedef struct Article Article;
+typedef struct InputFile InputFile;
typedef enum StateMachineState StateMachineState;
DEFLIST(Conn);
const char *forlog, const char *why);
static void check_master_queue(void);
+static void postfork_inputfile(InputFile *ipf);
+
/*----- configuration options -----*/
static char *sitename, *feedfile;
/*----- core operational data structure types -----*/
-typedef struct InputFile {
- /* This is an instance of struct oop_readable */
+struct InputFile {
+ /* This is also an instance of struct oop_readable */
struct oop_readable readable; /* first */
oop_readable_call *readable_callback;
void *readable_callback_user;
int counts[art_MaxState][RCI_max];
char path[];
-} InputFile;
+};
struct Article {
ISNODE(Article);
}
static void xfstat(int fd, struct stat *stab_r, const char *what) {
- int r= fstab(fd, stab_r);
+ int r= fstat(fd, stab_r);
if (r) sysdie("could not fstat %s", what);
}
a->st_dev == b->st_dev);
}
+static char *sanitise(const char *input, int len) {
+ static char sanibuf[100]; /* returns pointer to this buffer! */
+
+ const char *p= input;
+ char *q= sanibuf;
+ *q++= '`';
+ for (;;) {
+ if (q > sanibuf+sizeof(sanibuf)-8) { strcpy(q,"'.."); break; }
+ int c;
+ if (len<=0 || !(c= *p++)) { *q++= '\''; *q=0; break; }
+ if (c>=' ' && c<=126 && c!='\\') { *q++= c; continue; }
+ sprintf(q,"\\x%02x",c);
+ q += 4;
+ }
+ return sanibuf;
+}
+
/*========== making new connections ==========*/
static int connecting_sockets[2]= {-1,-1};
static void connect_attempt_discard(void) {
if (connecting_sockets[0])
- cancel_fd(connecting_sockets[0]);
+ loop->cancel_fd(connecting_sockets[0]);
perhaps_close(&connecting_sockets[0]);
perhaps_close(&connecting_sockets[1]);
fatal("connect: child gave unexpected exit status %d", es);
}
- setnonblocking(conn->fd, 1);
+ setnonblock(conn->fd, 1);
/* Phew! */
LIST_ADDHEAD(idle, conn);
alarm(connection_setup_timeout);
if (NNTPconnect(remote_host, port, &cn_from, &cn_to, buf) < 0) {
- if (buf[0]) {
- sanitise_inplace(buf);
- fatal("connect: rejected: %s", buf);
- } else {
- sysfatal("connect: connection attempt failed");
- }
+ if (buf[0]) fatal("connect: rejected: %s", sanitise(buf));
+ else sysfatal("connect: connection attempt failed");
}
if (NNTPsendpassword(remote_host, cn_from, cn_to) < 0)
sysfatal("connect: authentication failed");
}
int l= strlen(buf);
assert(l>=1);
- if (buf[-1]!='\n') {
- sanitise_inplace(buf);
+ if (buf[-1]!='\n')
fatal("connect: response to MODE STREAM is too long: %.100s...",
- remote_host, buf);
- }
+ remote_host, sanitise(buf));
l--; if (l>0 && buf[l-1]=='\r') l--;
buf[l]= 0;
char *ep;
int rcode= strtoul(buf,&ep,10);
- if (ep != &buf[3]) {
- sanitise_inplace(buf);
- fatal("connect: bad response to MODE STREAM: %.50s", buf);
- }
+ if (ep != &buf[3])
+ fatal("connect: bad response to MODE STREAM: %.50s", sanitise(buf));
+
switch (rcode) {
case 203:
exitstatus= CONNCHILD_ESTATUS_STREAM;
case 500:
break;
default:
- sanitise_inplace(buf);
- warn("connect: unexpected response to MODE STREAM: %.50s", buf);
+ warn("connect: unexpected response to MODE STREAM: %.50s",
+ sanitise(buf));
exitstatus= 2;
break;
}
}
assert(ev == OOP_RD_OK);
+ char *sani= sanitise(data, recsz);
+
char *ep;
unsigned long code= strtoul(data, &ep, 10);
if (ep != data+3 || *ep != ' ' || data[0]=='0') {
- char sanibuf[100];
- const char *p= data;
- char *q= sanibuf;
- *q++= '`';
- for (;;) {
- if (q > sanibuf+sizeof(sanibuf)-8) { strcpy(q,"..."); break; }
- int c= *p++;
- if (!c) { *q++= '\''; break; }
- if (c>=' ' && c<=126 && c!='\\') { *q++= c; continue; }
- sprintf(q,"\\x%02x",c);
- q += 4;
- }
- connfail(conn, "badly formatted response from peer: %s", sanibuf);
+ connfail(conn, "badly formatted response from peer: %s", sani);
return OOP_CONTINUE;
}