Index: source/ariba/utility/addressing/endpoint_set.hpp =================================================================== --- source/ariba/utility/addressing/endpoint_set.hpp (revision 6900) +++ source/ariba/utility/addressing/endpoint_set.hpp (revision 6919) @@ -399,4 +399,5 @@ this->rfcomm = rhs.rfcomm; this->tcp = rhs.tcp; + return *this; } Index: source/ariba/utility/addressing/ip_address.hpp =================================================================== --- source/ariba/utility/addressing/ip_address.hpp (revision 6900) +++ source/ariba/utility/addressing/ip_address.hpp (revision 6919) @@ -166,5 +166,4 @@ } - bool is_multicast_site_local() const { if (addr.is_v4()) return false; Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp =================================================================== --- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (revision 6900) +++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (revision 6919) @@ -64,4 +64,7 @@ namespace utility { +static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}}; +static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}}; + use_logging_cpp(BluetoothSdp); OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL; @@ -216,5 +219,5 @@ // connect to the local SDP server, register the service record if( sdp_session_ == NULL ){ - sdp_session_ = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY); + sdp_session_ = sdp_connect(&bd_addr_any, &bd_addr_local, SDP_RETRY_IF_BUSY); } @@ -275,5 +278,5 @@ bdaddr_t address; - uint8_t channel; +// uint8_t channel; dev_id = hci_get_route(NULL); @@ -339,5 +342,5 @@ char name[256], info1[256], info2[256], info3[256]; - session = sdp_connect(BDADDR_ANY, &target, SDP_RETRY_IF_BUSY); + session = sdp_connect(&bd_addr_any, &target, SDP_RETRY_IF_BUSY); if (session == NULL) { @@ -401,5 +404,4 @@ * Returns a string holding the bt adress in human readable form. */ - char addr[32] = { 0 }; char str[32] = { 0 }; ba2str(ba, str); Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h =================================================================== --- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 6900) +++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 6919) @@ -197,6 +197,6 @@ public: udp_server(boost::asio::io_service& io_service, ServiceList* _services, boost::mutex* _servicesmutex) - : services(_services), servicesmutex(_servicesmutex), - socket_v4(io_service), socket_v6(io_service) { + : socket_v4(io_service), socket_v6(io_service), + services(_services), servicesmutex(_servicesmutex) { if( open4() ) start_receive_4(); @@ -350,5 +350,5 @@ { // insert new found service - boost::mutex::scoped_lock( *servicesmutex ); + boost::mutex::scoped_lock lock( *servicesmutex ); ServiceList::iterator it = services->find( msg.getName() ); Index: source/ariba/utility/measurement/PathloadMeasurement.cpp =================================================================== --- source/ariba/utility/measurement/PathloadMeasurement.cpp (revision 6900) +++ source/ariba/utility/measurement/PathloadMeasurement.cpp (revision 6919) @@ -45,6 +45,6 @@ PathloadMeasurement::PathloadMeasurement(BaseOverlay* _overlay) - : running( false ), resultNode( NodeID::UNSPECIFIED ), - listener( NULL), serverpid( -1 ) { + : running( false ), listener( NULL), resultNode( NodeID::UNSPECIFIED ), + serverpid( -1 ) { if( _overlay != NULL ) // this is important due to the singleton interface! @@ -142,5 +142,5 @@ char buf[128]; string content = ""; - bool failed = true; +// bool failed = true; while( fgets(buf, 100, stream) != NULL ){ Index: source/ariba/utility/messages/Message.h =================================================================== --- source/ariba/utility/messages/Message.h (revision 6900) +++ source/ariba/utility/messages/Message.h (revision 6919) @@ -106,5 +106,5 @@ */ explicit inline Message( const Data& data ) : - srcAddr(NULL),destAddr(NULL), releasePayload(true) { + releasePayload(true), srcAddr(NULL),destAddr(NULL) { this->payload = data.clone(); // this->root = shared_array((uint8_t*)data.getBuffer()); @@ -246,5 +246,5 @@ } else { if (msg->payload.isUnspecified()) { - size_t l = ((len == ~0) ? X.getRemainingLength() : len); + size_t l = ((len == ~(size_t)0) ? X.getRemainingLength() : len); msg->payload = X.getRemainingData(l); msg->releasePayload = false; Index: source/ariba/utility/messages/MessageProvider.cpp =================================================================== --- source/ariba/utility/messages/MessageProvider.cpp (revision 6900) +++ source/ariba/utility/messages/MessageProvider.cpp (revision 6919) @@ -49,5 +49,5 @@ bool MessageProvider::sendMessageToReceivers( const Message* message ) { bool sent = false; - for (int i=0; ireceiveMessage(message, LinkID::UNSPECIFIED, NodeID::UNSPECIFIED)) sent = true; return sent; @@ -59,5 +59,5 @@ void MessageProvider::removeMessageReceiver( MessageReceiver* receiver ) { - for (int i=0; i + template class ArrayTpl : public ExplicitSerializer { private: @@ -527,5 +527,5 @@ sznMethodBegin(X) - if (X.isDeserializer()) v = new T[l]; + if (X.isDeserializer() && !staticArray) v = new T[l]; for (size_t i=0; i A( T*& array, size_t length ) { return ArrayTpl(array,length); + } + + template + finline ArrayTpl static_A( T*& array, size_t length ) { + return ArrayTpl(array,length); } Index: source/ariba/utility/system/SystemEvent.h =================================================================== --- source/ariba/utility/system/SystemEvent.h (revision 6900) +++ source/ariba/utility/system/SystemEvent.h (revision 6919) @@ -59,5 +59,5 @@ const void* data; //< data attached to the event -public: +public: // TODO: these should be private, but the gcc 3.4 in scratchbox for cross-compiling // for Maemo (Nokia N810) gets confused when the friend class SystemQueue has a @@ -66,31 +66,22 @@ uint32_t delayTime; //< time the event is scheduled at, or 0 if it is to be fired immediately uint32_t remainingDelay; //< remaining delay time for sleeping - + public: - inline SystemEvent( - SystemEventListener* mlistener, - SystemEventType mtype = SystemEventType::DEFAULT, - void* mdata = NULL) - : scheduledTime(boost::posix_time::not_a_date_time), - delayTime(0), - remainingDelay(0), - listener(mlistener), - type(mtype), - data(mdata) { + inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype = + SystemEventType::DEFAULT, void* mdata = NULL) : + listener(mlistener), type(mtype), data(mdata), scheduledTime( + boost::posix_time::not_a_date_time), delayTime(0), + remainingDelay(0) + + { } template - inline SystemEvent( SystemEventListener* mlistener, - SystemEventType mtype = SystemEventType::DEFAULT, - T* mdata = NULL) - : scheduledTime(boost::posix_time::not_a_date_time), - delayTime(0), - remainingDelay(0), - listener(mlistener), - type(mtype), - data((void*)mdata) { + inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype = + SystemEventType::DEFAULT, T* mdata = NULL) : + listener(mlistener), type(mtype), data((void*) mdata), scheduledTime( + boost::posix_time::not_a_date_time), delayTime(0), + remainingDelay(0) { } - - inline SystemEvent(const SystemEvent& copy) { @@ -126,5 +117,5 @@ template inline T* getData() const { - return (T*)*this; + return (T*) *this; } @@ -147,5 +138,6 @@ }; -}} // spovnet, common +} +} // spovnet, common #endif /* SYSTEMEVENT_H_ */ Index: source/ariba/utility/system/SystemQueue.cpp =================================================================== --- source/ariba/utility/system/SystemQueue.cpp (revision 6900) +++ source/ariba/utility/system/SystemQueue.cpp (revision 6919) @@ -125,5 +125,5 @@ SystemQueue::QueueThread::QueueThread(QueueThread* _transferQueue) - : running( false ), transferQueue( _transferQueue ) { + : transferQueue( _transferQueue ), running( false ) { } Index: source/ariba/utility/system/SystemQueue.h =================================================================== --- source/ariba/utility/system/SystemQueue.h (revision 6900) +++ source/ariba/utility/system/SystemQueue.h (revision 6919) @@ -234,4 +234,5 @@ #ifdef UNDERLAY_OMNET +#if 0 // // the system queue must be a singleton in simulations, too. @@ -243,10 +244,11 @@ // this is the macro definition from macros.h // - // #define Define_Module(CLASSNAME) \ - // static cModule *CLASSNAME##__create() {return new CLASSNAME();} \ + // #define Define_Module(CLASSNAME) /backslash + // static cModule *CLASSNAME##__create() {return new CLASSNAME();} /backslash // EXECUTE_ON_STARTUP(CLASSNAME##__mod, modtypes.instance()->add(new cModuleType(#CLASSNAME,#CLASSNAME,(ModuleCreateFunc)CLASSNAME##__create));) // // and this is how we do it :) // +#endif static cModule* SystemQueue__create() { Index: source/ariba/utility/transport/tcpip/protlib/address.h =================================================================== --- source/ariba/utility/transport/tcpip/protlib/address.h (revision 6900) +++ source/ariba/utility/transport/tcpip/protlib/address.h (revision 6919) @@ -790,6 +790,6 @@ node *insert(netaddress &key, data_type &dat) { - node *a, *b, *c, *n, *m; - int cmp, pos = 0; + node *a, *b = NULL, *c, *n, *m; + int cmp = 0, pos = 0; c = a = key.is_ipv4() ? v4head : v6head; Index: source/ariba/utility/transport/tcpip/tcpip.cpp =================================================================== --- source/ariba/utility/transport/tcpip/tcpip.cpp (revision 6900) +++ source/ariba/utility/transport/tcpip/tcpip.cpp (revision 6919) @@ -183,5 +183,5 @@ datamsg->set_pos(0); uint32_t message_size = datamsg->decode32(true)-2; - uint16_t remote_port = datamsg->decode16(true); + //uint16_t remote_port = datamsg->decode16(true); Index: source/ariba/utility/types/Identifier.cpp =================================================================== --- source/ariba/utility/types/Identifier.cpp (revision 6900) +++ source/ariba/utility/types/Identifier.cpp (revision 6919) @@ -70,5 +70,5 @@ void Identifier::clearAddress() { - for (int i = 0; i < array_size; i++) + for (size_t i = 0; i < array_size; i++) key[i] = 0; isUnspec = false; @@ -77,5 +77,5 @@ bool Identifier::setAddress(string address) { - // TODO + return false; } @@ -204,5 +204,5 @@ if (isUnspec) return std::string(""); - char temp[80]; + char temp[250]; if (base == 16) { int k = 0; @@ -238,4 +238,5 @@ } #endif + return ""; } Index: source/ariba/utility/types/ServiceID.h =================================================================== --- source/ariba/utility/types/ServiceID.h (revision 6900) +++ source/ariba/utility/types/ServiceID.h (revision 6919) @@ -75,5 +75,5 @@ inline bool isUnspecified() const { - return (id==~0); + return (id==~(uint32_t)0); } Index: source/ariba/utility/visual/DddVis.cpp =================================================================== --- source/ariba/utility/visual/DddVis.cpp (revision 6900) +++ source/ariba/utility/visual/DddVis.cpp (revision 6919) @@ -125,4 +125,6 @@ order = ORDER_RANDOMLY; break; + default: + break; }