Index: /source/ariba/Makefile.am =================================================================== --- /source/ariba/Makefile.am (revision 4850) +++ /source/ariba/Makefile.am (revision 4851) @@ -336,5 +336,6 @@ utility/bootstrap/modules/multicastdns/MulticastDns.cpp \ utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp \ - utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp + utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp \ + utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.cpp nobase_libariba_la_HEADERS += \ @@ -344,5 +345,6 @@ utility/bootstrap/modules/multicastdns/MulticastDns.h \ utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h \ - utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h + utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h \ + utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.h #------------> utility :: configuration Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (revision 4850) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (revision 4851) @@ -53,4 +53,5 @@ #include "PeriodicBroadcast.h" +#include "PeriodicBroadcastMessage.h" namespace ariba { @@ -115,5 +116,20 @@ void PeriodicBroadcast::sendLocalServices(){ + boost::mutex::scoped_lock lock( localServicesMutex ); + ServiceList::iterator i = localServices.begin(); + ServiceList::iterator iend = localServices.end(); + + for( ; i != iend; i++){ + + PeriodicBroadcastMessage msg( i->second.name, i->second.info1, i->second.info2, i->second.info3 ); + Data data = data_serialize( msg, DEFAULT_V ); + uint8_t* pnt = data.getBuffer(); + size_t len = data.getLength(); + + + // TODO: Ìber socket rauspusten + + } } Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 4850) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 4851) @@ -42,7 +42,8 @@ #include "ariba/config.h" +#include +#include #include -#include -#include +#include #include #include Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.cpp =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.cpp (revision 4851) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.cpp (revision 4851) @@ -0,0 +1,70 @@ +// [License] +// The Ariba-Underlay Copyright +// +// Copyright (c) 2008-2009, 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 ARIBA PROJECT 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] + +#include "PeriodicBroadcastMessage.h" + +namespace ariba { +namespace utility { + +vsznDefault(PeriodicBroadcastMessage); + +PeriodicBroadcastMessage::PeriodicBroadcastMessage( + string _name, string _info1, string _info2, string _info3) +: name(_name), info1(_info1), info2(_info2), info3(_info3){ +} + +PeriodicBroadcastMessage::~PeriodicBroadcastMessage(){ +} + +string PeriodicBroadcastMessage::getName(){ + return name; +} + +string PeriodicBroadcastMessage::getInfo1(){ + return info1; +} + +string PeriodicBroadcastMessage::getInfo2(){ + return info2; +} + +string PeriodicBroadcastMessage::getInfo3(){ + return info3; +} + +}} // ariba::utility Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.h =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.h (revision 4851) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcastMessage.h (revision 4851) @@ -0,0 +1,78 @@ +// [License] +// The Ariba-Underlay Copyright +// +// Copyright (c) 2008-2009, 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 ARIBA PROJECT 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] + +#ifndef __PERIODIC_BROADCAST_MESSAGE_H +#define __PERIODIC_BROADCAST_MESSAGE_H + +#include +#include "ariba/utility/messages.h" +#include "ariba/utility/serialization.h" + +using std::string; +using ariba::utility::Message; + +namespace ariba { +namespace utility { + +using_serialization; + +class PeriodicBroadcastMessage : public Message { + VSERIALIZEABLE; +private: + string name; + string info1; + string info2; + string info3; + +public: + PeriodicBroadcastMessage(string _name = "", string _info1 = "", string _info2 = "", string _info3 = ""); + virtual ~PeriodicBroadcastMessage(); + + string getName(); + string getInfo1(); + string getInfo2(); + string getInfo3(); +}; + +}} // ariba::utility + +sznBeginDefault( ariba::utility::PeriodicBroadcastMessage, X ) { + X && T(name) && T(info1) && T(info2) && T(info3); +} sznEnd(); + +#endif // __PERIODIC_BROADCAST_MESSAGE_H