feed00->feed03 accepted by receiver

diff --git a/Makefile.dbg b/Makefile.dbg
index 718f99853a2f53532e89d7e5e72135a607bb6879..d568c4c46b846475f7c4a031109b2b0bb2c2df45 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -23,6 +23,11 @@ EMLPAR       =                                               \
 #====================================================================
 #area to start components receiver,sorter,sender once at a time
 #--------------------------------------------------------------------
+stdrcvr        :  clean debug
+          @                                            \
+            ./bin/receiver                             \
+               $(EMLPAR)$(TESTITER)
+
 gorcvr :  clean debug
           @                                            \
             ./bin/receiver                             \

diff --git a/app/feeder.c b/app/feeder.c
index 20aa44f9bbc1d47771ec19a1c95a5e8009b4fb3c..7db14c3c1dac5e2f97f6bd0fde9dddfab6e99ee9 100644 (file)
--- a/app/feeder.c
+++ b/app/feeder.c
@@ -289,6 +289,7 @@ while (proceed==true) {
         phase=999;
       break;
     case 4      :       //eveythin is fine SOC in crypted mode
+      (void) usleep(10000);     //sleep 10 millisec
       status=true;
       break;
     default     :       //SAFE Guard

diff --git a/data-feed/feed00.tst b/data-feed/feed00.tst
index 18eff56be55b007df36d8d4b6494e55fee718653..79d74eefdda6a5827df9a5eda81d93c5e04747e5 100644 (file)
--- a/data-feed/feed00.tst
+++ b/data-feed/feed00.tst
@@ -55,7 +55,9 @@ D:end
 D:ligne court|
 C:.
 #-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery (Session...
+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/data-feed/feed01.tst b/data-feed/feed01.tst
index 4e617f846d6ddab12ef3d412bf177b96fd65fcb3..6e368a7140653e725d27aa21f07f3ed7f570997a 100644 (file)
--- a/data-feed/feed01.tst
+++ b/data-feed/feed01.tst
@@ -11,7 +11,6 @@ R:250-8BITMIME
 R:250-ENHANCEDSTATUSCODES
 R:250 AUTH PLAIN LOGIN
 C:GOTLS
-C:WAIT 1
 S:EHLO example.com
 R:250-mailleur.example.com, link (crypted) ready,...
 R:250-SIZE 52428800

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index 0007c32426a9519d0ac7e4a409d71ffee0616040..922c48d52d2b98decceeacbd00cb1671e9d7fcca 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -25,6 +25,8 @@ D:
 D:This email is sent to 2 domain X 2 users
 C:.
 #-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery...
+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/data-feed/feed03.tst b/data-feed/feed03.tst
index ed0aee24b49ef15d2bc0792f214b5e3ac8fa52f1..648d899ce1975a4b8f6c4a2766de7076a34314be 100644 (file)
--- a/data-feed/feed03.tst
+++ b/data-feed/feed03.tst
@@ -6,9 +6,9 @@ R:250 mailleur.example.com, link (cleartext) ready,...
 S:MAIL FROM: <trouble@mailref1.example.com>
 R:250 2.1.3 trouble@mailref1.example.com.. sender ok
 S:RCPT TO: <dom1user1@mailref1.example.com>
-R:250 2.6.4 Address accepted
+R:250 2.6.4 Address accepted <dom1user1@mailref1.example.com>
 S:RCPT TO: <dom1user2@mailref1.example.com>
-R:250 2.6.4 Address accepted
+R:250 2.6.4 Address accepted <dom1user2@mailref1.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
@@ -20,7 +20,9 @@ D:
 D:This email was transmitted by feed03 first session
 C:.
 #-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery...
+R:250-3.5.3 Session ID=<...
+R:250-3.5.3 data stream received:...
+R:250 3.5.3 Message accepted for delivery
 #=========================================================================
 #Testing Reset sequence
 S:RSET
@@ -32,9 +34,9 @@ R:250 mailleur.example.com, link (cleartext) ready,...
 S:MAIL FROM: <trouble@mailref1.example.com>
 R:250 2.1.3 trouble@mailref1.example.com.. sender ok
 S:RCPT TO: <dom1user2@mailref1.example.com>
-R:250 2.6.4 Address accepted
+R:250 2.6.4 Address accepted <dom1user2@mailref1.example.com>
 S:RCPT TO: <dom1user1@mailref1.example.com>
-R:250 2.6.4 Address accepted
+R:250 2.6.4 Address accepted <dom1user1@mailref1.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
@@ -46,7 +48,9 @@ D:
 D:This email was transmitted by feed03 second session
 C:.
 #-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery...
+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...