From 30c2c3c70ea13288bfd93d816531df07521048a0 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Fri, 20 Jun 2025 00:54:00 -0400 Subject: [PATCH] feed00 send DATA probleme --- Makefile.dbg | 10 ++++++---- app/feeder.c | 1 + data-feed/feed00.tst | 4 ++-- lib/devsoc.c | 4 +--- lib/gestcp.c | 4 ++-- lib/lvleml.c | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile.dbg b/Makefile.dbg index 71fda5b..718f998 100644 --- a/Makefile.dbg +++ b/Makefile.dbg @@ -14,9 +14,6 @@ EXTIP = safemail3.safe.ca EXTPORT = 25 TESTITER= 1 -#specific test file to use will "feeding" the receiver. -ONEFEED=feed02.tst - EMLPAR = \ -r $(TESTDIR) \ -c ./conf/$(APPNAME).conf.dvl \ @@ -48,7 +45,7 @@ onefeed : debug -c ./conf/$(APPNAME).conf.dvl \ $(TESTIP) \ $(TESTPORT) \ - ./$(DATATST)/$(ONEFEED) + ./$(DATATST)/$(ONEFEED).tst onesendr: debug @ \ @@ -164,3 +161,8 @@ valsendr: debug tr '\\n' ' ' ` #-------------------------------------------------------------------- +#to Specify FEED +ONEFEED=$(FEED) +ifeq ($(strip $(FEED)),) +ONEFEED=feed02.tst +endif diff --git a/app/feeder.c b/app/feeder.c index c70f7d4..625a693 100644 --- a/app/feeder.c +++ b/app/feeder.c @@ -551,6 +551,7 @@ while (proceed==true) { break; case 'S' : //sending data (void) tcp_write(fd->socptr,line); + (void) tcp_write(fd->socptr,CRLF); break; case 'T' : //Get the test titre status=strncpy(testname,line,sizeof(testname)); diff --git a/data-feed/feed00.tst b/data-feed/feed00.tst index 41f3d4b..18eff56 100644 --- a/data-feed/feed00.tst +++ b/data-feed/feed00.tst @@ -33,9 +33,9 @@ R:250 mailleur.example.com, link (cleartext) ready,... S:MAIL FROM: R:250 2.1.3 postmaster@example.com.. sender ok S:RCPT TO: -R:250 2.6.4 Address accepted +R:250 2.6.4 Address accepted S:RCPT TO: -R:250 2.6.4 Address accepted +R:250 2.6.4 Address accepted #------------------------------------------------------------------------- #-sending data C:DATA 354 3.5.0 End data with . diff --git a/lib/devsoc.c b/lib/devsoc.c index ad7ae98..77ba270 100644 --- a/lib/devsoc.c +++ b/lib/devsoc.c @@ -66,7 +66,6 @@ int count; max=1000; //purging for 1 seconde max; count=0; -/* for (;countcarin=0; soc->carpile[0]='\000'; @@ -75,7 +74,6 @@ for (;countcarin==0) //got no character break; } -*/ if (count>=max) //one second max! (void) rou_alert(0,"%s purge is too long with peer [%s]",OPEP,peerip); #undef OPEP @@ -1178,7 +1176,7 @@ buffer=(char *)0; phase=0; proceed=true; while (proceed==true) { - //(void) rou_alert(0,"JMPDBG %s phase='%d'",OPEP,phase); + //(void) rou_alert(0,"JMPDBG %s phase='%d' carpile=<%s>",OPEP,phase,soc->carpile); switch (phase) { case 0 : //is socket available if (soc==(SOCTYP *)0) { diff --git a/lib/gestcp.c b/lib/gestcp.c index b0ed5d0..0431189 100644 --- a/lib/gestcp.c +++ b/lib/gestcp.c @@ -36,7 +36,7 @@ register int taille; taille=0; if (strlen(line)>0) { - taille=strlen(line)+strlen(CRLF)+2; + taille=strlen(line)+strlen(CRLF)+3; if (buffer==(char *)0) buffer=(char *)calloc(taille,sizeof(char)); taille+=strlen(buffer); @@ -73,7 +73,7 @@ got=0; phase=0; proceed=true; while (proceed==true) { - //(void) rou_alert(0,"JMPDBG %s phase='%d'",OPEP,phase); + //(void) rou_alert(0,"JMPDBG %s phase='%d' line=<%s>",OPEP,phase,*lineptr); switch (phase) { case 0 : //link still open? if (soc_receive(socptr)<0) { diff --git a/lib/lvleml.c b/lib/lvleml.c index a283d87..e157774 100644 --- a/lib/lvleml.c +++ b/lib/lvleml.c @@ -138,6 +138,7 @@ if (rou_vasprintf(&line,fmt,args)>0) { contact->transout=tcp_addline(contact->transout,line); } if (flush==true) { + (void) rou_alert(0,"JMPDBG trans=<%s>",contact->transout); (void) tcp_write(contact->socptr,contact->transout); contact->transout=rou_freestr(contact->transout); } -- 2.47.3