From 42026fbc114f47656cff655b4c37644e9febd45f Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Thu, 8 May 2025 05:52:21 -0400 Subject: [PATCH] Change test directory organisation --- Makefile | 7 ++++--- app/feeder.c | 7 +++---- {data-tst => data-feed}/extfeed00.tst | 0 {data-tst => data-feed}/feed00.tst | 0 data-feed/feed01.tst | 26 ++++++++++++++++++++++++ {data-tst => data-feed}/xxfeed.tst | 2 +- {data-tst => data-feed}/zone.example.com | 0 {data-tst => data-spf}/spf.tst | 0 lib/unitls.c | 4 ++-- 9 files changed, 36 insertions(+), 10 deletions(-) rename {data-tst => data-feed}/extfeed00.tst (100%) rename {data-tst => data-feed}/feed00.tst (100%) create mode 100644 data-feed/feed01.tst rename {data-tst => data-feed}/xxfeed.tst (96%) rename {data-tst => data-feed}/zone.example.com (100%) rename {data-tst => data-spf}/spf.tst (100%) diff --git a/Makefile b/Makefile index c31db87..6f1607e 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ clean : #-------------------------------------------------------------------- #test area sub directory SBINDIR = usr/sbin -DATATST = data-tst +DATATST = data-feed LOCKDIR = $(TESTDIR)/var/run/$(APPNAME) #managing debugging test @@ -218,11 +218,12 @@ killall : #-------------------------------------------------------------------- #test procedure #-------------------------------------------------------------------- +#testing SPF fonction tstspf : clean debug - @ shell/test-spf.sh data-tst/spf.tst + @ shell/test-spf.sh data-spf/spf.tst #todo a specfic test -DATA = chkaddr.spf.example.com 127.0.1.255 +#DATA = chkaddr.spf.example.com 127.0.1.255 #-------------------------------------------------------------------- #preparing a test area diff --git a/app/feeder.c b/app/feeder.c index 2d5e3d5..a890f8f 100644 --- a/app/feeder.c +++ b/app/feeder.c @@ -195,7 +195,6 @@ while (proceed==true) { phase=999; //Trouble trouble break; case 5 : //all data sent lets say it is good - (void) rou_alert(0,"JMPDBG all data sent",data); status=true; break; default : //SAFE Guard @@ -633,7 +632,7 @@ while (proceed==true) { phase++; } if (status==true) - (void) rou_alert(0,"Scanning file <%s> was completed OK",filename); + (void) rou_alert(2,"Scanning file <%s> was completed OK",filename); return status; } /********************************************************/ @@ -665,7 +664,7 @@ while (nextargc,params->argv); if (numfile==(params->argc-2)) - (void) rou_alert(0,"%d file successfully transmitted to <%s.%s>", + (void) rou_alert(0,"%d file successfully submitted to <%s.%s>", numfile,params->argv[0],params->argv[1]); (void) closelog(); break; diff --git a/data-tst/extfeed00.tst b/data-feed/extfeed00.tst similarity index 100% rename from data-tst/extfeed00.tst rename to data-feed/extfeed00.tst diff --git a/data-tst/feed00.tst b/data-feed/feed00.tst similarity index 100% rename from data-tst/feed00.tst rename to data-feed/feed00.tst diff --git a/data-feed/feed01.tst b/data-feed/feed01.tst new file mode 100644 index 0000000..08515d2 --- /dev/null +++ b/data-feed/feed01.tst @@ -0,0 +1,26 @@ +#very simple test to feed SMTP server +#==================================================== +T:Very Simple email sending +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +C:ORGN 127.127.0.2 +R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... +#==================================================== +S:HELO example.com +R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.127.0.2/feed2.example.com] +S:MAIL FROM: +R:250 2.1.3 postmaster@example.com.. sender ok +S:RCPT TO: +R:250 2.6.2 Address accepted +#------------------------------------------------------------------------- +#-sending data +C:DATA +Subject: Very Simple email contents + +FIRST Line +SECOND Line +LAST Line + +. +R:250 3.5.3 Message accepted for delivery +S:QUIT +R:221 2.0.0 Bye, closing connection... diff --git a/data-tst/xxfeed.tst b/data-feed/xxfeed.tst similarity index 96% rename from data-tst/xxfeed.tst rename to data-feed/xxfeed.tst index 26ffce3..08515d2 100644 --- a/data-tst/xxfeed.tst +++ b/data-feed/xxfeed.tst @@ -1,6 +1,6 @@ #very simple test to feed SMTP server #==================================================== -T:Simple email sending +T:Very Simple email sending R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... C:ORGN 127.127.0.2 R:220 mailleur.example.com ESMTP (cleartext) emlrcvr... diff --git a/data-tst/zone.example.com b/data-feed/zone.example.com similarity index 100% rename from data-tst/zone.example.com rename to data-feed/zone.example.com diff --git a/data-tst/spf.tst b/data-spf/spf.tst similarity index 100% rename from data-tst/spf.tst rename to data-spf/spf.tst diff --git a/lib/unitls.c b/lib/unitls.c index d7defb7..a706945 100644 --- a/lib/unitls.c +++ b/lib/unitls.c @@ -412,8 +412,8 @@ while (proceed==true) { verif=SSL_get_verify_result(tls->ssl); switch (verif) { case X509_V_OK : - (void) rou_alert(0,"Peer is [%s]/%s",tls->peerip,tls->peername); - (void) rou_alert(0,"%s; Remote certificate is verified",cn); + (void) rou_alert(1,"Peer is [%s]/%s",tls->peerip,tls->peername); + (void) rou_alert(1,"%s; Remote certificate is verified",cn); break; default : (void) rou_alert(0,"%s Remote certificate status='%d'",OPEP,verif); -- 2.47.3