(chicken sort)
srfi-1 srfi-13 matchable base64)
-(define lambdamail-version "LambdaMail v1.1.0")
+(define lambdamail-version "LambdaMail v1.3.0")
(define-record config host port spool-dir user group)
(define-record message to from text user password)
(smtp-session 'expect "354")
(smtp-session 'send (message-text msg))
(smtp-session 'send ".")
- (smtp-session 'expect "250")
+ (smtp-session 'expect "250" "5") ;Do not try again on rejects.
(smtp-session 'send "quit"))))
(close-input-port tcp-in)
(close-output-port tcp-out)
(print "* REMOTE DELIVERY FAILED (unexpected server response)"))
result)))))
+(define (or-list l)
+ (fold (lambda (a b) (or a b)) #f l))
+
(define ((make-outgoing-smtp-session tcp-in tcp-out) . command)
(match command
- (('expect code)
- (let ((result (read-line tcp-in)))
- (print "Expecting " code " got " result)
- (string-prefix? code result)))
+ (('expect codes ...)
+ (let loop ((result (read-line tcp-in)))
+ (if (and (> (string-length result) 3)
+ (eq? (string-ref result 3) #\-))
+ (loop (read-line tcp-in)) ;status continues on next line
+ (begin
+ (print "Expecting one of " codes " got " result)
+ (or-list (map (lambda (code)
+ (string-prefix? code result))
+ codes))))))
(('send strings ...)
(print "Sending " (if (> (string-length (car strings)) 30)
(string-take (car strings) 30)
(main)
;; (define (test)
-;; (run-server (make-config "localhost" 2525 "spool" '() '())))
+ ;; (run-server (make-config "localhost" 2525 "spool" '() '())))