X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=odmr.c;h=d495e9cd0223713270710c20acb0a601c75f4178;hb=67309fa53035304ad104723d4eb9d71142c20277;hp=0c4db03367083305ffc607b2ffc42967d6cea87e;hpb=a016460027f89e7c81106a0560d1d495f727c182;p=~andy%2Ffetchmail

diff --git a/odmr.c b/odmr.c
index 0c4db033..d495e9cd 100644
--- a/odmr.c
+++ b/odmr.c
@@ -16,15 +16,18 @@
 #include <net/socket.h>
 #endif
 #include  <sys/types.h>
-#include  <sys/time.h>
 #ifdef HAVE_NET_SELECT_H /* AIX needs this */
 #include <net/select.h>
 #endif
+#ifdef HAVE_SYS_SELECT_H /* AIX 4.1, at least, needs this */
+#include  <sys/select.h>
+#endif
 #include  <netdb.h>
 #include  <errno.h>
 #include  <unistd.h>
 #include  "i18n.h"
 #include  "fetchmail.h"
+#include  "sdump.h"
 #include  "smtp.h"
 #include  "socket.h"
 
@@ -33,7 +36,8 @@ static int odmr_ok (int sock, char *argbuf)
 {
     int ok;
 
-    ok = SMTP_ok(sock);
+    (void)argbuf;
+    ok = SMTP_ok(sock, SMTP_MODE, TIMEOUT_DEFAULT);
     if (ok == SM_UNRECOVERABLE)
 	return(PS_PROTOCOL);
     else
@@ -45,10 +49,12 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 /* send ODMR and then run a reverse SMTP session */
 {
     int ok, opts, smtp_sock;
+    int doing_smtp_data = 0;   /* Are we in SMTP DATA state? */
     char buf [MSGBUFSIZE+1];
     struct idlist *qnp;		/* pointer to Q names */
 
-    if ((ok = SMTP_ehlo(sock, fetchmailhost, 
+    (void)id;
+    if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost, 
 			ctl->server.esmtp_name, ctl->server.esmtp_password,
 			&opts)))
     {
@@ -95,12 +101,12 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
     switch(atoi(buf))
     {
     case 250:	/* OK, turnaround is about to happe */
-	if (outlevel >= O_SILENT)
+	if (outlevel > O_SILENT)
 	    report(stdout, GT_("Turnaround now...\n"));
 	break;
 
     case 450:	/* ATRN request refused */
-	if (outlevel >= O_SILENT)
+	if (outlevel > O_SILENT)
 	    report(stdout, GT_("ATRN request refused.\n"));
 	return(PS_PROTOCOL);
 
@@ -109,7 +115,8 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 	return(PS_EXCLUDE);
 
     case 453:	/* You have no mail */
-	report(stderr, GT_("You have no mail.\n"));
+	if (outlevel > O_SILENT)
+	    report(stderr, GT_("You have no mail.\n"));
 	return(PS_NOMAIL);
 
     case 502:	/* Command not implemented */
@@ -120,9 +127,12 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 	report(stderr, GT_("Authentication required.\n"));
 	return(PS_AUTHFAIL);
 
-    default:
-	report(stderr, GT_("Unknown ODMR error %d\n"), atoi(buf));
-	return(PS_PROTOCOL);
+    default: {
+	    char *t = sdump(buf, strlen(buf));
+	    report(stderr, GT_("Unknown ODMR error \"%s\"\n"), t);
+	    xfree(t);
+	    return(PS_PROTOCOL);
+	}
     }
 
     /*
@@ -132,7 +142,7 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
      * instead, we'll use select(2) to watch the read sides of both
      * sockets and just throw their data at each other.
      */
-    if ((smtp_sock = smtp_open(ctl)) == -1)
+    if ((smtp_sock = smtp_setup(ctl)) == -1)
 	return(PS_SOCKET);
     else
     {
@@ -142,7 +152,6 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 	{
 	    fd_set	readfds;
 	    struct timeval timeout;
-	    char	buf[MSGBUFSIZE];
 
 	    FD_ZERO(&readfds);
 	    FD_SET(sock, &readfds);
@@ -161,7 +170,7 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 		    break;
 
 		SockWrite(smtp_sock, buf, n);
-		if (outlevel >= O_MONITOR)
+		if (outlevel >= O_MONITOR && !doing_smtp_data)
 		    report(stdout, "ODMR< %s", buf);
 	    }
 	    if (FD_ISSET(smtp_sock, &readfds))
@@ -173,6 +182,17 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 		SockWrite(sock, buf, n);
 		if (outlevel >= O_MONITOR)
 		    report(stdout, "ODMR> %s", buf);
+
+               /* We are about to receive message data if the local MTA
+                * sends 354 (after receiving DATA) */
+               if (!doing_smtp_data && !strncmp(buf, "354", 3))
+               {
+                   doing_smtp_data = 1;
+		   if (outlevel > O_SILENT)
+		       report(stdout, GT_("receiving message data\n"));
+               }
+               else if (doing_smtp_data)
+                   doing_smtp_data = 0;
 	    }
 	}
 	SockClose(smtp_sock);
@@ -193,27 +213,25 @@ static int odmr_logout(int sock, struct query *ctl)
        return(PS_SUCCESS);
 }
 
-const static struct method odmr =
+static const struct method odmr =
 {
     "ODMR",		/* ODMR protocol */
-#if INET6_ENABLE
-    "odmr",		/* standard SMTP port */
-    "odmrs",		/* ssl SMTP port */
-#else /* INET6_ENABLE */
-    366,		/* standard SMTP port */
-    2366,		/* ssl SMTP port (BOGUS! RANDOM VALUE) */
-#endif /* INET6_ENABLE */
+    "odmr",		/* standard ODMR port */
+    "odmrs",		/* ssl ODMR port */
     FALSE,		/* this is not a tagged protocol */
     FALSE,		/* this does not use a message delimiter */
     odmr_ok,		/* parse command response */
     NULL,		/* no need to get authentication */
     odmr_getrange,	/* initialize message sending */
     NULL,		/* we cannot get a list of sizes */
+    NULL,		/* we cannot get a list of sizes of subsets */
     NULL,		/* how do we tell a message is old? */
     NULL,		/* no way to fetch headers */
     NULL,		/* no way to fetch body */
     NULL,		/* no message trailer */
     NULL,		/* how to delete a message */
+    NULL,		/* how to mark a message as seen */
+    NULL,		/* no mailbox support */
     odmr_logout,	/* log out, we're done */
     FALSE,		/* no, we can't re-poll */
 };
@@ -232,7 +250,7 @@ int doODMR (struct query *ctl)
 	return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-	fprintf(stderr, GT_("Option --remote is not supported with ODMR\n"));
+	fprintf(stderr, GT_("Option --folder is not supported with ODMR\n"));
 	return(PS_SYNTAX);
     }
     if (check_only) {