An Overlay-based
Virtual Network Substrate
SpoVNet

Ignore:
Timestamp:
Mar 23, 2011, 12:06:05 PM (9 years ago)
Author:
mies
Message:

rolled back

Location:
source/ariba/communication/messages
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/communication/messages/AribaBaseMsg.cpp

    r9684 r9694  
    4444vsznDefault(AribaBaseMsg);
    4545
    46 AribaBaseMsg::AribaBaseMsg( type_ _type, LinkID link ) :
    47         type((uint8_t)_type), link(link){
     46AribaBaseMsg::AribaBaseMsg( type_ _type,
     47        const LinkID& localLink, const LinkID& remoteLink ) :
     48        type((uint8_t)_type),
     49        localLink(localLink),remoteLink(remoteLink) {
    4850}
    4951
  • source/ariba/communication/messages/AribaBaseMsg.h

    r9684 r9694  
    4141
    4242#include <string>
    43 #include <stdint.h>
    44 
     43#include <boost/cstdint.hpp>
    4544#include "ariba/utility/messages.h"
    4645#include "ariba/utility/serialization.h"
    47 
    4846#include "ariba/utility/types/LinkID.h"
    4947#include "ariba/utility/types/Address.h"
     
    7472        };
    7573
    76         AribaBaseMsg( type_ type = typeData, LinkID link = LinkID::UNSPECIFIED );
     74        AribaBaseMsg( type_ type = typeData,
     75                        const LinkID& localLink = LinkID::UNSPECIFIED,
     76                        const LinkID& remoteLink = LinkID::UNSPECIFIED );
     77
    7778        virtual ~AribaBaseMsg();
    7879
     
    8384        }
    8485
    85         const LinkID& getLink() const {
    86                 return link;
     86        const LinkID& getLocalLink() const {
     87                return localLink;
     88        }
     89
     90        const LinkID& getRemoteLink() const {
     91                return remoteLink;
    8792        }
    8893
     
    96101
    97102private:
    98         // link message type
    99         uint8_t type;
     103        uint8_t type;           // the link message type
    100104
    101         // link identifier
    102         LinkID  link;
     105        // remote and local link ids
     106        LinkID localLink;       // the local link id
     107        LinkID remoteLink;      // the remote link id
    103108
    104         // remote and local endpoint descriptors (link reply/request only)
     109        // remote and local endpoint descriptors
    105110        EndpointDescriptor localDescriptor;
    106111        EndpointDescriptor remoteDescriptor;
     
    110115
    111116sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
    112         X && type && link;
    113         if (type == typeLinkReply || type == typeLinkRequest) {
     117        X && type && &localLink && &remoteLink;
     118        if (type == typeLinkReply || type == typeLinkRequest)
    114119                X && localDescriptor && remoteDescriptor;
    115         }
    116120        X && Payload();
    117121} sznEnd();
Note: See TracChangeset for help on using the changeset viewer.