Working on sending data

diff --git a/Makefile.dbg b/Makefile.dbg
index 5906b74c2a3a30d97effccd1f75e45183f346f27..3fe3f856780a88b1a1369f3d71797e7cc0b692f0 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -41,8 +41,6 @@ onercvr       :  clean debug newtest
                -f                                      \
                $(EMLPAR)$(TESTITER)
 
-#                      # -i 127.63.31.15
-#
 onefeed        :  debug
           @ bin/feeder                                 \
                        -f                              \

diff --git a/lib/gestcp.c b/lib/gestcp.c
index 1a2ac0a3a5481ba2d7a796c65cc45f812a6808fc..46e43ddce0a741f33c2205f4a33c1f8edc50ffb8 100644 (file)
--- a/lib/gestcp.c
+++ b/lib/gestcp.c
@@ -226,6 +226,7 @@ PUBLIC int tcp_send_smtp_data(RMTTYP *rmt,const char *qemail)
 
 {
 #define OPEP    "gestcpc.c:tcp_send_smtp_data,"
+#define ENDDATA CRLF"."CRLF
 
 int sent;
 FILE *qfile;
@@ -237,6 +238,7 @@ qfile=(FILE *)0;
 phase=0;
 proceed=true;
 while (proceed==true) {
+  (void) rou_alert(0,"%s JMPDBG phase='%d'",OPEP,phase);
   switch (phase) {
     case 0      :       //opending email data file
       if ((qfile=eml_openqfile(qemail,(const char *)0))==(FILE *)0) {
@@ -271,6 +273,7 @@ while (proceed==true) {
       break;
       }
     case 2      :       //end of transmission
+      sent+=tcp_write(rmt->socptr,ENDDATA);
       break;
     case 3      :       //closing datafile
       qfile=eml_closeqfile(qfile);
@@ -283,5 +286,6 @@ while (proceed==true) {
   }
 return sent;
 
+#undef  ENDDATA
 #undef  OPEP
 }

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 5b0227c977cc36fdf096458ab2e82e486c049bb4..c513945af4ab9047be35def1bdd342993ba9923c 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -1172,7 +1172,6 @@ while (proceed==true) {
         phase=999;      //No need to wait form response code
       break;
     case 2      :       //send the text termination
-      (void) tcp_write(rmt->socptr,".");
       rspcode= tcp_get_smtp_reply(rmt,WAITRMT,&resp);
       break;
     case 3      :       //sending session data