Try to connect to mailref1

diff --git a/Makefile.dbg b/Makefile.dbg
index d568c4c46b846475f7c4a031109b2b0bb2c2df45..5906b74c2a3a30d97effccd1f75e45183f346f27 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -52,6 +52,15 @@ onefeed      :  debug
                        $(TESTPORT)                     \
                        ./$(DATATST)/$(ONEFEED).tst
 
+stdsendr:  debug
+          @                                            \
+            ./bin/sender                               \
+                 -d 2                                  \
+                 -c ./conf/mailleur.conf.dvl           \
+                -r $(TESTDIR)                          \
+                  `basename -a $(TESTDIR)/var/spool/$(APPNAME)/queue/*.todo  | \
+                       tr '\\n' ' ' `
+
 onesendr:  debug
           @                                            \
             ./bin/sender                               \
@@ -117,12 +126,16 @@ dbgsortr:  clean debug
                   -c ./conf/mailleur.conf.dvl          \
                   -r $(TESTDIR) 
 
-TODO   =  `basename -a data-sender/*.todo | tr '\\n' ' ' `
+TODO   =  `basename -a                                 \
+          $(TESTDIR)/var/spool/$(APPNAME)/queue/*.todo|\
+           tr '\\n' ' ' `
+
 dbgsendr:  clean debug
           @                                            \
              gdb                                       \
                --args                                  \
                  bin/sender                            \
+                   -f                                  \
                    -d2                                 \
                    -c ./conf/mailleur.conf.dvl         \
                    -r $(TESTDIR)                       \

