feed00 send DATA probleme

diff --git a/Makefile.dbg b/Makefile.dbg
index 71fda5bcf0e8dae7895aa6375ac116d75122fc67..718f99853a2f53532e89d7e5e72135a607bb6879 100644 (file)
--- 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 c70f7d4dd9e9d067b887ada306c097e4bdb83718..625a6933552a54864510237b21ae3842b315fac8 100644 (file)
--- 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 41f3d4b5f53d8f3d1cc82c0f57d57cba8f7c0598..18eff56be55b007df36d8d4b6494e55fee718653 100644 (file)
--- 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: <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
+R:250 2.6.4 Address accepted <webmaster@example.com>
 S:RCPT TO: <postmaster@example.com>
-R:250 2.6.4 Address accepted
+R:250 2.6.4 Address accepted <postmaster@example.com>
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>

diff --git a/lib/devsoc.c b/lib/devsoc.c
index ad7ae980a501e4f65b4849f9e62fc4224fcf7b3d..77ba270a6021ef76a40a21ff9a8e49f03fa138f5 100644 (file)
--- a/lib/devsoc.c
+++ b/lib/devsoc.c
@@ -66,7 +66,6 @@ int count;
 
 max=1000;       //purging for 1 seconde max;
 count=0;
-/*
 for (;count<max;count++) {
   soc->carin=0;
   soc->carpile[0]='\000';
@@ -75,7 +74,6 @@ for (;count<max;count++) {
   if (soc->carin==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 b0ed5d0477c57dc5bb2b0e3be400a14391495603..04311890cc8467d4744299499a53f89198bf88fa 100644 (file)
--- 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 a283d87a1e53dee25b5a0b38d1262514fa281a3b..e15777460615357e78d6ffac638e77e604bb9026 100644 (file)
--- 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);
   }