Ticket #31: innxmit-post.patch

inn-2.3.2/backends/innxmit.c

@@ -2 +2 @@
 **
 **  Transmit articles to remote site.
 **  Modified for NNTP streaming: 3Jan96 Jerry Aguirre
+
+**  Modified for POST article send mode by Dmitry Yasir (dima@scm.com.ua) :
+**  18Mar2002
+**  Added option -R, with make POST article in READER mode.
+**  In POST send mode drop header lines :
+**  NNTP-Posting-Date:
+**  NNTP-Posting-Host:
+**  Xref:
+**  X-Server-Date:
+**  X-Trace:
+**  X-Complaints-To:
 */
 #include "config.h"
 #include "clibrary.h"
@@ -33 +44 @@
 # include <sys/select.h>
 #endif
 
+#include <string.h>
+
 #define OUTPUT_BUFFER_SIZE      (16 * 1024)
 
 /* Streaming extensions to NNTP.  This extension removes the lock-step
@@ -74 +87 @@
 static char modestream[] = "mode stream";
 static long retries = 0;
 static int logRejects = TRUE ;  /* syslog the 437 responses. */
-
+static int PostSendMode = FALSE; /* Send article with POST directive */
 
 
 /*
@@ -672 +685 @@
 
 
 
 /*
+**  Send a article in POST mode to the server.
+*/
+STATIC BOOL
+REMsendarticle_post_mode(char *Article, char *MessageID, ARTHANDLE *art) {
+    char        buff[NNTP_STRLEN];
+    char *article_data_buff; 
+    char *line_buffer;    /* buffer for current line of message */
+    const int max_line_size = 512;
+    char *source_pointer; /* current source pointer */
+    char *dest_pointer; /* current dest pointer */
+    int counter; /* number bytes thet a worked */
+    int new_message_size;
+    int flag;
+    int line_size_val; /* size of current string */
+
+    if (!REMflush())
+        return FALSE;
+        
+    /* We must scan art->data buffer with lenth art->len and delete same
+       header lines
+    */
+    
+    article_data_buff = (char *) malloc(sizeof(char) * art->len);
+    
+    if(article_data_buff == NULL)
+     return FALSE;
+     
+    line_buffer = (char *) malloc(sizeof(char) * (max_line_size + 2));
+    if(line_buffer == NULL)
+    {
+     free(article_data_buff);
+     return FALSE;
+    }
+     
+    source_pointer = art->data;
+    dest_pointer = article_data_buff;
+    flag = 0;
+    counter = 0;
+    new_message_size = 0;
+    
+    while(counter < art->len)
+    {
+     line_size_val = strchr(source_pointer, '\n') - source_pointer + 1;
+     if(line_size_val > max_line_size)
+     {
+      syslog(L_FATAL, "Too long line in article Header\n");
+      free(line_buffer);
+      free(article_data_buff);
+      return FALSE;
+     }
+          
+     memcpy(line_buffer, source_pointer, line_size_val);
+     *(line_buffer + line_size_val) = '\0';
+
+     if(line_size_val <= 2)
+     {
+      /* Current line - is Header bode */
+      memcpy(dest_pointer, source_pointer, (art->len - counter));
+      new_message_size += art->len - counter;
+      flag = 1;
+      break;
+     }
+     
+     if(strstr(line_buffer, "NNTP-Posting-Date:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;
+     }
+     
+     if(strstr(line_buffer, "NNTP-Posting-Host:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;      
+     }
+     
+     if(strstr(line_buffer, "Xref:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;      
+     }
+     
+     if(strstr(line_buffer, "X-Server-Date:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;      
+     }
+     
+     if(strstr(line_buffer, "X-Trace:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;      
+     }
+     
+     if(strstr(line_buffer, "X-Complaints-To:") != NULL)
+     {
+      counter += line_size_val;
+      source_pointer += line_size_val;
+      continue;            
+     }
+     
+     memcpy(dest_pointer, source_pointer, line_size_val);
+     source_pointer += line_size_val;
+     dest_pointer += line_size_val;
+     counter += line_size_val;
+     new_message_size += line_size_val;
+    } /* end while */
+    
+    free(line_buffer);
+    
+    if(flag == 0)
+    {
+     syslog(L_FATAL, "Internal error, flag=0\n");
+     free(article_data_buff);
+     return FALSE;
+    }
+
+    if (xwrite(ToServer, article_data_buff, new_message_size) < 0)
+    {
+        free(article_data_buff);
+        return FALSE;
+    }
+    
+    free(article_data_buff);
+    
+    if (GotInterrupt)
+        Interrupted(Article, MessageID);
+    if (Debug) {
+        (void)fprintf(stderr, "> [ article %d ]\n", art->len);
+        (void)fprintf(stderr, "> .\n");
+    }
+
+    if (CanStream) return TRUE; /* streaming mode does not wait for ACK */
+
+    /* What did the remote site say? */
+    if (!REMread(buff, (int)sizeof buff)) {
+        (void)fprintf(stderr, "No reply after sending \"%s\", %s\n",
+                Article, strerror(errno));
+        return FALSE;
+    }
+    if (GotInterrupt)
+        Interrupted(Article, MessageID);
+    if (Debug)
+        (void)fprintf(stderr, "< %s", buff);
+
+    /* Parse the reply. */
+    switch (atoi(buff)) {
+    default:
+        (void)fprintf(stderr, "Unknown reply after \"%s\" -- %s",
+                Article, buff);
+        if (DoRequeue)
+            Requeue(Article, MessageID);
+        break;
+    case NNTP_BAD_COMMAND_VAL:
+    case NNTP_SYNTAX_VAL:
+    case NNTP_ACCESS_VAL:
+        /* The receiving server is likely confused...no point in continuing */
+        syslog(L_FATAL, GOT_BADCOMMAND, REMhost, MessageID, REMclean(buff));
+        RequeueRestAndExit(Article, MessageID);
+        /* NOTREACHED */
+    case NNTP_RESENDIT_VAL:
+    case NNTP_GOODBYE_VAL:
+#if 0
+        syslog(L_NOTICE, GOT_RESENDIT, REMhost, MessageID, REMclean(buff));
+#endif
+        Requeue(Article, MessageID);
+        break;
+    case NNTP_TOOKIT_VAL:
+    case NNTP_POSTEDOK_VAL:
+        STATaccepted++;
+        STATacceptedsize += (double)art->len;
+        break;
+    case NNTP_REJECTIT_VAL:
+        if (logRejects)
+            syslog(L_NOTICE, REJECTED, REMhost,
+                   MessageID, Article, REMclean(buff));
+        STATrejected++;
+        STATrejectedsize += (double)art->len;
+        break;
+    }
+
+    /* Article sent, or we requeued it. */
+    return TRUE;
+} /* end REMsendarticle_post_mode() */
+
+
+/*
 **  Get the Message-ID header from an open article.
 */

inn-2.3.2/backends/nntpsend.in

@@ -4 +4 @@
 ##  $Revision: 1.2 $
 ##  Send news via NNTP by running several innxmit processes in the background.
 ##  Usage:
-##      nntpsend [-n][-p][-r][-s size][-S][-t timeout][-T limit][host fqdn]...
+##      nntpsend [-n][-p][-r][-R][-s size][-S][-t timeout][-T limit][host fqdn]...
 ##      -a              Always have innxmit rewrite the batchfile
 ##      -d              debug mode, run ixxmmits with debug as well
 ##      -D              same as -d except innxmits are not debugged
 ##      -p              Run innxmit with -p to prune batch files
 ##      -r              innxmit, don't requeue on unexpected error code
+##      -R              innxmit will send message in MODE READER by POST command
 ##      -s size         limit the =n file to size bytes
 ##      -c              disable message-ID checking in streaming mode
 ##      -t timeout      innxmit timeout to make connection (def: 180)
@@ -38 +39 @@
 TIMELIMIT=
 PP_FLAG=
 NOLOCK=
+RM_FLAG=
 
 ##  Parse JCL.
 MORETODO=true
@@ -59 +61 @@
     X-r)
         R_FLAG="-r"
         ;;
+    X-R)
+        RM_FLAG="-R"
+        ;;
     X-S)
         S_FLAG="-S"
         ;;
@@ -219 +224 @@
     PP_PARAM=
     TIMEOUT_PARAM=
     TIMELIMIT_PARAM=
+    RM_PARAM=
     if [ -z "${FLAGS}" ]; then
         MORETODO=false
     else
@@ -241 +247 @@
         X-r)
             R_PARAM="-r"
             ;;
+        X-R)
+            RM_PARAM="-R"
+            ;;
         X-S)
             S_PARAM="-S"
             ;;
@@ -316 +325 @@
     else
         test -n "${R_PARAM}" && INNFLAGS="${INNFLAGS} ${R_PARAM}"
     fi
+    if [ -n "${RM_FLAG}" ]; then
+        INNFLAGS = "${INNFLAGS} ${RP_FLAG}"
+    else
+        test -n "${RM_PARAM}" && INNFLAGS="${INNFLAGS} ${RM_PARAM}"
+    fi
     if [ -n "${S_FLAG}" ]; then
         INNFLAGS="${INNFLAGS} ${S_FLAG}"
     else