Feeder, no memory leak detected

diff --git a/Makefile b/Makefile
index 51b56e7e6b60d4f2bc33a614c39420502ff96bba..f1267093996e7f72cf34e152e3846f7fbec8ebfb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ extfeed       :       debug
                        $(EXTPORT)                      \
                        $(DATATST)/extfeed00.tst
 
-onefeed        :       debug
-               @ bin/feeder                            \
+onefeed        :  debug
+          @ bin/feeder                                 \
                        -f                              \
                        -d2                             \
                        -i 127.63.31.15                 \
@@ -64,12 +64,12 @@ onefeed     :       debug
                        $(DATATST)/feed00.tst
 
 #direct test
-tstfeed        :       debug
-               @ bin/feeder $(FEEDPAR)
+tstfeed        :  debug
+          @ bin/feeder $(FEEDPAR)
 
 #using gdb
-dbgfeed        :       debug
-               @ gdb --args                            \
+dbgfeed        :  debug
+          @ gdb --args                                 \
                        bin/feeder                      \
                          -f                            \
                          -d2                           \
@@ -78,6 +78,21 @@ dbgfeed      :       debug
                          $(TESTPORT)                   \
                          $(DATATST)/feed00.tst
 
+valfeed        :  debug                        #valgring of emlrcvr
+          @ echo "feed valgrind test"
+          @ valgrind                                   \
+               --leak-check=full                       \
+               --show-leak-kinds=$(VALKIND)            \
+                       bin/feeder                      \
+                         -f                            \
+                         -d2                           \
+                         -c ./conf/feeder.conf.dvl     \
+                         $(TESTIP)                     \
+                         $(TESTPORT)                   \
+                         $(DATATST)/feed00.tst
+
+            
+#              --track-fds=yes                         \
 #testing TLS connection
 tlsrcvr        :       
                @ clear

diff --git a/lib/devsoc.c b/lib/devsoc.c
index 0703d8f1a3522b5b31b5fb9bc0caf744e8ba4fdd..cc07e16315d673052aa5bf5795a84ebfb971320a 100644 (file)
--- a/lib/devsoc.c
+++ b/lib/devsoc.c
@@ -679,6 +679,8 @@ while (proceed==true) {
       soc->iteration=1;
       break;
     default     :       //SAFE Guard
+      if (ai!=(struct addrinfo *)0)
+        (void) freeaddrinfo(ai);
       proceed=false;
       break;
     }
@@ -716,11 +718,15 @@ while (proceed==true) {
         phase=999;      //no need to go further
         }
       break;
-    case 1      :       //is the sockect detected closed
+    case 1      :       //clsing cryptying if needed
+      if (soc->tls!=(TLSTYP *)0) 
+        soc->tls=tls_closetls(soc->tls);
+      break;
+    case 2      :       //is the sockect detected closed
       if (soc->handle<0)
         phase=999;      //Socket allready closed
       break;
-    case 2      :       //let close the socket
+    case 3      :       //let close the socket
       if (close(soc->handle)<0) 
         (void) rou_alert(0,"%s, error on closing socket '%s.%s' (error=<%s>)",
                             OPEP,soc->ip,soc->port,strerror(errno));