Implemented the range handling code for XOVER

[citadel.git] / citadel / modules / nntp / serv_nntp.c

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index f32ce1d733a095a2088cb1a6675dd6c8b563a86d..e4897d6c3f3bbfe160729cc252debb3da5d91718 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -238,6 +238,7 @@ void nntp_capabilities(void)
        cprintf("READER\r\n");
        cprintf("MODE-READER\r\n");
        cprintf("LIST ACTIVE NEWSGROUPS\r\n");
+       cprintf("OVER\r\n");
 #ifdef HAVE_OPENSSL
        cprintf("STARTTLS\r\n");
 #endif
@@ -509,11 +510,30 @@ void nntp_list(const char *cmd) {
        else if (!strcasecmp(list_format, "NEWSGROUPS")) {
                nld.list_format = NNTP_LIST_NEWSGROUPS;
        }
+       else if (!strcasecmp(list_format, "OVERVIEW.FMT")) {
+               nld.list_format = NNTP_LIST_OVERVIEW_FMT;
+       }
        else {
                cprintf("501 syntax error , unsupported list format\r\n");
                return;
        }
 
+       // OVERVIEW.FMT delivers a completely different type of data than all of the
+       // other LIST commands.  It's a stupid place to put it.  But that's how it's
+       // written into RFC3977, so we have to handle it here.
+       if (nld.list_format == NNTP_LIST_OVERVIEW_FMT) {
+               cprintf("215 Order of fields in overview database.\r\n");
+               cprintf("Subject:\r\n");
+               cprintf("From:\r\n");
+               cprintf("Date:\r\n");
+               cprintf("Message-ID:\r\n");
+               cprintf("References:\r\n");
+               cprintf(":bytes\r\n");
+               cprintf(":lines\r\n");
+               cprintf(".\r\n");
+               return;
+       }
+
        cprintf("215 list of newsgroups follows\r\n");
        CtdlGetUser(&CC->user, CC->curr_user);
        CtdlForEachRoom(nntp_list_backend, &nld);
@@ -940,6 +960,44 @@ void nntp_last_next(const char *cmd) {
 }
 
 
+//
+// XOVER is used by some clients, even if we don't offer it
+//
+void nntp_xover(const char *cmd) {
+       if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
+
+       citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+       char range[256];
+       long lowest = (-1) ;
+       long highest = (-1) ; 
+
+       extract_token(range, cmd, 1, ' ', sizeof range);
+       lowest = atol(range);
+       if (lowest <= 0) {
+               lowest = nntpstate->current_article_number;
+               highest = nntpstate->current_article_number;
+       }
+       else {
+               char *dash = strchr(range, '-');
+               if (dash != NULL) {
+                       ++dash;
+                       highest = atol(dash);
+                       if (highest == 0) {
+                               highest = LONG_MAX;
+                       }
+                       if (highest < lowest) {
+                               highest = lowest;
+                       }
+               }
+               else {
+                       highest = lowest;
+               }
+       }
+
+       cprintf("500 not implemented yet FIXME lowest=%ld highest=%ld\r\n", lowest, highest);
+}
+
+
 // 
 // Main command loop for NNTP server sessions.
 //
@@ -1022,6 +1080,14 @@ void nntp_command_loop(void)
                nntp_last_next(ChrPtr(Cmd));
        }
 
+       else if (
+                       (!strcasecmp(cmdname, "xover"))
+                       || (!strcasecmp(cmdname, "over"))
+               )
+       {
+               nntp_xover(ChrPtr(Cmd));
+       }
+
        else {
                cprintf("500 I'm afraid I can't do that.\r\n");
        }