Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | The test-smtp-probe command is now working. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | smtp |
Files: | files | file ages | folders |
SHA3-256: |
9281d52a91d8d2fb15d42437195e8b55 |
User & Date: | drh 2018-06-28 17:15:48.399 |
Context
2018-06-28
| ||
21:38 | Add the smtp_send_msg() function capable of encoding and sending a complete email message. ... (check-in: 03888604 user: drh tags: smtp) | |
17:15 | The test-smtp-probe command is now working. ... (check-in: 9281d52a user: drh tags: smtp) | |
15:23 | Incremental check-in of initial code for client-side SMTP. Does not work. ... (check-in: 20006a86 user: drh tags: smtp) | |
Changes
Changes to src/http_socket.c.
︙ | ︙ | |||
205 206 207 208 209 210 211 212 | pContent = (void*)&((char*)pContent)[sent]; } return total; } /* ** Receive content back from the open socket connection. */ | > > > > | > | | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | pContent = (void*)&((char*)pContent)[sent]; } return total; } /* ** Receive content back from the open socket connection. ** Return the number of bytes read. ** ** When bDontBlock is false, this function blocks until all N bytes ** have been read. */ size_t socket_receive(void *NotUsed, void *pContent, size_t N, int bDontBlock){ ssize_t got; size_t total = 0; int flags = bDontBlock ? MSG_DONTWAIT : 0; while( N>0 ){ /* WinXP fails for large values of N. So limit it to 64KiB. */ got = recv(iSocket, pContent, N>65536 ? 65536 : N, flags); if( got<=0 ) break; total += (size_t)got; N -= (size_t)got; pContent = (void*)&((char*)pContent)[got]; } return total; } |
︙ | ︙ |
Changes to src/http_transport.c.
︙ | ︙ | |||
323 324 325 326 327 328 329 | got = ssl_receive(0, zBuf, N); #else got = 0; #endif }else if( pUrlData->isFile ){ got = fread(zBuf, 1, N, transport.pFile); }else{ | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | got = ssl_receive(0, zBuf, N); #else got = 0; #endif }else if( pUrlData->isFile ){ got = fread(zBuf, 1, N, transport.pFile); }else{ got = socket_receive(0, zBuf, N, 0); } /* printf("received %d of %d bytes\n", got, N); fflush(stdout); */ if( transport.pLog ){ fwrite(zBuf, 1, got, transport.pLog); fflush(transport.pLog); } return got; |
︙ | ︙ |
Changes to src/smtp.c.
︙ | ︙ | |||
115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | const char *zFrom; /* Domain from which we are sending */ const char *zDest; /* Domain that will receive the email */ char *zHostname; /* Hostname of SMTP server for zDest */ u32 smtpFlags; /* Flags changing the operation */ FILE *logFile; /* Write session transcript to this log file */ Blob *pTranscript; /* Record session transcript here */ const char *zLabel; /* Either "CS" or "SC" */ char *zErr; /* Error message */ }; /* Allowed values for SmtpSession.smtpFlags */ #define SMTP_TRACE_STDOUT 0x00001 /* Debugging info to console */ #define SMTP_TRACE_FILE 0x00002 /* Debugging info to logFile */ #define SMTP_TRACE_BLOB 0x00004 /* Record transcript */ #endif /* ** Shutdown an SmtpSession */ void smtp_session_free(SmtpSession *pSession){ socket_close(); fossil_free(pSession->zHostname); fossil_free(pSession->zErr); fossil_free(pSession); } /* ** Allocate a new SmtpSession object. | > > > | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | const char *zFrom; /* Domain from which we are sending */ const char *zDest; /* Domain that will receive the email */ char *zHostname; /* Hostname of SMTP server for zDest */ u32 smtpFlags; /* Flags changing the operation */ FILE *logFile; /* Write session transcript to this log file */ Blob *pTranscript; /* Record session transcript here */ const char *zLabel; /* Either "CS" or "SC" */ int atEof; /* True after connection closes */ char *zErr; /* Error message */ Blob inbuf; /* Input buffer */ }; /* Allowed values for SmtpSession.smtpFlags */ #define SMTP_TRACE_STDOUT 0x00001 /* Debugging info to console */ #define SMTP_TRACE_FILE 0x00002 /* Debugging info to logFile */ #define SMTP_TRACE_BLOB 0x00004 /* Record transcript */ #endif /* ** Shutdown an SmtpSession */ void smtp_session_free(SmtpSession *pSession){ socket_close(); blob_zero(&pSession->inbuf); fossil_free(pSession->zHostname); fossil_free(pSession->zErr); fossil_free(pSession); } /* ** Allocate a new SmtpSession object. |
︙ | ︙ | |||
157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | p = fossil_malloc( sizeof(*p) ); memset(p, 0, sizeof(*p)); p->zFrom = zFrom; p->zDest = zDest; p->zLabel = zDest==0 ? "CS" : "SC"; p->smtpFlags = smtpFlags; va_start(ap, smtpFlags); if( smtpFlags & SMTP_TRACE_FILE ){ p->logFile = va_arg(ap, FILE*); }else if( smtpFlags & SMTP_TRACE_BLOB ){ p->pTranscript = va_arg(ap, Blob*); } va_end(ap); p->zHostname = smtp_mx_host(zDest); if( p->zHostname==0 ){ p->zErr = mprintf("cannot locate SMTP server for \"%s\"", zDest); return p; } memset(&url, 0, sizeof(url)); url.name = p->zHostname; url.port = 25; socket_global_init(); if( socket_open(&url) ){ p->zErr = socket_errmsg(); socket_close(); } return p; } /* ** Send a single line of output the SMTP client to the server. */ static void smtp_send_line(SmtpSession *p, const char *zFormat, ...){ Blob b = empty_blob; va_list ap; char *z; int n; va_start(ap, zFormat); blob_vappendf(&b, zFormat, ap); va_end(ap); z = blob_buffer(&b); n = blob_size(&b); assert( n>=2 ); assert( z[n-1]=='\n' ); | > > > > | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 | p = fossil_malloc( sizeof(*p) ); memset(p, 0, sizeof(*p)); p->zFrom = zFrom; p->zDest = zDest; p->zLabel = zDest==0 ? "CS" : "SC"; p->smtpFlags = smtpFlags; blob_init(&p->inbuf, 0, 0); va_start(ap, smtpFlags); if( smtpFlags & SMTP_TRACE_FILE ){ p->logFile = va_arg(ap, FILE*); }else if( smtpFlags & SMTP_TRACE_BLOB ){ p->pTranscript = va_arg(ap, Blob*); } va_end(ap); p->zHostname = smtp_mx_host(zDest); if( p->zHostname==0 ){ p->atEof = 1; p->zErr = mprintf("cannot locate SMTP server for \"%s\"", zDest); return p; } memset(&url, 0, sizeof(url)); url.name = p->zHostname; url.port = 25; socket_global_init(); if( socket_open(&url) ){ p->atEof = 1; p->zErr = socket_errmsg(); socket_close(); } return p; } /* ** Send a single line of output the SMTP client to the server. */ static void smtp_send_line(SmtpSession *p, const char *zFormat, ...){ Blob b = empty_blob; va_list ap; char *z; int n; if( p->atEof ) return; va_start(ap, zFormat); blob_vappendf(&b, zFormat, ap); va_end(ap); z = blob_buffer(&b); n = blob_size(&b); assert( n>=2 ); assert( z[n-1]=='\n' ); |
︙ | ︙ | |||
210 211 212 213 214 215 216 | blob_appendf(p->pTranscript, "%c: %.*s\n", p->zLabel[1], n-2, z); } socket_send(0, z, n); blob_zero(&b); } /* | | | > > > | < | > > > > > > > > > > > > | | | | | > | | > > > > > > > > > > > > > > | > > > | | > | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | blob_appendf(p->pTranscript, "%c: %.*s\n", p->zLabel[1], n-2, z); } socket_send(0, z, n); blob_zero(&b); } /* ** Read a line of input received from the SMTP server. Make in point ** to the next input line. ** ** Content is actually read into the p->in buffer. Then blob_line() ** is used to extract individual lines, passing each to "in". */ static void smtp_recv_line(SmtpSession *p, Blob *in){ int n = blob_size(&p->inbuf); char *z = blob_buffer(&p->inbuf); int i = blob_tell(&p->inbuf); int nDelay = 0; if( i<n && z[n-1]=='\n' ){ blob_line(&p->inbuf, in); }else if( p->atEof ){ blob_init(in, 0, 0); }else{ if( n>0 && i>=n ){ blob_truncate(&p->inbuf, 0); blob_rewind(&p->inbuf); n = 0; } do{ size_t got; blob_resize(&p->inbuf, n+1000); z = blob_buffer(&p->inbuf); got = socket_receive(0, z+n, 1000, 1); if( got>0 ){ in->nUsed += got; n += got; z[n] = 0; if( n>0 && z[n-1]=='\n' ) break; if( got==1000 ) continue; } nDelay++; if( nDelay>100 ){ blob_init(in, 0, 0); p->zErr = mprintf("timeout"); socket_close(); p->atEof = 1; return; }else{ sqlite3_sleep(25); } }while( n<1 || z[n-1]!='\n' ); blob_truncate(&p->inbuf, n); blob_line(&p->inbuf, in); } z = blob_buffer(in); n = blob_size(in); if( n && z[n-1]=='\n' ) n--; if( n && z[n-1]=='\r' ) n--; if( p->smtpFlags & SMTP_TRACE_STDOUT ){ fossil_print("%c: %.*s\n", p->zLabel[0], n, z); } if( p->smtpFlags & SMTP_TRACE_FILE ){ fprintf(p->logFile, "%c: %.*s\n", p->zLabel[0], n, z); } |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 | static void smtp_get_reply_from_server( SmtpSession *p, /* The SMTP connection */ Blob *in, /* Buffer used to hold the reply */ int *piCode, /* The return code */ int *pbMore, /* True if the reply is not complete */ char **pzArg /* Argument */ ){ blob_truncate(in, 0); smtp_recv_line(p, in); | > > > > > | | | > > > > > | 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | static void smtp_get_reply_from_server( SmtpSession *p, /* The SMTP connection */ Blob *in, /* Buffer used to hold the reply */ int *piCode, /* The return code */ int *pbMore, /* True if the reply is not complete */ char **pzArg /* Argument */ ){ int n; char *z; blob_truncate(in, 0); smtp_recv_line(p, in); z = blob_str(in); n = blob_size(in); if( z[0]=='#' ){ *piCode = 0; *pbMore = 1; *pzArg = z; }else{ *piCode = atoi(z); *pbMore = n>=4 && z[3]=='-'; *pzArg = n>=4 ? z+4 : ""; } } /* ** Have the client send a QUIT message. */ int smtp_client_quit(SmtpSession *p){ Blob in = BLOB_INITIALIZER; |
︙ | ︙ | |||
304 305 306 307 308 309 310 | } return 0; } /* ** COMMAND: test-smtp-probe ** | | < > > | | > > | | | < > > > | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | } return 0; } /* ** COMMAND: test-smtp-probe ** ** Usage: %fossil test-smtp-probe DOMAIN [ME] ** ** Interact with the SMTP server for DOMAIN by setting up a connection ** and then immediately shutting it back down. Log all interaction ** on the console. Use ME as the domain name of the sender. */ void test_smtp_probe(void){ SmtpSession *p; int rc; const char *zDomain; const char *zSelf; if( g.argc!=3 && g.argc!=4 ) usage("DOMAIN [ME]"); zDomain = g.argv[2]; zSelf = g.argc==4 ? g.argv[3] : "fossil-scm.org"; p = smtp_session_new(zSelf, zDomain, SMTP_TRACE_STDOUT); if( p->zErr ){ fossil_fatal("%s", p->zErr); } fossil_print("Connection to \"%s\"\n", p->zHostname); rc = smtp_client_startup(p); if( !rc ) smtp_client_quit(p); if( p->zErr ){ fossil_fatal("ERROR: %s\n", p->zErr); } smtp_session_free(p); } |