Loading ccsrc/Framework/Layer.h +5 −4 Changes for ccsrc/Framework/Layer.h: 5 added lines, 4 removed lines. Original line number Original line Diff line number Diff line Loading @@ -27,18 +27,19 @@ class Layer { template <typename TPort> class TLayer : public Layer { template <typename TPort> class TLayer : public Layer { typedef std::vector<TPort*> TPortList; typedef std::vector<TPort*> TPortList; typedef typename std::vector<TPort*>::iterator TPortListIterator; TPortList upperPorts; TPortList upperPorts; public: public: TLayer(){} TLayer(){} void addUpperPort(TPort*); void addUpperPort(TPort*); void removeUpperPort(TPort*); void removeUpperPort(TPort*); /* template <typename Msg> void receiveToAllPorts(Msg* m, const Param& param) { template <typename T> void receiveToAllPorts(const T& m, const Params& param) { for(TPortList::iterator it=upperPorts.begin(); it<upperPorts.end(); ++it){ for(TPortListIterator it=upperPorts.begin(); it<upperPorts.end(); ++it){ (*it)->receiveMsg(m, param); (*it)->receiveMsg(m, param); } } } } */ }; }; class LayerFactory { class LayerFactory { Loading ccsrc/Framework/Makefile 0 → 100755 +14 −0 Changes for ccsrc/Framework/Makefile: 14 added lines, 0 removed lines. Original line number Original line Diff line number Diff line PROJECTROOT = .. BUILDROOT = ../../bin PROJECT = its-framework DEBUG = yes testdir = tests srcdir = src alibs = $(PROJECT) sources := LayerFactory.cpp headers := Codec.h Layer.h includes := . .. include ../common.mk ccsrc/Protocols/BTP/BTPCodec.cpp +2 −11 Changes for ccsrc/Protocols/BTP/BTPCodec.cpp: 2 added lines, 11 removed lines. Original line number Original line Diff line number Diff line #include "BTPCodec.h" #include "BTPCodec.h" int BTPACodec::encode (const BTPA& msg, OCTETSTRING& data) int BTPCodec::encode (const LibItsBtp__TypesAndValues::BtpPacket& msg, OCTETSTRING& data) { { return 0; return 0; } } int BTPACodec::decode (const OCTETSTRING& data, BTPA& msg) int BTPCodec::decode (const OCTETSTRING& data, LibItsBtp__TypesAndValues::BtpPacket& msg) { return 0; } int BTPBCodec::encode (const BTPB& msg, OCTETSTRING& data) { return 0; } int BTPBCodec::decode (const OCTETSTRING& data, BTPB& msg) { { return 0; return 0; } } ccsrc/Protocols/BTP/BTPCodec.h +4 −8 Changes for ccsrc/Protocols/BTP/BTPCodec.h: 4 added lines, 8 removed lines. Original line number Original line Diff line number Diff line Loading @@ -3,14 +3,10 @@ #include "BTPTypes.h" #include "BTPTypes.h" #include "Codec.h" #include "Codec.h" class BTPACodec : public Codec<BTPA> { class BTPCodec : public Codec<LibItsBtp__TypesAndValues::BtpPacket> { virtual int encode (const BTPA& msg, OCTETSTRING& data); public: virtual int decode (const OCTETSTRING& data, BTPA& msg); virtual int encode (const LibItsBtp__TypesAndValues::BtpPacket&, OCTETSTRING& data); }; virtual int decode (const OCTETSTRING& data, LibItsBtp__TypesAndValues::BtpPacket&); class BTPBCodec : public Codec<BTPB> { virtual int encode (const BTPB& msg, OCTETSTRING& data); virtual int decode (const OCTETSTRING& data, BTPB& msg); }; }; #endif #endif ccsrc/Protocols/BTP/BTPLayer.cpp +10 −13 Changes for ccsrc/Protocols/BTP/BTPLayer.cpp: 10 added lines, 13 removed lines. Original line number Original line Diff line number Diff line #include "BTPLayer.h" #include "BTPLayer.h" #include "BTPPort.h" #include "BTPPort.h" void BTPLayer::sendMsg(const BTPA& m, const Params& params){ void BTPLayer::sendMsg(const LibItsBtp__TypesAndValues::BtpPacket& m, const Params& params){ OCTETSTRING data; OCTETSTRING data; _a.encode(m, data); _codec.encode(m, data); sendData(data, Params()); sendData(data, Params()); } } void BTPLayer::sendMsg(const BTPB& m, const Params& params){ OCTETSTRING data; _b.encode(m, data); sendData(data, Params()); } void BTPLayer::sendData(const OCTETSTRING& data, const Params& params){ void BTPLayer::sendData(const OCTETSTRING& data, const Params& params){ sendToAllLayers(data, params); sendToAllLayers(data, params); } } void BTPLayer::receiveData(const OCTETSTRING& data, const Params& info) void BTPLayer::receiveData(const OCTETSTRING& data, const Params& info) { { BTPB b; LibItsBtp__TypesAndValues::BtpPacket p; BTPA a; _codec.decode(data, p); receiveToAllPorts(a, Params()); receiveToAllPorts(p, info); receiveToAllPorts(b, Params()); if(p.payload().is_present()){ receiveToAllLayers(data, Params()); //a.payload shall be sent! receiveToAllLayers(p.payload()().rawPayload(), info); } } } class BTPFactory : public LayerFactory { class BTPFactory : public LayerFactory { Loading @@ -33,8 +30,8 @@ public: BTPFactory::BTPFactory() BTPFactory::BTPFactory() { { StackFactory::getInstance()->registerLayerFactory("BTP", this); // register factory // register factory StackFactory::getInstance()->registerLayerFactory("BTP", this); } } Layer * BTPFactory::createLayer(const std::string & type, const std::string & param) Layer * BTPFactory::createLayer(const std::string & type, const std::string & param) Loading Loading
ccsrc/Framework/Layer.h +5 −4 Changes for ccsrc/Framework/Layer.h: 5 added lines, 4 removed lines. Original line number Original line Diff line number Diff line Loading @@ -27,18 +27,19 @@ class Layer { template <typename TPort> class TLayer : public Layer { template <typename TPort> class TLayer : public Layer { typedef std::vector<TPort*> TPortList; typedef std::vector<TPort*> TPortList; typedef typename std::vector<TPort*>::iterator TPortListIterator; TPortList upperPorts; TPortList upperPorts; public: public: TLayer(){} TLayer(){} void addUpperPort(TPort*); void addUpperPort(TPort*); void removeUpperPort(TPort*); void removeUpperPort(TPort*); /* template <typename Msg> void receiveToAllPorts(Msg* m, const Param& param) { template <typename T> void receiveToAllPorts(const T& m, const Params& param) { for(TPortList::iterator it=upperPorts.begin(); it<upperPorts.end(); ++it){ for(TPortListIterator it=upperPorts.begin(); it<upperPorts.end(); ++it){ (*it)->receiveMsg(m, param); (*it)->receiveMsg(m, param); } } } } */ }; }; class LayerFactory { class LayerFactory { Loading
ccsrc/Framework/Makefile 0 → 100755 +14 −0 Changes for ccsrc/Framework/Makefile: 14 added lines, 0 removed lines. Original line number Original line Diff line number Diff line PROJECTROOT = .. BUILDROOT = ../../bin PROJECT = its-framework DEBUG = yes testdir = tests srcdir = src alibs = $(PROJECT) sources := LayerFactory.cpp headers := Codec.h Layer.h includes := . .. include ../common.mk
ccsrc/Protocols/BTP/BTPCodec.cpp +2 −11 Changes for ccsrc/Protocols/BTP/BTPCodec.cpp: 2 added lines, 11 removed lines. Original line number Original line Diff line number Diff line #include "BTPCodec.h" #include "BTPCodec.h" int BTPACodec::encode (const BTPA& msg, OCTETSTRING& data) int BTPCodec::encode (const LibItsBtp__TypesAndValues::BtpPacket& msg, OCTETSTRING& data) { { return 0; return 0; } } int BTPACodec::decode (const OCTETSTRING& data, BTPA& msg) int BTPCodec::decode (const OCTETSTRING& data, LibItsBtp__TypesAndValues::BtpPacket& msg) { return 0; } int BTPBCodec::encode (const BTPB& msg, OCTETSTRING& data) { return 0; } int BTPBCodec::decode (const OCTETSTRING& data, BTPB& msg) { { return 0; return 0; } }
ccsrc/Protocols/BTP/BTPCodec.h +4 −8 Changes for ccsrc/Protocols/BTP/BTPCodec.h: 4 added lines, 8 removed lines. Original line number Original line Diff line number Diff line Loading @@ -3,14 +3,10 @@ #include "BTPTypes.h" #include "BTPTypes.h" #include "Codec.h" #include "Codec.h" class BTPACodec : public Codec<BTPA> { class BTPCodec : public Codec<LibItsBtp__TypesAndValues::BtpPacket> { virtual int encode (const BTPA& msg, OCTETSTRING& data); public: virtual int decode (const OCTETSTRING& data, BTPA& msg); virtual int encode (const LibItsBtp__TypesAndValues::BtpPacket&, OCTETSTRING& data); }; virtual int decode (const OCTETSTRING& data, LibItsBtp__TypesAndValues::BtpPacket&); class BTPBCodec : public Codec<BTPB> { virtual int encode (const BTPB& msg, OCTETSTRING& data); virtual int decode (const OCTETSTRING& data, BTPB& msg); }; }; #endif #endif
ccsrc/Protocols/BTP/BTPLayer.cpp +10 −13 Changes for ccsrc/Protocols/BTP/BTPLayer.cpp: 10 added lines, 13 removed lines. Original line number Original line Diff line number Diff line #include "BTPLayer.h" #include "BTPLayer.h" #include "BTPPort.h" #include "BTPPort.h" void BTPLayer::sendMsg(const BTPA& m, const Params& params){ void BTPLayer::sendMsg(const LibItsBtp__TypesAndValues::BtpPacket& m, const Params& params){ OCTETSTRING data; OCTETSTRING data; _a.encode(m, data); _codec.encode(m, data); sendData(data, Params()); sendData(data, Params()); } } void BTPLayer::sendMsg(const BTPB& m, const Params& params){ OCTETSTRING data; _b.encode(m, data); sendData(data, Params()); } void BTPLayer::sendData(const OCTETSTRING& data, const Params& params){ void BTPLayer::sendData(const OCTETSTRING& data, const Params& params){ sendToAllLayers(data, params); sendToAllLayers(data, params); } } void BTPLayer::receiveData(const OCTETSTRING& data, const Params& info) void BTPLayer::receiveData(const OCTETSTRING& data, const Params& info) { { BTPB b; LibItsBtp__TypesAndValues::BtpPacket p; BTPA a; _codec.decode(data, p); receiveToAllPorts(a, Params()); receiveToAllPorts(p, info); receiveToAllPorts(b, Params()); if(p.payload().is_present()){ receiveToAllLayers(data, Params()); //a.payload shall be sent! receiveToAllLayers(p.payload()().rawPayload(), info); } } } class BTPFactory : public LayerFactory { class BTPFactory : public LayerFactory { Loading @@ -33,8 +30,8 @@ public: BTPFactory::BTPFactory() BTPFactory::BTPFactory() { { StackFactory::getInstance()->registerLayerFactory("BTP", this); // register factory // register factory StackFactory::getInstance()->registerLayerFactory("BTP", this); } } Layer * BTPFactory::createLayer(const std::string & type, const std::string & param) Layer * BTPFactory::createLayer(const std::string & type, const std::string & param) Loading