#include <stdio.h>
#include <config.h>
-#include <sys/types.h>
#include <unistd.h>
#include <string.h>
-#include "socket.h"
#include "fetchmail.h"
+#include "socket.h"
#include "smtp.h"
+struct opt
+{
+ char *name;
+ int value;
+};
+
+static struct opt extensions[] =
+{
+ {"8BITMIME", ESMTP_8BITMIME},
+ {"SIZE", ESMTP_SIZE},
+ {(char *)NULL, 0},
+};
+
+char smtp_response[MSGBUFSIZE];
+
int SMTP_helo(FILE *sockfp,char *host)
/* send a "HELO" message to the SMTP listener */
{
SockPrintf(sockfp,"HELO %s\r\n", host);
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> HELO %s\n", host);
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP> HELO %s", host);
+ ok = SMTP_ok(sockfp);
return ok;
}
-int SMTP_from(FILE *sockfp, char *from)
+int SMTP_ehlo(FILE *sockfp, char *host, int *opt)
+/* send a "EHLO" message to the SMTP listener, return extension status bits */
+{
+ int ok;
+ char *ip;
+ struct opt *hp;
+
+ SockPrintf(sockfp,"EHLO %s\r\n", host);
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP> EHLO %s", host);
+
+ *opt = 0;
+ while ((ip = SockGets(smtp_response, sizeof(smtp_response)-1, sockfp)))
+ {
+ int n = strlen(ip);
+
+ if (smtp_response[strlen(smtp_response)-1] == '\n')
+ smtp_response[strlen(smtp_response)-1] = '\0';
+ if (smtp_response[strlen(smtp_response)-1] == '\r')
+ smtp_response[strlen(smtp_response)-1] = '\r';
+ if (n < 4)
+ return SM_ERROR;
+ smtp_response[n] = '\0';
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP< %s", smtp_response);
+ for (hp = extensions; hp->name; hp++)
+ if (!strncasecmp(hp->name, smtp_response+4, strlen(hp->name)))
+ *opt |= hp->value;
+ if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ')
+ return SM_OK;
+ else if (smtp_response[3] != '-')
+ return SM_ERROR;
+ }
+ return SM_UNRECOVERABLE;
+}
+
+int SMTP_from(FILE *sockfp, char *from, char *opts)
/* send a "MAIL FROM:" message to the SMTP listener */
{
int ok;
+ struct opt *hp;
+ char buf[MSGBUFSIZE];
- SockPrintf(sockfp,"MAIL FROM:<%s>\r\n", from);
+ sprintf(buf, "MAIL FROM:<%s>", from);
+ if (opts)
+ strcat(buf, opts);
+ SockPrintf(sockfp,"%s\r\n", buf);
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> MAIL FROM:<%s>\n", from);
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP> %s", buf);
+ ok = SMTP_ok(sockfp);
return ok;
}
SockPrintf(sockfp,"RCPT TO:<%s>\r\n", to);
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> RCPT TO:<%s>\n", to);
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP> RCPT TO:<%s>", to);
+ ok = SMTP_ok(sockfp);
return ok;
}
SockPrintf(sockfp,"DATA\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> DATA\n");
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP> DATA");
+ ok = SMTP_ok(sockfp);
+ return ok;
+}
+
+int SMTP_rset(FILE *sockfp)
+/* send a "RSET" message to the SMTP listener */
+{
+ int ok;
+
+ SockPrintf(sockfp,"RSET\r\n");
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP> RSET");
+ ok = SMTP_ok(sockfp);
return ok;
}
SockPrintf(sockfp,"QUIT\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> QUIT\n");
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP> QUIT");
+ ok = SMTP_ok(sockfp);
return ok;
}
SockPrintf(sockfp,".\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP>. (EOM)\n");
- ok = SMTP_ok(sockfp,NULL);
+ error(0, 0, "SMTP>. (EOM)");
+ ok = SMTP_ok(sockfp);
return ok;
}
-void SMTP_rset(FILE *sockfp)
-/* send a "RSET" message to the SMTP listener */
-{
- SockPrintf(sockfp,"RSET\r\n");
- if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> RSET\n");
-}
-
-static int SMTP_check(FILE *sockfp,char *argbuf)
+int SMTP_ok(FILE *sockfp)
/* returns status of SMTP connection */
{
- int ok;
- char buf[SMTPBUFSIZE];
+ char *ip;
- if ((ok = SockGets(buf, sizeof(buf)-1, sockfp)) > 0) {
- buf[ok] = '\0';
- if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP< %s\n", buf);
- if (argbuf)
- strcpy(argbuf,buf);
- if (buf[0] == '1' || buf[0] == '2' || buf[0] == '3')
- ok = SM_OK;
- else
- ok = SM_ERROR;
- }
- else
- {
- if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP< (read failed)\n");
- ok = SM_UNRECOVERABLE;
- }
- return (ok);
-}
-
-int SMTP_ok(FILE *sockfp,char *argbuf)
-/* accepts SMTP response, returns status of SMTP connection */
-{
- int ok;
-
- /* I can tell that the SMTP server connection is ok if I can read a
- status message that starts with "1xx" ,"2xx" or "3xx".
- Therefore, it can't be ok if there's no data waiting to be read
-
- Tried to deal with this with a call to SockDataWaiting, but
- it failed badly.
-
- */
-
- ok = SMTP_check(sockfp,argbuf);
- if (ok == SM_ERROR) /* if we got an error, */
+ while ((ip = SockGets(smtp_response, sizeof(smtp_response)-1, sockfp)))
{
- SMTP_rset(sockfp);
- ok = SMTP_check(sockfp,argbuf); /* how does it look now ? */
- if (ok == SM_OK)
- ok = SM_ERROR; /* It's just a simple error, for*/
- /* the current message */
- else
- ok = SM_UNRECOVERABLE; /* if it still says error, we're */
- /* in bad shape */
+ int n = strlen(ip);
+
+ if (smtp_response[strlen(smtp_response)-1] == '\n')
+ smtp_response[strlen(smtp_response)-1] = '\0';
+ if (smtp_response[strlen(smtp_response)-1] == '\r')
+ smtp_response[strlen(smtp_response)-1] = '\r';
+ if (n < 4)
+ return SM_ERROR;
+ smtp_response[n] = '\0';
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP< %s", smtp_response);
+ if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ')
+ return SM_OK;
+ else if (smtp_response[3] != '-')
+ return SM_ERROR;
}
- return ok;
+ return SM_UNRECOVERABLE;
}
/* smtp.c ends here */
projects / ~andy / fetchmail / blobdiff