Changeset 6878 for source/ariba/overlay


Ignore:
Timestamp:
Nov 6, 2009, 1:42:09 PM (15 years ago)
Author:
mies
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/overlay/BaseOverlay.cpp

    r6874 r6878  
    11121112
    11131113        // return own end-point descriptor
    1114         if( link == LinkID::UNSPECIFIED )
     1114        if( link.isUnspecified() )
    11151115                return bc->getEndpointDescriptor();
    11161116
     
    11321132        // no joined and request remote descriptor? -> fail!
    11331133        if( overlayInterface == NULL ) {
    1134                 logging_error( "overlay interface not set, cannot resolve endpoint" );
     1134                logging_error( "Overlay interface not set, cannot resolve end-point." );
    11351135                return EndpointDescriptor::UNSPECIFIED();
    11361136        }
    11371137
    1138         // resolve end-point descriptor from the base-overlay routing table
    1139         const EndpointDescriptor& ep = overlayInterface->resolveNode( node );
    1140         if(ep.toString() != "") return ep;
     1138//      // resolve end-point descriptor from the base-overlay routing table
     1139//      const EndpointDescriptor& ep = overlayInterface->resolveNode( node );
     1140//      if(ep.toString() != "") return ep;
    11411141
    11421142        // see if we can find the node in our own table
    11431143        BOOST_FOREACH(const LinkDescriptor* ld, links){
    11441144                if(ld->remoteNode != node) continue;
    1145                 const EndpointDescriptor& ep = bc->getEndpointDescriptor(ld->communicationId);
     1145                const EndpointDescriptor& ep =
     1146                                bc->getEndpointDescriptor(ld->communicationId);
    11461147                if(ep.toString() == "") continue;
    11471148                if(ep != EndpointDescriptor::UNSPECIFIED()) return ep;
    11481149        }
     1150
     1151        logging_warn( "No EndpointDescriptor found for node " << node );
     1152        logging_warn( debugInformation() );
    11491153
    11501154        return EndpointDescriptor::UNSPECIFIED();
     
    22642268
    22652269        // dump overlay information
     2270        s << "Long debug info ... [see below]" << endl << endl;
    22662271        s << "--- overlay information ----------------------" << endl;
    22672272        s << overlayInterface->debugInformation() << endl;
    2268         s << "----------------------------------------------" << endl;
    22692273
    22702274        // dump link state
     
    22742278                i++;
    22752279        }
    2276         s << endl;
     2280        s << endl << endl;
    22772281
    22782282        return s.str();
Note: See TracChangeset for help on using the changeset viewer.