Changeset 5289 for source/ariba

Timestamp:

Jul 24, 2009, 4:32:18 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/utility

Files:

• system/StartupWrapper.cpp (modified) (2 diffs)
• transport/rfcomm/rfcomm.cpp (modified) (4 diffs)
• transport/rfcomm/rfcomm.hpp (modified) (1 diff)

source/ariba/utility/system/StartupWrapper.cpp

@@ -98 +98 @@
         {
                 log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
-                logger->setLevel(log4cxx::Level::getAll());
+                logger->setLevel(log4cxx::Level::getError());
         }
 
@@ -108 +108 @@
         {
                 log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseCommunication"));
-                logger->setLevel(log4cxx::Level::getAll());
+                logger->setLevel(log4cxx::Level::getError());
         }
 

source/ariba/utility/transport/rfcomm/rfcomm.cpp

@@ -49 +49 @@
         std::deque<link_data> send_buffer;
 };
+
+void rfcomm::remove_info(link_info* info) {
+        for (vector<link_info*>::iterator i = links.begin(); i!=links.end();i++)
+                if (*i==info) {
+                        delete info;
+                        links.erase(i);
+                }
+}
+
 
 inline bluetooth::rfcomm::endpoint convert( const rfcomm_endpoint& endpoint ) {
@@ -222 +231 @@
 
 void rfcomm::start_read(link_info* info) {
-        cout << "Waiting for messages..." << endl;
-
         // start read
         boost::asio::async_read(info->socket,
@@ -271 +278 @@
 
         // ignore errors and wait for all data to be received
-        if (error || bytes != info->size) return;
+        if (error || bytes != info->size) {
+                if (error) remove_info(info);
+                return;
+        }
 
         cout << "received message of size " << info->size << endl;
@@ -321 +331 @@
         // ignore errors and wait for all data to be sent
         if (error || bytes != (size+4) ) {
-                if (error) cout << "Message sent error" << endl;
+                if (error) {
+                        cout << "Message sent error" << endl;
+                        remove_info(info);
+                }
                 return;
         }

source/ariba/utility/transport/rfcomm/rfcomm.hpp

@@ -59 +59 @@
         void handle_write_data(const error_code& error, size_t bytes,
                 link_info* info, size_t size, uint8_t* buffer );
+
+        void remove_info(link_info* info);
 };