diff --git a/app/feeder.c b/app/feeder.c
index 7db14c3c1dac5e2f97f6bd0fde9dddfab6e99ee9..6293e10a65baa7192ec1eebfe6ef6a8af8a2dd87 100644 (file)
--- a/app/feeder.c
+++ b/app/feeder.c
@@ -288,7 +288,7 @@ while (proceed==true) {
       if (soc_starttls(socptr,false)==false)  
         phase=999;
       break;
-    case 4      :       //eveythin is fine SOC in crypted mode
+    case 4      :       //everything is fine SOC in crypted mode
       (void) usleep(10000);     //sleep 10 millisec
       status=true;
       break;

diff --git a/conf/mailleur.conf.dvl b/conf/mailleur.conf.dvl
index cffefe9c7baa6698d03d38d1b1a92230487bbd6c..c3b73cb6abb65e33f03bdcf2dea325eae8b6f149 100644 (file)
--- a/conf/mailleur.conf.dvl
+++ b/conf/mailleur.conf.dvl
@@ -27,7 +27,7 @@ CA_VERIFY_SRV =       0       #to check PEER/client remote certificate
 CA_ROOT_CLT    =       "./certs/root-safe_CA.pem"
 CA_CERT_CLT    =       "./certs/localhost-chain-cert.pem"
 CA_KEY_CLT     =       "./certs/localhost-key.pem"
-CA_VERIFY_CLT  =       1       #to check PEER/server remote certificate
+CA_VERIFY_CLT  =       0       #to check PEER/server remote certificate
 #------------------------------------------------
 #Configured for Postgresql database
 DB_TYPE                =       POSTGRESQL

diff --git a/data-feed/feed01.tst b/data-feed/feed01.tst
index 6e368a7140653e725d27aa21f07f3ed7f570997a..002937f2a747ffe441a765d0c17ff999904c9426 100644 (file)
--- a/data-feed/feed01.tst
+++ b/data-feed/feed01.tst
@@ -19,17 +19,17 @@ R:250-ENHANCEDSTATUSCODES
 R:250 AUTH PLAIN LOGIN
 S:MAIL FROM: <postmaster@example.com>
 R:250 2.1.3 postmaster@example.com.. sender ok
-S:RCPT TO: <dom1user1@mailref1.example.com>
-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 <dom1user2@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
+R:250 2.6.4 Address accepted <user2@mailref1.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
 D:Subject: Very Simple email contents
 D:From: Maitre Post <postmaster@example.com>
-D:To: Remote person <dom1user1@mailref1.example.com>
-D:CC: Other person <dom1user2@mailref1.example.com>
+D:To: Remote person <user1@mailref1.example.com>
+D:CC: Other person <user2@mailref1.example.com>
 C:T
 D:
 D:FIRST Line

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index 922c48d52d2b98decceeacbd00cb1671e9d7fcca..c8cd19a7442825159e42fc0ad0dd3dfa5f8a6277 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -7,14 +7,14 @@ S:MAIL FROM: <postmaster@example.com>
 R:250 2.1.3 postmaster@example.com.. sender ok
 S:RCPT TO: <webmaster@example.com>
 R:250 2.6.4 Address accepted <webmaster@example.com>
-S:RCPT TO: <dom1user1@mailref1.example.com>
-R:250 2.6.4 Address accepted <dom1user1@mailref1.example.com>
-S:RCPT TO: <dom2user1@mailleur.example.com>
-R:250 2.6.4 Address accepted <dom2user1@mailleur.example.com>
-S:RCPT TO: <dom1user2@mailref1.example.com>
-R:250 2.6.4 Address accepted <dom1user2@mailref1.example.com>
-S:RCPT TO: <dom2user2@mailleur.example.com>
-R:250 2.6.4 Address accepted <dom2user2@mailleur.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
+S:RCPT TO: <user1@mailleur.example.com>
+R:250 2.6.4 Address accepted <user1@mailleur.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
+R:250 2.6.4 Address accepted <user2@mailref1.example.com>
+S:RCPT TO: <user2@mailleur.example.com>
+R:250 2.6.4 Address accepted <user2@mailleur.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>

diff --git a/data-feed/feed03.tst b/data-feed/feed03.tst
index 648d899ce1975a4b8f6c4a2766de7076a34314be..3c37c46d4a3e3ffd703fcdbf09b87f83a1987f72 100644 (file)
--- a/data-feed/feed03.tst
+++ b/data-feed/feed03.tst
@@ -5,17 +5,17 @@ S:HELO example.com
 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 <dom1user1@mailref1.example.com>
-S:RCPT TO: <dom1user2@mailref1.example.com>
-R:250 2.6.4 Address accepted <dom1user2@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
+R:250 2.6.4 Address accepted <user2@mailref1.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
 D:Subject: feed03 email first part
 D:From: Tester <trouble@mailref1.example.com>
-D:To: A User1 <dom1user1@mailref1.example.com>
-D:Cc: A User2 <dom1user2@mailref1.example.com>
+D:To: A User1 <user1@mailref1.example.com>
+D:Cc: A User2 <user2@mailref1.example.com>
 D:
 D:This email was transmitted by feed03 first session
 C:.
@@ -33,17 +33,17 @@ S:HELO example.com
 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 <dom1user2@mailref1.example.com>
-S:RCPT TO: <dom1user1@mailref1.example.com>
-R:250 2.6.4 Address accepted <dom1user1@mailref1.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
+R:250 2.6.4 Address accepted <user2@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
 D:Subject: feed03 email second part
 D:From: Tester <trouble@mailref1.example.com>
-D:To: A User1 <dom1user1@mailref1.example.com>
-D:Cc: A User2 <dom1user2@mailref1.example.com>
+D:To: A User1 <user1@mailref1.example.com>
+D:Cc: A User2 <user2@mailref1.example.com>
 D:
 D:This email was transmitted by feed03 second session
 C:.

diff --git a/data-feed/feed10.tst b/data-feed/feed10.tst
index 123781a70969ff53cd38c8e80e8b985f0f1b72c7..e8d087fee209ae4778adc8ae4e265d90e411ce76 100644 (file)
--- a/data-feed/feed10.tst
+++ b/data-feed/feed10.tst
@@ -7,10 +7,10 @@ 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: <dom1user1@subdom0.example.com>
+S:RCPT TO: <user1@subdom0.example.com>
 R:563 5.6.3 No valid MX found for recipient domain name (domain=subdom0.example.com)
-S:RCPT TO: <dom1user1@mailref1.example.com>
-R:250 2.6.4 Address accepted <dom1user1@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
+R:250 2.6.4 Address accepted <user1@mailref1.example.com>
 S:QUIT
 R:221 2.0.0 Bye, closing connection...
 #-------------------------------------------------------------------------

diff --git a/data-feed/feed11.tst b/data-feed/feed11.tst
index b4f77c14bb3cef1b8780f6432a236b8787e08a5c..79152b37021bdf097d484f61a9141faf35a77439 100644 (file)
--- a/data-feed/feed11.tst
+++ b/data-feed/feed11.tst
@@ -24,8 +24,8 @@ S:RCPT TO: <dom1user3@example.com>
 R:250 2.6.4 Address accepted <dom1user3@example.com>
 S:RCPT TO: <dom1user3@mailref1.example.com>
 R:250 2.6.4 Address accepted <dom1user3@mailref1.example.com>
-S:RCPT TO: <dom1user1@mailleur.example.com>
-R:250 2.6.4 Address accepted <dom1user1@mailleur.example.com>
+S:RCPT TO: <user1@mailleur.example.com>
+R:250 2.6.4 Address accepted <user1@mailleur.example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>

diff --git a/data-feed/feed12.tst b/data-feed/feed12.tst
index 9c8f871684f4eb4061ceca463814adc3ee9a0ad5..803244a93f324b2ed1fc9ac66cb8013748cc8c56 100644 (file)
--- a/data-feed/feed12.tst
+++ b/data-feed/feed12.tst
@@ -6,7 +6,7 @@ S:HELO example.com
 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@subdom0.example.com>
+S:RCPT TO: <user1@subdom0.example.com>
 R:563 5.6.3 No valid MX found for recipient domain name (domain=subdom0.example.com)
 #-------------------------------------------------------------------------
 #-sending data

diff --git a/data-feed/xxfeed.tst b/data-feed/xxfeed.tst
index e8c974636de1dbb7cdb3eaa3cc2eb7668f624dde..6e4a4493dacb7c8bcd86e6e3c0a7ca2cb4d16cbe 100644 (file)
--- a/data-feed/xxfeed.tst
+++ b/data-feed/xxfeed.tst
@@ -16,11 +16,11 @@ S:MAIL FROM: <postmaster@example.com>
 R:250 2.1.3 postmaster@example.com.. sender ok
 S:RCPT TO: <webmaster@example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom1user1@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user1@mailleur.example.com>
+S:RCPT TO: <user1@mailleur.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user2@mailleur.example.com>
+S:RCPT TO: <user2@mailleur.example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
@@ -52,13 +52,13 @@ C:RESTART
 R:220 mailleur.example.com ESMTP (cleartext) mailleur...
 S:MAIL FROM: <webmaster@example.com>
 R:250 2.1.3 webmaster@example.com.. sender ok
-S:RCPT TO: <dom1user1@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom1user2@mailref1.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user1@mailleur.example.com>
+S:RCPT TO: <user1@mailleur.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user2@mailleur.example.com>
+S:RCPT TO: <user2@mailleur.example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
@@ -83,13 +83,13 @@ C:RESTART
 R:220 mailleur.example.com ESMTP (cleartext) mailleur...
 S:MAIL FROM: <noreply@example.com>
 R:250 2.1.3 noreply@example.com.. sender ok
-S:RCPT TO: <dom1user1@mailref1.example.com>
+S:RCPT TO: <user1@mailref1.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom1user2@mailref1.example.com>
+S:RCPT TO: <user2@mailref1.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user1@mailleur.example.com>
+S:RCPT TO: <user1@mailleur.example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user2@mailleur.example.com>
+S:RCPT TO: <user2@mailleur.example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data

diff --git a/lib/gestcp.c b/lib/gestcp.c
index 04311890cc8467d4744299499a53f89198bf88fa..342b06b3854a297c76ae42a687dc746a2b8d4f6d 100644 (file)
--- a/lib/gestcp.c
+++ b/lib/gestcp.c
@@ -158,13 +158,13 @@ int maxlines;
 code=ERRPROC;
 maxlines=20;     //maximun number of line error
 if (debug>0)
-  wait/=10;     //debug mode not waiting form long
+  wait/=10;     //debug mode not waiting for long
 while (maxlines>0) {
   char *line;
   int sofar;
   
   line=(char *)0;
-  if (tcp_getline(rmt->socptr,wait,&line)<0) {
+  if (tcp_getline(rmt->socptr,wait,&line)<=0) {
     char cmt[100]; 
 
     (void) snprintf(cmt,sizeof(cmt),"%d Timeout waiting '%d' sec for MX <%s>",
@@ -205,8 +205,9 @@ va_list args;
 char strloc[300];
 
 va_start(args,fmt);
-(void) vsnprintf(strloc,sizeof(strloc),fmt,args);
+(void) vsnprintf(strloc,sizeof(strloc)-4,fmt,args);
 va_end(args);
+(void) strcat(strloc,CRLF);
 (void) tcp_write(rmt->socptr,strloc);
 (void) log_fprintlog(rmt->logptr,false,strloc);
 return tcp_get_smtp_reply(rmt,WAITRMT,resp);