Added mandatory HELP command; removed nonstandard NOOP command.

[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 12bf9c7f7a35fefd909f87b32cf871cc2c86ef0a..2b094586d9520f369cb72fe4edabc2b34b21611a 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -231,12 +231,6 @@ void nntp_starttls(void)
 }
 
 
-void nntp_noop(void)
-{
-       cprintf("250 NOOP\r\n");
-}
-
-
 void nntp_capabilities(void)
 {
        cprintf("101 Capability list:\r\n");
@@ -378,13 +372,20 @@ enum {
 /*
  * Output a room name (newsgroup name) in formats required for LIST and NEWGROUPS command
  */
-void output_roomname_in_list_format(struct ctdlroom *qrbuf, int which_format) {
+void output_roomname_in_list_format(struct ctdlroom *qrbuf, int which_format, char *wildmat_pattern) {
        char n_name[1024];
        struct nntp_msglist nm;
        long low_water_mark = 0;
        long high_water_mark = 0;
 
        room_to_newsgroup(n_name, qrbuf->QRname, sizeof n_name);
+
+       if ((wildmat_pattern != NULL) && (!IsEmptyStr(wildmat_pattern))) {
+               if (!wildmat(n_name, wildmat_pattern)) {
+                       return;
+               }
+       }
+
        nm = nntp_fetch_msglist(qrbuf);
        if ((nm.num_msgs > 0) && (nm.msgnums != NULL)) {
                low_water_mark = nm.msgnums[0];
@@ -429,7 +430,7 @@ void nntp_newgroups_backend(struct ctdlroom *qrbuf, void *data)
 
        if (ra & UA_KNOWN) {
                if (qrbuf->QRgen >= thetime) {
-                       output_roomname_in_list_format(qrbuf, NNTP_LIST_ACTIVE);
+                       output_roomname_in_list_format(qrbuf, NNTP_LIST_ACTIVE, NULL);
                }
        }
 }
@@ -491,11 +492,9 @@ void nntp_list_backend(struct ctdlroom *qrbuf, void *data)
        int view;
        struct nntp_list_data *nld = (struct nntp_list_data *)data;
 
-       // FIXME do something with nld->wildmat, bitch
-
        CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
        if (ra & UA_KNOWN) {
-               output_roomname_in_list_format(qrbuf, nld->list_format);
+               output_roomname_in_list_format(qrbuf, nld->list_format, nld->wildmat_pattern);
        }
 }
 
@@ -511,17 +510,17 @@ void nntp_list(const char *cmd) {
        if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
 
        char list_format[64];
-       char wildmat[1024];
+       char wildmat_pattern[1024];
        struct nntp_list_data nld;
 
        extract_token(list_format, cmd, 1, ' ', sizeof list_format);
-       extract_token(wildmat, cmd, 2, ' ', sizeof wildmat);
+       extract_token(wildmat_pattern, cmd, 2, ' ', sizeof wildmat_pattern);
 
-       if (strlen(wildmat) > 0) {
-               nld.wildmat = wildmat;
+       if (strlen(wildmat_pattern) > 0) {
+               nld.wildmat_pattern = wildmat_pattern;
        }
        else {
-               nld.wildmat = NULL;
+               nld.wildmat_pattern = NULL;
        }
 
        if ( (strlen(cmd) < 6) || (!strcasecmp(list_format, "ACTIVE")) ) {
@@ -534,8 +533,6 @@ void nntp_list(const char *cmd) {
                cprintf("501 syntax error , unsupported list format\r\n");
                return;
        }
-       // FIXME do all of the other variants, bitch
-
 
        cprintf("231 list of newsgroups follows\r\n");
        CtdlGetUser(&CC->user, CC->curr_user);
@@ -544,6 +541,16 @@ void nntp_list(const char *cmd) {
 }
 
 
+/*
+ * Implement HELP command.
+ */
+void nntp_help(void) {
+       cprintf("100 This is the Citadel NNTP service.\r\n");
+       cprintf("RTFM http://www.ietf.org/rfc/rfc3977.txt\r\n");
+       cprintf(".\r\n");
+}
+
+
 /* 
  * Main command loop for NNTP server sessions.
  */
@@ -570,6 +577,10 @@ void nntp_command_loop(void)
                nntp_quit();
        }
 
+       else if (!strcasecmp(cmdname, "help")) {
+               nntp_help();
+       }
+
        else if (!strcasecmp(cmdname, "capabilities")) {
                nntp_capabilities();
        }
@@ -578,10 +589,6 @@ void nntp_command_loop(void)
                nntp_starttls();
        }
 
-       else if (!strcasecmp(cmdname, "noop")) {
-               nntp_noop();
-       }
-
        else if (!strcasecmp(cmdname, "authinfo")) {
                nntp_authinfo(ChrPtr(Cmd));
        }