Index: source/ariba/communication/BaseCommunication.cpp =================================================================== --- source/ariba/communication/BaseCommunication.cpp (revision 5405) +++ source/ariba/communication/BaseCommunication.cpp (revision 5406) @@ -84,5 +84,5 @@ logging_info( "Searching for local locators ..." ); - discoverEndpoints(localDescriptor.getEndpoints()); + discover_endpoints(localDescriptor.getEndpoints()); logging_info( "Done. Local endpoints = " << localDescriptor.toString() ); Index: source/ariba/communication/EndpointDescriptor.h =================================================================== --- source/ariba/communication/EndpointDescriptor.h (revision 5405) +++ source/ariba/communication/EndpointDescriptor.h (revision 5406) @@ -111,10 +111,10 @@ bool operator==(const EndpointDescriptor& rh) const { if (rh.isUnspecified() && isUnspecified()) return true; - return false; + return endpoints == rh.endpoints; } bool operator!=(const EndpointDescriptor& rh) const { if (!rh.isUnspecified() && !isUnspecified()) return true; - return false; + return endpoints != rh.endpoints; } Index: source/ariba/communication/networkinfo/AddressDiscovery.hpp =================================================================== --- source/ariba/communication/networkinfo/AddressDiscovery.hpp (revision 5405) +++ source/ariba/communication/networkinfo/AddressDiscovery.hpp (revision 5406) @@ -6,8 +6,18 @@ #include #include +#include +#include + #include + #include + #include + #include + +#include +#include +#include using namespace ariba::addressing; @@ -26,5 +36,22 @@ } -void discoverEndpoints( endpoint_set& endpoints ) { + +int dev_info(int s, int dev_id, long arg) { + endpoint_set* set = (endpoint_set*)arg; + struct hci_dev_info di; + di.dev_id = dev_id; + if (ioctl(s, HCIGETDEVINFO, (void *) &di)) return 0; + mac_address mac; + mac.bluetooth( di.bdaddr ); + address_vf vf = mac; + set->add(vf); + return 0; +} + +void discover_bluetooth( endpoint_set& endpoints ) { + hci_for_each_dev(HCI_UP, &dev_info, (long)&endpoints ); +} + +void discover_ip_addresses( endpoint_set& endpoints ) { struct ifaddrs* ifaceBuffer = NULL; struct ifaddrs* tmpAddr = NULL; @@ -63,8 +90,13 @@ mac_address mac = getMacFromIF(i->ifa_name); address_vf vf = mac; - endpoints.add( vf ); +// endpoints.add( vf ); } } } +void discover_endpoints( endpoint_set& endpoints ) { + discover_ip_addresses( endpoints ); + discover_bluetooth( endpoints ); +} + #endif /* ADDRESSDISCOVERY_HPP_ */ Index: source/ariba/overlay/BaseOverlay.cpp =================================================================== --- source/ariba/overlay/BaseOverlay.cpp (revision 5405) +++ source/ariba/overlay/BaseOverlay.cpp (revision 5406) @@ -146,10 +146,10 @@ } -/// forwards a message over relays/overlay/directly using link descriptor +/// forwards a message over relays/directly using link descriptor seqnum_t BaseOverlay::sendMessage( Message* message, const LinkDescriptor* ld ) { // directly send message if ( !ld->communicationId.isUnspecified() && ld->communicationUp ) { - logging_debug("sendMessage: Sending message via Base Communication"); + logging_debug("Send: Sending message via Base Communication"); return bc->sendMessage( ld->communicationId, message ); } @@ -157,5 +157,6 @@ // relay message else if ( ld->relay ) { - logging_debug("sendMessage: Relaying message to node " + + logging_debug("Send: Relaying message to node " << ld->remoteNode.toString() << " using relay " << ld->localRelay @@ -165,6 +166,6 @@ LinkDescriptor* rld = getRelayDescriptor(ld->localRelay); if (rld==NULL) { - logging_error("sendMessage: Relay descriptor for relay " << - ld->localRelay.toString() << " unknown."); + logging_error("Send: Relay descriptor for relay " << + ld->localRelay.toString() << " is unknown."); return -1; } @@ -183,12 +184,9 @@ } - // route message using overlay + // error else { - logging_error("Could not send message descriptor=" << ld ); - logging_debug( "sendMessage: Routing message to node " << ld->remoteNode.toString() ); - overlayInterface->routeMessage( ld->remoteNode, message ); - return 0; - } - + logging_error( "Could not send message descriptor=" << ld ); + return -1; + } return -1; } @@ -1399,9 +1397,21 @@ LinkDescriptor* rld = getDescriptor( overlayMsg->getRelayLink() ); logging_force( "Received direct link convert notification for " << rld ); + + // set communcation link id and set it up rld->communicationId = ld->communicationId; + + // this is neccessary since this link was a relay link before! rld->communicationUp = true; + + // this is not a relay link anymore! rld->relay = false; - rld->localRelay = NodeID::UNSPECIFIED; + rld->localRelay = NodeID::UNSPECIFIED; rld->remoteRelay = NodeID::UNSPECIFIED; + + // mark used and alive! + rld->markAsUsed(); + rld->markAlive(); + + // erase the original descriptor eraseDescriptor(ld->overlayId); break; Index: source/ariba/utility/addressing/endpoint_set.hpp =================================================================== --- source/ariba/utility/addressing/endpoint_set.hpp (revision 5405) +++ source/ariba/utility/addressing/endpoint_set.hpp (revision 5406) @@ -247,5 +247,5 @@ /// checks whether two end-points are disjoint /// (only check lower level addresses) - bool is_disjoint_to( const endpoint_set& set ) const { + bool disjoint_to( const endpoint_set& set ) const { scoped_lock lock(const_cast(io_mutex)); BOOST_FOREACH( const mac_address& mac, bluetooth ) @@ -254,4 +254,13 @@ if (set.ip.count(ip_) !=0 ) return false; return true; + } + + bool intersects_with( const endpoint_set& set ) const { + return !disjoint_to(set); + } + + bool is_subset_of( const endpoint_set& set ) const { + throw "Not implemented!"; + return false; } @@ -387,4 +396,14 @@ this->tcp = rhs.tcp; } + + /// checks wheter the two endpoint sets are identical + bool operator== ( const endpoint_set& rhs ) const { + return (rhs.rfcomm == rfcomm && rhs.ip == ip && rhs.tcp == tcp && + rhs.bluetooth == bluetooth); + } + + bool operator!= ( const endpoint_set& rhs ) const { + return !(*this==rhs); + } }; Index: source/ariba/utility/addressing/ip_address.hpp =================================================================== --- source/ariba/utility/addressing/ip_address.hpp (revision 5405) +++ source/ariba/utility/addressing/ip_address.hpp (revision 5406) @@ -128,9 +128,9 @@ //--- address info -------------------------------------------------------- - const std::string& type_name() const { + static const std::string& type_name() { return type_name_ip; } - const uint16_t type_id() const { + static const uint16_t type_id() { return 0x81DD; } @@ -148,4 +148,26 @@ } + bool is_link_local() const { + if (addr.is_v4()) return false; + return addr.to_v6().is_link_local(); + } + + bool is_multicast_link_local() const { + if (addr.is_v4()) return false; + return addr.to_v6().is_multicast_link_local(); + + } + + bool is_multicast_node_local() const { + if (addr.is_v4()) return false; + return addr.to_v6().is_multicast_node_local(); + } + + + bool is_multicast_site_local() const { + if (addr.is_v4()) return false; + return addr.to_v6().is_multicast_site_local(); + } + bool is_any() const { if (addr.is_v4()) return addr.to_v4() == address_v4::any(); @@ -153,4 +175,14 @@ } + bool is_v4_compatible() const { + if (addr.is_v4()) return true; + return addr.to_v6().is_v4_compatible(); + } + + bool is_v4_mapped() { + if (addr.is_v4()) return true; + return addr.to_v6().is_v4_mapped(); + } + bool is_v4() const { return addr.is_v4(); @@ -176,4 +208,5 @@ namespace boost { +// boost hash function template<> struct hash: public std::unary_function { Index: source/ariba/utility/transport/rfcomm/rfcomm.cpp =================================================================== --- source/ariba/utility/transport/rfcomm/rfcomm.cpp (revision 5405) +++ source/ariba/utility/transport/rfcomm/rfcomm.cpp (revision 5406) @@ -11,7 +11,8 @@ #include - namespace ariba { namespace transport { + +use_logging_cpp(rfcomm) using namespace boost::asio; @@ -31,5 +32,6 @@ public: link_info(io_service& io ) : - up(false), local(), remote(), socket(io), size(0), buffer(NULL), sending(false) { + up(false), local(), remote(), socket(io), connect_retries(0), + size(0), buffer(NULL), sending(false) { } @@ -38,4 +40,5 @@ rfcomm_endpoint local, remote; bluetooth::rfcomm::socket socket; + int connect_retries; // read buffer @@ -50,10 +53,9 @@ }; -void rfcomm::remove_info(link_info* info) { - for (vector::iterator i = links.begin(); i!=links.end();i++) - if (*i==info) { - delete info; - links.erase(i); - } +void rfcomm::shutdown(link_info* info) { + if (info != NULL && info->up) { + info->up = false; + info->socket.shutdown( bluetooth::rfcomm::socket::shutdown_both ); + } } @@ -76,4 +78,5 @@ rfcomm::rfcomm(uint16_t channel) : channel(channel), io(asio_io_service::alloc()) { + accept_retries = 0; } @@ -88,9 +91,11 @@ // create acceptor - cout << "Binding to channel " << channel << endl; + logging_info( "Binding to channel " << channel ); acceptor = new bluetooth::rfcomm::acceptor(io, bluetooth::rfcomm::endpoint(bluetooth::rfcomm::get(), channel ) ); + send_data = new link_data(); + // start accepting start_accept(); @@ -98,8 +103,10 @@ void rfcomm::stop() { + logging_info( "Stopping asio rfcomm" ); } void rfcomm::send(const address_v* remote, const uint8_t* data, size_t size) { + // get end-point rfcomm_endpoint endpoint = *remote; @@ -107,15 +114,22 @@ // try to find established connector + logging_debug("Trying to find a already existing link."); link_info* info = NULL; for (size_t i = 0; i < links.size(); i++) if (links[i]->remote.mac() == endpoint.mac()) { + logging_debug("Using already established link"); info = links[i]; break; } - // not found? ->try to connect - if (info==NULL) { - cout << "Connecting to " << endpoint.to_string() << endl; - info = new link_info(io); + // not found, or not up? ->try to (re-)connect + if (info==NULL || !info->up) { + logging_debug( "Connecting to " << endpoint.to_string() ); + if (info != NULL && !info->up) { + logging_debug("Old link is down. Trying to re-establish link."); + } else { + info = new link_info(io); + } + info->remote = endpoint; info->socket.async_connect( convert(endpoint), boost::bind( &rfcomm::handle_connect, this, @@ -156,5 +170,16 @@ void rfcomm::terminate(const address_v* local, const address_v* remote) { - // not supported right now! + // get end-point + rfcomm_endpoint endpoint = *remote; + + for (size_t i = 0; i < links.size(); i++) + if (links[i]->remote.mac() == endpoint.mac()) { + + // close socket + links[i]->socket.cancel(); + links[i]->socket.close(); + links[i]->up = false; + break; + } } @@ -165,5 +190,5 @@ void rfcomm::start_accept() { - cout << "Waiting for connections ..." << endl; + logging_info( "Waiting for connections ..." ); // start accepting a connection @@ -181,6 +206,13 @@ void rfcomm::handle_accept(const error_code& error, link_info* info) { if (error) { - cout << "Error accepting" << endl; + logging_error( "Error waiting for new connections: " << error + << ", trying to recover (attempt " << accept_retries << ")"); delete info; + + // restart accepting + if (accept_retries<3) { + accept_retries++; + start_accept(); + } return; } @@ -191,5 +223,6 @@ info->remote = convert( info->socket.remote_endpoint() ); - cout << "Accepting incoming connection from " << info->remote.to_string() << endl; + logging_debug("Accepting incoming connection from " + << info->remote.to_string() ); // add to list @@ -208,7 +241,21 @@ void rfcomm::handle_connect( const error_code& error, link_info* info ) { if (error) { - cout << "Error connecting ..." << endl; - delete info; - return; + logging_error( "Can not connect. Retrying ... " + "(attempt " << info->connect_retries << ")" ); + + // do we retry this connection? yes-> + if (info->connect_retries<3) { + // increase counter + info->connect_retries++; + + // retry connection attempt + info->socket.async_connect( convert(info->remote), boost::bind( + &rfcomm::handle_connect, this, + boost::asio::placeholders::error, info + )); + + } else { // no-> delete link and stop + return; + } } @@ -218,5 +265,5 @@ info->remote = convert( info->socket.remote_endpoint() ); - cout << "Connected to " << info->remote.to_string() << endl; + logging_debug( "Connected to " << info->remote.to_string() ); // add to list @@ -233,10 +280,14 @@ // start read boost::asio::async_read(info->socket, + // read size of packet boost::asio::buffer(info->size_, 4), + // bind handler boost::bind( + // bind parameters &rfcomm::handle_read_header, this, + // handler parameters placeholders::error, placeholders::bytes_transferred, info @@ -248,6 +299,13 @@ link_info* info) { + // handle error + if (error) { + logging_error("Failed to receive message payload."); + shutdown(info); + return; + } + // ignore errors and wait for all data to be received - if (error || bytes != 4) return; + if (bytes != 4) return; // get size @@ -255,5 +313,5 @@ (info->size_[2]<< 8) + (info->size_[3] << 0); - cout << "receive message of size " << info->size << endl; + logging_debug( "Message header received -> receive message of size " << info->size ); // allocate buffer @@ -277,11 +335,15 @@ link_info* info) { - // ignore errors and wait for all data to be received - if (error || bytes != info->size) { - if (error) remove_info(info); + // check error + if (error) { + logging_error("Failed to receive message payload."); + shutdown(info); return; } - cout << "received message of size " << info->size << endl; + // wait for all data to be received + if (bytes != info->size) return; + + logging_debug( "Received message of size " << info->size ); // deliver data @@ -296,4 +358,6 @@ void rfcomm::start_write( link_info* info ) { + boost::mutex::scoped_lock(info->mutex); + // do not start writing if sending is in progress if (info->sending || !info->up || info->send_buffer.size()==0) return; @@ -302,12 +366,10 @@ // safely remove data from deque - info->mutex.lock(); - link_data data = info->send_buffer.front(); + *send_data = info->send_buffer.front(); info->send_buffer.pop_front(); - info->mutex.unlock(); boost::array buffer; - buffer[0] = boost::asio::buffer(data.size_,4); - buffer[1] = boost::asio::buffer(data.buffer,data.size); + buffer[0] = boost::asio::buffer(send_data->size_,4); + buffer[1] = boost::asio::buffer(send_data->buffer,send_data->size); // start writing @@ -321,5 +383,5 @@ // handler parameters placeholders::error, placeholders::bytes_transferred, - info, data.size, data.buffer + info, send_data->size, send_data->buffer ) ); @@ -332,11 +394,13 @@ if (error || bytes != (size+4) ) { if (error) { - cout << "Message sent error" << endl; - remove_info(info); + logging_error( "Message sent error" ); + + // close socket + info->socket.close(); + info->up = false; } return; } - - cout << "Message sent" << endl; + logging_debug( "Message sent" ); // free buffer Index: source/ariba/utility/transport/rfcomm/rfcomm.hpp =================================================================== --- source/ariba/utility/transport/rfcomm/rfcomm.hpp (revision 5405) +++ source/ariba/utility/transport/rfcomm/rfcomm.hpp (revision 5406) @@ -11,4 +11,6 @@ #include +#include "ariba/utility/logging/Logging.h" + namespace ariba { namespace transport { @@ -18,4 +20,5 @@ class link_info; +class link_data; /** @@ -25,4 +28,5 @@ */ class rfcomm : public transport_protocol { + use_logging_h(rfcomm) public: rfcomm( uint16_t channel ); @@ -42,4 +46,6 @@ transport_listener* listener; bluetooth::rfcomm::acceptor* acceptor; + int accept_retries; + link_data* send_data; void start_accept(); @@ -60,5 +66,5 @@ link_info* info, size_t size, uint8_t* buffer ); - void remove_info(link_info* info); + void shutdown(link_info* info); };