Adjusted the session number within logs

diff --git a/data-feed/feed03.tst b/data-feed/feed03.tst
index 70bbac16b54ae88e7b77ab55f32c0e855285bfa7..bd45c608c4b6ce6816028675b26e96282ba99af2 100644 (file)
--- a/data-feed/feed03.tst
+++ b/data-feed/feed03.tst
@@ -24,8 +24,8 @@ R:250 3.5.3 Message accepted for delivery...
 #=========================================================================
 #Testing Reset sequence
 S:RSET
-R:250-2.0.0 Flushed session ...
-R:250 2.0.0 Opening new session...
+R:250-2.1.0 flushed session ...
+R:250 2.1.0 opening new session...
 #-------------------------------------------------------------------------
 S:HELO example.com
 R:250 mailleur.example.com, link (cleartext) ready,...

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 534e1a844722199c1777c761185920d10cf6a756..ff46ec72412807634d9c78ff542c2b4ee89c6110 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -533,7 +533,7 @@ while (proceed==true) {
       delta=rou_getdifftime(&start);
       fmt="%d 3.5.3 Message accepted for delivery (Session ID=<%s>)";
       (void) transmit(contact,fmt,CMDOK,contact->cursesid);
-      fmt="DATA stream received: %d Kbytes within %d.%03d seconds";
+      fmt="(DATA stream received: %d Kbytes within %d.%03d seconds)";
       (void) log_fprintlog(contact->logptr,false,fmt,total,delta/1000,delta%1000);
       done=true;
       proceed=false;    //task done
@@ -790,15 +790,21 @@ return success;
 static _Bool doreset(CONTYP *contact,char *parameter)
 
 {
-(void) transmit(contact,"%d-2.0.0 Flushed session %s",CMDOK,contact->cursesid);
+#define LOCSEQ  "2.1.0"
+
+(void) transmit(contact,"%d-%s flushed session %s",
+                         CMDOK,LOCSEQ,contact->cursesid);
 contact->numreset++;
 contact->recipients=(RCPTYP **)rou_freelist((void **)(contact->recipients),
                                             (genfree_t)eml_freerecipient);
 contact->mailfrom=rou_freestr(contact->mailfrom);
 contact->cursesid=rou_freestr(contact->cursesid);
 contact->cursesid=eml_getcursesid(contact->mainsesid,contact->numreset);
-(void) transmit(contact,"%d 2.0.0 Opening new session %s",CMDOK,contact->cursesid);
+(void) transmit(contact,"%d %s opening new session %s",
+                         CMDOK,LOCSEQ,contact->cursesid);
 return true;
+
+#undef  LOCSEQ
 }
 /*
 ^L
@@ -1303,7 +1309,7 @@ while (proceed==true) {
                               CMDOK,contact->mainsesid);
       break;
     case c_quit         :       //QUIT SMTP protocol
-      (void) transmit(contact,"%d 2.0.0 Bye, closing connection %s",    
+      (void) transmit(contact,"%d 2.0.0 Bye, closing connection CNT=%s",    
                               QUITOK,contact->mainsesid);
       status=1;                 //every thing fine
       proceed=false;
@@ -1435,8 +1441,8 @@ while (proceed==true) {
         }
       break;
     case 5      :       //contact is good, then sending a signon
-      (void) log_fprintlog(contact->logptr,false,"SID: %s -> Contact open",
-                                                      contact->mainsesid);
+      (void) log_fprintlog(contact->logptr,false,"opening connection CNT=%s",
+                                                  contact->mainsesid);
       break;
     default     :       //SAFE guard
       proceed=false;