Ignore:
Timestamp:
Feb 23, 2009, 2:21:49 PM (16 years ago)
Author:
Christoph Mayer
Message:

-einige fixes im ablauf des neuen interface
-einige fehlende funktionalität implementiert

Location:
source/ariba/interface
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/interface/ServiceInterface.cpp

    r2472 r2473  
    3838
    3939#include "ServiceInterface.h"
    40 #include "ariba/interface/AribaContext.h"
    4140
    4241namespace ariba {
    4342namespace interface {
    4443
    45 ServiceInterface::ServiceInterface() : overlay( NULL ){
     44ServiceInterface::ServiceInterface() {
    4645}
    4746
    4847ServiceInterface::~ServiceInterface(){
    49         if( overlay != NULL )
    50                 overlay->unbind( this, serviceid );
    51 }
    52 
    53 bool ServiceInterface::initialize( AribaContext* _ctx, const ServiceID& _serviceid ){
    54         return initialize( &_ctx->getOverlay(), _serviceid );
    55 }
    56 
    57 bool ServiceInterface::initialize( BaseOverlay* _overlay, const ServiceID& _serviceid ){
    58         if( _overlay == NULL ) return false;
    59 
    60         overlay = _overlay;
    61         serviceid = _serviceid;
    62 
    63         return overlay->bind( this, serviceid);
    6448}
    6549

  • source/ariba/interface/ServiceInterface.h

    r2472 r2473  
    6767namespace interface {
    6868
    69 class AribaContext;
    70 
    7169class ServiceInterface : public OverlayEvents, MessageReceiver {
    7270        friend class ariba::overlay::BaseOverlay;
    … …  
    7472        ServiceInterface();
    7573        virtual ~ServiceInterface();
    76 
    77         bool initialize( AribaContext* _ctx, const ServiceID& _serviceid );
    78         bool initialize( BaseOverlay* _overlay, const ServiceID& _serviceid );
    7974
    8075protected:
    … …  
    9691
    9792        virtual bool receiveMessage( const Message* message, const LinkID& link, const NodeID& node );
    98 
    99 private:
    100         BaseOverlay* overlay;
    101         ServiceID serviceid;
    10293};
    10394

  • source/ariba/interface/UnderlayAbstraction.cpp

    r2472 r2473  
    8686}
    8787
    88 void UnderlayAbstraction::destroySpoVNet(AribaContext* ctx) {
    89         ctx->getOverlay().leaveSpoVNet();
    90         delete &ctx->getOverlay();
    91         delete &ctx->getBaseCommunication();
    92         delete ctx;
    93 }
    94 
    9588AribaContext* UnderlayAbstraction::joinSpoVNet(const SpoVNetID& spovnetid, const EndpointDescriptor& bootstrapnode, const NodeID& nodeid, const NetworkLocator* locallocator, const uint16_t localport) {
    9689
    … …  
    107100
    108101void UnderlayAbstraction::leaveSpoVNet(AribaContext* ctx) {
    109         destroySpoVNet( ctx );
     102        ctx->getOverlay().leaveSpoVNet();
     103        delete &ctx->getOverlay();
     104        delete &ctx->getBaseCommunication();
     105        delete ctx;
    110106}
    111107

  • source/ariba/interface/UnderlayAbstraction.h

    r2472 r2473  
    7979        );
    8080
    81         void destroySpoVNet( AribaContext* ctx );
    82 
    8381        AribaContext* joinSpoVNet(
    8482                const SpoVNetID& spovnetid,
Note: See TracChangeset for help on using the changeset viewer.