Changeset 5412 for source/ariba/overlay/BaseOverlay.cpp
- Timestamp:
- Jul 29, 2009, 11:45:17 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
source/ariba/overlay/BaseOverlay.cpp
r5406 r5412 60 60 namespace overlay { 61 61 62 #define logging_force(x) std::cout << x << std::endl;63 #define logging_force1(x) std::cout << x << std::endl;64 65 62 LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) { 66 63 BOOST_FOREACH( LinkDescriptor* lp, links ) … … 127 124 // get descriptor of first hop 128 125 rld = getDescriptor(rlid); 129 logging_force 1( rld );126 logging_force( rld ); 130 127 131 128 // is first hop a relay path? yes-> try to find real link! … … 136 133 else relayNode = rld->remoteNode; 137 134 } 138 logging_force 1( "Potential relay node " << relayNode.toString() );135 logging_force( "Potential relay node " << relayNode.toString() ); 139 136 // do not return myself or use the node as relay node 140 137 if (relayNode == nodeId) 141 138 return NodeID::UNSPECIFIED; 142 139 else { 143 logging_force 1( "Returning relay node " << relayNode.toString() );140 logging_force( "Returning relay node " << relayNode.toString() ); 144 141 return relayNode; 145 142 } … … 310 307 " with nodeid " << nodeId.toString()); 311 308 312 if(bootstrapEp == EndpointDescriptor::UNSPECIFIED&& state == BaseOverlayStateInvalid){309 if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){ 313 310 314 311 // bootstrap against ourselfs
Note:
See TracChangeset
for help on using the changeset viewer.