Ignore:
Timestamp:
May 26, 2009, 1:40:23 AM (16 years ago)
Author:
mies
Message:

Merged 20090512-mies-connectors changes r3472:r3689 into trunk.

Location:
source/ariba/communication
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/communication/BaseCommunication.cpp

    r3067 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "BaseCommunication.h"
    … …  
    160160
    161161const LinkID BaseCommunication::establishLink(
    162                         const EndpointDescriptor& descriptor,
    163                         const QoSParameterSet& qos,
    164                         const SecurityParameterSet& sec){
    165 
     162        const EndpointDescriptor& descriptor,
     163        const LinkID& link_id,
     164        const QoSParameterSet& qos,
     165        const SecurityParameterSet& sec) {
     166
     167        // copy link id
     168        LinkID linkid = link_id;
     169
     170        // debug
    166171        logging_debug( "request to establish link" );
    167172
    … …  
    169174        // just use the first locator in the endp descriptors
    170175        //
    171 
    172176        if( descriptor.locator == NULL ){
    173177                logging_error( "invalid destination endpoint" );
    … …  
    183187        const NetworkLocator* local =  localDescriptor.locator;
    184188
    185         //
    186         // create link and link descriptor
    187         //
    188 
    189         LinkID linkid = LinkID::create();
    190 
     189        // create link identifier and link descriptor
     190        if (linkid.isUnspecified()) linkid = LinkID::create();
    191191        logging_debug( "creating new local descriptor entry with local link id " << linkid.toString() );
    192192        LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor, false );

  • source/ariba/communication/BaseCommunication.h

    r3037 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef BASECOMMUNICATION_H_
    … …  
    147147
    148148        /**
    149          * Establishes a link to another end-point
     149         * Establishes a link to another end-point.
    150150         */
    151151        const LinkID establishLink(
    152                         const EndpointDescriptor& descriptor,
    153                         const QoSParameterSet& qos = QoSParameterSet::DEFAULT,
    154                         const SecurityParameterSet& sec = SecurityParameterSet::DEFAULT
     152                const EndpointDescriptor& descriptor,
     153                const LinkID& linkid = LinkID::UNSPECIFIED,
     154                const QoSParameterSet& qos = QoSParameterSet::DEFAULT,
     155                const SecurityParameterSet& sec = SecurityParameterSet::DEFAULT
    155156        );
    156157
    157158        /**
    158          * Drops a link
     159         * Drops a link.
    159160         *
    160161         * @param The link id of the link that should be dropped

  • source/ariba/communication/CommunicationEvents.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "CommunicationEvents.h"

  • source/ariba/communication/CommunicationEvents.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __COMMUNICATION_EVENTS_H

  • source/ariba/communication/EndpointDescriptor.cpp

    r3037 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "EndpointDescriptor.h"

  • source/ariba/communication/EndpointDescriptor.h

    r3037 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef ENDPOINTDESCRIPTOR_H_
    … …  
    5656using_serialization;
    5757
    58 class EndpointDescriptor : VSerializeable {
     58class EndpointDescriptor : public VSerializeable {
    5959        VSERIALIZEABLE;
    6060

  • source/ariba/communication/messages/AribaBaseMsg.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "AribaBaseMsg.h"

  • source/ariba/communication/messages/AribaBaseMsg.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef ARIBA_BASE_MSG_H__

  • source/ariba/communication/modules/_namespace.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#undef NAMESPACE_BEGIN

  • source/ariba/communication/modules/modules.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef MODULES_H_

  • source/ariba/communication/modules/network/NetworkLocator.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "NetworkLocator.h"

  • source/ariba/communication/modules/network/NetworkLocator.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef NETWORKLOCATOR_H_

  • source/ariba/communication/modules/network/NetworkProtocol.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "NetworkProtocol.h"

  • source/ariba/communication/modules/network/NetworkProtocol.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef NETWORKPROTOCOL_H_

  • source/ariba/communication/modules/network/ip/IPv4Locator.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "IPv4Locator.h"

  • source/ariba/communication/modules/network/ip/IPv4Locator.h

    r2452 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef IPV4LOCATOR_H_

  • source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "IPv4NetworkProtocol.h"

  • source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef IPV4_NETWORK_PROTOCOL_H__

  • source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "OmnetNetworkProtocol.h"

  • source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __OMNET_NETWORK_PROTOCOL_H

  • source/ariba/communication/modules/transport/TransportLocator.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "TransportLocator.h"

  • source/ariba/communication/modules/transport/TransportLocator.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef TRANSPORTLOCATOR_H_

  • source/ariba/communication/modules/transport/TransportProtocol.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "TransportProtocol.h"

  • source/ariba/communication/modules/transport/TransportProtocol.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef TRANSPORTPROTOCOL_H_

  • source/ariba/communication/modules/transport/omnet/AribaOmnetMessage.msg

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939message AribaOmnetMessage

  • source/ariba/communication/modules/transport/omnet/AribaOmnetModule.cpp

    r3055 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "AribaOmnetModule.h"

  • source/ariba/communication/modules/transport/omnet/AribaOmnetModule.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef ARIBA_OMNET_MODULE_H__

  • source/ariba/communication/modules/transport/tcp/TCPTransport.cpp

    r2467 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "TCPTransport.h"

  • source/ariba/communication/modules/transport/tcp/TCPTransport.h

    r2467 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef TCPTRANSPORT_H_

  • source/ariba/communication/modules/transport/tcp/TCPTransportLocator.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "TCPTransportLocator.h"

  • source/ariba/communication/modules/transport/tcp/TCPTransportLocator.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef TCPTRANSPORTLOCATOR_H_

  • source/ariba/communication/networkinfo/AddressInformation.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "AddressInformation.h"

  • source/ariba/communication/networkinfo/AddressInformation.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __ADDRESS_INFORMATION_H

  • source/ariba/communication/networkinfo/NetworkChangeDetection.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "NetworkChangeDetection.h"

  • source/ariba/communication/networkinfo/NetworkChangeDetection.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __NETWORK_CHANGE_DETECTION_H

  • source/ariba/communication/networkinfo/NetworkChangeInterface.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __NETWORK_CHANGE_INTERFACE_H

  • source/ariba/communication/networkinfo/NetworkInformation.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "NetworkInformation.h"

  • source/ariba/communication/networkinfo/NetworkInformation.h

    r2988 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __NETWORK_INFORMATION_H

  • source/ariba/communication/networkinfo/NetworkInterface.cpp

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#include "NetworkInterface.h"

  • source/ariba/communication/networkinfo/NetworkInterface.h

    r3689 r3690  
    1 // [Licence]
     1// [License]
    22// The Ariba-Underlay Copyright
    33//
    … …  
    3535// official policies, either expressed or implied, of the Institute of
    3636// Telematics.
    37 // [Licence]
     37// [License]
    3838
    3939#ifndef __NETWORK_INTERFACE_H
Note: See TracChangeset for help on using the changeset viewer.