Changeset 8606 for source/ariba/utility/transport/tcpip

Timestamp:

Sep 30, 2010, 4:34:31 PM (14 years ago)

Author:

Christoph Mayer

Message:

-memleaks

Location:

source/ariba/utility/transport/tcpip

Files:

• protlib/tp_over_tcp.cpp (modified) (7 diffs)
• protlib/tp_over_tcp.h (modified) (1 diff)
• tcpip.cpp (modified) (6 diffs)

source/ariba/utility/transport/tcpip/protlib/tp_over_tcp.cpp

@@ -253 +253 @@
         if (newmsg)
         {
-          newmsg->send_to(tpparam.source);
+          bool ret = newmsg->send_to(tpparam.source);
+          if(!ret) delete newmsg;
           return assoc;
         }
@@ -413 +414 @@
     // both parameters will be freed after message was sent!
     
-    TPoverTCPMsg* internalmsg= new TPoverTCPMsg(netmsg,new appladdress(*addr));
+    appladdress* apl=new appladdress(*addr);
+    TPoverTCPMsg* internalmsg= new TPoverTCPMsg(netmsg,apl);
     if (internalmsg)
     {
       // send the internal message to the sender thread queue
-      internalmsg->send(tpparam.source,destqueue);
+      bool sent = internalmsg->send(tpparam.source,destqueue);
+      if (!sent) {
+          delete internalmsg->get_appladdr();
+          delete internalmsg;
+          internalmsg = NULL;
+      }
     }
   }
@@ -659 +666 @@
     if (internalmsg == 0)
     {
-      ERRLog(tpparam.name, methodname << "received not an TPoverTCPMsg but a" << internal_thread_msg->get_type_name());      
+      ERRLog(tpparam.name, methodname << "received not an TPoverTCPMsg but a" << internal_thread_msg->get_type_name());
     }
     else
@@ -694 +701 @@
     {
       terminate= true;
-    }  
+    }
+
+    delete internalmsg;
   } // end while
   
@@ -929 +938 @@
         if ( ret < 0 )
         {
+          delete netmsg;
           if (errno!=EAGAIN && errno!=EWOULDBLOCK)
           {
@@ -1106 +1116 @@
 
   receiver_thread_argp->terminated= true;
+  delete netmsg;
 
   Log(DEBUG_LOG,LOG_NORMAL, tpparam.name, methodname << "Thread <" << pthread_self() << "> terminated");
@@ -1701 +1712 @@
 {
   init= false;
+  this->connmap.clear();
 
   Log(DEBUG_LOG,LOG_NORMAL, tpparam.name,  "Destructor called");

source/ariba/utility/transport/tcpip/protlib/tp_over_tcp.h

@@ -247 +247 @@
     message(type_transport, source), peer_assoc(0), type(send_data), netmsg(netmsg), addr(addr) {}
 
+  virtual ~TPoverTCPMsg() {}
+
   const AssocData* get_peer_assoc() const { return peer_assoc; }
   TPoverTCPMsg::msg_t get_msgtype() const { return type; }

source/ariba/utility/transport/tcpip/tcpip.cpp

@@ -96 +96 @@
 
         // unregister TPoverTCP
+        delete QueueManager::instance()->get_queue( message::qaddr_signaling );
         QueueManager::instance()->unregister_queue( message::qaddr_signaling );
 
@@ -104 +105 @@
         protlib::setuid::end();
         protlib::tsdb::end();
+
+        // wait for thread to finish and delete
+        pthread_join(tpreceivethread, NULL);
 }
 
@@ -167 +171 @@
                 TPMsg* tpmsg = dynamic_cast<TPMsg*> (msg);
                 if (!tpmsg) {
+                        delete msg;
                         continue;
                 }
@@ -177 +182 @@
                 // not a data message? -> continue!
                 if (!datamsg) {
+                        delete tpmsg;
                         continue;
                 }
@@ -184 +190 @@
                 uint32_t message_size = datamsg->decode32(true)-2;
                 //uint16_t remote_port = datamsg->decode16(true);
-
 
                 // inform listener
@@ -194 +199 @@
 
                 }
+                delete datamsg;
                 delete tpmsg;
         }