Ignore:
Timestamp:
Jul 24, 2009, 8:53:41 PM (15 years ago)
Author:
Christoph Mayer
Message:

merge from bootstrap branch

File:
1 edited

Legend:

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

    r5002 r5316  
    6161        nodeid = _nodeid;
    6262
     63        logging_info("starting overlay bootstrap");
     64
    6365        manager.registerCallback( this );
    64         //manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
     66        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
     67        //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
    6568}
    6669
     
    7073        nodeid = NodeID::UNSPECIFIED;
    7174
     75        logging_info("stopping overlay bootstrap");
     76
    7277        manager.unregisterCallback( this );
    73         //manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
     78        manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
     79        //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
    7480}
    7581
     
    8389        // tell the base overlay to join using this endpoint
    8490        assert( overlay != NULL );
    85         // TODO: overlay->joinSpoVNet( spovnetid, data->endpoint );
     91        overlay->joinSpoVNet( spovnetid, data->endpoint );
    8692
    8793        delete data;
Note: See TracChangeset for help on using the changeset viewer.