Skip to content

some suggestions #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gene-hightower wants to merge 5 commits into
base: master
Choose a base branch
from
Open

some suggestions #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ae41ba
RFC 5322 conforming date-time, with correct time zone
gene-hightower Jan 6, 2018
5b78a45
correct quotes
gene-hightower Jan 6, 2018
63e3736
must not have space after quit, see grammar in RFC 5321
gene-hightower Jan 6, 2018
0bc20f5
must have blank line before message body, see grammar in RFC 5321
gene-hightower Jan 6, 2018
3446a00
for strcasecmp
gene-hightower Jan 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions smtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <sys/socket.h>
#include <time.h>
#include <unistd.h>
Expand Down Expand Up @@ -316,10 +317,9 @@ static char* smtp_time(char* buffer)
struct tm t;
localtime_r(&t2,&t);

static char* week[] = {"Sun" , "Mon" , "Tue" , "Wed" , "Thu" , "Fri" , "Sat"};
static char* month[] = {"Jan" , "Feb" , "Mar" , "Apr" , "May" , "Jun" , "Jul" , "Aug" , "Sep" , "Oct" , "Nov" , "Dec"};
sprintf(buffer,"%s, %02d %s %04d %02d:%02d:%02d %s%02d%2d",week[t.tm_wday],t.tm_mday,month[t.tm_mon],
t.tm_year + 1900,t.tm_hour,t.tm_min,t.tm_sec,t.__tm_gmtoff >= 0? "+":"-",t.__tm_gmtoff / 3600);
// RFC 5322 date-time section 3.3.
strftime(buffer, 32, "%a, %d %b %Y %H:%M:%S %z", &t);

return buffer;
}

Expand Down Expand Up @@ -356,13 +356,16 @@ static int send_mail(struct smtp* sm)
{
pos += sprintf(&header[pos],"To: %s\r\n",sm->to[i]);
}
pos += sprintf(&header[pos],"From: %s<%s>\r\n",sm->user_name,sm->user_name);
pos += sprintf(&header[pos],"From: \"%s\" <%s>\r\n",sm->user_name,sm->user_name);
pos += sprintf(&header[pos],"Subject: %s\r\n",sm->subject);
pos += sprintf(&header[pos],"Message-ID: <%d.%s>\r\n",time(NULL),sm->user_name);

char date[100];
pos += sprintf(&header[pos],"Date: %s\r\n",smtp_time(date));

// Must have blank line after header, before message body.
pos += sprintf(&header[pos],"\r\n");

if(smtp_write(sm->socket,header,pos)) return SMTP_ERROR_WRITE;
if(smtp_write(sm->socket,sm->content,strlen(sm->content))) return SMTP_ERROR_WRITE;
if(smtp_write(sm->socket,"\r\n.\r\n",strlen("\r\n.\r\n"))) return SMTP_ERROR_WRITE;
Expand All @@ -375,7 +378,7 @@ static int send_mail(struct smtp* sm)

static int quit(struct smtp* sm)
{
if(smtp_write(sm->socket,"QUIT \r\n",strlen("QUIT \r\n"))) return SMTP_ERROR_WRITE;
if(smtp_write(sm->socket,"QUIT\r\n",strlen("QUIT\r\n"))) return SMTP_ERROR_WRITE;
if(smtp_read(sm) || strcmp(sm->cmd,"221")) return SMTP_ERROR_READ;

sm->status = SMTP_STATUS_NULL;
Expand Down