-/* Copyright 1996 Eric S. Raymond
+/*
+ * smtp.c -- code for speaking SMTP to a listener port
+ *
+ * Concept due to Harry Hochheiser. Implementation by ESR. Cleanup and
+ * strict RFC821 compliance by Cameron MacPherson.
+ *
+ * Copyright 1996 Eric S. Raymond
* All rights reserved.
* For license terms, see the file COPYING in this directory.
*/
-/***********************************************************************
- module: smtp.c
- project: popclient
- programmer: Harry Hochheiser
- description: Handling of SMTP connections, and processing of mail
- to be forwarded via SMTP connections.
-
- ***********************************************************************/
-
#include <stdio.h>
#include <config.h>
-#include <sys/types.h>
#include <unistd.h>
#include <string.h>
+#include "fetchmail.h"
#include "socket.h"
-#include "popclient.h"
#include "smtp.h"
-/*********************************************************************
- function: SMTP_helo
- description: Send a "HELO" message to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
- return value: Result of SMTP_OK: based on codes in popclient.h.
-
- *********************************************************************/
+int smtp_response; /* numeric value of SMTP response code */
-int SMTP_helo(int socket,char *host)
+int SMTP_helo(FILE *sockfp,char *host)
+/* send a "HELO" message to the SMTP listener */
{
int ok;
- char buf[SMTPBUFSIZE];
- sprintf(buf,"HELO %s",host);
- SockPuts(socket, buf);
+ SockPrintf(sockfp,"HELO %s\r\n", host);
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> %s\n", buf);
- ok = SMTP_ok(socket,buf);
+ error(0, 0, "SMTP> HELO %s", host);
+ ok = SMTP_ok(sockfp);
return ok;
}
-
-/*********************************************************************
- function: SMTP_from
- description: Send a "MAIL FROM:" message to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
- from user name/host of originator
-
- Note: these args are likely to change, as we get fancier about
- handling the names.
-
- return value: Result of SMTP_ok: based on codes in popclient.h.
-
- *********************************************************************/
-int SMTP_from(int socket, char *from)
+int SMTP_from(FILE *sockfp, char *from)
+/* send a "MAIL FROM:" message to the SMTP listener */
{
- char buf[SMTPBUFSIZE]; /* it's as good as size as any... */
int ok;
- SockPrintf(socket, "MAIL FROM: %s\n", from);
- if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> MAIL FROM: %s\n", from);
- ok = SMTP_ok(socket,buf);
+ SockPrintf(sockfp,"MAIL FROM:<%s>\r\n", from);
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP> MAIL FROM:<%s>", from);
+ ok = SMTP_ok(sockfp);
return ok;
}
-
-/*********************************************************************
- function: SMTP_rcpt
- description: Send a "RCPT TO:" message to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
- touser: user name of recipient
- tohost: host name of recipient
-
- return value: Result of SMTP_OK: based on codes in popclient.h.
-
- *********************************************************************/
-int SMTP_rcpt(int socket,char *to)
+int SMTP_rcpt(FILE *sockfp, char *to)
+/* send a "RCPT TO:" message to the SMTP listener */
{
- char buf[SMTPBUFSIZE]; /* it's as good as size as any... */
int ok;
- SockPrintf(socket, "RCPT TO: %s\n", to);
+ SockPrintf(sockfp,"RCPT TO:<%s>\r\n", to);
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> RCPT TO: %s\n", to);
- ok = SMTP_ok(socket,buf);
-
+ error(0, 0, "SMTP> RCPT TO:<%s>", to);
+ ok = SMTP_ok(sockfp);
return ok;
}
-
-/*********************************************************************
- function: SMTP_data
- description: Send a "DATA" message to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
-
- *********************************************************************/
-int SMTP_data(int socket)
+int SMTP_data(FILE *sockfp)
+/* send a "DATA" message to the SMTP listener */
{
int ok;
- SockPrintf(socket,"DATA\n");
+ SockPrintf(sockfp,"DATA\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> DATA\n");
- ok = SMTP_ok(socket, NULL);
-
+ error(0, 0, "SMTP> DATA");
+ ok = SMTP_ok(sockfp);
return ok;
}
-/*********************************************************************
- function: SMTP_eom
- description: Send a message data termination to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
- return value: Result of SMTP_OK: based on codes in popclient.h.
-
- *********************************************************************/
-
-int SMTP_eom(int socket)
+int SMTP_quit(FILE *sockfp)
+/* send a "QUIT" message to the SMTP listener */
{
int ok;
- SockPuts(socket,".");
+ SockPrintf(sockfp,"QUIT\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> (EOM)\n");
- ok = SMTP_ok(socket,NULL);
+ error(0, 0, "SMTP> QUIT");
+ ok = SMTP_ok(sockfp);
return ok;
}
-/*********************************************************************
- function: SMTP_rset
- description: Send an "RSET" message to the SMTP server.
-
- arguments:
- socket TCP/IP socket for connection to SMTP
-
- *********************************************************************/
-void SMTP_rset(int socket)
+int SMTP_eom(FILE *sockfp)
+/* send a message data terminator to the SMTP listener */
{
- SockPrintf(socket,"RSET\n");
+ int ok;
+
+ SockPrintf(sockfp,".\r\n");
if (outlevel == O_VERBOSE)
- fprintf(stderr, "SMTP> RSET\n");
+ error(0, 0, "SMTP>. (EOM)");
+ ok = SMTP_ok(sockfp);
+ return ok;
}
-/*********************************************************************
- function: SMTP_check
- description: Returns the status of the smtp connection
- arguments:
- socket TCP/IP socket for connection to SMTP
- return value: based on codes in popclient.h.
- Do the dirty work of seeing what the status is..
- *********************************************************************/
-static int SMTP_check(int socket,char *argbuf)
+int SMTP_ok(FILE *sockfp)
+/* returns status of SMTP connection */
{
- int ok;
- char buf[SMTPBUFSIZE];
+ char buf[SMTPBUFSIZE], *ip;
- if ((ok = SMTP_Gets(socket, buf, sizeof(buf))) > 0) {
- if (outlevel == O_VERBOSE)
- {
- buf[ok] = '\0';
- fprintf(stderr, "SMTP< %s", buf);
- }
- if (argbuf)
- strcpy(argbuf,buf);
- if (buf[0] == '1' || buf[0] == '2' || buf[0] == '3')
- ok = SM_OK;
- else
- ok = SM_ERROR;
- }
- else
- ok = SM_UNRECOVERABLE;
- return (ok);
-}
-
-/*********************************************************************
- function: SMTP_ok
- description: Returns the statsus of the smtp connection
- arguments:
- socket TCP/IP socket for connection to SMTP
- return value: based on codes in popclient.h.
- *********************************************************************/
-int SMTP_ok(int socket,char *argbuf)
-{
- int ok;
- char buf[SMTPBUFSIZE];
-
- /* 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(socket,argbuf);
- if (ok == SM_ERROR) /* if we got an error, */
+ while ((ip = SockGets(buf, sizeof(buf)-1, sockfp)))
{
- SMTP_rset(socket);
- ok = SMTP_check(socket,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 (buf[strlen(buf)-1] == '\n')
+ buf[strlen(buf)-1] = '\0';
+ if (buf[strlen(buf)-1] == '\r')
+ buf[strlen(buf)-1] = '\r';
+ if (n < 4)
+ return SM_ERROR;
+ buf[n] = '\0';
+ if (outlevel == O_VERBOSE)
+ error(0, 0, "SMTP< %s", buf);
+ smtp_response = atoi(buf);
+ if ((buf[0] == '1' || buf[0] == '2' || buf[0] == '3') && buf[3] == ' ')
+ return SM_OK;
+ else if (buf[3] != '-')
+ return SM_ERROR;
}
- return ok;
-}
-
-/*********************************************************************
- function: SMTP_Gets
- description: Gets a line from the SMTP connection
- arguments:
- socket TCP/IP socket for connection to SMTP
- return value: number of bytes read.
- *********************************************************************/
-int SMTP_Gets(int socket,char *buf,int sz)
-{
- return read(socket,buf,sz);
+ return SM_UNRECOVERABLE;
}
+/* smtp.c ends here */
projects / ~andy / fetchmail / blobdiff