Ignore:
Timestamp:
Jul 24, 2009, 3:23:11 PM (15 years ago)
Author:
mies
Message:

+ added new transport modules and adapted ariba to them
+ exchange endpoint descriptors an link establishment
+ clean up of base communication
+ link establishment with in the presence of multiple endpoints
+ local discovery for ipv6, ipv4 and bluetooth mac addresses

File:
1 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/Makefile.am

    r5151 r5284  
    113113# ------------> communication :: modules
    114114
    115 nobase_libariba_la_HEADERS += \
    116   communication/modules/modules.h \
    117   communication/modules/_namespace.h
     115#nobase_libariba_la_HEADERS += \
     116#  communication/modules/modules.h \
     117#  communication/modules/_namespace.h
    118118
    119119# ------------> communication :: modules :: network
    120 libariba_la_SOURCES += \
    121   communication/modules/network/NetworkLocator.cpp \
    122   communication/modules/network/NetworkProtocol.cpp
    123 
    124 nobase_libariba_la_HEADERS += \
    125   communication/modules/network/NetworkLocator.h \
    126   communication/modules/network/NetworkProtocol.h
     120
     121#libariba_la_SOURCES += \
     122#  communication/modules/network/NetworkLocator.cpp \
     123#  communication/modules/network/NetworkProtocol.cpp
     124
     125#nobase_libariba_la_HEADERS += \
     126#  communication/modules/network/NetworkLocator.h \
     127#  communication/modules/network/NetworkProtocol.h
    127128
    128129# ------------> communication :: modules :: network :: ip
    129130
    130 libariba_la_SOURCES += \
    131   communication/modules/network/ip/IPv4Locator.cpp \
    132   communication/modules/network/ip/IPv4NetworkProtocol.cpp
    133 
    134 nobase_libariba_la_HEADERS += \
    135   communication/modules/network/ip/IPv4Locator.h  \
    136   communication/modules/network/ip/IPv4NetworkProtocol.h
     131#libariba_la_SOURCES += \
     132#  communication/modules/network/ip/IPv4Locator.cpp \
     133#  communication/modules/network/ip/IPv4NetworkProtocol.cpp
     134
     135#nobase_libariba_la_HEADERS += \
     136#  communication/modules/network/ip/IPv4Locator.h  \
     137#  communication/modules/network/ip/IPv4NetworkProtocol.h
    137138
    138139# ------------> communication :: modules :: network :: omnet
    139140
    140 if OMNET
    141 libariba_la_SOURCES += \
    142   communication/modules/network/omnet/OmnetNetworkProtocol.cpp
    143 
    144 nobase_libariba_la_HEADERS += \
    145   communication/modules/network/omnet/OmnetNetworkProtocol.h
    146 endif
     141#if OMNET
     142#libariba_la_SOURCES += \
     143#  communication/modules/network/omnet/OmnetNetworkProtocol.cpp
     144
     145#nobase_libariba_la_HEADERS += \
     146#  communication/modules/network/omnet/OmnetNetworkProtocol.h
     147#endif
    147148
    148149#------------> communication :: modules :: transport
    149150
    150 libariba_la_SOURCES += \
    151   communication/modules/transport/TransportLocator.cpp \
    152   communication/modules/transport/TransportProtocol.cpp
    153 
    154 nobase_libariba_la_HEADERS += \
    155   communication/modules/transport/TransportLocator.h \
    156   communication/modules/transport/TransportProtocol.h
     151#libariba_la_SOURCES += \
     152#  communication/modules/transport/TransportLocator.cpp \
     153#  communication/modules/transport/TransportProtocol.cpp
     154
     155#nobase_libariba_la_HEADERS += \
     156#  communication/modules/transport/TransportLocator.h \
     157#  communication/modules/transport/TransportProtocol.h
    157158
    158159#------------> communication :: modules :: transport :: omnet
    159160
    160 if OMNET
    161 libariba_la_SOURCES += \
    162   communication/modules/transport/omnet/AribaOmnetMessage_m.cc \
    163   communication/modules/transport/omnet/AribaOmnetModule.cpp
    164 
    165 nobase_libariba_la_HEADERS += \
    166   communication/modules/transport/omnet/AribaOmnetMessage_m.h \
    167   communication/modules/transport/omnet/AribaOmnetModule.h
    168 endif
     161#if OMNET
     162#libariba_la_SOURCES += \
     163#  communication/modules/transport/omnet/AribaOmnetMessage_m.cc \
     164#  communication/modules/transport/omnet/AribaOmnetModule.cpp
     165
     166#nobase_libariba_la_HEADERS += \
     167#  communication/modules/transport/omnet/AribaOmnetMessage_m.h \
     168#  communication/modules/transport/omnet/AribaOmnetModule.h
     169#endif
    169170
    170171#------------> communication :: modules :: transport :: protlib
    … …  
    172173if OMNET
    173174else
    174 libariba_la_SOURCES += \
    175   communication/modules/transport/protlib/timer_module.cpp \
    176   communication/modules/transport/protlib/threadsafe_db.cpp \
    177   communication/modules/transport/protlib/address.cpp \
    178   communication/modules/transport/protlib/ie.cpp \
    179   communication/modules/transport/protlib/tp_over_tcp.cpp \
    180   communication/modules/transport/protlib/setuid.cpp \
    181   communication/modules/transport/protlib/tp.cpp \
    182   communication/modules/transport/protlib/connectionmap_uds.cpp \
    183   communication/modules/transport/protlib/logfile.cpp \
    184   communication/modules/transport/protlib/timer.cpp \
    185   communication/modules/transport/protlib/connectionmap.cpp \
    186   communication/modules/transport/protlib/fqueue.cpp \
    187   communication/modules/transport/protlib/threads.cpp \
    188   communication/modules/transport/protlib/messages.cpp \
    189   communication/modules/transport/protlib/queuemanager.cpp \
    190   communication/modules/transport/protlib/network_message.cpp \
    191   communication/modules/transport/protlib/configuration.cpp \
    192   communication/modules/transport/protlib/tp_over_uds.cpp \
    193   communication/modules/transport/protlib/tp_over_udp.cpp \
    194   communication/modules/transport/protlib/tp_over_tls_tcp.cpp \
    195   communication/modules/transport/protlib/fastqueue.c \
    196   communication/modules/transport/protlib/eclock_gettime.c \
    197   communication/modules/transport/protlib/testqueue.c
    198 
    199 nobase_libariba_la_HEADERS += \
    200   communication/modules/transport/protlib/tp_over_uds.h \
    201   communication/modules/transport/protlib/threadsafe_db.h \
    202   communication/modules/transport/protlib/configuration.h \
    203   communication/modules/transport/protlib/ie.h \
    204   communication/modules/transport/protlib/llhashers.h \
    205   communication/modules/transport/protlib/fqueue.h \
    206   communication/modules/transport/protlib/assocdata_uds.h \
    207   communication/modules/transport/protlib/address.h \
    208   communication/modules/transport/protlib/logfile.h \
    209   communication/modules/transport/protlib/timer.h \
    210   communication/modules/transport/protlib/queuemanager.h \
    211   communication/modules/transport/protlib/messages.h \
    212   communication/modules/transport/protlib/assocdata.h \
    213   communication/modules/transport/protlib/protlib_types.h \
    214   communication/modules/transport/protlib/tp_over_tcp.h \
    215   communication/modules/transport/protlib/tp.h \
    216   communication/modules/transport/protlib/threads.h \
    217   communication/modules/transport/protlib/connectionmap.h \
    218   communication/modules/transport/protlib/timer_module.h \
    219   communication/modules/transport/protlib/fastqueue.h \
    220   communication/modules/transport/protlib/tperror.h \
    221   communication/modules/transport/protlib/tp_over_tls_tcp.h \
    222   communication/modules/transport/protlib/network_message.h \
    223   communication/modules/transport/protlib/tp_over_udp.h \
    224   communication/modules/transport/protlib/setuid.h \
    225   communication/modules/transport/protlib/cleanuphandler.h \
    226   communication/modules/transport/protlib/connectionmap_uds.h
     175#libariba_la_SOURCES += \
     176#  communication/modules/transport/protlib/timer_module.cpp \
     177#  communication/modules/transport/protlib/threadsafe_db.cpp \
     178#  communication/modules/transport/protlib/address.cpp \
     179#  communication/modules/transport/protlib/ie.cpp \
     180#  communication/modules/transport/protlib/tp_over_tcp.cpp \
     181#  communication/modules/transport/protlib/setuid.cpp \
     182#  communication/modules/transport/protlib/tp.cpp \
     183#  communication/modules/transport/protlib/connectionmap_uds.cpp \
     184#  communication/modules/transport/protlib/logfile.cpp \
     185#  communication/modules/transport/protlib/timer.cpp \
     186#  communication/modules/transport/protlib/connectionmap.cpp \
     187#  communication/modules/transport/protlib/fqueue.cpp \
     188#  communication/modules/transport/protlib/threads.cpp \
     189#  communication/modules/transport/protlib/messages.cpp \
     190#  communication/modules/transport/protlib/queuemanager.cpp \
     191#  communication/modules/transport/protlib/network_message.cpp \
     192#  communication/modules/transport/protlib/configuration.cpp \
     193#  communication/modules/transport/protlib/tp_over_uds.cpp \
     194#  communication/modules/transport/protlib/tp_over_udp.cpp \
     195#  communication/modules/transport/protlib/tp_over_tls_tcp.cpp \
     196#  communication/modules/transport/protlib/fastqueue.c \
     197#  communication/modules/transport/protlib/eclock_gettime.c \
     198#  communication/modules/transport/protlib/testqueue.c
     199
     200#nobase_libariba_la_HEADERS += \
     201#  communication/modules/transport/protlib/tp_over_uds.h \
     202#  communication/modules/transport/protlib/threadsafe_db.h \
     203#  communication/modules/transport/protlib/configuration.h \
     204#  communication/modules/transport/protlib/ie.h \
     205#  communication/modules/transport/protlib/llhashers.h \
     206#  communication/modules/transport/protlib/fqueue.h \
     207#  communication/modules/transport/protlib/assocdata_uds.h \
     208#  communication/modules/transport/protlib/address.h \
     209#  communication/modules/transport/protlib/logfile.h \
     210#  communication/modules/transport/protlib/timer.h \
     211#  communication/modules/transport/protlib/queuemanager.h \
     212#  communication/modules/transport/protlib/messages.h \
     213#  communication/modules/transport/protlib/assocdata.h \
     214#  communication/modules/transport/protlib/protlib_types.h \
     215#  communication/modules/transport/protlib/tp_over_tcp.h \
     216#  communication/modules/transport/protlib/tp.h \
     217#  communication/modules/transport/protlib/threads.h \
     218#  communication/modules/transport/protlib/connectionmap.h \
     219#  communication/modules/transport/protlib/timer_module.h \
     220#  communication/modules/transport/protlib/fastqueue.h \
     221#  communication/modules/transport/protlib/tperror.h \
     222#  communication/modules/transport/protlib/tp_over_tls_tcp.h \
     223#  communication/modules/transport/protlib/network_message.h \
     224#  communication/modules/transport/protlib/tp_over_udp.h \
     225#  communication/modules/transport/protlib/setuid.h \
     226#  communication/modules/transport/protlib/cleanuphandler.h \
     227#  communication/modules/transport/protlib/connectionmap_uds.h
    227228endif
    228229
    229230#------------> communication :: modules :: transport :: tcp
    230231
    231 if OMNET
    232 else
    233 libariba_la_SOURCES += \
    234   communication/modules/transport/tcp/TCPTransport.cpp \
    235   communication/modules/transport/tcp/TCPTransportLocator.cpp
    236 
    237 nobase_libariba_la_HEADERS += \
    238   communication/modules/transport/tcp/TCPTransport.h \
    239   communication/modules/transport/tcp/TCPTransportLocator.h
    240 endif
     232#if OMNET
     233#else
     234#libariba_la_SOURCES += \
     235#  communication/modules/transport/tcp/TCPTransport.cpp \
     236#  communication/modules/transport/tcp/TCPTransportLocator.cpp
     237
     238#nobase_libariba_la_HEADERS += \
     239#  communication/modules/transport/tcp/TCPTransport.h \
     240#  communication/modules/transport/tcp/TCPTransportLocator.h
     241#endif
    241242
    242243#------------> communication :: networkinfo
    … …  
    379380nobase_libariba_la_HEADERS += \
    380381  utility/measurement/PathloadMeasurement.h
     382
     383#------------> utility :: addressing
     384
     385libariba_la_SOURCES += \
     386  utility/addressing/ip_address.cpp \
     387  utility/addressing/tcpip_endpoint.cpp \
     388  utility/addressing/rfcomm_endpoint.cpp \
     389  utility/addressing/mac_address.cpp \
     390  utility/addressing/port_address.cpp
     391
     392nobase_libariba_la_HEADERS += \
     393  utility/addressing/ip_address.hpp \
     394  utility/addressing/test_addressing.hpp \
     395  utility/addressing/tcpip_endpoint.hpp \
     396  utility/addressing/endpoint_set.hpp \
     397  utility/addressing/addressing.hpp \
     398  utility/addressing/detail/compare_to_operators.hpp \
     399  utility/addressing/detail/address_convenience.hpp \
     400  utility/addressing/rfcomm_endpoint.hpp \
     401  utility/addressing/mac_address.hpp \
     402  utility/addressing/port_address.hpp \
     403  utility/addressing/facades/to_string_v.hpp \
     404  utility/addressing/facades/address_v.hpp \
     405  utility/addressing/facades/vfacade.hpp \
     406  utility/addressing/facades/comparable_v.hpp \
     407  utility/addressing/facades/to_bytes_v.hpp
     408
     409#------------> utility :: transport
     410
     411libariba_la_SOURCES += \
     412  utility/transport/tcpip/tcpip.cpp \
     413  utility/transport/tcpip/protlib/timer_module.cpp \
     414  utility/transport/tcpip/protlib/setuid.cpp \
     415  utility/transport/tcpip/protlib/queuemanager.cpp \
     416  utility/transport/tcpip/protlib/messages.cpp \
     417  utility/transport/tcpip/protlib/fqueue.cpp \
     418  utility/transport/tcpip/protlib/fastqueue.c \
     419  utility/transport/tcpip/protlib/eclock_gettime.c \
     420  utility/transport/tcpip/protlib/tp_over_udp.cpp \
     421  utility/transport/tcpip/protlib/connectionmap_uds.cpp \
     422  utility/transport/tcpip/protlib/network_message.cpp \
     423  utility/transport/tcpip/protlib/threadsafe_db.cpp \
     424  utility/transport/tcpip/protlib/timer.cpp \
     425  utility/transport/tcpip/protlib/address.cpp \
     426  utility/transport/tcpip/protlib/connectionmap.cpp \
     427  utility/transport/tcpip/protlib/tp.cpp \
     428  utility/transport/tcpip/protlib/tp_over_tcp.cpp \
     429  utility/transport/tcpip/protlib/configuration.cpp \
     430  utility/transport/tcpip/protlib/ie.cpp \
     431  utility/transport/tcpip/protlib/threads.cpp \
     432  utility/transport/tcpip/protlib/logfile.cpp \
     433  utility/transport/transport_peer.cpp \
     434  utility/transport/rfcomm/rfcomm.cpp \
     435  utility/transport/asio/asio_io_service.cpp
     436
     437nobase_libariba_la_HEADERS += \
     438  utility/transport/test_transport.hpp \
     439  utility/transport/tcpip/tcpip.hpp \
     440  utility/transport/transport_peer.hpp \
     441  utility/transport/transport_protocol.hpp \
     442  utility/transport/rfcomm/rfcomm.hpp \
     443  utility/transport/transport.hpp \
     444  utility/transport/asio/bluetooth_endpoint.hpp \
     445  utility/transport/asio/rfcomm.hpp \
     446  utility/transport/transport_listener.hpp \
     447  utility/transport/tcpip/protlib/threadsafe_db.h \
     448  utility/transport/tcpip/protlib/configuration.h \
     449  utility/transport/tcpip/protlib/ie.h \
     450  utility/transport/tcpip/protlib/llhashers.h \
     451  utility/transport/tcpip/protlib/fqueue.h \
     452  utility/transport/tcpip/protlib/assocdata_uds.h \
     453  utility/transport/tcpip/protlib/address.h \
     454  utility/transport/tcpip/protlib/logfile.h \
     455  utility/transport/tcpip/protlib/timer.h \
     456  utility/transport/tcpip/protlib/queuemanager.h \
     457  utility/transport/tcpip/protlib/messages.h \
     458  utility/transport/tcpip/protlib/assocdata.h \
     459  utility/transport/tcpip/protlib/protlib_types.h \
     460  utility/transport/tcpip/protlib/tp_over_tcp.h \
     461  utility/transport/tcpip/protlib/tp.h \
     462  utility/transport/tcpip/protlib/threads.h \
     463  utility/transport/tcpip/protlib/connectionmap.h \
     464  utility/transport/tcpip/protlib/timer_module.h \
     465  utility/transport/tcpip/protlib/fastqueue.h \
     466  utility/transport/tcpip/protlib/tperror.h \
     467  utility/transport/tcpip/protlib/network_message.h \
     468  utility/transport/tcpip/protlib/setuid.h \
     469  utility/transport/tcpip/protlib/cleanuphandler.h \
     470  utility/transport/tcpip/protlib/connectionmap_uds.h
    381471
    382472#------------> utility :: messages
Note: See TracChangeset for help on using the changeset viewer.