From e785a37f3e565aac29b87afac32f571a4e0ff247 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Fri, 20 Jun 2025 11:31:06 -0400 Subject: [PATCH] Try to connect to mailref1 --- Makefile.dbg | 15 ++++++++++++++- app/feeder.c | 2 +- conf/mailleur.conf.dvl | 2 +- data-feed/feed01.tst | 12 ++++++------ data-feed/feed02.tst | 16 ++++++++-------- data-feed/feed03.tst | 24 ++++++++++++------------ data-feed/feed10.tst | 6 +++--- data-feed/feed11.tst | 4 ++-- data-feed/feed12.tst | 2 +- data-feed/xxfeed.tst | 22 +++++++++++----------- lib/gestcp.c | 7 ++++--- 11 files changed, 63 insertions(+), 49 deletions(-) diff --git a/Makefile.dbg b/Makefile.dbg index d568c4c..5906b74 100644 --- 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 7db14c3..6293e10 100644 --- 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 cffefe9..c3b73cb 100644 --- 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 6e368a7..002937f 100644 --- 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: R:250 2.1.3 postmaster@example.com.. sender ok -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . D:Subject: Very Simple email contents D:From: Maitre Post -D:To: Remote person -D:CC: Other person +D:To: Remote person +D:CC: Other person C:T D: D:FIRST Line diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst index 922c48d..c8cd19a 100644 --- a/data-feed/feed02.tst +++ b/data-feed/feed02.tst @@ -7,14 +7,14 @@ S:MAIL FROM: R:250 2.1.3 postmaster@example.com.. sender ok S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . diff --git a/data-feed/feed03.tst b/data-feed/feed03.tst index 648d899..3c37c46 100644 --- 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: R:250 2.1.3 trouble@mailref1.example.com.. sender ok -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . D:Subject: feed03 email first part D:From: Tester -D:To: A User1 -D:Cc: A User2 +D:To: A User1 +D:Cc: A User2 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: R:250 2.1.3 trouble@mailref1.example.com.. sender ok -S:RCPT TO: -R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . D:Subject: feed03 email second part D:From: Tester -D:To: A User1 -D:Cc: A User2 +D:To: A User1 +D:Cc: A User2 D: D:This email was transmitted by feed03 second session C:. diff --git a/data-feed/feed10.tst b/data-feed/feed10.tst index 123781a..e8d087f 100644 --- 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: R:250 2.1.3 postmaster@example.com.. sender ok -S:RCPT TO: +S:RCPT TO: R:563 5.6.3 No valid MX found for recipient domain name (domain=subdom0.example.com) -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted S:QUIT R:221 2.0.0 Bye, closing connection... #------------------------------------------------------------------------- diff --git a/data-feed/feed11.tst b/data-feed/feed11.tst index b4f77c1..79152b3 100644 --- a/data-feed/feed11.tst +++ b/data-feed/feed11.tst @@ -24,8 +24,8 @@ S:RCPT TO: R:250 2.6.4 Address accepted S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: -R:250 2.6.4 Address accepted +S:RCPT TO: +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . diff --git a/data-feed/feed12.tst b/data-feed/feed12.tst index 9c8f871..803244a 100644 --- 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: R:250 2.1.3 trouble@mailref1.example.com.. sender ok -S:RCPT TO: +S:RCPT TO: 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 e8c9746..6e4a449 100644 --- a/data-feed/xxfeed.tst +++ b/data-feed/xxfeed.tst @@ -16,11 +16,11 @@ S:MAIL FROM: R:250 2.1.3 postmaster@example.com.. sender ok S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: 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: R:250 2.1.3 webmaster@example.com.. sender ok -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: 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: R:250 2.1.3 noreply@example.com.. sender ok -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted -S:RCPT TO: +S:RCPT TO: R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data diff --git a/lib/gestcp.c b/lib/gestcp.c index 0431189..342b06b 100644 --- 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); -- 2.47.3