#include "ctdl_module.h"
-
+extern long timezone;
/****************** BEGIN UTILITY FUNCTIONS THAT COULD BE MOVED ELSEWHERE LATER **************/
}
+// FIXME move this to a header file
+struct nntp_msglist {
+ int num_msgs;
+ long *msgnums;
+};
+/*
+ * Utility function to fetch the current list of message numbers in a room
+ */
+struct nntp_msglist nntp_fetch_msglist(struct ctdlroom *qrbuf) {
+ struct nntp_msglist nm;
+ struct cdbdata *cdbfr;
+
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ nm.msgnums = (long*)cdbfr->ptr;
+ cdbfr->ptr = NULL;
+ nm.num_msgs = cdbfr->len / sizeof(long);
+ cdbfr->len = 0;
+ cdb_free(cdbfr);
+ } else {
+ nm.num_msgs = 0;
+ nm.msgnums = NULL;
+ }
+ return(nm);
+}
-/*
+
+
+
+
+
+/*
+ * Output a room name (newsgroup name) in the format required for LIST and NEWGROUPS command
+ */
+void output_roomname_in_list_format(struct ctdlroom *qrbuf) {
+ 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);
+ nm = nntp_fetch_msglist(qrbuf);
+ if ((nm.num_msgs > 0) && (nm.msgnums != NULL)) {
+ low_water_mark = nm.msgnums[0];
+ high_water_mark = nm.msgnums[nm.num_msgs - 1];
+ }
+
+ // FIXME we have hardcoded "n" for "no posting allowed" -- fix when we add posting
+ cprintf("%s %ld %ld n\r\n", n_name, high_water_mark, low_water_mark);
+ if (nm.msgnums != NULL) {
+ free(nm.msgnums);
+ }
+}
+
+
+
+/*
+ * Called once per room by nntp_newgroups() to qualify and possibly output a single room
*/
void nntp_newgroups_backend(struct ctdlroom *qrbuf, void *data)
{
int ra;
int view;
+ time_t thetime = *(time_t *)data;
CtdlRoomAccess(qrbuf, &CC->user, &ra, &view);
+ /*
+ * The "created after <date/time>" heuristics depend on the happy coincidence
+ * that for a very long time we have used a unix timestamp as the room record's
+ * generation number (QRgen). When this module is merged into the master
+ * source tree we should rename QRgen to QR_create_time or something like that.
+ */
+
if (ra & UA_KNOWN) {
- char n_name[1024];
- room_to_newsgroup(n_name, qrbuf->QRname, sizeof n_name);
- cprintf("%s\r\n", n_name);
+ if (qrbuf->QRgen >= thetime) {
+ output_roomname_in_list_format(qrbuf);
+ }
}
}
/*
- * Implements the NEWGROUPS command (FIXME not finished)
+ * Implements the NEWGROUPS command
*/
void nntp_newgroups(const char *cmd) {
/*
- * HACK: this works because the 5XX series error codes from citadeli
+ * HACK: this works because the 5XX series error codes from citadel
* protocol will also be considered error codes by an NNTP client
*/
if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
- cprintf("231 imma show you everything FIXME\r\n");
+
+ char stringy_date[16];
+ char stringy_time[16];
+ char stringy_gmt[16];
+ struct tm tm;
+ time_t thetime;
+
+ extract_token(stringy_date, cmd, 1, ' ', sizeof stringy_date);
+ extract_token(stringy_time, cmd, 2, ' ', sizeof stringy_time);
+ extract_token(stringy_gmt, cmd, 3, ' ', sizeof stringy_gmt);
+
+ memset(&tm, 0, sizeof tm);
+ if (strlen(stringy_date) == 6) {
+ sscanf(stringy_date, "%2d%2d%2d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
+ tm.tm_year += 100;
+ }
+ else {
+ sscanf(stringy_date, "%4d%2d%2d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
+ tm.tm_year -= 1900;
+ }
+ tm.tm_mon -= 1; // tm_mon is zero based (0=January)
+ tm.tm_isdst = (-1); // let the C library figure out whether DST is in effect
+ sscanf(stringy_time, "%2d%2d%2d", &tm.tm_hour, &tm.tm_min ,&tm.tm_sec);
+ thetime = mktime(&tm);
+ if (!strcasecmp(stringy_gmt, "GMT")) {
+ tzset();
+ thetime += timezone;
+ }
+
+
+ cprintf("231 list of new newsgroups follows\r\n");
CtdlGetUser(&CC->user, CC->curr_user);
- cprintf("%d Rooms w/o new msgs:\n", LISTING_FOLLOWS);
- CtdlForEachRoom(nntp_newgroups_backend, NULL);
+ CtdlForEachRoom(nntp_newgroups_backend, &thetime);
cprintf(".\r\n");
}
/* return our module name for the log */
return "nntp";
}
+