Changeset 5424

Timestamp:

Jul 29, 2009, 3:30:42 PM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/utility/transport/rfcomm/rfcomm.cpp (modified) (11 diffs)

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

@@ -33 +33 @@
 public:
         link_info(io_service& io ) :
-                up(false), local(), remote(), socket(io), connect_retries(0),
+                io(io), up(false), local(), remote(), socket(new bluetooth::rfcomm::socket(io)), connect_retries(0),
                 size(0), buffer(NULL), sending(false) {
         }
+
+        ~link_info() {
+                delete socket;
+        }
+
+        void reinit() {
+                delete socket;
+                socket = new bluetooth::rfcomm::socket(io);
+                up = false;
+        }
+
+        io_service& io;
 
         // state
         bool up;
         rfcomm_endpoint local, remote;
-        bluetooth::rfcomm::socket socket;
+        bluetooth::rfcomm::socket* socket;
         int connect_retries;
 
@@ -57 +69 @@
         if (info != NULL && info->up) {
                 info->up = false;
-                info->socket.shutdown( bluetooth::rfcomm::socket::shutdown_both );
+                info->socket->shutdown( bluetooth::rfcomm::socket::shutdown_both );
         }
 }
@@ -124 +136 @@
 
         // not found, or not up? ->try to (re-)connect
-        if (info==NULL || !info->up || info->socket.is_open() ) {
+        if (info==NULL || !info->up || info->socket->is_open() ) {
                 logging_debug( "Connecting to " << endpoint.to_string() );
-                if (info != NULL && (!info->up || !info->socket.is_open())) {
+                if (info != NULL && (!info->up || !info->socket->is_open())) {
                         logging_debug("Old link is down. Trying to re-establish link.");
+                        info->reinit();
                 } else {
                         info = new link_info(io);
@@ -133 +146 @@
                 info->connect_retries = 0;
                 info->remote = endpoint;
-                info->socket.async_connect( convert(endpoint), boost::bind(
+                info->socket->async_connect( convert(endpoint), boost::bind(
                         &rfcomm::handle_connect, this,
                         boost::asio::placeholders::error, info
@@ -192 +205 @@
         // start accepting a connection
         link_info* info = new link_info(io);
-        acceptor->async_accept(info->socket, boost::bind(
+        acceptor->async_accept(*info->socket, boost::bind(
                 // bind parameters
                 &rfcomm::handle_accept, this,
@@ -221 +234 @@
         // convert endpoints
         info->up = true;
-        info->local  = convert( info->socket.local_endpoint()  );
-        info->remote = convert( info->socket.remote_endpoint() );
+        info->local  = convert( info->socket->local_endpoint()  );
+        info->remote = convert( info->socket->remote_endpoint() );
 
         logging_debug("Accepted incoming connection from "
@@ -249 +262 @@
                         // increase counter
                         info->connect_retries++;
+                        info->reinit();
 
                         // retry connection attempt
-                        info->socket.async_connect( convert(info->remote), boost::bind(
+                        info->socket->async_connect( convert(info->remote), boost::bind(
                                 &rfcomm::handle_connect, this,
                                 boost::asio::placeholders::error, info
@@ -263 +277 @@
         // convert endpoints
         info->up = true;
-        info->local  = convert( info->socket.local_endpoint()  );
-        info->remote = convert( info->socket.remote_endpoint() );
+        info->local  = convert( info->socket->local_endpoint()  );
+        info->remote = convert( info->socket->remote_endpoint() );
 
         logging_debug( "Connected to " << info->remote.to_string() );
@@ -280 +294 @@
 void rfcomm::start_read(link_info* info) {
         // start read
-        boost::asio::async_read(info->socket,
+        boost::asio::async_read(*info->socket,
 
                 // read size of packet
@@ -321 +335 @@
 
         // start read
-        boost::asio::async_read(info->socket,
+        boost::asio::async_read(*info->socket,
                 // read size of packet
                 boost::asio::buffer(info->buffer, info->size),
@@ -378 +392 @@
 
         // start writing
-        boost::asio::async_write(info->socket,
+        boost::asio::async_write(*info->socket,
                 // read size of packet
                 buffer,