Ready to work on remote email sending

diff --git a/app/sender.c b/app/sender.c
index 922afdebad2dfcd257cdbd692014e3595f9f5cf1..3b677d4c66e455592b13a96c1ed1fa86693f6914 100644 (file)
--- a/app/sender.c
+++ b/app/sender.c
@@ -33,24 +33,26 @@
 static _Bool dispatcher(TRATYP **tra)
 
 {
-#define OPEP    "sorter.c:dispatcher,"
+#define OPEP    "sender.c:dispatcher,"
 _Bool status;
 
 status=false;
 if (tra!=(TRATYP **)0) {
   time_t isnow;
+  int count;
   TRATYP **ptr;
 
   isnow=time((time_t *)0);
   ptr=tra;
+  count=0;
   status=true;
   while (*ptr!=(TRATYP *)0) {
-    (void) rou_alert(0,"%s JMPDBG date='%ld' isnow='%ld'",OPEP,(*ptr)->date,isnow);
+    count++;
     if (((*ptr)->date+(*ptr)->delay)<=isnow) {
-      (void) rou_alert(0,"%s JMPDBG action delay='%d'",OPEP,(*ptr)->delay);
       (void) eml_add_delay(isnow,*ptr);
       switch ((*ptr)->code) {
         case 'L'  :       //local delivery
+          (void) rou_alert(0,"%s local email count='%d'",OPEP,count);
           (*ptr)->code='C';       //delivery done 'C'ompleted
           if (eml_store_email(*ptr)==false) {
             (*ptr)->code='L';       //delivery done 'D'elayed
@@ -59,8 +61,14 @@ if (tra!=(TRATYP **)0) {
             }
           break;
         case 'R'  :       //remote delivery
+/*
+          char temps[40];
+
+          (void) strftime(temps,sizeof(temps),"%H:%M:%S",localtime(&isnow));
           //JMPDBG  set as the remote email was not succesful
-          (void) rou_alert(0,"%s JMPDBG delay='%d'",OPEP,(*ptr)->delay);
+          (void) rou_alert(0,"%s JMPDBG at '%s', Unable to deliver email <%s> to <%s>",
+                                OPEP,temps,(*ptr)->sessid,(*ptr)->rcptto);
+*/
           break;
         default   :
           (void) rou_alert(0,"%s unexpected code '%c'",OPEP,(*ptr)->code);

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index 9a2c8e42514edb7c494dd26e674cff01797f1255..a3888edd9f5e215d29f7cb8656d011a314542d6f 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -60,6 +60,8 @@ S:RCPT TO: <dom2user1@subdom2.example.com>
 R:250 2.6.4 Address accepted
 S:RCPT TO: <dom2user2@subdom2.example.com>
 R:250 2.6.4 Address accepted
+S:RCPT TO: <postmaster@example.com>
+R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA

diff --git a/lib/geseml.c b/lib/geseml.c
index fb6a77b753c6b5ea663607e5b3c06b71fb5c7d45..4957daa5bcc55ad24f85cf134b3a28b9f0cdedbf 100644 (file)
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -403,7 +403,6 @@ TRATYP **next;
 
 sids=(SIDTYP **)0;
 next=(TRATYP **)0;
-(void) rou_alert(0,"%s JMPDBG trying check",OPEP);
 if (list!=(TRATYP **)0) {
   TRATYP **ptr;
 
@@ -569,16 +568,18 @@ return done;
 PUBLIC _Bool eml_add_delay(time_t isnow,TRATYP *tra)
 
 {
+#define OPEP    "geseml.c:eml_add_delay,"
 _Bool status;
 
 status=false;
-(void) rou_alert(0,"eml_add_delay, JMPDBG");
 if (tra!=(TRATYP *)0) {
   tra->date=isnow;
   tra->delay=(tra->delay*2)+60;
   status=true;
   }
 return status;
+
+#undef  OPEP
 }
 /*
 ^L