Changeset 5627

Timestamp:

Aug 3, 2009, 4:33:50 PM (15 years ago)

Author:

stud-florian

Message:

 

File:

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

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

@@ -33 +33 @@
 public:
         link_info(io_service& io ) :
-                io(io), up(false), local(), remote(), socket(new bluetooth::rfcomm::socket(io)), connect_retries(0),
+                io(io), up(false), connecting(false), local(), remote(), socket(new bluetooth::rfcomm::socket(io)), connect_retries(0),
                 size(0), buffer(NULL), sending(false) {
         }
@@ -51 +51 @@
         // state
         bool up;
+        bool connecting;
         rfcomm_endpoint local, remote;
         bluetooth::rfcomm::socket* socket;
@@ -136 +137 @@
 
         // 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()) && !info->connecting) ) {
                 logging_debug( "Connecting to " << endpoint.to_string() );
                 if (info != NULL && (!info->up || !info->socket->is_open())) {
@@ -146 +147 @@
                 info->connect_retries = 0;
                 info->remote = endpoint;
+                info->connecting = true;
                 info->socket->async_connect( convert(endpoint), boost::bind(
                         &rfcomm::handle_connect, this,
                         boost::asio::placeholders::error, info
                 ));
+                links.push_back(info);
         }
 
@@ -260 +263 @@
                 if (info->connect_retries<3) {
                         // increase counter
+                        info->connecting = false;
                         info->connect_retries++;
                         info->reinit();
@@ -276 +280 @@
         // convert endpoints
         info->up = true;
+        info->connecting = false;
         info->local  = convert( info->socket->local_endpoint()  );
         info->remote = convert( info->socket->remote_endpoint() );