Ignore:
Timestamp:
Jul 29, 2009, 11:45:17 AM (15 years ago)
Author:
Christoph Mayer
Message:

-logging fix, -sdp fix, -endpoint operator fix, -endpoint aufräumen

File:
1 edited

Legend:

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

    r5406 r5412  
    6060namespace overlay {
    6161
    62 #define logging_force(x) std::cout << x << std::endl;
    63 #define logging_force1(x) std::cout << x << std::endl;
    64 
    6562LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) {
    6663        BOOST_FOREACH( LinkDescriptor* lp, links )
     
    127124                // get descriptor of first hop
    128125                rld = getDescriptor(rlid);
    129                 logging_force1( rld );
     126                logging_force( rld );
    130127
    131128                // is first hop a relay path? yes-> try to find real link!
     
    136133                else relayNode = rld->remoteNode;
    137134        }
    138         logging_force1( "Potential relay node " << relayNode.toString() );
     135        logging_force( "Potential relay node " << relayNode.toString() );
    139136        // do not return myself or use the node as relay node
    140137        if (relayNode == nodeId)
    141138                return NodeID::UNSPECIFIED;
    142139        else {
    143                 logging_force1( "Returning relay node " << relayNode.toString() );
     140                logging_force( "Returning relay node " << relayNode.toString() );
    144141                return relayNode;
    145142        }
     
    310307                        " with nodeid " << nodeId.toString());
    311308
    312         if(bootstrapEp == EndpointDescriptor::UNSPECIFIED && state == BaseOverlayStateInvalid){
     309        if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){
    313310
    314311                // bootstrap against ourselfs
Note: See TracChangeset for help on using the changeset viewer.