working on transaction information improvement

diff --git a/conf/mailleur.conf b/conf/mailleur.conf
index c4d36921aa613bbec5b620d90b305e3ce85b01ed..aa5806ed772dc3cb270761dac446021b00e38082 100644 (file)
--- a/conf/mailleur.conf
+++ b/conf/mailleur.conf
@@ -21,11 +21,11 @@ REALM="mailleur-email"
 #|ipnum|||             -> smtp|ipnum|25|2
 #||,smtps||465|2       -> smtp|0.0.0.0|25|2 + smtps||465|2
 #||                    -> smtp|0.0.0.0|25|2
-#Examples
-#SMTPPORTS="|127.127.10.25|1025|,smtps|127.127.10.25|1026|1"
+#Examples for test purpose
+#SMTPPORTS="|127.127.10.25|1025|,smtps|127.127.10.25|1465|1"
 #SMTPPORTS="|127.127.10.25|1025|"
-#SMTPPORTS="smtps|127.127.10.25|1065|1"
-#Defaults
+#SMTPPORTS="smtps|127.127.10.25|1465|1"
+#Defaults (production)
 SMTPPORTS="|||5,smtps||465|3,smtp||587|2"
 #------------------------------------------------
 #SSL Security level default value

diff --git a/data-feed/feed30.tst b/data-feed/feed30.tst
new file mode 100644 (file)
index 0000000..e370b7d
--- /dev/null
+++ b/data-feed/feed30.tst
@@ -0,0 +1,34 @@
+#very simple  test to feed SMTP server
+#====================================================
+T:(feed30) Testing a simple email
+C:CONNECT
+R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
+#====================================================
+S:HELO example.com
+R:250 mailleur.example.com, link (cleartext) ready,...
+S:MAIL FROM: <postmaster@example.com>
+R:250 2.1.3 postmaster@example.com sender ok
+S:RCPT TO: <root@example.com>
+R:250 2.6.4 Address accepted <root@example.com>
+S:RCPT TO: <jmp@example.com>
+R:250 2.6.4 Address accepted <jmp@example.com>
+#-------------------------------------------------------------------------
+#-sending data
+C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
+D:Subject: (feed030) Very Simple email contents
+C:T
+D:From: Maitre Post <postmaster@example.com>
+D:To: Big Master <root@example.com>
+D:
+D:this email is for local test purpose only
+D:and test log display
+D:
+C:.
+#-------------------------------------------------------------------------
+R:250-3.5.3 Session ID=<...
+R:250-3.5.3 data stream received:...
+R:250 3.5.3 Message accepted for delivery
+#-------------------------------------------------------------------------
+S:QUIT
+R:221 2.0.0 Bye, closing connection...
+#-------------------------------------------------------------------------

diff --git a/sql/mailleur.sql b/sql/mailleur.sql
index 8222e5e899fe75cf763fc5f44d0334db0bee4ff6..1d6ce229b9a6cae53ee533cca0770efb65a6bf8d 100644 (file)
--- a/sql/mailleur.sql
+++ b/sql/mailleur.sql
@@ -95,7 +95,10 @@ CREATE TABLE actions (
                        DFLT NOW(),
        code            SHORTTEXT,      //action status (one char)
        sessid          TEXT,           //Session id
-       rcptto          text,           //Recipient status
+       smtpfrom        TEXT,           //SMTP Connection "MAIL FROM:"
+       rcptto          TEXT,           //SMTP Connection "RCPT TO:"
+       emailfrom       TEXT,           //email contents "From:"
+       subject         TEXT,           //email contents "Subject:"
        numline         INTEGER,        //status line
        info            TEXT            //line info
        );