ORGN debug smtp command is working

diff --git a/Makefile b/Makefile
index f1267093996e7f72cf34e152e3846f7fbec8ebfb..04588e3ac19cd2b3e9da3d130610e2193b6e83ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,8 @@ tstfeed       :  debug
 
 #using gdb
 dbgfeed        :  debug
-          @ gdb --args                                 \
+          @ gdb                                        \
+               --args                                  \
                        bin/feeder                      \
                          -f                            \
                          -d2                           \

diff --git a/app/Makefile b/app/Makefile
index d1d2b31781be5990715c36834ac4d525a9a0aa96..b269fcb365975cf3edab585bb64da56478571ee7 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -6,7 +6,7 @@ debug   :
            @ echo "application compiled in '$@' mode now ready"
 
 prod   :
-          @ $(MAKE) OPTIME="-g2" exe
+          @ $(MAKE) OPTIME="-O3" exe
           @ echo "application compiled in '$@' mode now ready"
 
 exe    :
@@ -33,8 +33,8 @@ SRC=                                                          \
 #--------------------------------------------------------------------
 #definitions
 #--------------------------------------------------------------------
-CC     =  gcc
-LD     =  gcc
+CC     =  gcc 
+LD     =  gcc -g
 CFLAGS =  -I ../lib -Wall $(OPTIME)
 LIBMAIL        =  ../lib/libmail.a
 LIBS   =       $(LIBMAIL)                      \

diff --git a/app/emlrcvr.c b/app/emlrcvr.c
index caf0a743e3495ffade4a133985fa9bdf7705a2a0..8dc0e6a6e321958aae75b558aacc7b71ff88e0c5 100644 (file)
--- a/app/emlrcvr.c
+++ b/app/emlrcvr.c
@@ -71,13 +71,13 @@ while (proceed==true) {
       (void) prc_locking(appname,false,1);
       break;
     case 4      :       //doing main task
+      (void) rou_loadconfig(config,false);
       (void) prc_cleantitle();
       params=par_freeparams(params);
       (void) sig_trapsignal(false,sig_alrm);
       (void) sig_modeunisig(false);
       (void) prc_modeuniprc(false);
       (void) rou_modesubrou(false);
-      (void) rou_loadconfig(config,false);
       break;
     default     :       //end of task
       proceed=false;

diff --git a/data-tst/feed00.tst b/data-tst/feed00.tst
index 57dbc7a136b96b99a4ae8b89aceafee70449c760..f8aa8dde06e1999af2a8f846cea7169a9d336c61 100644 (file)
--- a/data-tst/feed00.tst
+++ b/data-tst/feed00.tst
@@ -43,6 +43,10 @@ W:1
 #-restarting link
 L:first restart link
 R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
+S:ORGN 127.168.0.1
+R:250 2.9.9 New peer [127.168.0.1/No.Reverse] set
+S:ORGN 192.219.254.203
+R:250 2.9.9 New peer [192.219.254.203/mailprod0.safe.ca] set
 S:QUIT
 R:221 2.0.0 Bye, closing connection...
 #-------------------------------------------------------------------------

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 5e61708bba71d7cb9c5fdd0bd3f3f2170b98982f..2fae29c6485c827146b26e3a9346834cbe125fc4 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -133,7 +133,7 @@ mode=soc_getstrmode(contact->socptr);
 static void doorgn(CONTYP *contact,char *newip)
 
 {
-#define        OPEP    "lvleml.c:dorgn"
+#define OPEP    "lvleml.c:doorgn,"
 
 struct addrinfo *res;
 int phase;
@@ -146,6 +146,8 @@ while (proceed==true) {
   //(void) rou_alert(0,"JMPDBG %s phase='%d' parm=<%s>",OPEP,phase,newip);
   switch (phase) {
     case 0      :       //checking if we have a parameter
+      while ((*newip==' ')||(*newip=='\t'))
+        newip++;        //removing unneeded space
       if (strlen(newip)==0) {
         (void) rou_alert(0,"%s, newip not specified (debug?)",OPEP);
         phase=999;      //No need to go further
@@ -190,6 +192,7 @@ while (proceed==true) {
             (void) rou_alert(0,"%s, Unexpected namestat='%d' (IP=<%s>) (bug?)",
                                 OPEP,namestat,newip);
             (void) transmit(contact,"%d 5.5.4 Bug! with <%s>",BADPAR,newip);
+            phase=999;  //Trouble trouble
             break;
           }
         }
@@ -202,6 +205,7 @@ while (proceed==true) {
   }
 if (res!=(struct addrinfo *)0) 
   (void) freeaddrinfo(res);
+
 #undef  OPEP
 }
 /*