* POP3 sessions now set the last-read pointer in Mail>.
+Revision 1.457 2000/02/08 21:00:47 ajc
+* Implemented the deprecated "LAST" command in POP3. Some clients need it.
+* POP3 sessions now set the last-read pointer in Mail>.
+
Revision 1.456 2000/02/07 05:15:00 ajc
* Renamed CtdlLocalHost() to CtdlHostAlias() and worked it a little deeper into
the message routing logic. Still needs some work on the gateway-domain
Revision 1.456 2000/02/07 05:15:00 ajc
* Renamed CtdlLocalHost() to CtdlHostAlias() and worked it a little deeper into
the message routing logic. Still needs some work on the gateway-domain
Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* Initial CVS import
Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* Initial CVS import
* Copyright (C) 1998-2000 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
* Copyright (C) 1998-2000 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
- * This module implements all required POP3 server commands as described
- * in RFC1939. It also implements nearly all of the optional commands. The
- * only one missing is APOP, because it implements a "shared secret" method
- * of authentication which currently does not fit well with Citadel. Perhaps
- * we'll do it later.
+ * Current status of standards conformance:
+ *
+ * -> All required POP3 commands described in RFC1939 are implemented.
+ *
+ * -> Nearly all of the optional commands in RFC1939 are also implemented.
+ * The only one missing is APOP, because it implements a "shared secret"
+ * method of authentication which would require some major changes to the
+ * Citadel server core.
+ *
+ * -> The deprecated "LAST" command is included in this implementation, because
+ * there exist mail clients which insist on using it (such as Bynari
+ * TradeMail, and certain versions of Eudora).
+ *
* of messages in the inbox, or -1 for error)
*/
int pop3_grab_mailbox(void) {
* of messages in the inbox, or -1 for error)
*/
int pop3_grab_mailbox(void) {
+ struct visit vbuf;
+ int i;
+
if (getroom(&CC->quickroom, MAILROOM) != 0) return(-1);
if (getroom(&CC->quickroom, MAILROOM) != 0) return(-1);
+
+ /* Load up the messages */
CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, pop3_add_message);
CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, pop3_add_message);
+
+ /* Figure out which are old and which are new */
+ CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+ POP3->lastseen = (-1);
+ if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
+ if ((POP3->msgs[POP3->num_msgs-1].msgnum) <= vbuf.v_lastseen) {
+ POP3->lastseen = i;
+ }
+ }
+
return(POP3->num_msgs);
}
return(POP3->num_msgs);
}
-/* Perform "UPDATE state" stuff (remove messages marked for deletion)
+/* Perform "UPDATE state" stuff
*/
void pop3_update(void) {
int i;
*/
void pop3_update(void) {
int i;
+ /* Remove messages marked for deletion */
if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
if (POP3->msgs[i].deleted) {
CtdlDeleteMessages(MAILROOM,
POP3->msgs[i].msgnum, NULL);
}
}
if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
if (POP3->msgs[i].deleted) {
CtdlDeleteMessages(MAILROOM,
POP3->msgs[i].msgnum, NULL);
}
}
+
+ /* Set last read pointer */
+ if (POP3->num_msgs > 0) {
+ lgetuser(&CC->usersupp, CC->curr_user);
+
+ CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+ vbuf.v_lastseen = POP3->msgs[POP3->num_msgs-1].msgnum;
+ CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+
+ lputuser(&CC->usersupp);
+ }
+
+/*
+ * LAST (Determine which message is the last unread message)
+ */
+void pop3_last(char *argbuf) {
+ cprintf("+OK %d\r\n", POP3->lastseen + 1);
+}
+
+
/*
* UIDL (Universal IDentifier Listing) is easy. Our 'unique' message
/*
* UIDL (Universal IDentifier Listing) is easy. Our 'unique' message
+ else if (!strncasecmp(cmdbuf, "LAST", 4)) {
+ pop3_last(&cmdbuf[4]);
+ }
+
else {
cprintf("500 I'm afraid I can't do that, Dave.\r\n");
}
else {
cprintf("500 I'm afraid I can't do that, Dave.\r\n");
}
};
struct citpop3 { /* Information about the current session */
};
struct citpop3 { /* Information about the current session */
- struct pop3msg *msgs;
- int num_msgs;
+ struct pop3msg *msgs; /* Array of message pointers */
+ int num_msgs; /* Number of messages in array */
+ int lastseen; /* Offset of last-read message in array */
+ /* Note: the "lastseen" is represented as the
+ * offset in this array (zero-based), so when
+ * displaying it to a POP3 client, it must be
+ * incremented by one.
+ */
#define POP3 ((struct citpop3 *)CtdlGetUserData(SYM_POP3))
#define POP3 ((struct citpop3 *)CtdlGetUserData(SYM_POP3))
{
char buf[4096];
char tempfile[64];
{
char buf[4096];
char tempfile[64];
sprintf(tempfile, tmpnam(NULL));
sprintf(tempfile, tmpnam(NULL));
switch (setup_type) {
case UI_TEXT:
switch (setup_type) {
case UI_TEXT:
* These define what port to listen on for various services.
* FIX ... put this in a programmable config somewhere
*/
* These define what port to listen on for various services.
* FIX ... put this in a programmable config somewhere
*/
-#define POP3_PORT 1110
-#define SMTP_PORT 2525
+#define POP3_PORT 110
+#define SMTP_PORT 25