Index: source/ariba/communication/messages/AribaBaseMsg.cpp =================================================================== --- source/ariba/communication/messages/AribaBaseMsg.cpp (revision 12775) +++ source/ariba/communication/messages/AribaBaseMsg.cpp (revision 2378) @@ -1,3 +1,3 @@ -// [License] +// [Licence] // The Ariba-Underlay Copyright // @@ -35,5 +35,5 @@ // official policies, either expressed or implied, of the Institute of // Telematics. -// [License] +// [Licence] #include "AribaBaseMsg.h" @@ -44,28 +44,42 @@ vsznDefault(AribaBaseMsg); -AribaBaseMsg::AribaBaseMsg( type_ _type, - const LinkID& localLink, const LinkID& remoteLink ) : - type((uint8_t)_type), - localLink(localLink),remoteLink(remoteLink) { +AribaBaseMsg::AribaBaseMsg( + const Address* address, + LINK_STATE _state, + const LinkID& _localLink, + const LinkID& _remoteLink ) + : state( (uint8_t)_state ), + localLink( _localLink ), + remoteLink( _remoteLink ){ + + Message::setDestinationAddress( address ); } -AribaBaseMsg::~AribaBaseMsg() { +AribaBaseMsg::~AribaBaseMsg(){ } -const string AribaBaseMsg::getTypeString() const { - switch (getType()) { - case typeData: - return "typeData"; - case typeLinkRequest: - return "typeLinkRequest"; - case typeLinkReply: - return "typeLinkReply"; - case typeLinkClose: - return "typeLinkClose"; - case typeLinkUpdate: - return "typeLinkUpdate"; - default: - return "unknown"; +const AribaBaseMsg::LINK_STATE AribaBaseMsg::getType(){ + return (LINK_STATE)state; +} + +const LinkID& AribaBaseMsg::getLocalLink(){ + return localLink; +} + +const LinkID& AribaBaseMsg::getRemoteLink(){ + return remoteLink; +} + +const string AribaBaseMsg::getTypeString(){ + + switch( getType() ){ + case LINK_STATE_DATA: return "LINK_STATE_DATA"; + case LINK_STATE_OPEN_REQUEST: return "LINK_STATE_OPEN_REQUEST"; + case LINK_STATE_OPEN_REPLY: return "LINK_STATE_OPEN_REPLY"; + case LINK_STATE_CLOSE_REQUEST: return "LINK_STATE_CLOSE_REQUEST"; + case LINK_STATE_UPDATE: return "LINK_STATE_UPDATE"; + default: "unknown"; } + return "unknown"; } Index: source/ariba/communication/messages/AribaBaseMsg.h =================================================================== --- source/ariba/communication/messages/AribaBaseMsg.h (revision 12775) +++ source/ariba/communication/messages/AribaBaseMsg.h (revision 2378) @@ -1,3 +1,3 @@ -// [License] +// [Licence] // The Ariba-Underlay Copyright // @@ -35,5 +35,5 @@ // official policies, either expressed or implied, of the Institute of // Telematics. -// [License] +// [Licence] #ifndef ARIBA_BASE_MSG_H__ @@ -42,12 +42,9 @@ #include #include -//#include "ariba/utility/messages.h" -#include "ariba/utility/messages/Message.h" +#include "ariba/utility/messages.h" #include "ariba/utility/serialization.h" #include "ariba/utility/types/LinkID.h" #include "ariba/utility/types/Address.h" #include "ariba/utility/types/ServiceID.h" - -#include "../EndpointDescriptor.h" using std::string; @@ -62,55 +59,33 @@ using_serialization; -// XXX This whole message is DEPRECATED class AribaBaseMsg : public Message { VSERIALIZEABLE; public: - enum type_ { - typeData = 0, - typeLinkRequest = 1, - typeLinkReply = 2, - typeLinkClose = 3, - typeLinkUpdate = 4, - typeDirectData = 5 - }; - AribaBaseMsg( type_ type = typeData, - const LinkID& localLink = LinkID::UNSPECIFIED, - const LinkID& remoteLink = LinkID::UNSPECIFIED ); + typedef enum _LINK_STATE { + LINK_STATE_DATA = 0, + LINK_STATE_OPEN_REQUEST = 1, + LINK_STATE_OPEN_REPLY = 2, + LINK_STATE_CLOSE_REQUEST = 3, // there is no close reply. send request and local link is closed + LINK_STATE_UPDATE = 4, + } LINK_STATE; + + AribaBaseMsg( const Address* address = NULL, + LINK_STATE _state = LINK_STATE_DATA, + const LinkID& _localLink = LinkID::UNSPECIFIED, + const LinkID& _remoteLink = LinkID::UNSPECIFIED ); virtual ~AribaBaseMsg(); - const string getTypeString() const; - - const type_ getType() const { - return (type_)type; - } - - const LinkID& getLocalLink() const { - return localLink; - } - - const LinkID& getRemoteLink() const { - return remoteLink; - } - - EndpointDescriptor& getLocalDescriptor() { - return localDescriptor; - } - - EndpointDescriptor& getRemoteDescriptor() { - return remoteDescriptor; - } + const LINK_STATE getType(); + const string getTypeString(); + const LinkID& getLocalLink(); + const LinkID& getRemoteLink(); private: - uint8_t type; // the link message type - - // remote and local link ids + uint8_t state; // the link message type LinkID localLink; // the local link id LinkID remoteLink; // the remote link id - // remote and local endpoint descriptors - EndpointDescriptor localDescriptor; - EndpointDescriptor remoteDescriptor; }; @@ -118,8 +93,5 @@ sznBeginDefault( ariba::communication::AribaBaseMsg, X ) { - X && type && &remoteLink; - if (type == typeLinkReply || type == typeLinkRequest) - X && &localLink && localDescriptor && remoteDescriptor; -// X && Payload(); + X && state && &localLink && &remoteLink && Payload(); } sznEnd(); Index: source/ariba/communication/messages/CMakeLists.txt =================================================================== --- source/ariba/communication/messages/CMakeLists.txt (revision 12775) +++ (revision ) @@ -1,41 +1,0 @@ -# [License] -# The Ariba-Underlay Copyright -# -# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH) -# -# Institute of Telematics -# UniversitÀt Karlsruhe (TH) -# Zirkel 2, 76128 Karlsruhe -# Germany -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation -# are those of the authors and should not be interpreted as representing -# official policies, either expressed or implied, of the Institute of -# Telematics. -# [License] - -#add_headers(AribaBaseMsg.h) - -#add_sources(AribaBaseMsg.cpp)