Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2024-06-08 15:29:31 +00:00
Code Issues Projects Releases Wiki Activity

SMTP65: Do not connect to SMTP server unless there are messages to send

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-09-05 23:55:49 -04:00
parent 9fc6c5346b
commit faf3a66c53
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
apps/smtp65.c
View File

@ -483,11 +483,11 @@ void update_sent_mbox(char *name) {
void main(int argc, char *argv[]) {
static char sendbuf[80], recipients[160];
uint8_t eth_init = ETH_INIT_DEFAULT;
uint8_t linecount;
DIR *dp;
struct dirent *d;
char *p, *q;
uint8_t eth_init = ETH_INIT_DEFAULT, connected = 0;
if ((argc == 2) && (strcmp(argv[1], "EMAIL") == 0))
exec_email_on_exit = 1;
@ -523,32 +523,11 @@ void main(int argc, char *argv[]) {
if (dhcp_init()) {
ip65_error_exit();
}
printf("Ok\n");
// Copy IP config from IP65 to W5100
w5100_config(eth_init);
printf("Ok\nConnecting to %s - ", cfg_smtp_server);
if (!w5100_connect(parse_dotted_quad(cfg_smtp_server), smtp_port)) {
printf("Fail\n");
error_exit();
}
printf("Ok\n\n");
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DONT_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "220 "))
error_exit();
sprintf(sendbuf, "HELO %s\r\n", cfg_smtp_domain);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "250 "))
error_exit();
sprintf(filename, "%s/OUTBOX", cfg_emaildir);
dp = opendir(filename);
if (!dp) {
@ -595,6 +574,32 @@ void main(int argc, char *argv[]) {
}
}
if (!connected) {
printf("Connecting to %s - ", cfg_smtp_server);
if (!w5100_connect(parse_dotted_quad(cfg_smtp_server), smtp_port)) {
printf("Fail\n");
error_exit();
}
printf("Ok\n\n");
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DONT_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "220 "))
error_exit();
sprintf(sendbuf, "HELO %s\r\n", cfg_smtp_domain);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "250 "))
error_exit();
connected = 1;
}
sprintf(sendbuf, "MAIL FROM:<%s>\r\n", cfg_emailaddr);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
@ -665,7 +670,8 @@ skiptonext:
// Ignore any error - can be a race condition where other side
// disconnects too fast and we get an error
w5100_tcp_send_recv("QUIT\r\n", buf, NETBUFSZ, DO_SEND, CMD_MODE);
if (connected)
w5100_tcp_send_recv("QUIT\r\n", buf, NETBUFSZ, DO_SEND, CMD_MODE);
printf("Disconnecting\n");
w5100_disconnect();