X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=lambdamail.scm;h=bcd7a7e9da343629f8e0545c8d3217898fc0820f;hb=c86d9ff9b19f1e88eed83a73704bb210f77d58de;hp=683781e9ae0e96b462ca058a12ed138f82be9cc2;hpb=2d92632d54049b81988e5eabb849eaa4b2248830;p=lambdamail.git

diff --git a/lambdamail.scm b/lambdamail.scm
index 683781e..bcd7a7e 100644
--- a/lambdamail.scm
+++ b/lambdamail.scm
@@ -23,7 +23,7 @@
 (define (make-empty-message) (make-message "" "" "" "" ""))
 
 (define (time-stamp)
-  (time->string (seconds->local-time "%d %b %Y %T %z")))
+  (time->string (seconds->local-time) "%d %b %Y %T %z"))
 
 
 ;;; Server initialization
@@ -75,15 +75,18 @@
 
 (define (make-smtp-session in-port out-port config)
   (let ((user "")
-        (password ""))
+        (password "")
+        (helo ""))
     (lambda command
       (match command
         (('get-line) (read-line in-port))
         (('send strings ...) (write-line (conc (apply conc strings) "\r") out-port))
         (('set-user! u) (set! user u))
         (('set-password! p) (set! password p))
+        (('set-helo! h) (set! helo h))
         (('user) user)
-        (('password) password)))))
+        (('password) password)
+        (('helo) helo)))))
 
 (define (smtp-command? cmd-string input-string)
   (string-prefix? cmd-string (string-downcase input-string)))
@@ -94,7 +97,7 @@
       ""))
 
 (define (process-smtp smtp-session config)
-  (smtp-session 'send "220 " (config-host config) lambdamail-version)
+  (smtp-session 'send "220 " (config-host config) " " lambdamail-version)
   (let loop ((msg (make-empty-message))
              (received-messages '()))
     (let ((line (smtp-session 'get-line)))
@@ -102,9 +105,11 @@
         (print "got " line)
         (cond
          ((smtp-command? "helo" line)
+          (smtp-session 'set-helo! (smtp-command-args "helo" line))
           (smtp-session 'send "250 ok")
           (loop msg received-messages))
          ((smtp-command? "ehlo" line)
+          (smtp-session 'set-helo! (smtp-command-args "helo" line))
           (smtp-session 'send
                         "250-" (config-host config)
                         " Hello " (smtp-command-args "ehlo" line))
@@ -132,10 +137,10 @@
           (loop msg received-messages))
          ((smtp-command? "data" line)
           (smtp-session 'send "354 intermediate")
-          (let text-loop ((text (conc "Received: from " (smtp-session 'helo)
-                                      " by " (config-host)
-                                      " for " (message-from msg)
-                                      "; " (time-stamp))))
+          (let text-loop ((text (conc "Received: from " (smtp-session 'helo) "\n"
+                                      "   by " (config-host config) "\n"
+                                      "   for " (message-from msg)
+                                      "; " (time-stamp) "\n")))
             (let ((text-line (smtp-session 'get-line)))
               (if (string=? "." text-line)
                   (message-text-set! msg text)
@@ -158,7 +163,8 @@
 ;;
 
 (define (deliver-messages config messages)
-  (print "Attempting delivery of " (length messages) " mail items.")
+  (print "\n"
+         "**** Attempting delivery of " (length messages) " mail items.")
   (filter (lambda (msg) (not (deliver-message msg config)))
           messages))
 
@@ -171,7 +177,7 @@
           (cond
            (dest
             (let ((dest-dir (cadr dest)))
-              (deliver-message-local msg dest-file))
+              (deliver-message-local msg dest-dir))
             (print "Message DELIVERED (local):"))
            (orig
             (let ((password (caddr orig)))
@@ -183,9 +189,9 @@
                   (begin
                     (deliver-message-remote msg config)
                     (print "Message DELIVERED (remote):"))
-                  (print "Message DELIVERY REJECTED (auth failure):"))))
+                  (print "Message REMOTE DELIVERY REJECTED (auth failure):"))))
            (else
-            (print "Message DELIVERY REJECTED (relay forbidden):"))))
+            (print "Message REMOTE DELIVERY REJECTED (relay forbidden):"))))
         (print " * From: " (message-from msg))
         (print " * To: " (message-to msg))
         #t)
@@ -222,7 +228,7 @@
 (define (deliver-message-remote msg config)
   (let ((host (get-host-from-email (message-to msg))))
     (print "Attempting delivery to host " host)
-    (let-values (((tcp-in tcp-out) (tcp-connect host 2525)))
+    (let-values (((tcp-in tcp-out) (tcp-connect host 25)))
       (let ((smtp-session (make-outgoing-smtp-session tcp-in tcp-out)))
         (let ((result (and
                        (smtp-session 'expect "220")
@@ -249,7 +255,9 @@
        (print "Expecting " code " got " result)
        (string-prefix? code result)))
     (('send strings ...)
-     (print "Sending " (car strings) (if (> (length strings) 1) " ... (truncated)" ""))
+     (print "Sending " (if (> (string-length (car strings)) 30)
+                           (string-take (car strings) 30)
+                           (car strings)))
      (let ((processed-string
             (string-translate* (conc (apply conc strings) "\n")
                                '(("\n" . "\r\n")))))