From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Thu, 12 Jun 2025 22:21:26 +0000 (-0400)
Subject: Adjusting feed about DATA parameter
X-Git-Tag: tag-0.8~16
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=dfe7e9eacd0b1e919e54c962437c255395fb898e;p=jmp%2Fmailleur

Adjusting feed about DATA parameter
---

diff --git a/Makefile b/Makefile
index 8c40e72..5d7858c 100644
--- a/Makefile
+++ b/Makefile
@@ -133,17 +133,17 @@ extfeed	:	debug
 			$(EXTIP)			\
 			$(EXTPORT)			\
 		  	./$(DATATST)/extfeed00.tst
-
+ONEFEED=feed00.tst
 onefeed	:  debug
 	   @ rm -fr ./data-queue/*
 	   @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue/*
 	   @ bin/feeder					\
 			-f				\
-			-d 6				\
+			-d 2				\
 	   		-c ./conf/$(APPNAME).conf.dvl	\
 			$(TESTIP)			\
 			$(TESTPORT)			\
-		  	./$(DATATST)/feed12.tst
+		  	./$(DATATST)/$(ONEFEED)
 	   @ rm -fr ./data-sorter/*
 	   @ cp -a					\
 		$(TESTDIR)/var/spool/$(APPNAME)/queue/* \
@@ -172,11 +172,11 @@ dbgfeed	:  debug
 		--args					\
 			bin/feeder			\
 			  -f				\
-			  -d 9				\
+			  -d 2				\
 			  -c ./conf/feeder.conf.dvl	\
 			  $(TESTIP)			\
 			  $(TESTPORT)			\
-			  $(DATATST)/feed12.tst
+			  $(DATATST)/$(ONEFEED)
 
 valfeed	:  debug			#valgring of emlrcvr
 	   @ echo "feed valgrind test"
diff --git a/app/feeder.c b/app/feeder.c
index aeec29b..5602a68 100644
--- a/app/feeder.c
+++ b/app/feeder.c
@@ -141,7 +141,7 @@ numdata=0;
 phase=0;
 proceed=true;
 while (proceed==true) {
-  (void) rou_alert(0,"%s JMPDBG phase='%d'",OPEP,phase);
+  //(void) rou_alert(0,"%s JMPDBG phase='%d'",OPEP,phase);
   switch (phase) {
     case 0      :       //Transmit "DATA" to remote
       if (tcp_write(fd->socptr,action)!=(strlen(action)+2))
@@ -152,6 +152,8 @@ while (proceed==true) {
         phase=999;      //Didn't get signon
       break;
     case 2      :       //did we received the Proper "proceed" acknoledge
+      if (expected==(char *)0)
+        expected="Nothing?";
       if (strcmp(line,expected)!=0) {
         (void) rou_alert(0,"expecting\t'%s'",expected);
         (void) rou_alert(0,"found\t\t'%s'",line);
diff --git a/data-feed/feed00.tst b/data-feed/feed00.tst
index 8c4708d..ec60c57 100644
--- a/data-feed/feed00.tst
+++ b/data-feed/feed00.tst
@@ -38,7 +38,7 @@ S:RCPT TO: <postmaster@example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
-C:DATA
+C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
 D:Subject: Very Simple email contents
 C:T
 D:From: Maitre Post <postmaster@example.com>
diff --git a/data-feed/feed01.tst b/data-feed/feed01.tst
index 916ed36..acc9720 100644
--- a/data-feed/feed01.tst
+++ b/data-feed/feed01.tst
@@ -17,7 +17,7 @@ S:RCPT TO: <dom1user3@subdom1.example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
-C: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@subdom1.example.com>