X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnntp%2Fserv_nntp.c;h=26b0ccd4f9a7bc55e22846353e7d0800d15a4fba;hb=01ac2ae1ffc8fa65e6459d7c6fd9a2a368093504;hp=0210f789dd098a1692b6e4999e09748b248955d8;hpb=e36089c6f542c3e482e6e92548c266eb98f28bde;p=citadel.git

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index 0210f789d..26b0ccd4f 100644
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -531,6 +531,25 @@ void nntp_help(void) {
 }
 
 
+//
+// Implement DATE command.
+//
+void nntp_date(void) {
+	time_t now;
+	struct tm nowLocal;
+	struct tm nowUtc;
+	char tsFromUtc[32];
+
+	now = time(NULL);
+	localtime_r(&now, &nowLocal);
+	gmtime_r(&now, &nowUtc);
+
+	strftime(tsFromUtc, sizeof(tsFromUtc), "%Y%m%d%H%M%S", &nowUtc);
+
+	cprintf("111 %s\r\n", tsFromUtc);
+}
+
+
 //
 // back end for the LISTGROUP command , called for each message number
 //
@@ -790,6 +809,33 @@ void nntp_article(const char *cmd) {
 }
 
 
+//
+// Utility function for nntp_last_next() that turns a msgnum into a message ID.
+// The memory for the returned string is pwnz0red by the caller.
+//
+char *message_id_from_msgnum(long msgnum) {
+
+	char *fetched_message_id = NULL;
+	CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+	CtdlOutputMsg(msgnum,
+			MT_RFC822,		// output in RFC822 format ... sort of
+			HEADERS_FAST,		// headers, body, or both?
+			0,			// don't do Citadel protocol responses
+			1,			// CRLF newlines
+			NULL,			// teh whole thing, not just a section
+			0,			// no flags yet ... maybe new ones for Path: etc ?
+			NULL,
+			NULL,
+			&fetched_message_id	// extract the message ID from the message as we go...
+	);
+	StrBuf *msgtext = CC->redirect_buffer;
+	CC->redirect_buffer = NULL;
+
+	FreeStrBuf(&msgtext);
+	return(fetched_message_id);
+}
+
+
 //
 // The LAST and NEXT commands are so similar that they are handled by a single function.
 //
@@ -820,7 +866,89 @@ void nntp_last_next(const char *cmd) {
 		return;
 	}
 
-	cprintf("500 FIXME cmd=%d current_article_number=%ld\r\n", acmd, nntpstate->current_article_number);
+	// ok, here we go ... fetch the msglist so we can figure out our place in the universe
+	struct nntp_msglist nm;
+	int i = 0;
+	long selected_msgnum = 0;
+	char *message_id = NULL;
+
+	nm = nntp_fetch_msglist(&CC->room);
+	if ((nm.num_msgs < 0) || (nm.msgnums == NULL)) {
+		cprintf("500 something bad happened\r\n");
+		return;
+	}
+
+	if ( (acmd == NNTP_LAST) && (nm.num_msgs == 0) ) {
+			cprintf("422 no previous article in this group\r\n");	// nothing here
+	}
+
+	else if ( (acmd == NNTP_LAST) && (nntpstate->current_article_number <= nm.msgnums[0]) ) {
+			cprintf("422 no previous article in this group\r\n");	// already at the beginning
+	}
+
+	else if (acmd == NNTP_LAST) {
+		for (i=0; ((i<nm.num_msgs)&&(selected_msgnum<=0)); ++i) {
+			if ( (nm.msgnums[i] >= nntpstate->current_article_number) && (i > 0) ) {
+				selected_msgnum = nm.msgnums[i-1];
+			}
+		}
+		if (selected_msgnum > 0) {
+			nntpstate->current_article_number = selected_msgnum;
+			message_id = message_id_from_msgnum(nntpstate->current_article_number);
+			cprintf("223 %ld <%s>\r\n", nntpstate->current_article_number, message_id);
+			if (message_id) free(message_id);
+		}
+		else {
+			cprintf("422 no previous article in this group\r\n");
+		}
+	}
+
+	else if ( (acmd == NNTP_NEXT) && (nm.num_msgs == 0) ) {
+			cprintf("421 no next article in this group\r\n");	// nothing here
+	}
+
+	else if ( (acmd == NNTP_NEXT) && (nntpstate->current_article_number >= nm.msgnums[nm.num_msgs-1]) ) {
+			cprintf("421 no next article in this group\r\n");	// already at the end
+	}
+
+	else if (acmd == NNTP_NEXT) {
+		for (i=0; ((i<nm.num_msgs)&&(selected_msgnum<=0)); ++i) {
+			if (nm.msgnums[i] > nntpstate->current_article_number) {
+				selected_msgnum = nm.msgnums[i];
+			}
+		}
+		if (selected_msgnum > 0) {
+			nntpstate->current_article_number = selected_msgnum;
+			message_id = message_id_from_msgnum(nntpstate->current_article_number);
+			cprintf("223 %ld <%s>\r\n", nntpstate->current_article_number, message_id);
+			if (message_id) free(message_id);
+		}
+		else {
+			cprintf("421 no next article in this group\r\n");
+		}
+	}
+
+	// should never get here
+	else {
+		cprintf("500 internal error\r\n");
+	}
+
+	if (nm.msgnums != NULL) {
+		free(nm.msgnums);
+	}
+
+}
+
+
+//
+// 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;
+
+	cprintf("500 not implemented yet FIXME\r\n");
 }
 
 
@@ -852,6 +980,10 @@ void nntp_command_loop(void)
 		nntp_help();
 	}
 
+	else if (!strcasecmp(cmdname, "date")) {
+		nntp_date();
+	}
+
 	else if (!strcasecmp(cmdname, "capabilities")) {
 		nntp_capabilities();
 	}
@@ -902,6 +1034,10 @@ void nntp_command_loop(void)
 		nntp_last_next(ChrPtr(Cmd));
 	}
 
+	else if (!strcasecmp(cmdname, "xover")) {
+		nntp_xover(ChrPtr(Cmd));
+	}
+
 	else {
 		cprintf("500 I'm afraid I can't do that.\r\n");
 	}