Debianisation (initial cut)

[innduct.git] / innduct.h

diff --git a/innduct.h b/innduct.h
index d6dc8dd033c6516b26cfdc68785cb3efac50aabc..231524d04b0fdaaa54d5687fe10d474a66f71904 100644 (file)
--- a/innduct.h
+++ b/innduct.h
@@ -59,6 +59,7 @@
 #include <time.h>
 #include <math.h>
 #include <ctype.h>
 #include <time.h>
 #include <math.h>
 #include <ctype.h>

+#include <limits.h>

 
 #include <oop.h>
 #include <oop-read.h>
 
 #include <oop.h>
 #include <oop-read.h>


@@ -71,7 +72,7 @@
 #define INNDCOMMCHILD_ESTATUS_FAIL     26
 #define INNDCOMMCHILD_ESTATUS_NONESUCH 27
 
 #define INNDCOMMCHILD_ESTATUS_FAIL     26
 #define INNDCOMMCHILD_ESTATUS_NONESUCH 27
 

-#define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10)
+#define MAX_LINE_FEEDFILE (NNTP_MAXLEN_MSGID + sizeof(TOKEN)*2 + 10)

 #define MAX_CLI_COMMAND 1000
 
 #define VA                va_list al;  va_start(al,fmt)
 #define MAX_CLI_COMMAND 1000
 
 #define VA                va_list al;  va_start(al,fmt)


@@ -84,8 +85,10 @@
 
 #define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
 
 
 #define DUMPV(fmt,pfx,v) fprintf(f, " " #v "=" fmt, pfx v);
 

-#define FOR_CONN(conn) \
-  for ((conn)=LIST_HEAD(conns); (conn); (conn)=LIST_NEXT((conn)))
+#define FOR_LIST_NODE(nodevar, list) \
+  for ((nodevar)=LIST_HEAD(list); (nodevar); (nodevar)=LIST_NEXT((nodevar)))
+
+#define FOR_CONN(conn) FOR_LIST_NODE(conn, conns)

 
 /*----- doubly linked lists -----*/
 
 
 /*----- doubly linked lists -----*/
 


@@ -184,7 +187,7 @@ extern double max_bad_data_ratio;
 extern int max_bad_data_initial;
 
 
 extern int max_bad_data_initial;
 
 

-/*----- statistics -----*/
+/*----- article states, and statistics -----*/

 
 typedef enum {      /* in queue                 in conn->sent             */
   art_Unchecked,    /*   not checked, not sent    checking                */
 
 typedef enum {      /* in queue                 in conn->sent             */
   art_Unchecked,    /*   not checked, not sent    checking                */


@@ -321,13 +324,14 @@ void dbg(const char *fmt, ...) PRINTF(1,2);
 void logv(int sysloglevel, const char *pfx, int errnoval,
          const char *fmt, va_list al) PRINTF(5,0);
 
 void logv(int sysloglevel, const char *pfx, int errnoval,
          const char *fmt, va_list al) PRINTF(5,0);
 

-char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
-char *xasprintf(const char *fmt, ...) PRINTF(1,2);
+char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0);
+char *masprintf(const char *fmt, ...) PRINTF(1,2);

 
 int close_perhaps(int *fd);
 void xclose(int fd, const char *what, const char *what2);
 void xclose_perhaps(int *fd, const char *what, const char *what2);
 
 int close_perhaps(int *fd);
 void xclose(int fd, const char *what, const char *what2);
 void xclose_perhaps(int *fd, const char *what, const char *what2);

-pid_t xfork(const char *what);
+pid_t xfork(const char *what); /* also runs postfork in child */
+pid_t xfork_bare(const char *what);

 
 void on_fd_read_except(int fd, oop_call_fd callback);
 void cancel_fd_read_except(int fd);
 
 void on_fd_read_except(int fd, oop_call_fd callback);
 void cancel_fd_read_except(int fd);


@@ -365,7 +369,7 @@ static inline int isewouldblock(int errnoval) {
   INNLOGSET(die,      "fatal",    LOG_ERR)     \
   INNLOGSET(warn,     "warning",  LOG_WARNING) \
   INNLOGSET(notice,   "notice",   LOG_NOTICE)  \
   INNLOGSET(die,      "fatal",    LOG_ERR)     \
   INNLOGSET(warn,     "warning",  LOG_WARNING) \
   INNLOGSET(notice,   "notice",   LOG_NOTICE)  \

-  INNLOGSET(trace,    "trace",    LOG_NOTICE)
+  INNLOGSET(debug,    "debug",    LOG_DEBUG)

 #define INNLOGSET_DECLARE(fn, pfx, sysloglevel)                                \
   void duct_log_##fn(int l, const char *fmt, va_list al, int errval)   \
     PRINTF(3,0);
 #define INNLOGSET_DECLARE(fn, pfx, sysloglevel)                                \
   void duct_log_##fn(int l, const char *fmt, va_list al, int errval)   \
     PRINTF(3,0);


@@ -391,6 +395,10 @@ void conn_dispose(Conn *conn);
 void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
 void connfail(Conn *conn, const char *fmt, ...)         PRINTF(2,3);
 
 void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
 void connfail(Conn *conn, const char *fmt, ...)         PRINTF(2,3);
 

+void notice_conns_more(const char *new_kind);
+void notice_conns_fewer(void);
+void notice_conns_stats(void);
+

 int allow_connect_start(void);
 void connect_start(void);
 
 int allow_connect_start(void);
 void connect_start(void);
 


@@ -497,6 +505,8 @@ extern int until_stats_log;
 extern StateMachineState sms;
 extern int until_flush;
 extern InputFile *main_input_file, *flushing_input_file, *backlog_input_file;
 extern StateMachineState sms;
 extern int until_flush;
 extern InputFile *main_input_file, *flushing_input_file, *backlog_input_file;

+extern Counts backlog_counts;
+extern int backlog_counts_report;

 extern FILE *defer;
 extern int until_connect, until_backlog_nextscan;
 extern double accept_proportion;
 extern FILE *defer;
 extern int until_connect, until_backlog_nextscan;
 extern double accept_proportion;