From f6b74576d15853ca74ae7c7255d0a28d876dafcc Mon Sep 17 00:00:00 2001 From: mhsin Date: Sun, 19 Aug 2007 06:44:46 +0000 Subject: * Add more verbose log. * Fix mtime == -1 problem. * Discard some article with return code 441. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3551 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- innbbsd/bbslink.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/innbbsd/bbslink.c b/innbbsd/bbslink.c index 618ff7f5..b23c0bdc 100644 --- a/innbbsd/bbslink.c +++ b/innbbsd/bbslink.c @@ -1,3 +1,4 @@ +#include "antisplam.h" #if defined( LINUX ) #include "innbbsconf.h" #include "bbslib.h" @@ -7,7 +8,6 @@ #include "innbbsconf.h" #include "bbslib.h" #endif -#include "antisplam.h" #include @@ -577,7 +577,7 @@ read_outgoing(sover) strncpy(MSGID_BUF, msgid, sizeof MSGID_BUF); } sover->msgid = MSGID; - if (mtime == -1) { + if ((mtime == -1) || (mtime == 4294967295)) { static char BODY_BUF[MAXBUFLEN]; strncpy(BODY_BUF, fileglue("%s\r\n", subject), sizeof BODY_BUF); @@ -754,7 +754,11 @@ post_article(node, site, sover, textline) char *bodyp, *body; if (Verbose) + { fprintf(stdout, " %s %s %s\n", site, filename, msgid); + if(NNTPHOST && *NNTPHOST) + printf(" ==> NNTPHOST: %s\n", NNTPHOST); + } if (NoAction && Verbose) { printf(" ==>%s\n", sover->path); printf(" ==>%s:%s\n", sover->from, sover->group); @@ -862,8 +866,12 @@ post_article(node, site, sover, textline) return 0; } else { bbslog(" :Err: %d %s of <%s>\n", status, (char *)tcpmessage(), msgid); + if(Verbose) + printf(":Warn: %d %s <%s>\n", status, (char *)tcpmessage(), msgid); if (!strstr(tcpmessage(), "Article not posted")&& - !strstr(tcpmessage(), "435 Duplicate")) + !strstr(tcpmessage(), "435 Duplicate") && + !strstr(tcpmessage(), "No valid newsgroups") && + (strncmp(tcpmessage(), " 437 ", 5) != 0)) queuefeed(node, textline); return 0; } -- cgit v1.2.3