Report input file start to debug log

[innduct.git] / xmit.c

diff --git a/xmit.c b/xmit.c
index a4389166b48e59da3eed973d79648ba226cf9112..c4b1854717333b05249bf009e33387fe9b8d13de 100644 (file)
--- a/xmit.c
+++ b/xmit.c
@@ -174,7 +174,7 @@ int article_check_expired(Article *art /* must be queued, not conn */) {
 
   LIST_REMOVE(art->ipf->queue, art);
   art->missing= 1;
 
   LIST_REMOVE(art->ipf->queue, art);
   art->missing= 1;

-  art->ipf->counts.nooffer_missing++;
+  art->ipf->counts.events[nooffer_missing]++;

   article_done(art,-1);
   return 1;
 }
   article_done(art,-1);
   return 1;
 }


@@ -184,6 +184,7 @@ void inputfile_queue_check_expired(InputFile *ipf) {
 
   for (;;) {
     Article *art= LIST_HEAD(ipf->queue);
 
   for (;;) {
     Article *art= LIST_HEAD(ipf->queue);

+    if (!art) break;

     int expd= article_check_expired(art);
     if (!expd) break;
   }
     int expd= article_check_expired(art);
     if (!expd) break;
   }


@@ -329,7 +330,7 @@ void conn_make_some_xmits(Conn *conn) {
        (abort(),-1);
 
       if (!artdata) art->missing= 1;
        (abort(),-1);
 
       if (!artdata) art->missing= 1;

-      art->ipf->counts.counts[art->state][ artdata ? RC_sent : RC_missing ]++;
+      art->ipf->counts.results[art->state][ artdata ? RC_sent : RC_missing ]++;

 
       if (conn->stream) {
        if (artdata) {
 
       if (conn->stream) {
        if (artdata) {


@@ -363,7 +364,7 @@ void conn_make_some_xmits(Conn *conn) {
       XMIT_LITERAL("\r\n");
 
       assert(art->state == art_Unchecked);
       XMIT_LITERAL("\r\n");
 
       assert(art->state == art_Unchecked);

-      art->ipf->counts.counts[art->state][RC_sent]++;
+      art->ipf->counts.results[art->state][RC_sent]++;

       LIST_ADDTAIL(conn->sent, art);
     }
   }
       LIST_ADDTAIL(conn->sent, art);
     }
   }