high water mark first

[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 c6bca6c4d311dc065b37825e602cb21f8abe7607..249ae12f0019a786f3b39b76e47b84d1a1daf706 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -335,6 +335,7 @@ void nntp_authinfo(const char *cmd) {
 }
 
 
+// FIXME move this to a header file
 struct nntp_msglist {
        int num_msgs;
        long *msgnums;
@@ -367,9 +368,10 @@ struct nntp_msglist nntp_fetch_msglist(struct ctdlroom *qrbuf) {
 
 
 
-/* FIXME not finished need to add water marks
+/*
+ * Output a room name (newsgroup name) in the format required for LIST and NEWGROUPS command
  */
-void output_roomname_in_list_active_format(struct ctdlroom *qrbuf) {
+void output_roomname_in_list_format(struct ctdlroom *qrbuf) {
        char n_name[1024];
        struct nntp_msglist nm;
        long low_water_mark = 0;
@@ -383,7 +385,7 @@ void output_roomname_in_list_active_format(struct ctdlroom *qrbuf) {
        }
 
        // FIXME we have hardcoded "n" for "no posting allowed" -- fix when we add posting
-       cprintf("%s %ld %ld n\r\n", n_name, low_water_mark, high_water_mark);
+       cprintf("%s %ld %ld n\r\n", n_name, high_water_mark, low_water_mark);
        if (nm.msgnums != NULL) {
                free(nm.msgnums);
        }
@@ -391,7 +393,8 @@ void output_roomname_in_list_active_format(struct ctdlroom *qrbuf) {
 
 
 
-/* 
+/*
+ * Called once per room by nntp_newgroups() to qualify and possibly output a single room
  */
 void nntp_newgroups_backend(struct ctdlroom *qrbuf, void *data)
 {
@@ -410,7 +413,7 @@ void nntp_newgroups_backend(struct ctdlroom *qrbuf, void *data)
 
        if (ra & UA_KNOWN) {
                if (qrbuf->QRgen >= thetime) {
-                       output_roomname_in_list_active_format(qrbuf);
+                       output_roomname_in_list_format(qrbuf);
                }
        }
 }