Commits (2)
...@@ -5,42 +5,34 @@ ...@@ -5,42 +5,34 @@
#include <TTCN3.hh> #include <TTCN3.hh>
extern "C" { extern "C" {
static int asn1c_collect_encoded_data(const void *buffer, size_t size, void *application_specific_key) static int asn1c_collect_encoded_data(const void *buffer, size_t size, void *application_specific_key) {
{ TTCN_Buffer *tb = (TTCN_Buffer *)application_specific_key;
TTCN_Buffer * tb = (TTCN_Buffer *)application_specific_key;
tb->put_s(size, (unsigned char *)buffer); tb->put_s(size, (unsigned char *)buffer);
return 0; return 0;
} }
} }
int asn1_recode_per::recode(const asn_TYPE_descriptor_s & td, int from, int to, TTCN_Buffer & buf) int asn1_recode_per::recode(const asn_TYPE_descriptor_s &td, int from, int to, TTCN_Buffer &buf) {
{
int rc = -1; int rc = -1;
void * ptr = NULL; void * ptr = NULL;
asn_dec_rval_t rc_d; asn_dec_rval_t rc_d;
rc_d = asn_decode(NULL, (asn_transfer_syntax)from, (asn_TYPE_descriptor_s*)&td, &ptr, buf.get_data(), buf.get_len()); rc_d = asn_decode(NULL, (asn_transfer_syntax)from, (asn_TYPE_descriptor_s *)&td, &ptr, buf.get_data(), buf.get_len());
if(rc_d.code == RC_OK){ if (rc_d.code == RC_OK) {
// Encode as PER // Encode as PER
asn_enc_rval_t rc_e; asn_enc_rval_t rc_e;
buf.clear(); buf.clear();
rc_e = asn_encode(NULL, (asn_transfer_syntax)to, (asn_TYPE_descriptor_s*)&td, ptr, asn1c_collect_encoded_data, &buf); rc_e = asn_encode(NULL, (asn_transfer_syntax)to, (asn_TYPE_descriptor_s *)&td, ptr, asn1c_collect_encoded_data, &buf);
rc = rc_e.encoded; rc = rc_e.encoded;
} }
if(ptr){ if (ptr) {
ASN_STRUCT_FREE(td, ptr); ASN_STRUCT_FREE(td, ptr);
} }
return rc; return rc;
} }
int asn1_recode_per::ber2per(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf) int asn1_recode_per::ber2per(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf) { return recode(td, (int)ATS_BER, (int)ATS_UNALIGNED_CANONICAL_PER, buf); }
{
return recode(td, (int)ATS_BER, (int)ATS_UNALIGNED_CANONICAL_PER, buf);
}
int asn1_recode_per::per2ber(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf) int asn1_recode_per::per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf) { return recode(td, (int)ATS_UNALIGNED_BASIC_PER, (int)ATS_DER, buf); }
{
return recode(td, (int)ATS_UNALIGNED_BASIC_PER, (int)ATS_DER, buf);
}
/*int asn1_recode_oer::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf) /*int asn1_recode_oer::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)
{ {
......
...@@ -19,11 +19,9 @@ class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class ...@@ -19,11 +19,9 @@ class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class
struct asn_TYPE_descriptor_s; //! Forward declaration of asn1c class struct asn_TYPE_descriptor_s; //! Forward declaration of asn1c class
class asn1_recode_per class asn1_recode_per {
{
protected: protected:
int ber2per (const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf); int ber2per(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf);
int per2ber (const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf); int per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf);
int recode (const asn_TYPE_descriptor_s & td, int from, int to, TTCN_Buffer & buf); int recode(const asn_TYPE_descriptor_s &td, int from, int to, TTCN_Buffer &buf);
}; // End of class asn1_recode_per }; // End of class asn1_recode_per
...@@ -10,8 +10,7 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -10,8 +10,7 @@ namespace LibItsBtp__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__BtpReq(LibItsBtp__TestSystem::BtpReq const& p_btpReq) BITSTRING fx__enc__BtpReq(LibItsBtp__TestSystem::BtpReq const &p_btpReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__BtpReq: ", p_btpReq); loggers::get_instance().log_msg(">>> fx__enc__BtpReq: ", p_btpReq);
btp_codec codec; btp_codec codec;
...@@ -30,8 +29,7 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -30,8 +29,7 @@ namespace LibItsBtp__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__BtpReq(BITSTRING& b, LibItsBtp__TestSystem::BtpReq& p) INTEGER fx__dec__BtpReq(BITSTRING &b, LibItsBtp__TestSystem::BtpReq &p) {
{
loggers::get_instance().log(">>> fx__dec__BtpReq"); loggers::get_instance().log(">>> fx__dec__BtpReq");
btp_codec codec; btp_codec codec;
LibItsBtp__TypesAndValues::BtpPacket pdu; LibItsBtp__TypesAndValues::BtpPacket pdu;
...@@ -51,8 +49,7 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -51,8 +49,7 @@ namespace LibItsBtp__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__BtpInd(LibItsBtp__TestSystem::BtpInd const& p_btpInd) BITSTRING fx__enc__BtpInd(LibItsBtp__TestSystem::BtpInd const &p_btpInd) {
{
loggers::get_instance().log_msg(">>> fx__enc__BtpInd: ", p_btpInd); loggers::get_instance().log_msg(">>> fx__enc__BtpInd: ", p_btpInd);
btp_codec codec; btp_codec codec;
...@@ -71,8 +68,7 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -71,8 +68,7 @@ namespace LibItsBtp__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__BtpInd(BITSTRING& b, LibItsBtp__TestSystem::BtpInd& p_btpInd) INTEGER fx__dec__BtpInd(BITSTRING &b, LibItsBtp__TestSystem::BtpInd &p_btpInd) {
{
loggers::get_instance().log(">>> fx__dec__BtpInd"); loggers::get_instance().log(">>> fx__dec__BtpInd");
btp_codec codec; btp_codec codec;
LibItsBtp__TypesAndValues::BtpPacket pdu; LibItsBtp__TypesAndValues::BtpPacket pdu;
...@@ -89,14 +85,12 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -89,14 +85,12 @@ namespace LibItsBtp__EncdecDeclarations {
return 0; return 0;
} }
/**************************************************** /****************************************************
* @desc External function to encode a BtpPacket type * @desc External function to encode a BtpPacket type
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__BtpPacket(LibItsBtp__TypesAndValues::BtpPacket const& p_btpPacket) BITSTRING fx__enc__BtpPacket(LibItsBtp__TypesAndValues::BtpPacket const &p_btpPacket) {
{
loggers::get_instance().log_msg(">>> fx__enc__BtpPacket: ", p_btpPacket); loggers::get_instance().log_msg(">>> fx__enc__BtpPacket: ", p_btpPacket);
btp_codec codec; btp_codec codec;
...@@ -111,8 +105,7 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -111,8 +105,7 @@ namespace LibItsBtp__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__BtpPacket(BITSTRING& b, LibItsBtp__TypesAndValues::BtpPacket& p_btpPacket) INTEGER fx__dec__BtpPacket(BITSTRING &b, LibItsBtp__TypesAndValues::BtpPacket &p_btpPacket) {
{
loggers::get_instance().log(">>> fx__dec__BtpPacket"); loggers::get_instance().log(">>> fx__dec__BtpPacket");
btp_codec codec; btp_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -124,5 +117,4 @@ namespace LibItsBtp__EncdecDeclarations { ...@@ -124,5 +117,4 @@ namespace LibItsBtp__EncdecDeclarations {
return 0; return 0;
} }
} //end namespace } // namespace LibItsBtp__EncdecDeclarations
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "LibItsCam_EncdecDeclarations.hh" #include "LibItsCam_EncdecDeclarations.hh"
#include "cam_codec.hh" #include "cam_codec.hh"
#include "uppertester_cam_codec.hh"
#include "loggers.hh" #include "loggers.hh"
#include "uppertester_cam_codec.hh"
namespace LibItsCam__EncdecDeclarations { namespace LibItsCam__EncdecDeclarations {
/**************************************************** /****************************************************
...@@ -12,8 +12,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -12,8 +12,7 @@ namespace LibItsCam__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__CamReq(const LibItsCam__TestSystem::CamReq& p_camReq) BITSTRING fx__enc__CamReq(const LibItsCam__TestSystem::CamReq &p_camReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__CamReq: ", p_camReq); loggers::get_instance().log_msg(">>> fx__enc__CamReq: ", p_camReq);
cam_codec codec; cam_codec codec;
...@@ -31,8 +30,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -31,8 +30,7 @@ namespace LibItsCam__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__CamReq(BITSTRING& b, LibItsCam__TestSystem::CamReq& p) INTEGER fx__dec__CamReq(BITSTRING &b, LibItsCam__TestSystem::CamReq &p) {
{
loggers::get_instance().log(">>> fx__dec__CamReq"); loggers::get_instance().log(">>> fx__dec__CamReq");
cam_codec codec; cam_codec codec;
...@@ -48,8 +46,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -48,8 +46,7 @@ namespace LibItsCam__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__CamInd(BITSTRING& b, LibItsCam__TestSystem::CamInd& p_camInd) INTEGER fx__dec__CamInd(BITSTRING &b, LibItsCam__TestSystem::CamInd &p_camInd) {
{
loggers::get_instance().log(">>> fx__dec__CamInd"); loggers::get_instance().log(">>> fx__dec__CamInd");
cam_codec codec; cam_codec codec;
...@@ -57,17 +54,12 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -57,17 +54,12 @@ namespace LibItsCam__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsCam__TestSystem::CamInd_gnNextHeader_raw_.fieldlength + LibItsCam__TestSystem::CamInd_gnHeaderType_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_gnNextHeader_raw_.fieldlength + LibItsCam__TestSystem::CamInd_gnHeaderSubtype_raw_.fieldlength + LibItsCam__TestSystem::CamInd_gnLifetime_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_gnHeaderType_raw_.fieldlength + LibItsCam__TestSystem::CamInd_gnTrafficClass_raw_.fieldlength + LibItsCam__TestSystem::CamInd_btpDestinationPort_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_gnHeaderSubtype_raw_.fieldlength + LibItsCam__TestSystem::CamInd_btpInfo_raw_.fieldlength + LibItsCam__TestSystem::CamInd_ssp_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_gnLifetime_raw_.fieldlength + LibItsCam__TestSystem::CamInd_its__aid_raw_.fieldlength) /
LibItsCam__TestSystem::CamInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsCam__TestSystem::CamInd_btpDestinationPort_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_btpInfo_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_ssp_raw_.fieldlength +
LibItsCam__TestSystem::CamInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), cam) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), cam) == -1) {
loggers::get_instance().warning("fx__dec__CamInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__CamInd: -1 result code was returned");
...@@ -171,8 +163,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -171,8 +163,7 @@ namespace LibItsCam__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM& p_cam) BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM &p_cam) {
{
loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam); loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam);
cam_codec codec; cam_codec codec;
...@@ -181,8 +172,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -181,8 +172,7 @@ namespace LibItsCam__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__CAM(BITSTRING& b, CAM__PDU__Descriptions::CAM& p) INTEGER fx__dec__CAM(BITSTRING &b, CAM__PDU__Descriptions::CAM &p) {
{
loggers::get_instance().log(">>> fx__dec__CAM"); loggers::get_instance().log(">>> fx__dec__CAM");
cam_codec codec; cam_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -195,8 +185,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -195,8 +185,7 @@ namespace LibItsCam__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtCamInitialize (const LibItsCam__TypesAndValues::UtCamInitialize& p_utCamInitialize) BITSTRING fx__enc__UtCamInitialize(const LibItsCam__TypesAndValues::UtCamInitialize &p_utCamInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtCamInitialize: ", p_utCamInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtCamInitialize: ", p_utCamInitialize);
uppertester_cam_codec codec; uppertester_cam_codec codec;
...@@ -205,8 +194,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -205,8 +194,7 @@ namespace LibItsCam__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtCamChangePosition (const LibItsCam__TypesAndValues::UtCamChangePosition& p_utCamChangePosition) BITSTRING fx__enc__UtCamChangePosition(const LibItsCam__TypesAndValues::UtCamChangePosition &p_utCamChangePosition) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtCamChangePosition: ", p_utCamChangePosition); loggers::get_instance().log_msg(">>> fx__enc__UtCamChangePosition: ", p_utCamChangePosition);
uppertester_cam_codec codec; uppertester_cam_codec codec;
...@@ -215,8 +203,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -215,8 +203,7 @@ namespace LibItsCam__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtCamTrigger (const LibItsCam__TypesAndValues::UtCamTrigger& p_utCamTrigger) BITSTRING fx__enc__UtCamTrigger(const LibItsCam__TypesAndValues::UtCamTrigger &p_utCamTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtCamTrigger: ", p_utCamTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtCamTrigger: ", p_utCamTrigger);
uppertester_cam_codec codec; uppertester_cam_codec codec;
...@@ -230,8 +217,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -230,8 +217,7 @@ namespace LibItsCam__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtCamResults(BITSTRING& b, LibItsCam__TypesAndValues::UtCamResults& p) INTEGER fx__dec__UtCamResults(BITSTRING &b, LibItsCam__TypesAndValues::UtCamResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtCamResults"); loggers::get_instance().log(">>> fx__dec__UtCamResults");
uppertester_cam_codec codec; uppertester_cam_codec codec;
...@@ -241,7 +227,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -241,7 +227,7 @@ namespace LibItsCam__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtCamResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtCamResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsCam__TypesAndValues::UtCamResults&>(*ptr); p = static_cast<LibItsCam__TypesAndValues::UtCamResults &>(*ptr);
return 0; return 0;
} }
...@@ -250,8 +236,7 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -250,8 +236,7 @@ namespace LibItsCam__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtCamEventInd(BITSTRING& b, LibItsCam__TypesAndValues::UtCamEventInd& p) INTEGER fx__dec__UtCamEventInd(BITSTRING &b, LibItsCam__TypesAndValues::UtCamEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtCamEventInd"); loggers::get_instance().log(">>> fx__dec__UtCamEventInd");
uppertester_cam_codec codec; uppertester_cam_codec codec;
...@@ -261,9 +246,8 @@ namespace LibItsCam__EncdecDeclarations { ...@@ -261,9 +246,8 @@ namespace LibItsCam__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtCamEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtCamEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsCam__TypesAndValues::UtCamEventInd&>(*ptr); p = static_cast<LibItsCam__TypesAndValues::UtCamEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsCam__EncdecDeclarations
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "LibItsDenm_EncdecDeclarations.hh" #include "LibItsDenm_EncdecDeclarations.hh"
#include "denm_codec.hh" #include "denm_codec.hh"
#include "uppertester_denm_codec.hh"
#include "loggers.hh" #include "loggers.hh"
#include "uppertester_denm_codec.hh"
namespace LibItsDenm__EncdecDeclarations { namespace LibItsDenm__EncdecDeclarations {
/**************************************************** /****************************************************
...@@ -12,8 +12,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -12,8 +12,7 @@ namespace LibItsDenm__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__DenmReq(const LibItsDenm__TestSystem::DenmReq& p_denmReq) BITSTRING fx__enc__DenmReq(const LibItsDenm__TestSystem::DenmReq &p_denmReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__DenmReq: ", p_denmReq); loggers::get_instance().log_msg(">>> fx__enc__DenmReq: ", p_denmReq);
denm_codec codec; denm_codec codec;
...@@ -31,8 +30,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -31,8 +30,7 @@ namespace LibItsDenm__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__DenmReq(BITSTRING& b, LibItsDenm__TestSystem::DenmReq& p) INTEGER fx__dec__DenmReq(BITSTRING &b, LibItsDenm__TestSystem::DenmReq &p) {
{
loggers::get_instance().log(">>> fx__dec__DenmReq"); loggers::get_instance().log(">>> fx__dec__DenmReq");
denm_codec codec; denm_codec codec;
...@@ -48,25 +46,19 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -48,25 +46,19 @@ namespace LibItsDenm__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__DenmInd(BITSTRING& b, LibItsDenm__TestSystem::DenmInd& p_denmInd) INTEGER fx__dec__DenmInd(BITSTRING &b, LibItsDenm__TestSystem::DenmInd &p_denmInd) {
{
loggers::get_instance().log(">>> fx__dec__DenmInd"); loggers::get_instance().log(">>> fx__dec__DenmInd");
denm_codec codec; denm_codec codec;
DENM__PDU__Descriptions::DENM denm; DENM__PDU__Descriptions::DENM denm;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
int s = ( int s = (LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength) /
LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength +
LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength
) / 8;
// Decode DEN message // Decode DEN message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), denm) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), denm) == -1) {
loggers::get_instance().warning("fx__dec__DenmInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__DenmInd: -1 result code was returned");
...@@ -170,8 +162,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -170,8 +162,7 @@ namespace LibItsDenm__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__DENM(const DENM__PDU__Descriptions::DENM& p_denm) BITSTRING fx__enc__DENM(const DENM__PDU__Descriptions::DENM &p_denm) {
{
loggers::get_instance().log_msg(">>> fx__enc__DENM: ", p_denm); loggers::get_instance().log_msg(">>> fx__enc__DENM: ", p_denm);
denm_codec codec; denm_codec codec;
...@@ -180,8 +171,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -180,8 +171,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__DENM(BITSTRING& b, DENM__PDU__Descriptions::DENM& p) INTEGER fx__dec__DENM(BITSTRING &b, DENM__PDU__Descriptions::DENM &p) {
{
loggers::get_instance().log(">>> fx__dec__DENM"); loggers::get_instance().log(">>> fx__dec__DENM");
denm_codec codec; denm_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -194,8 +184,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -194,8 +184,7 @@ namespace LibItsDenm__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtDenmInitialize (const LibItsDenm__TypesAndValues::UtDenmInitialize& p_utDenmInitialize) BITSTRING fx__enc__UtDenmInitialize(const LibItsDenm__TypesAndValues::UtDenmInitialize &p_utDenmInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmInitialize: ", p_utDenmInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtDenmInitialize: ", p_utDenmInitialize);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -204,8 +193,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -204,8 +193,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtDenmChangePosition (const LibItsDenm__TypesAndValues::UtDenmChangePosition& p_utDenmChangePosition) BITSTRING fx__enc__UtDenmChangePosition(const LibItsDenm__TypesAndValues::UtDenmChangePosition &p_utDenmChangePosition) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmChangePosition: ", p_utDenmChangePosition); loggers::get_instance().log_msg(">>> fx__enc__UtDenmChangePosition: ", p_utDenmChangePosition);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -214,8 +202,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -214,8 +202,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtDenmChangePseudonym (const LibItsDenm__TypesAndValues::UtDenmChangePseudonym& p_utDenmChangePseudonym) BITSTRING fx__enc__UtDenmChangePseudonym(const LibItsDenm__TypesAndValues::UtDenmChangePseudonym &p_utDenmChangePseudonym) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmChangePseudonym: ", p_utDenmChangePseudonym); loggers::get_instance().log_msg(">>> fx__enc__UtDenmChangePseudonym: ", p_utDenmChangePseudonym);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -224,8 +211,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -224,8 +211,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtDenmTrigger (const LibItsDenm__TypesAndValues::UtDenmTrigger& p_utDenmTrigger) BITSTRING fx__enc__UtDenmTrigger(const LibItsDenm__TypesAndValues::UtDenmTrigger &p_utDenmTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmTrigger: ", p_utDenmTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtDenmTrigger: ", p_utDenmTrigger);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -234,8 +220,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -234,8 +220,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtDenmUpdate (const LibItsDenm__TypesAndValues::UtDenmUpdate& p_utDenmUpdate) BITSTRING fx__enc__UtDenmUpdate(const LibItsDenm__TypesAndValues::UtDenmUpdate &p_utDenmUpdate) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmUpdate: ", p_utDenmUpdate); loggers::get_instance().log_msg(">>> fx__enc__UtDenmUpdate: ", p_utDenmUpdate);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -244,8 +229,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -244,8 +229,7 @@ namespace LibItsDenm__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtDenmTermination (const LibItsDenm__TypesAndValues::UtDenmTermination& p_utDenmTermination) BITSTRING fx__enc__UtDenmTermination(const LibItsDenm__TypesAndValues::UtDenmTermination &p_utDenmTermination) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtDenmTermination: ", p_utDenmTermination); loggers::get_instance().log_msg(">>> fx__enc__UtDenmTermination: ", p_utDenmTermination);
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -259,8 +243,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -259,8 +243,7 @@ namespace LibItsDenm__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtDenmResults(BITSTRING& b, LibItsDenm__TypesAndValues::UtDenmResults& p) INTEGER fx__dec__UtDenmResults(BITSTRING &b, LibItsDenm__TypesAndValues::UtDenmResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtDenmResults"); loggers::get_instance().log(">>> fx__dec__UtDenmResults");
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -270,7 +253,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -270,7 +253,7 @@ namespace LibItsDenm__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtDenmResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtDenmResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsDenm__TypesAndValues::UtDenmResults&>(*ptr); p = static_cast<LibItsDenm__TypesAndValues::UtDenmResults &>(*ptr);
return 0; return 0;
} }
...@@ -279,8 +262,7 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -279,8 +262,7 @@ namespace LibItsDenm__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtDenmEventInd(BITSTRING& b, LibItsDenm__TypesAndValues::UtDenmEventInd& p) INTEGER fx__dec__UtDenmEventInd(BITSTRING &b, LibItsDenm__TypesAndValues::UtDenmEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtDenmEventInd"); loggers::get_instance().log(">>> fx__dec__UtDenmEventInd");
uppertester_denm_codec codec; uppertester_denm_codec codec;
...@@ -290,9 +272,8 @@ namespace LibItsDenm__EncdecDeclarations { ...@@ -290,9 +272,8 @@ namespace LibItsDenm__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtDenmEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtDenmEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsDenm__TypesAndValues::UtDenmEventInd&>(*ptr); p = static_cast<LibItsDenm__TypesAndValues::UtDenmEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsDenm__EncdecDeclarations
#include "LibItsEvcsn_EncdecDeclarations.hh" #include "LibItsEvcsn_EncdecDeclarations.hh"
namespace LibItsEvcsn__EncdecDeclarations { namespace LibItsEvcsn__EncdecDeclarations {
/**************************************************** /****************************************************
* @desc External function to encode a EvcsnReq type * @desc External function to encode a EvcsnReq type
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__EvcsnReq(const LibItsEvcsn__TestSystem::EvcsnReq& p) BITSTRING fx__enc__EvcsnReq(const LibItsEvcsn__TestSystem::EvcsnReq &p) {
{ // set error behavior
//set error behavior TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING);
TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL,TTCN_EncDec::EB_WARNING);
TTCN_Buffer TTCN_buf; TTCN_Buffer TTCN_buf;
TTCN_buf.clear(); TTCN_buf.clear();
//encode message in BER (CER variant, but can be any) // encode message in BER (CER variant, but can be any)
p.msgOut().encode(EVCSN__PDU__Descriptions::EvcsnPdu_descr_,TTCN_buf,TTCN_EncDec::CT_BER,BER_ENCODE_CER); p.msgOut().encode(EVCSN__PDU__Descriptions::EvcsnPdu_descr_, TTCN_buf, TTCN_EncDec::CT_BER, BER_ENCODE_CER);
OCTETSTRING encodedData(TTCN_buf.get_len(), TTCN_buf.get_data()); OCTETSTRING encodedData(TTCN_buf.get_len(), TTCN_buf.get_data());
//insert BER2PER recoding here! // insert BER2PER recoding here!
return oct2bit(encodedData); return oct2bit(encodedData);
} }
/****************************************************
/****************************************************
* @desc External function to decode a DenmReq type * @desc External function to decode a DenmReq type
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
/* TODO RGy function not implemented! (decvalue() not used by test suite @29-06-2016) /* TODO RGy function not implemented! (decvalue() not used by test suite @29-06-2016)
INTEGER fx__dec__EvcsnReq(BITSTRING& b, LibItsEvcsn__TestSystem::EvcsnReq& p) INTEGER fx__dec__EvcsnReq(BITSTRING& b, LibItsEvcsn__TestSystem::EvcsnReq& p)
{ {
return -1; return -1;
} }
*/ */
} //end namespace } // namespace LibItsEvcsn__EncdecDeclarations
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "LibItsGeoNetworking_EncdecDeclarations.hh" #include "LibItsGeoNetworking_EncdecDeclarations.hh"
#include "geonetworking_codec.hh" #include "geonetworking_codec.hh"
#include "uppertester_geonetworking_codec.hh"
#include "loggers.hh" #include "loggers.hh"
#include "uppertester_geonetworking_codec.hh"
namespace LibItsGeoNetworking__EncdecDeclarations { namespace LibItsGeoNetworking__EncdecDeclarations {
...@@ -21,8 +21,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -21,8 +21,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* \param[in] p_geoNetworkingReq The value to encode * \param[in] p_geoNetworkingReq The value to encode
* \return encoded value * \return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TestSystem::GeoNetworkingReq const& p_geoNetworkingReq) BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TestSystem::GeoNetworkingReq const &p_geoNetworkingReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingReq: ", p_geoNetworkingReq); loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingReq: ", p_geoNetworkingReq);
float duration; float duration;
...@@ -36,7 +35,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -36,7 +35,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
} }
TTCN_Buffer encoding_buffer(os); TTCN_Buffer encoding_buffer(os);
for (int i = 1; i < p_geoNetworkingReq.get_count(); i++) { for (int i = 1; i < p_geoNetworkingReq.get_count(); i++) {
loggers::get_instance().log("fx__enc__GeoNetworkingReq: processing %s/%s/%s - %d - %d", p_geoNetworkingReq.fld_name(i), p_geoNetworkingReq.fld_descr(i)->name, p_geoNetworkingReq.get_at(i)->get_descriptor()->name, p_geoNetworkingReq.get_at(i)->is_optional(), p_geoNetworkingReq.get_at(i)->is_present()); loggers::get_instance().log("fx__enc__GeoNetworkingReq: processing %s/%s/%s - %d - %d", p_geoNetworkingReq.fld_name(i),
p_geoNetworkingReq.fld_descr(i)->name, p_geoNetworkingReq.get_at(i)->get_descriptor()->name,
p_geoNetworkingReq.get_at(i)->is_optional(), p_geoNetworkingReq.get_at(i)->is_present());
if (p_geoNetworkingReq.get_at(i)->is_optional() && p_geoNetworkingReq.get_at(i)->is_present()) { if (p_geoNetworkingReq.get_at(i)->is_optional() && p_geoNetworkingReq.get_at(i)->is_present()) {
p_geoNetworkingReq.get_at(i)->get_opt_value()->encode(*p_geoNetworkingReq.fld_descr(i), encoding_buffer, TTCN_EncDec::CT_RAW); p_geoNetworkingReq.get_at(i)->get_opt_value()->encode(*p_geoNetworkingReq.fld_descr(i), encoding_buffer, TTCN_EncDec::CT_RAW);
} else { } else {
...@@ -54,18 +55,16 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -54,18 +55,16 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__GeoNetworkingReq(BITSTRING& b, LibItsGeoNetworking__TestSystem::GeoNetworkingReq& p) INTEGER fx__dec__GeoNetworkingReq(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingReq &p) {
{
loggers::get_instance().log(">>> fx__dec__GeoNetworkingReq"); loggers::get_instance().log(">>> fx__dec__GeoNetworkingReq");
geonetworking_codec codec; geonetworking_codec codec;
LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu pdu; LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu pdu;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
unsigned int s = ( unsigned int s = (LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength + LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /
LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength 8;
) / 8;
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {
loggers::get_instance().warning("fx__dec__GeoNetworkingReq: -1 result code was returned"); loggers::get_instance().warning("fx__dec__GeoNetworkingReq: -1 result code was returned");
return -1; return -1;
...@@ -86,8 +85,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -86,8 +85,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TestSystem::GeoNetworkingInd const& p_geoNetworkingInd) BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TestSystem::GeoNetworkingInd const &p_geoNetworkingInd) {
{
loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingInd: ", p_geoNetworkingInd); loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingInd: ", p_geoNetworkingInd);
geonetworking_codec codec; geonetworking_codec codec;
...@@ -98,7 +96,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -98,7 +96,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
} }
TTCN_Buffer encoding_buffer(os); TTCN_Buffer encoding_buffer(os);
for (int i = 1; i < p_geoNetworkingInd.get_count(); i++) { for (int i = 1; i < p_geoNetworkingInd.get_count(); i++) {
loggers::get_instance().log("fx__enc__GeoNetworkingInd: processing %s/%s/%s - %d - %d", p_geoNetworkingInd.fld_name(i), p_geoNetworkingInd.fld_descr(i)->name, p_geoNetworkingInd.get_at(i)->get_descriptor()->name, p_geoNetworkingInd.get_at(i)->is_optional(), p_geoNetworkingInd.get_at(i)->is_present()); loggers::get_instance().log("fx__enc__GeoNetworkingInd: processing %s/%s/%s - %d - %d", p_geoNetworkingInd.fld_name(i),
p_geoNetworkingInd.fld_descr(i)->name, p_geoNetworkingInd.get_at(i)->get_descriptor()->name,
p_geoNetworkingInd.get_at(i)->is_optional(), p_geoNetworkingInd.get_at(i)->is_present());
if (p_geoNetworkingInd.get_at(i)->is_optional() && p_geoNetworkingInd.get_at(i)->is_present()) { if (p_geoNetworkingInd.get_at(i)->is_optional() && p_geoNetworkingInd.get_at(i)->is_present()) {
p_geoNetworkingInd.get_at(i)->get_opt_value()->encode(*p_geoNetworkingInd.fld_descr(i), encoding_buffer, TTCN_EncDec::CT_RAW); p_geoNetworkingInd.get_at(i)->get_opt_value()->encode(*p_geoNetworkingInd.fld_descr(i), encoding_buffer, TTCN_EncDec::CT_RAW);
} else { } else {
...@@ -115,8 +115,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -115,8 +115,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__GeoNetworkingInd(BITSTRING& b, LibItsGeoNetworking__TestSystem::GeoNetworkingInd& p_geoNetworkingInd) INTEGER fx__dec__GeoNetworkingInd(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingInd &p_geoNetworkingInd) {
{
loggers::get_instance().log(">>> fx__dec__GeoNetworkingInd"); loggers::get_instance().log(">>> fx__dec__GeoNetworkingInd");
float duration; float duration;
...@@ -128,11 +127,10 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -128,11 +127,10 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
unsigned int s = ( unsigned int s =
LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength + (LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
LibItsGeoNetworking__TestSystem::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TestSystem::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /
LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength 8;
) / 8;
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {
loggers::get_instance().warning("fx__dec__GeoNetworkingInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__GeoNetworkingInd: -1 result code was returned");
return -1; return -1;
...@@ -141,9 +139,12 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -141,9 +139,12 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
TTCN_Buffer decoding_buffer(OCTETSTRING(s, static_cast<const unsigned char *>(is) + is.lengthof() - s)); TTCN_Buffer decoding_buffer(OCTETSTRING(s, static_cast<const unsigned char *>(is) + is.lengthof() - s));
loggers::get_instance().log_to_hexa("fx__dec__GeoNetworkingInd: Lower layer: ", decoding_buffer); loggers::get_instance().log_to_hexa("fx__dec__GeoNetworkingInd: Lower layer: ", decoding_buffer);
for (int i = 1; i < p_geoNetworkingInd.get_count(); i++) { for (int i = 1; i < p_geoNetworkingInd.get_count(); i++) {
loggers::get_instance().log("fx__dec__GeoNetworkingInd: processing %s/%s/%s - %d - %d", p_geoNetworkingInd.fld_name(i), p_geoNetworkingInd.fld_descr(i)->name, p_geoNetworkingInd.get_at(i)->get_descriptor()->name, p_geoNetworkingInd.get_at(i)->is_optional(), p_geoNetworkingInd.get_at(i)->is_present()); loggers::get_instance().log("fx__dec__GeoNetworkingInd: processing %s/%s/%s - %d - %d", p_geoNetworkingInd.fld_name(i),
p_geoNetworkingInd.fld_descr(i)->name, p_geoNetworkingInd.get_at(i)->get_descriptor()->name,
p_geoNetworkingInd.get_at(i)->is_optional(), p_geoNetworkingInd.get_at(i)->is_present());
if (p_geoNetworkingInd.get_at(i)->is_optional()) { if (p_geoNetworkingInd.get_at(i)->is_optional()) {
loggers::get_instance().log("fx__dec__GeoNetworkingInd: Bytes remaining: %d - field lenth: %d", decoding_buffer.get_len() - decoding_buffer.get_pos(), p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8); loggers::get_instance().log("fx__dec__GeoNetworkingInd: Bytes remaining: %d - field lenth: %d", decoding_buffer.get_len() - decoding_buffer.get_pos(),
p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8);
if (std::string(p_geoNetworkingInd.fld_name(i)).compare("ssp") == 0) { if (std::string(p_geoNetworkingInd.fld_name(i)).compare("ssp") == 0) {
if ((decoding_buffer.get_len() - decoding_buffer.get_pos()) >= (unsigned int)p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8) { if ((decoding_buffer.get_len() - decoding_buffer.get_pos()) >= (unsigned int)p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8) {
loggers::get_instance().log("fx__dec__GeoNetworkingInd: decoding %s", p_geoNetworkingInd.fld_descr(i)->name); loggers::get_instance().log("fx__dec__GeoNetworkingInd: decoding %s", p_geoNetworkingInd.fld_descr(i)->name);
...@@ -156,7 +157,8 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -156,7 +157,8 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
dynamic_cast<OPTIONAL<BITSTRING> &>(*p_geoNetworkingInd.get_at(i)).set_to_omit(); dynamic_cast<OPTIONAL<BITSTRING> &>(*p_geoNetworkingInd.get_at(i)).set_to_omit();
} }
} else if (std::string(p_geoNetworkingInd.fld_name(i)).compare("its_aid") == 0) { } else if (std::string(p_geoNetworkingInd.fld_name(i)).compare("its_aid") == 0) {
loggers::get_instance().log("fx__dec__GeoNetworkingInd: Bytes remaining: %d - its_aid lenth: %d", decoding_buffer.get_len() - decoding_buffer.get_pos(), p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8); loggers::get_instance().log("fx__dec__GeoNetworkingInd: Bytes remaining: %d - its_aid lenth: %d",
decoding_buffer.get_len() - decoding_buffer.get_pos(), p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8);
if ((decoding_buffer.get_len() - decoding_buffer.get_pos()) >= (unsigned int)p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8) { if ((decoding_buffer.get_len() - decoding_buffer.get_pos()) >= (unsigned int)p_geoNetworkingInd.fld_descr(i)->raw->fieldlength / 8) {
INTEGER its_aid; INTEGER its_aid;
its_aid.decode(*p_geoNetworkingInd.fld_descr(i), decoding_buffer, TTCN_EncDec::CT_RAW); its_aid.decode(*p_geoNetworkingInd.fld_descr(i), decoding_buffer, TTCN_EncDec::CT_RAW);
...@@ -186,8 +188,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -186,8 +188,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__GeoNetworkingPdu(LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu const& p_geoNetworkingPdu) BITSTRING fx__enc__GeoNetworkingPdu(LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu const &p_geoNetworkingPdu) {
{
loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingPdu: ", p_geoNetworkingPdu); loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingPdu: ", p_geoNetworkingPdu);
geonetworking_codec codec; geonetworking_codec codec;
...@@ -202,8 +203,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -202,8 +203,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__GeoNetworkingPdu(BITSTRING& b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu& p) INTEGER fx__dec__GeoNetworkingPdu(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &p) {
{
loggers::get_instance().log(">>> fx__dec__GeoNetworkingPdu"); loggers::get_instance().log(">>> fx__dec__GeoNetworkingPdu");
geonetworking_codec codec; geonetworking_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -221,8 +221,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -221,8 +221,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__GnNonSecuredPacket(const LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket& p_gnNonSecuredPacket) BITSTRING fx__enc__GnNonSecuredPacket(const LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket &p_gnNonSecuredPacket) {
{
loggers::get_instance().log_msg(">>> fx__enc__GnNonSecuredPacket: ", p_gnNonSecuredPacket); loggers::get_instance().log_msg(">>> fx__enc__GnNonSecuredPacket: ", p_gnNonSecuredPacket);
geonetworking_codec codec; geonetworking_codec codec;
...@@ -237,13 +236,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -237,13 +236,9 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__GnNonSecuredPacket(BITSTRING& b, LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket& p) INTEGER fx__dec__GnNonSecuredPacket(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket &p) { return -1; }
{
return -1;
}
BITSTRING fx__enc__UtGnInitialize (const LibItsGeoNetworking__TypesAndValues::UtGnInitialize& p_utGnInitialize) BITSTRING fx__enc__UtGnInitialize(const LibItsGeoNetworking__TypesAndValues::UtGnInitialize &p_utGnInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtGnInitialize: ", p_utGnInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtGnInitialize: ", p_utGnInitialize);
uppertester_geonetworking_codec codec; uppertester_geonetworking_codec codec;
...@@ -252,8 +247,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -252,8 +247,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtGnChangePosition (const LibItsGeoNetworking__TypesAndValues::UtGnChangePosition& p_utGnChangePosition) BITSTRING fx__enc__UtGnChangePosition(const LibItsGeoNetworking__TypesAndValues::UtGnChangePosition &p_utGnChangePosition) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtGnChangePosition: ", p_utGnChangePosition); loggers::get_instance().log_msg(">>> fx__enc__UtGnChangePosition: ", p_utGnChangePosition);
uppertester_geonetworking_codec codec; uppertester_geonetworking_codec codec;
...@@ -262,8 +256,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -262,8 +256,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtGnTrigger (const LibItsGeoNetworking__TypesAndValues::UtGnTrigger& p_utGnTrigger) BITSTRING fx__enc__UtGnTrigger(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger &p_utGnTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtGnTrigger: ", p_utGnTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtGnTrigger: ", p_utGnTrigger);
uppertester_geonetworking_codec codec; uppertester_geonetworking_codec codec;
...@@ -272,4 +265,4 @@ namespace LibItsGeoNetworking__EncdecDeclarations { ...@@ -272,4 +265,4 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
} //end namespace } // namespace LibItsGeoNetworking__EncdecDeclarations
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
namespace LibItsHttp__EncdecDeclarations { namespace LibItsHttp__EncdecDeclarations {
BITSTRING fx__enc__http__message(const LibItsHttp__TypesAndValues::HttpMessage& p) { BITSTRING fx__enc__http__message(const LibItsHttp__TypesAndValues::HttpMessage &p) {
loggers::get_instance().log_msg(">>> fx__enc__http__message: ", (const Base_Type&)p); loggers::get_instance().log_msg(">>> fx__enc__http__message: ", (const Base_Type &)p);
OCTETSTRING os; OCTETSTRING os;
http_codec codec; http_codec codec;
...@@ -16,7 +16,7 @@ namespace LibItsHttp__EncdecDeclarations { ...@@ -16,7 +16,7 @@ namespace LibItsHttp__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__http__message(BITSTRING& pdu, LibItsHttp__TypesAndValues::HttpMessage& p) { INTEGER fx__dec__http__message(BITSTRING &pdu, LibItsHttp__TypesAndValues::HttpMessage &p) {
loggers::get_instance().log_msg(">>> fx__dec__http__message: ", pdu); loggers::get_instance().log_msg(">>> fx__dec__http__message: ", pdu);
OCTETSTRING os = bit2oct(pdu); OCTETSTRING os = bit2oct(pdu);
......
...@@ -7,10 +7,7 @@ namespace LibItsIpv6OverGeoNetworking__EncdecDeclarations { ...@@ -7,10 +7,7 @@ namespace LibItsIpv6OverGeoNetworking__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__Ipv6Packet(const LibItsIpv6OverGeoNetworking__TypesAndValues::Ipv6Packet& p) BITSTRING fx__enc__Ipv6Packet(const LibItsIpv6OverGeoNetworking__TypesAndValues::Ipv6Packet &p) { return int2bit(0, 8); }
{
return int2bit(0,8);
}
/**************************************************** /****************************************************
* @desc External function to decode a Ipv6Packet type * @desc External function to decode a Ipv6Packet type
...@@ -18,9 +15,6 @@ namespace LibItsIpv6OverGeoNetworking__EncdecDeclarations { ...@@ -18,9 +15,6 @@ namespace LibItsIpv6OverGeoNetworking__EncdecDeclarations {
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__Ipv6Packet(BITSTRING& b, LibItsIpv6OverGeoNetworking__TypesAndValues::Ipv6Packet& p) INTEGER fx__dec__Ipv6Packet(BITSTRING &b, LibItsIpv6OverGeoNetworking__TypesAndValues::Ipv6Packet &p) { return -1; }
{
return -1;
}
} //end namespace } // namespace LibItsIpv6OverGeoNetworking__EncdecDeclarations
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "LibItsIvim_EncdecDeclarations.hh" #include "LibItsIvim_EncdecDeclarations.hh"
#include "ivim_codec.hh" #include "ivim_codec.hh"
#include "uppertester_ivim_codec.hh"
#include "loggers.hh" #include "loggers.hh"
#include "uppertester_ivim_codec.hh"
namespace LibItsIvim__EncdecDeclarations { namespace LibItsIvim__EncdecDeclarations {
/**************************************************** /****************************************************
...@@ -12,8 +12,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -12,8 +12,7 @@ namespace LibItsIvim__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__IvimReq(const LibItsIvim__TestSystem::IvimReq& p_ivimReq) BITSTRING fx__enc__IvimReq(const LibItsIvim__TestSystem::IvimReq &p_ivimReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__IvimReq: ", p_ivimReq); loggers::get_instance().log_msg(">>> fx__enc__IvimReq: ", p_ivimReq);
ivim_codec codec; ivim_codec codec;
...@@ -31,8 +30,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -31,8 +30,7 @@ namespace LibItsIvim__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__IvimReq(BITSTRING& b, LibItsIvim__TestSystem::IvimReq& p) INTEGER fx__dec__IvimReq(BITSTRING &b, LibItsIvim__TestSystem::IvimReq &p) {
{
loggers::get_instance().log(">>> fx__dec__IvimReq"); loggers::get_instance().log(">>> fx__dec__IvimReq");
ivim_codec codec; ivim_codec codec;
...@@ -48,8 +46,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -48,8 +46,7 @@ namespace LibItsIvim__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__IvimInd(BITSTRING& b, LibItsIvim__TestSystem::IvimInd& p_ivimInd) INTEGER fx__dec__IvimInd(BITSTRING &b, LibItsIvim__TestSystem::IvimInd &p_ivimInd) {
{
loggers::get_instance().log(">>> fx__dec__IvimInd"); loggers::get_instance().log(">>> fx__dec__IvimInd");
ivim_codec codec; ivim_codec codec;
...@@ -57,17 +54,12 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -57,17 +54,12 @@ namespace LibItsIvim__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsIvim__TestSystem::IvimInd_gnNextHeader_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_gnHeaderType_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_gnNextHeader_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_gnHeaderSubtype_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_gnLifetime_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_gnHeaderType_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_gnTrafficClass_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_btpDestinationPort_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_gnHeaderSubtype_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_btpInfo_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_ssp_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_gnLifetime_raw_.fieldlength + LibItsIvim__TestSystem::IvimInd_its__aid_raw_.fieldlength) /
LibItsIvim__TestSystem::IvimInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsIvim__TestSystem::IvimInd_btpDestinationPort_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_btpInfo_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_ssp_raw_.fieldlength +
LibItsIvim__TestSystem::IvimInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), ivim) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), ivim) == -1) {
loggers::get_instance().warning("fx__dec__IvimInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__IvimInd: -1 result code was returned");
...@@ -171,8 +163,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -171,8 +163,7 @@ namespace LibItsIvim__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM& p_ivim) BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM &p_ivim) {
{
loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim); loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim);
ivim_codec codec; ivim_codec codec;
...@@ -181,8 +172,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -181,8 +172,7 @@ namespace LibItsIvim__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__IVIM(BITSTRING& b, IVIM__PDU__Descriptions::IVIM& p) INTEGER fx__dec__IVIM(BITSTRING &b, IVIM__PDU__Descriptions::IVIM &p) {
{
loggers::get_instance().log(">>> fx__dec__IVIM"); loggers::get_instance().log(">>> fx__dec__IVIM");
ivim_codec codec; ivim_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -195,8 +185,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -195,8 +185,7 @@ namespace LibItsIvim__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtIvimInitialize (const LibItsIvim__TypesAndValues::UtIvimInitialize& p_utIvimInitialize) BITSTRING fx__enc__UtIvimInitialize(const LibItsIvim__TypesAndValues::UtIvimInitialize &p_utIvimInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtIvimInitialize: ", p_utIvimInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtIvimInitialize: ", p_utIvimInitialize);
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -205,8 +194,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -205,8 +194,7 @@ namespace LibItsIvim__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtIvimTrigger (const LibItsIvim__TypesAndValues::UtIvimTrigger& p_utIvimTrigger) BITSTRING fx__enc__UtIvimTrigger(const LibItsIvim__TypesAndValues::UtIvimTrigger &p_utIvimTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtIvimTrigger: ", p_utIvimTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtIvimTrigger: ", p_utIvimTrigger);
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -215,8 +203,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -215,8 +203,7 @@ namespace LibItsIvim__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtIvimUpdate (const LibItsIvim__TypesAndValues::UtIvimUpdate& p_utIvimUpdate) BITSTRING fx__enc__UtIvimUpdate(const LibItsIvim__TypesAndValues::UtIvimUpdate &p_utIvimUpdate) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtIvimUpdate: ", p_utIvimUpdate); loggers::get_instance().log_msg(">>> fx__enc__UtIvimUpdate: ", p_utIvimUpdate);
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -225,8 +212,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -225,8 +212,7 @@ namespace LibItsIvim__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtIvimTermination (const LibItsIvim__TypesAndValues::UtIvimTermination& p_utIvimTermination) BITSTRING fx__enc__UtIvimTermination(const LibItsIvim__TypesAndValues::UtIvimTermination &p_utIvimTermination) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtIvimTermination: ", p_utIvimTermination); loggers::get_instance().log_msg(">>> fx__enc__UtIvimTermination: ", p_utIvimTermination);
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -240,8 +226,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -240,8 +226,7 @@ namespace LibItsIvim__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtIvimResults(BITSTRING& b, LibItsIvim__TypesAndValues::UtIvimResults& p) INTEGER fx__dec__UtIvimResults(BITSTRING &b, LibItsIvim__TypesAndValues::UtIvimResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtIvimResults"); loggers::get_instance().log(">>> fx__dec__UtIvimResults");
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -251,7 +236,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -251,7 +236,7 @@ namespace LibItsIvim__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtIvimResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtIvimResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsIvim__TypesAndValues::UtIvimResults&>(*ptr); p = static_cast<LibItsIvim__TypesAndValues::UtIvimResults &>(*ptr);
return 0; return 0;
} }
...@@ -260,8 +245,7 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -260,8 +245,7 @@ namespace LibItsIvim__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtIvimEventInd(BITSTRING& b, LibItsIvim__TypesAndValues::UtIvimEventInd& p) INTEGER fx__dec__UtIvimEventInd(BITSTRING &b, LibItsIvim__TypesAndValues::UtIvimEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtIvimEventInd"); loggers::get_instance().log(">>> fx__dec__UtIvimEventInd");
uppertester_ivim_codec codec; uppertester_ivim_codec codec;
...@@ -271,9 +255,8 @@ namespace LibItsIvim__EncdecDeclarations { ...@@ -271,9 +255,8 @@ namespace LibItsIvim__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtIvimEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtIvimEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsIvim__TypesAndValues::UtIvimEventInd&>(*ptr); p = static_cast<LibItsIvim__TypesAndValues::UtIvimEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsIvim__EncdecDeclarations
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#include "LibItsMapemSpatem_EncdecDeclarations.hh" #include "LibItsMapemSpatem_EncdecDeclarations.hh"
#include "loggers.hh"
#include "mapem_codec.hh" #include "mapem_codec.hh"
#include "spatem_codec.hh" #include "spatem_codec.hh"
#include "uppertester_mapem_spatem_codec.hh" #include "uppertester_mapem_spatem_codec.hh"
#include "loggers.hh"
namespace LibItsMapemSpatem__EncdecDeclarations { namespace LibItsMapemSpatem__EncdecDeclarations {
/**************************************************** /****************************************************
...@@ -13,8 +13,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -13,8 +13,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__MapemReq(const LibItsMapemSpatem__TestSystem::MapemReq& p_sremReq) BITSTRING fx__enc__MapemReq(const LibItsMapemSpatem__TestSystem::MapemReq &p_sremReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__MapemReq: ", p_sremReq); loggers::get_instance().log_msg(">>> fx__enc__MapemReq: ", p_sremReq);
mapem_codec codec; mapem_codec codec;
...@@ -32,8 +31,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -32,8 +31,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__MapemReq(BITSTRING& b, LibItsMapemSpatem__TestSystem::MapemReq& p) INTEGER fx__dec__MapemReq(BITSTRING &b, LibItsMapemSpatem__TestSystem::MapemReq &p) {
{
loggers::get_instance().log(">>> fx__dec__MapemReq"); loggers::get_instance().log(">>> fx__dec__MapemReq");
mapem_codec codec; mapem_codec codec;
...@@ -49,8 +47,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -49,8 +47,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__MapemInd(BITSTRING& b, LibItsMapemSpatem__TestSystem::MapemInd& p_mapemInd) INTEGER fx__dec__MapemInd(BITSTRING &b, LibItsMapemSpatem__TestSystem::MapemInd &p_mapemInd) {
{
loggers::get_instance().log(">>> fx__dec__MapemInd"); loggers::get_instance().log(">>> fx__dec__MapemInd");
mapem_codec codec; mapem_codec codec;
...@@ -58,17 +55,12 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -58,17 +55,12 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsMapemSpatem__TestSystem::MapemInd_gnNextHeader_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_gnHeaderType_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_gnNextHeader_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_gnHeaderSubtype_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_gnLifetime_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_gnHeaderType_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_gnHeaderSubtype_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_gnLifetime_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_gnTrafficClass_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_gnTrafficClass_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_btpDestinationPort_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_btpDestinationPort_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_btpInfo_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::MapemInd_btpInfo_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_ssp_raw_.fieldlength + LibItsMapemSpatem__TestSystem::MapemInd_its__aid_raw_.fieldlength) /
LibItsMapemSpatem__TestSystem::MapemInd_ssp_raw_.fieldlength + 8;
LibItsMapemSpatem__TestSystem::MapemInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), mapem) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), mapem) == -1) {
loggers::get_instance().warning("fx__dec__MapemInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__MapemInd: -1 result code was returned");
...@@ -172,8 +164,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -172,8 +164,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM& p_mapem) BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM &p_mapem) {
{
loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem); loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem);
mapem_codec codec; mapem_codec codec;
...@@ -182,8 +173,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -182,8 +173,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__MAPEM(BITSTRING& b, MAPEM__PDU__Descriptions::MAPEM& p) INTEGER fx__dec__MAPEM(BITSTRING &b, MAPEM__PDU__Descriptions::MAPEM &p) {
{
loggers::get_instance().log(">>> fx__dec__Mapem"); loggers::get_instance().log(">>> fx__dec__Mapem");
mapem_codec codec; mapem_codec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -201,8 +191,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -201,8 +191,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__SpatemReq(const LibItsMapemSpatem__TestSystem::SpatemReq& p_spatemReq) BITSTRING fx__enc__SpatemReq(const LibItsMapemSpatem__TestSystem::SpatemReq &p_spatemReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__SpatemReq: ", p_spatemReq); loggers::get_instance().log_msg(">>> fx__enc__SpatemReq: ", p_spatemReq);
spatem_codec codec; spatem_codec codec;
...@@ -220,8 +209,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -220,8 +209,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__SpatemReq(BITSTRING& b, LibItsMapemSpatem__TestSystem::SpatemReq& p) INTEGER fx__dec__SpatemReq(BITSTRING &b, LibItsMapemSpatem__TestSystem::SpatemReq &p) {
{
loggers::get_instance().log(">>> fx__dec__SpatemReq"); loggers::get_instance().log(">>> fx__dec__SpatemReq");
spatem_codec codec; spatem_codec codec;
...@@ -237,8 +225,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -237,8 +225,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__SpatemInd(BITSTRING& b, LibItsMapemSpatem__TestSystem::SpatemInd& p_mapemInd) INTEGER fx__dec__SpatemInd(BITSTRING &b, LibItsMapemSpatem__TestSystem::SpatemInd &p_mapemInd) {
{
loggers::get_instance().log(">>> fx__dec__SpatemInd"); loggers::get_instance().log(">>> fx__dec__SpatemInd");
spatem_codec codec; spatem_codec codec;
...@@ -246,17 +233,12 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -246,17 +233,12 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsMapemSpatem__TestSystem::SpatemInd_gnNextHeader_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_gnHeaderType_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_gnNextHeader_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_gnHeaderSubtype_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_gnLifetime_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_gnHeaderType_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_gnHeaderSubtype_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_gnLifetime_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_gnTrafficClass_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_gnTrafficClass_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_btpDestinationPort_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_btpDestinationPort_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_btpInfo_raw_.fieldlength +
LibItsMapemSpatem__TestSystem::SpatemInd_btpInfo_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_ssp_raw_.fieldlength + LibItsMapemSpatem__TestSystem::SpatemInd_its__aid_raw_.fieldlength) /
LibItsMapemSpatem__TestSystem::SpatemInd_ssp_raw_.fieldlength + 8;
LibItsMapemSpatem__TestSystem::SpatemInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), spatem) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), spatem) == -1) {
loggers::get_instance().warning("fx__dec__SpatemSpatemInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__SpatemSpatemInd: -1 result code was returned");
...@@ -360,8 +342,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -360,8 +342,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM& p_spatem) BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM &p_spatem) {
{
loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem); loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem);
spatem_codec codec; spatem_codec codec;
...@@ -370,8 +351,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -370,8 +351,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__SPATEM(BITSTRING& b, SPATEM__PDU__Descriptions::SPATEM& p_spatem) INTEGER fx__dec__SPATEM(BITSTRING &b, SPATEM__PDU__Descriptions::SPATEM &p_spatem) {
{
loggers::get_instance().log(">>> fx__dec__Spatem"); loggers::get_instance().log(">>> fx__dec__Spatem");
spatem_codec codec; spatem_codec codec;
...@@ -385,8 +365,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -385,8 +365,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtMapemSpatemInitialize (const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize& p_utMapemSpatemInitialize) BITSTRING fx__enc__UtMapemSpatemInitialize(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize &p_utMapemSpatemInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemInitialize: ", p_utMapemSpatemInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemInitialize: ", p_utMapemSpatemInitialize);
uppertester_mapem_spatem_codec codec; uppertester_mapem_spatem_codec codec;
...@@ -395,8 +374,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -395,8 +374,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtMapemSpatemResults (const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults& p_utMapemSpatemResults) BITSTRING fx__enc__UtMapemSpatemResults(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &p_utMapemSpatemResults) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemResults: ", p_utMapemSpatemResults); loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemResults: ", p_utMapemSpatemResults);
/*uppertester_mapem_spatem_codec codec; /*uppertester_mapem_spatem_codec codec;
...@@ -411,8 +389,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -411,8 +389,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtMapemSpatemResults(BITSTRING& b, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults& p) INTEGER fx__dec__UtMapemSpatemResults(BITSTRING &b, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtMapemSpatemResults"); loggers::get_instance().log(">>> fx__dec__UtMapemSpatemResults");
uppertester_mapem_spatem_codec codec; uppertester_mapem_spatem_codec codec;
...@@ -422,7 +399,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -422,7 +399,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtMapemSpatemResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtMapemSpatemResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults&>(*ptr); p = static_cast<LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &>(*ptr);
return 0; return 0;
} }
...@@ -431,8 +408,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -431,8 +408,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtMapemEventInd(BITSTRING& b, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd& p) INTEGER fx__dec__UtMapemEventInd(BITSTRING &b, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtMapemEventInd"); loggers::get_instance().log(">>> fx__dec__UtMapemEventInd");
uppertester_mapem_spatem_codec codec; uppertester_mapem_spatem_codec codec;
...@@ -442,7 +418,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -442,7 +418,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtMapemEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtMapemEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsMapemSpatem__TypesAndValues::UtMapemEventInd&>(*ptr); p = static_cast<LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &>(*ptr);
return 0; return 0;
} }
...@@ -451,8 +427,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -451,8 +427,7 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtSpatemEventInd(BITSTRING& b, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd& p) INTEGER fx__dec__UtSpatemEventInd(BITSTRING &b, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtSpatemEventInd"); loggers::get_instance().log(">>> fx__dec__UtSpatemEventInd");
uppertester_mapem_spatem_codec codec; uppertester_mapem_spatem_codec codec;
...@@ -462,9 +437,8 @@ namespace LibItsMapemSpatem__EncdecDeclarations { ...@@ -462,9 +437,8 @@ namespace LibItsMapemSpatem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtSpatemEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtSpatemEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd&>(*ptr); p = static_cast<LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsMapemSpatem__EncdecDeclarations
#include "LibItsPki_EncdecDeclarations.hh" #include "LibItsPki_EncdecDeclarations.hh"
#include "etsi_ts102941_base_types_public_keys.hh"
#include "etsi_ts102941_data_codec.hh" #include "etsi_ts102941_data_codec.hh"
#include "etsi_ts102941_data_content_codec.hh" #include "etsi_ts102941_data_content_codec.hh"
#include "etsi_ts102941_types_enrolment_inner_request.hh"
#include "etsi_ts102941_types_enrolment_inner_response.hh"
#include "etsi_ts102941_types_authorization_inner_request.hh" #include "etsi_ts102941_types_authorization_inner_request.hh"
#include "etsi_ts102941_types_authorization_inner_response.hh" #include "etsi_ts102941_types_authorization_inner_response.hh"
#include "etsi_ts102941_types_authorization_shared_at_request.hh" #include "etsi_ts102941_types_authorization_shared_at_request.hh"
#include "etsi_ts102941_types_authorization_validation_request.hh" #include "etsi_ts102941_types_authorization_validation_request.hh"
#include "etsi_ts102941_types_authorization_validation_response.hh" #include "etsi_ts102941_types_authorization_validation_response.hh"
#include "etsi_ts102941_base_types_public_keys.hh" #include "etsi_ts102941_types_enrolment_inner_request.hh"
#include "etsi_ts102941_types_enrolment_inner_response.hh"
#include "ieee_1609dot2_base_types_public_encryption_key.hh" #include "ieee_1609dot2_base_types_public_encryption_key.hh"
#include "ieee_1609dot2_base_types_public_verification_key.hh" #include "ieee_1609dot2_base_types_public_verification_key.hh"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
namespace LibItsPki__EncdecDeclarations { namespace LibItsPki__EncdecDeclarations {
BITSTRING fx__enc__EtsiTs102941Data(const EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_102941_data) { BITSTRING fx__enc__EtsiTs102941Data(const EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) {
loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941Data: ", p_etsi_ts_102941_data); loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941Data: ", p_etsi_ts_102941_data);
etsi_ts102941_data_codec codec; etsi_ts102941_data_codec codec;
...@@ -30,7 +30,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -30,7 +30,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__EtsiTs102941Data(BITSTRING& b, EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_102941_data) { INTEGER fx__dec__EtsiTs102941Data(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) {
loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941Data: ", b); loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941Data: ", b);
etsi_ts102941_data_codec codec; etsi_ts102941_data_codec codec;
...@@ -43,7 +43,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -43,7 +43,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__EtsiTs102941DataContent(const EtsiTs102941MessagesCa::EtsiTs102941DataContent& p_etsi_ts_102941_data_content) { BITSTRING fx__enc__EtsiTs102941DataContent(const EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) {
loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941DataContent: ", p_etsi_ts_102941_data_content); loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941DataContent: ", p_etsi_ts_102941_data_content);
etsi_ts102941_data_content_codec codec; etsi_ts102941_data_content_codec codec;
...@@ -56,7 +56,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -56,7 +56,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__EtsiTs102941DataContent(BITSTRING& b, EtsiTs102941MessagesCa::EtsiTs102941DataContent& p_etsi_ts_102941_data_content) { INTEGER fx__dec__EtsiTs102941DataContent(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) {
loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941DataContent: ", b); loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941DataContent: ", b);
etsi_ts102941_data_content_codec codec; etsi_ts102941_data_content_codec codec;
...@@ -69,7 +69,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -69,7 +69,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__InnerEcRequest(const EtsiTs102941TypesEnrolment::InnerEcRequest& p_inner_request) { BITSTRING fx__enc__InnerEcRequest(const EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) {
loggers::get_instance().log_msg(">>> fx_enc_InnerEcRequest: ", p_inner_request); loggers::get_instance().log_msg(">>> fx_enc_InnerEcRequest: ", p_inner_request);
etsi_ts102941_types_enrolment_inner_request codec; etsi_ts102941_types_enrolment_inner_request codec;
...@@ -82,7 +82,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -82,7 +82,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__InnerEcRequest(BITSTRING& b, EtsiTs102941TypesEnrolment::InnerEcRequest& p_inner_request) { INTEGER fx__dec__InnerEcRequest(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) {
loggers::get_instance().log_msg(">>> fx__dec__InnerEcRequest: ", b); loggers::get_instance().log_msg(">>> fx__dec__InnerEcRequest: ", b);
etsi_ts102941_types_enrolment_inner_request codec; etsi_ts102941_types_enrolment_inner_request codec;
...@@ -96,7 +96,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -96,7 +96,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__InnerEcResponse(const EtsiTs102941TypesEnrolment::InnerEcResponse& p_inner_response) { BITSTRING fx__enc__InnerEcResponse(const EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) {
loggers::get_instance().log_msg(">>> fx__enc__InnerEcResponse: ", p_inner_response); loggers::get_instance().log_msg(">>> fx__enc__InnerEcResponse: ", p_inner_response);
etsi_ts102941_types_enrolment_inner_response codec; etsi_ts102941_types_enrolment_inner_response codec;
...@@ -109,7 +109,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -109,7 +109,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__InnerEcResponse(BITSTRING& b, EtsiTs102941TypesEnrolment::InnerEcResponse& p_inner_response) { INTEGER fx__dec__InnerEcResponse(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) {
loggers::get_instance().log_msg(">>> fx__dec__InnerEcResponse: ", b); loggers::get_instance().log_msg(">>> fx__dec__InnerEcResponse: ", b);
etsi_ts102941_types_enrolment_inner_response codec; etsi_ts102941_types_enrolment_inner_response codec;
...@@ -123,7 +123,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -123,7 +123,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__InnerAtRequest(const EtsiTs102941TypesAuthorization::InnerAtRequest& p_inner_request) { BITSTRING fx__enc__InnerAtRequest(const EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) {
loggers::get_instance().log_msg(">>> fx_enc_InnerAtRequest: ", p_inner_request); loggers::get_instance().log_msg(">>> fx_enc_InnerAtRequest: ", p_inner_request);
etsi_ts102941_types_authorization_inner_request codec; etsi_ts102941_types_authorization_inner_request codec;
...@@ -136,7 +136,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -136,7 +136,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__InnerAtRequest(BITSTRING& b, EtsiTs102941TypesAuthorization::InnerAtRequest& p_inner_request) { INTEGER fx__dec__InnerAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) {
loggers::get_instance().log_msg(">>> fx__dec__InnerAtRequest: ", b); loggers::get_instance().log_msg(">>> fx__dec__InnerAtRequest: ", b);
etsi_ts102941_types_authorization_inner_request codec; etsi_ts102941_types_authorization_inner_request codec;
...@@ -150,7 +150,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -150,7 +150,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__InnerAtResponse(const EtsiTs102941TypesAuthorization::InnerAtResponse& p_inner_response) { BITSTRING fx__enc__InnerAtResponse(const EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) {
loggers::get_instance().log_msg(">>> fx__enc__InnerAtResponse: ", p_inner_response); loggers::get_instance().log_msg(">>> fx__enc__InnerAtResponse: ", p_inner_response);
etsi_ts102941_types_authorization_inner_response codec; etsi_ts102941_types_authorization_inner_response codec;
...@@ -163,7 +163,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -163,7 +163,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__InnerAtResponse(BITSTRING& b, EtsiTs102941TypesAuthorization::InnerAtResponse& p_inner_response) { INTEGER fx__dec__InnerAtResponse(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) {
loggers::get_instance().log_msg(">>> fx__dec__InnerAtResponse: ", b); loggers::get_instance().log_msg(">>> fx__dec__InnerAtResponse: ", b);
etsi_ts102941_types_authorization_inner_response codec; etsi_ts102941_types_authorization_inner_response codec;
...@@ -177,7 +177,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -177,7 +177,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SharedAtRequest(EtsiTs102941TypesAuthorization::SharedAtRequest const& p_shared_at) { BITSTRING fx__enc__SharedAtRequest(EtsiTs102941TypesAuthorization::SharedAtRequest const &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__enc__SharedAtRequest: ", p_shared_at); loggers::get_instance().log_msg(">>> fx__enc__SharedAtRequest: ", p_shared_at);
etsi_ts102941_types_authorization_shared_at_request codec; etsi_ts102941_types_authorization_shared_at_request codec;
...@@ -190,7 +190,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -190,7 +190,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__SharedAtRequest(BITSTRING& b, EtsiTs102941TypesAuthorization::SharedAtRequest& p_shared_at) { INTEGER fx__dec__SharedAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::SharedAtRequest &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__dec__SharedAtRequest: ", b); loggers::get_instance().log_msg(">>> fx__dec__SharedAtRequest: ", b);
etsi_ts102941_types_authorization_shared_at_request codec; etsi_ts102941_types_authorization_shared_at_request codec;
...@@ -204,7 +204,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -204,7 +204,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__AuthorizationValidationRequest(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest const& p_shared_at) { BITSTRING fx__enc__AuthorizationValidationRequest(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest const &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationRequest: ", p_shared_at); loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationRequest: ", p_shared_at);
etsi_ts102941_types_authorization_validation_request codec; etsi_ts102941_types_authorization_validation_request codec;
...@@ -217,7 +217,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -217,7 +217,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__AuthorizationValidationRequest(BITSTRING& b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest& p_shared_at) { INTEGER fx__dec__AuthorizationValidationRequest(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationRequest: ", b); loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationRequest: ", b);
etsi_ts102941_types_authorization_validation_request codec; etsi_ts102941_types_authorization_validation_request codec;
...@@ -231,7 +231,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -231,7 +231,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__AuthorizationValidationResponse(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse const& p_shared_at) { BITSTRING fx__enc__AuthorizationValidationResponse(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse const &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationResponse: ", p_shared_at); loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationResponse: ", p_shared_at);
etsi_ts102941_types_authorization_validation_response codec; etsi_ts102941_types_authorization_validation_response codec;
...@@ -244,7 +244,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -244,7 +244,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__AuthorizationValidationResponse(BITSTRING& b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse& p_shared_at) { INTEGER fx__dec__AuthorizationValidationResponse(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse &p_shared_at) {
loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationResponse: ", b); loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationResponse: ", b);
etsi_ts102941_types_authorization_validation_response codec; etsi_ts102941_types_authorization_validation_response codec;
...@@ -258,7 +258,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -258,7 +258,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const& p_public_keys) { BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const &p_public_keys) {
loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys); loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys);
etsi_ts102941_base_types_public_keys codec; etsi_ts102941_base_types_public_keys codec;
...@@ -271,7 +271,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -271,7 +271,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__PublicKeys(BITSTRING& b, EtsiTs102941BaseTypes::PublicKeys& p_public_keys) { INTEGER fx__dec__PublicKeys(BITSTRING &b, EtsiTs102941BaseTypes::PublicKeys &p_public_keys) {
loggers::get_instance().log_msg(">>> fx__dec__PublicKeys: ", b); loggers::get_instance().log_msg(">>> fx__dec__PublicKeys: ", b);
etsi_ts102941_base_types_public_keys codec; etsi_ts102941_base_types_public_keys codec;
...@@ -285,7 +285,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -285,7 +285,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__PublicVerificationKey(IEEE1609dot2BaseTypes::PublicVerificationKey const& p_public_verification_key) { BITSTRING fx__enc__PublicVerificationKey(IEEE1609dot2BaseTypes::PublicVerificationKey const &p_public_verification_key) {
loggers::get_instance().log_msg(">>> fx__enc__PublicVerificationKey: ", p_public_verification_key); loggers::get_instance().log_msg(">>> fx__enc__PublicVerificationKey: ", p_public_verification_key);
ieee_1609dot2_base_types_public_verification_key codec; ieee_1609dot2_base_types_public_verification_key codec;
...@@ -298,7 +298,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -298,7 +298,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__PublicVerificationKey(BITSTRING& b, IEEE1609dot2BaseTypes::PublicVerificationKey& p_public_verification_key) { INTEGER fx__dec__PublicVerificationKey(BITSTRING &b, IEEE1609dot2BaseTypes::PublicVerificationKey &p_public_verification_key) {
loggers::get_instance().log_msg(">>> fx__dec__PublicVerificationKey: ", b); loggers::get_instance().log_msg(">>> fx__dec__PublicVerificationKey: ", b);
ieee_1609dot2_base_types_public_verification_key codec; ieee_1609dot2_base_types_public_verification_key codec;
...@@ -312,7 +312,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -312,7 +312,7 @@ namespace LibItsPki__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__PublicEncryptionKey(IEEE1609dot2BaseTypes::PublicEncryptionKey const& p_public_encryption_key) { BITSTRING fx__enc__PublicEncryptionKey(IEEE1609dot2BaseTypes::PublicEncryptionKey const &p_public_encryption_key) {
loggers::get_instance().log_msg(">>> fx__enc__PublicEncryptionKey: ", p_public_encryption_key); loggers::get_instance().log_msg(">>> fx__enc__PublicEncryptionKey: ", p_public_encryption_key);
ieee_1609dot2_base_types_public_encryption_key codec; ieee_1609dot2_base_types_public_encryption_key codec;
...@@ -325,7 +325,7 @@ namespace LibItsPki__EncdecDeclarations { ...@@ -325,7 +325,7 @@ namespace LibItsPki__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__PublicEncryptionKey(BITSTRING& b, IEEE1609dot2BaseTypes::PublicEncryptionKey& p_public_encryption_key) { INTEGER fx__dec__PublicEncryptionKey(BITSTRING &b, IEEE1609dot2BaseTypes::PublicEncryptionKey &p_public_encryption_key) {
loggers::get_instance().log_msg(">>> fx__dec__PublicEncryptionKey: ", b); loggers::get_instance().log_msg(">>> fx__dec__PublicEncryptionKey: ", b);
ieee_1609dot2_base_types_public_encryption_key codec; ieee_1609dot2_base_types_public_encryption_key codec;
......
...@@ -12,8 +12,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -12,8 +12,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__RtcmemReq(const LibItsRtcmem__TestSystem::RtcmemReq& p_rtcmemReq) BITSTRING fx__enc__RtcmemReq(const LibItsRtcmem__TestSystem::RtcmemReq &p_rtcmemReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__RtcmemReq: ", p_rtcmemReq); loggers::get_instance().log_msg(">>> fx__enc__RtcmemReq: ", p_rtcmemReq);
RtcmemCodec codec; RtcmemCodec codec;
...@@ -31,8 +30,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -31,8 +30,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__RtcmemReq(BITSTRING& b, LibItsRtcmem__TestSystem::RtcmemReq& p) INTEGER fx__dec__RtcmemReq(BITSTRING &b, LibItsRtcmem__TestSystem::RtcmemReq &p) {
{
loggers::get_instance().log(">>> fx__dec__RtcmemReq"); loggers::get_instance().log(">>> fx__dec__RtcmemReq");
RtcmemCodec codec; RtcmemCodec codec;
...@@ -48,8 +46,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -48,8 +46,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return 0; return 0;
} }
INTEGER fx__dec__RtcmemInd(BITSTRING& b, LibItsRtcmem__TestSystem::RtcmemInd& p_rtcmemInd) INTEGER fx__dec__RtcmemInd(BITSTRING &b, LibItsRtcmem__TestSystem::RtcmemInd &p_rtcmemInd) {
{
loggers::get_instance().log(">>> fx__dec__RtcmemInd"); loggers::get_instance().log(">>> fx__dec__RtcmemInd");
RtcmemCodec codec; RtcmemCodec codec;
...@@ -57,17 +54,12 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -57,17 +54,12 @@ namespace LibItsRtcmem__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsRtcmem__TestSystem::RtcmemInd_gnNextHeader_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_gnHeaderType_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_gnNextHeader_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_gnHeaderSubtype_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_gnLifetime_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_gnHeaderType_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_gnTrafficClass_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_btpDestinationPort_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_gnHeaderSubtype_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_btpInfo_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_ssp_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_gnLifetime_raw_.fieldlength + LibItsRtcmem__TestSystem::RtcmemInd_its__aid_raw_.fieldlength) /
LibItsRtcmem__TestSystem::RtcmemInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsRtcmem__TestSystem::RtcmemInd_btpDestinationPort_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_btpInfo_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_ssp_raw_.fieldlength +
LibItsRtcmem__TestSystem::RtcmemInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), rtcmem) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), rtcmem) == -1) {
loggers::get_instance().warning("fx__dec__RtcmemInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__RtcmemInd: -1 result code was returned");
...@@ -171,8 +163,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -171,8 +163,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__RTCMEM(const RTCMEM__PDU__Descriptions::RTCMEM& p_rtcmem) BITSTRING fx__enc__RTCMEM(const RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem) {
{
loggers::get_instance().log_msg(">>> fx__enc__RTCMEM: ", p_rtcmem); loggers::get_instance().log_msg(">>> fx__enc__RTCMEM: ", p_rtcmem);
RtcmemCodec codec; RtcmemCodec codec;
...@@ -181,8 +172,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -181,8 +172,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__RTCMEM(BITSTRING& b, RTCMEM__PDU__Descriptions::RTCMEM& p) INTEGER fx__dec__RTCMEM(BITSTRING &b, RTCMEM__PDU__Descriptions::RTCMEM &p) {
{
loggers::get_instance().log(">>> fx__dec__RTCMEM"); loggers::get_instance().log(">>> fx__dec__RTCMEM");
RtcmemCodec codec; RtcmemCodec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -195,8 +185,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -195,8 +185,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtRtcmemInitialize (const LibItsRtcmem__TypesAndValues::UtRtcmemInitialize& p_utRtcmemInitialize) BITSTRING fx__enc__UtRtcmemInitialize(const LibItsRtcmem__TypesAndValues::UtRtcmemInitialize &p_utRtcmemInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemInitialize: ", p_utRtcmemInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemInitialize: ", p_utRtcmemInitialize);
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -205,8 +194,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -205,8 +194,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtRtcmemTrigger (const LibItsRtcmem__TypesAndValues::UtRtcmemTrigger& p_utRtcmemTrigger) BITSTRING fx__enc__UtRtcmemTrigger(const LibItsRtcmem__TypesAndValues::UtRtcmemTrigger &p_utRtcmemTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemTrigger: ", p_utRtcmemTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemTrigger: ", p_utRtcmemTrigger);
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -215,8 +203,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -215,8 +203,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtRtcmemUpdate (const LibItsRtcmem__TypesAndValues::UtRtcmemUpdate& p_utRtcmemUpdate) BITSTRING fx__enc__UtRtcmemUpdate(const LibItsRtcmem__TypesAndValues::UtRtcmemUpdate &p_utRtcmemUpdate) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemUpdate: ", p_utRtcmemUpdate); loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemUpdate: ", p_utRtcmemUpdate);
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -225,8 +212,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -225,8 +212,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtRtcmemTermination (const LibItsRtcmem__TypesAndValues::UtRtcmemTermination& p_utRtcmemTermination) BITSTRING fx__enc__UtRtcmemTermination(const LibItsRtcmem__TypesAndValues::UtRtcmemTermination &p_utRtcmemTermination) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemTermination: ", p_utRtcmemTermination); loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemTermination: ", p_utRtcmemTermination);
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -240,8 +226,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -240,8 +226,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtRtcmemResults(BITSTRING& b, LibItsRtcmem__TypesAndValues::UtRtcmemResults& p) INTEGER fx__dec__UtRtcmemResults(BITSTRING &b, LibItsRtcmem__TypesAndValues::UtRtcmemResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtRtcmemResults"); loggers::get_instance().log(">>> fx__dec__UtRtcmemResults");
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -251,7 +236,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -251,7 +236,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtRtcmemResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtRtcmemResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsRtcmem__TypesAndValues::UtRtcmemResults&>(*ptr); p = static_cast<LibItsRtcmem__TypesAndValues::UtRtcmemResults &>(*ptr);
return 0; return 0;
} }
...@@ -260,8 +245,7 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -260,8 +245,7 @@ namespace LibItsRtcmem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtRtcmemEventInd(BITSTRING& b, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd& p) INTEGER fx__dec__UtRtcmemEventInd(BITSTRING &b, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtRtcmemEventInd"); loggers::get_instance().log(">>> fx__dec__UtRtcmemEventInd");
UpperTesterRtcmemCodec codec; UpperTesterRtcmemCodec codec;
...@@ -271,9 +255,8 @@ namespace LibItsRtcmem__EncdecDeclarations { ...@@ -271,9 +255,8 @@ namespace LibItsRtcmem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtRtcmemEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtRtcmemEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsRtcmem__TypesAndValues::UtRtcmemEventInd&>(*ptr); p = static_cast<LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsRtcmem__EncdecDeclarations
#include "LibItsSecurity_EncdecDeclarations.hh" #include "LibItsSecurity_EncdecDeclarations.hh"
#include "etsi_ts103097_certificate_codec.hh" #include "etsi_ts103097_certificate_codec.hh"
#include "etsi_ts103097_tobesigned_certificate_codec.hh"
#include "etsi_ts103097_data_codec.hh" #include "etsi_ts103097_data_codec.hh"
#include "etsi_ts103097_tobesigned_certificate_codec.hh"
#include "etsi_ts103097_tobesigned_data_codec.hh" #include "etsi_ts103097_tobesigned_data_codec.hh"
#include "loggers.hh" #include "loggers.hh"
namespace LibItsSecurity__EncdecDeclarations { namespace LibItsSecurity__EncdecDeclarations {
BITSTRING fx__enc__CertificateBase(IEEE1609dot2::CertificateBase const& p_cert) { BITSTRING fx__enc__CertificateBase(IEEE1609dot2::CertificateBase const &p_cert) {
loggers::get_instance().log_msg(">>> fx__enc__CertificateBase: ", p_cert); loggers::get_instance().log_msg(">>> fx__enc__CertificateBase: ", p_cert);
etsi_ts103097_certificate_codec codec; etsi_ts103097_certificate_codec codec;
...@@ -22,7 +22,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -22,7 +22,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__CertificateBase(BITSTRING& b, IEEE1609dot2::CertificateBase& p_cert) { INTEGER fx__dec__CertificateBase(BITSTRING &b, IEEE1609dot2::CertificateBase &p_cert) {
loggers::get_instance().log_msg(">>> fx__dec__CertificateBase: ", b); loggers::get_instance().log_msg(">>> fx__dec__CertificateBase: ", b);
etsi_ts103097_certificate_codec codec; etsi_ts103097_certificate_codec codec;
...@@ -36,7 +36,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -36,7 +36,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__ToBeSignedCertificate(const IEEE1609dot2::ToBeSignedCertificate& p_toBeSignedCertificate) { BITSTRING fx__enc__ToBeSignedCertificate(const IEEE1609dot2::ToBeSignedCertificate &p_toBeSignedCertificate) {
loggers::get_instance().log_msg(">>> fx__enc__ToBeSignedCertificate: ", p_toBeSignedCertificate); loggers::get_instance().log_msg(">>> fx__enc__ToBeSignedCertificate: ", p_toBeSignedCertificate);
etsi_ts103097_tobesigned_certificate_codec codec; etsi_ts103097_tobesigned_certificate_codec codec;
...@@ -49,7 +49,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -49,7 +49,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__Ieee1609Dot2Data(const IEEE1609dot2::Ieee1609Dot2Data& p__ieee1609Dot2Data) { BITSTRING fx__enc__Ieee1609Dot2Data(const IEEE1609dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) {
loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2Data: ", p__ieee1609Dot2Data); loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2Data: ", p__ieee1609Dot2Data);
etsi_ts103097_data_codec codec; etsi_ts103097_data_codec codec;
...@@ -62,7 +62,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -62,7 +62,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__Ieee1609Dot2Data(BITSTRING& p__data, IEEE1609dot2::Ieee1609Dot2Data& p__ieee1609Dot2Data) { INTEGER fx__dec__Ieee1609Dot2Data(BITSTRING &p__data, IEEE1609dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) {
loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2Data: ", p__data); loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2Data: ", p__data);
etsi_ts103097_data_codec codec; etsi_ts103097_data_codec codec;
...@@ -76,7 +76,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -76,7 +76,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__Ieee1609Dot2ToBeSignedData(const IEEE1609dot2::ToBeSignedData& p__toBeSignedData) { BITSTRING fx__enc__Ieee1609Dot2ToBeSignedData(const IEEE1609dot2::ToBeSignedData &p__toBeSignedData) {
loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData); loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData);
etsi_ts103097_tobesigned_data_codec codec; etsi_ts103097_tobesigned_data_codec codec;
...@@ -89,7 +89,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -89,7 +89,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__Ieee1609Dot2ToBeSignedData(BITSTRING& p__data, IEEE1609dot2::ToBeSignedData& p__toBeSignedData) { INTEGER fx__dec__Ieee1609Dot2ToBeSignedData(BITSTRING &p__data, IEEE1609dot2::ToBeSignedData &p__toBeSignedData) {
loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2ToBeSignedData: ", p__data); loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2ToBeSignedData: ", p__data);
etsi_ts103097_tobesigned_data_codec codec; etsi_ts103097_tobesigned_data_codec codec;
...@@ -103,7 +103,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -103,7 +103,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SspCAM(const LibItsSecurity__TypesAndValues::SspCAM& p__ssp) { BITSTRING fx__enc__SspCAM(const LibItsSecurity__TypesAndValues::SspCAM &p__ssp) {
loggers::get_instance().log_msg(">>> fx__enc__SspCAM: ", p__ssp); loggers::get_instance().log_msg(">>> fx__enc__SspCAM: ", p__ssp);
TTCN_Buffer encoding_buffer; TTCN_Buffer encoding_buffer;
...@@ -111,7 +111,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -111,7 +111,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())); return oct2bit(OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()));
} }
INTEGER fx__dec__SspCAM(BITSTRING& p__data, LibItsSecurity__TypesAndValues::SspCAM& p__ssp) { INTEGER fx__dec__SspCAM(BITSTRING &p__data, LibItsSecurity__TypesAndValues::SspCAM &p__ssp) {
loggers::get_instance().log_msg(">>> fx__dec__SspCAM: ", p__data); loggers::get_instance().log_msg(">>> fx__dec__SspCAM: ", p__data);
TTCN_Buffer decoding_buffer(bit2oct(p__data)); TTCN_Buffer decoding_buffer(bit2oct(p__data));
...@@ -119,7 +119,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -119,7 +119,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SspDENM(const LibItsSecurity__TypesAndValues::SspDENM& p__ssp) { BITSTRING fx__enc__SspDENM(const LibItsSecurity__TypesAndValues::SspDENM &p__ssp) {
loggers::get_instance().log_msg(">>> fx__enc__SspDENM: ", p__ssp); loggers::get_instance().log_msg(">>> fx__enc__SspDENM: ", p__ssp);
TTCN_Buffer encoding_buffer; TTCN_Buffer encoding_buffer;
...@@ -127,7 +127,7 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -127,7 +127,7 @@ namespace LibItsSecurity__EncdecDeclarations {
return oct2bit(OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())); return oct2bit(OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()));
} }
INTEGER fx__dec__SspDENM(BITSTRING& p__data, LibItsSecurity__TypesAndValues::SspDENM& p__ssp) { INTEGER fx__dec__SspDENM(BITSTRING &p__data, LibItsSecurity__TypesAndValues::SspDENM &p__ssp) {
loggers::get_instance().log_msg(">>> fx__dec__SspDENM: ", p__data); loggers::get_instance().log_msg(">>> fx__dec__SspDENM: ", p__data);
TTCN_Buffer decoding_buffer(bit2oct(p__data)); TTCN_Buffer decoding_buffer(bit2oct(p__data));
...@@ -135,4 +135,4 @@ namespace LibItsSecurity__EncdecDeclarations { ...@@ -135,4 +135,4 @@ namespace LibItsSecurity__EncdecDeclarations {
return 0; return 0;
} }
} //end namespace } // namespace LibItsSecurity__EncdecDeclarations
...@@ -13,8 +13,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -13,8 +13,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__SremReq(const LibItsSremSsem__TestSystem::SremReq& p_sremReq) BITSTRING fx__enc__SremReq(const LibItsSremSsem__TestSystem::SremReq &p_sremReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__SremReq: ", p_sremReq); loggers::get_instance().log_msg(">>> fx__enc__SremReq: ", p_sremReq);
SremCodec codec; SremCodec codec;
...@@ -32,8 +31,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -32,8 +31,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__SremReq(BITSTRING& b, LibItsSremSsem__TestSystem::SremReq& p) INTEGER fx__dec__SremReq(BITSTRING &b, LibItsSremSsem__TestSystem::SremReq &p) {
{
loggers::get_instance().log(">>> fx__dec__SremReq"); loggers::get_instance().log(">>> fx__dec__SremReq");
SremCodec codec; SremCodec codec;
...@@ -54,8 +52,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -54,8 +52,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__SremInd(const LibItsSremSsem__TestSystem::SremInd& p_sremInd) BITSTRING fx__enc__SremInd(const LibItsSremSsem__TestSystem::SremInd &p_sremInd) {
{
loggers::get_instance().log_msg(">>> fx__enc__SremInd: ", p_sremInd); loggers::get_instance().log_msg(">>> fx__enc__SremInd: ", p_sremInd);
SremCodec codec; SremCodec codec;
...@@ -73,8 +70,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -73,8 +70,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__SremInd(BITSTRING& b, LibItsSremSsem__TestSystem::SremInd& p_sremInd) INTEGER fx__dec__SremInd(BITSTRING &b, LibItsSremSsem__TestSystem::SremInd &p_sremInd) {
{
loggers::get_instance().log(">>> fx__dec__SremInd"); loggers::get_instance().log(">>> fx__dec__SremInd");
SremCodec codec; SremCodec codec;
...@@ -82,17 +78,12 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -82,17 +78,12 @@ namespace LibItsSremSsem__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsSremSsem__TestSystem::SremInd_gnNextHeader_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_gnHeaderType_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_gnNextHeader_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_gnHeaderSubtype_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_gnLifetime_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_gnHeaderType_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_gnTrafficClass_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_btpDestinationPort_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_gnHeaderSubtype_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_btpInfo_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_ssp_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_gnLifetime_raw_.fieldlength + LibItsSremSsem__TestSystem::SremInd_its__aid_raw_.fieldlength) /
LibItsSremSsem__TestSystem::SremInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsSremSsem__TestSystem::SremInd_btpDestinationPort_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_btpInfo_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_ssp_raw_.fieldlength +
LibItsSremSsem__TestSystem::SremInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), srem) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), srem) == -1) {
loggers::get_instance().warning("fx__dec__SremInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__SremInd: -1 result code was returned");
...@@ -196,8 +187,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -196,8 +187,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SREM(const SREM__PDU__Descriptions::SREM& p_srem) BITSTRING fx__enc__SREM(const SREM__PDU__Descriptions::SREM &p_srem) {
{
loggers::get_instance().log_msg(">>> fx__enc__SREM: ", p_srem); loggers::get_instance().log_msg(">>> fx__enc__SREM: ", p_srem);
SremCodec codec; SremCodec codec;
...@@ -206,8 +196,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -206,8 +196,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__SREM(BITSTRING& b, SREM__PDU__Descriptions::SREM& p) INTEGER fx__dec__SREM(BITSTRING &b, SREM__PDU__Descriptions::SREM &p) {
{
loggers::get_instance().log(">>> fx__dec__SREM"); loggers::get_instance().log(">>> fx__dec__SREM");
SremCodec codec; SremCodec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -225,8 +214,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -225,8 +214,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__SsemReq(const LibItsSremSsem__TestSystem::SsemReq& p_ssemReq) BITSTRING fx__enc__SsemReq(const LibItsSremSsem__TestSystem::SsemReq &p_ssemReq) {
{
loggers::get_instance().log_msg(">>> fx__enc__SsemReq: ", p_ssemReq); loggers::get_instance().log_msg(">>> fx__enc__SsemReq: ", p_ssemReq);
SsemCodec codec; SsemCodec codec;
...@@ -244,8 +232,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -244,8 +232,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__SsemReq(BITSTRING& b, LibItsSremSsem__TestSystem::SsemReq& p) INTEGER fx__dec__SsemReq(BITSTRING &b, LibItsSremSsem__TestSystem::SsemReq &p) {
{
loggers::get_instance().log(">>> fx__dec__SsemReq"); loggers::get_instance().log(">>> fx__dec__SsemReq");
SsemCodec codec; SsemCodec codec;
...@@ -266,8 +253,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -266,8 +253,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
BITSTRING fx__enc__SsemInd(const LibItsSremSsem__TestSystem::SsemInd& p_ssemInd) BITSTRING fx__enc__SsemInd(const LibItsSremSsem__TestSystem::SsemInd &p_ssemInd) {
{
loggers::get_instance().log_msg(">>> fx__enc__SsemInd: ", p_ssemInd); loggers::get_instance().log_msg(">>> fx__enc__SsemInd: ", p_ssemInd);
SsemCodec codec; SsemCodec codec;
...@@ -285,8 +271,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -285,8 +271,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__SsemInd(BITSTRING& b, LibItsSremSsem__TestSystem::SsemInd& p_ssemInd) INTEGER fx__dec__SsemInd(BITSTRING &b, LibItsSremSsem__TestSystem::SsemInd &p_ssemInd) {
{
loggers::get_instance().log(">>> fx__dec__SsemInd"); loggers::get_instance().log(">>> fx__dec__SsemInd");
SsemCodec codec; SsemCodec codec;
...@@ -294,17 +279,12 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -294,17 +279,12 @@ namespace LibItsSremSsem__EncdecDeclarations {
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
// Calculate the size of the lower layers information // Calculate the size of the lower layers information
int s = ( int s = (LibItsSremSsem__TestSystem::SsemInd_gnNextHeader_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_gnHeaderType_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_gnNextHeader_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_gnHeaderSubtype_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_gnLifetime_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_gnHeaderType_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_gnTrafficClass_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_btpDestinationPort_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_gnHeaderSubtype_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_btpInfo_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_ssp_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_gnLifetime_raw_.fieldlength + LibItsSremSsem__TestSystem::SsemInd_its__aid_raw_.fieldlength) /
LibItsSremSsem__TestSystem::SsemInd_gnTrafficClass_raw_.fieldlength + 8;
LibItsSremSsem__TestSystem::SsemInd_btpDestinationPort_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_btpInfo_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_ssp_raw_.fieldlength +
LibItsSremSsem__TestSystem::SsemInd_its__aid_raw_.fieldlength
) / 8;
// Decode CA message // Decode CA message
if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), ssem) == -1) { if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), ssem) == -1) {
loggers::get_instance().warning("fx__dec__SsemSsemInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__SsemSsemInd: -1 result code was returned");
...@@ -408,8 +388,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -408,8 +388,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__SSEM(const SSEM__PDU__Descriptions::SSEM& p_ssem) BITSTRING fx__enc__SSEM(const SSEM__PDU__Descriptions::SSEM &p_ssem) {
{
loggers::get_instance().log_msg(">>> fx__enc__SSEM: ", p_ssem); loggers::get_instance().log_msg(">>> fx__enc__SSEM: ", p_ssem);
SsemCodec codec; SsemCodec codec;
...@@ -418,8 +397,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -418,8 +397,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
INTEGER fx__dec__SSEM(BITSTRING& b, SSEM__PDU__Descriptions::SSEM& p_ssem) INTEGER fx__dec__SSEM(BITSTRING &b, SSEM__PDU__Descriptions::SSEM &p_ssem) {
{
loggers::get_instance().log(">>> fx__dec__SSEM"); loggers::get_instance().log(">>> fx__dec__SSEM");
SsemCodec codec; SsemCodec codec;
OCTETSTRING is = bit2oct(b); OCTETSTRING is = bit2oct(b);
...@@ -432,8 +410,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -432,8 +410,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return 0; return 0;
} }
BITSTRING fx__enc__UtSremInitialize (const LibItsSremSsem__TypesAndValues::UtSremInitialize& p_utSremInitialize) BITSTRING fx__enc__UtSremInitialize(const LibItsSremSsem__TypesAndValues::UtSremInitialize &p_utSremInitialize) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtSremInitialize: ", p_utSremInitialize); loggers::get_instance().log_msg(">>> fx__enc__UtSremInitialize: ", p_utSremInitialize);
UpperTesterSremSsemCodec codec; UpperTesterSremSsemCodec codec;
...@@ -442,8 +419,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -442,8 +419,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
return oct2bit(os); return oct2bit(os);
} }
BITSTRING fx__enc__UtSremTrigger (const LibItsSremSsem__TypesAndValues::UtSremTrigger& p_utSremTrigger) BITSTRING fx__enc__UtSremTrigger(const LibItsSremSsem__TypesAndValues::UtSremTrigger &p_utSremTrigger) {
{
loggers::get_instance().log_msg(">>> fx__enc__UtSremTrigger: ", p_utSremTrigger); loggers::get_instance().log_msg(">>> fx__enc__UtSremTrigger: ", p_utSremTrigger);
UpperTesterSremSsemCodec codec; UpperTesterSremSsemCodec codec;
...@@ -457,8 +433,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -457,8 +433,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtSremResults(BITSTRING& b, LibItsSremSsem__TypesAndValues::UtSremResults& p) INTEGER fx__dec__UtSremResults(BITSTRING &b, LibItsSremSsem__TypesAndValues::UtSremResults &p) {
{
loggers::get_instance().log(">>> fx__dec__UtSremResults"); loggers::get_instance().log(">>> fx__dec__UtSremResults");
UpperTesterSremSsemCodec codec; UpperTesterSremSsemCodec codec;
...@@ -468,7 +443,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -468,7 +443,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtSremResults: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtSremResults: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsSremSsem__TypesAndValues::UtSremResults&>(*ptr); p = static_cast<LibItsSremSsem__TypesAndValues::UtSremResults &>(*ptr);
return 0; return 0;
} }
...@@ -477,8 +452,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -477,8 +452,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtSremEventInd(BITSTRING& b, LibItsSremSsem__TypesAndValues::UtSremEventInd& p) INTEGER fx__dec__UtSremEventInd(BITSTRING &b, LibItsSremSsem__TypesAndValues::UtSremEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtSremEventInd"); loggers::get_instance().log(">>> fx__dec__UtSremEventInd");
UpperTesterSremSsemCodec codec; UpperTesterSremSsemCodec codec;
...@@ -488,7 +462,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -488,7 +462,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtSremEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtSremEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsSremSsem__TypesAndValues::UtSremEventInd&>(*ptr); p = static_cast<LibItsSremSsem__TypesAndValues::UtSremEventInd &>(*ptr);
return 0; return 0;
} }
...@@ -497,8 +471,7 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -497,8 +471,7 @@ namespace LibItsSremSsem__EncdecDeclarations {
* @param value to encode * @param value to encode
* @return encoded value * @return encoded value
****************************************************/ ****************************************************/
INTEGER fx__dec__UtSsemEventInd(BITSTRING& b, LibItsSremSsem__TypesAndValues::UtSsemEventInd& p) INTEGER fx__dec__UtSsemEventInd(BITSTRING &b, LibItsSremSsem__TypesAndValues::UtSsemEventInd &p) {
{
loggers::get_instance().log(">>> fx__dec__UtSsemEventInd"); loggers::get_instance().log(">>> fx__dec__UtSsemEventInd");
UpperTesterSremSsemCodec codec; UpperTesterSremSsemCodec codec;
...@@ -508,9 +481,8 @@ namespace LibItsSremSsem__EncdecDeclarations { ...@@ -508,9 +481,8 @@ namespace LibItsSremSsem__EncdecDeclarations {
loggers::get_instance().warning("fx__dec__UtSsemEventInd: -1 result code was returned"); loggers::get_instance().warning("fx__dec__UtSsemEventInd: -1 result code was returned");
return -1; return -1;
} }
p = static_cast<LibItsSremSsem__TypesAndValues::UtSsemEventInd&>(*ptr); p = static_cast<LibItsSremSsem__TypesAndValues::UtSsemEventInd &>(*ptr);
return 0; return 0;
} }
} //end namespace } // namespace LibItsSremSsem__EncdecDeclarations
#include "ItsRSUsSimulator_Functions.hh" #include "ItsRSUsSimulator_Functions.hh"
namespace ItsRSUsSimulator__Functions namespace ItsRSUsSimulator__Functions {
{ void fx__computePositionFromRotation(const INTEGER &p__refLatitude, const INTEGER &p__refLongitude, const INTEGER &p__cenLatitude,
void fx__computePositionFromRotation(const INTEGER& p__refLatitude, const INTEGER& p__refLongitude, const INTEGER& p__cenLatitude, const INTEGER& p__cenLongitude, const INTEGER& p__rotation, INTEGER& p__latitude, INTEGER& p__longitude) { const INTEGER &p__cenLongitude, const INTEGER &p__rotation, INTEGER &p__latitude, INTEGER &p__longitude) {
// TODO // TODO
p__latitude = p__cenLatitude; p__latitude = p__cenLatitude;
p__longitude = p__cenLongitude; p__longitude = p__cenLongitude;
} }
} // end of namespace } // namespace ItsRSUsSimulator__Functions
...@@ -10,16 +10,14 @@ ...@@ -10,16 +10,14 @@
#define earthRadius 6378137.0L #define earthRadius 6378137.0L
#define rbis = ((double)(earthRadius * M_PI / 180)) #define rbis = ((double)(earthRadius * M_PI / 180))
namespace LibItsCommon__Functions namespace LibItsCommon__Functions {
{
/** /**
* @desc This external function gets the current time * @desc This external function gets the current time
* @return Timestamp - current time since 01/01/2004 in milliseconds * @return Timestamp - current time since 01/01/2004 in milliseconds
* @see fx_getCurrentTime() return TimestampIts * @see fx_getCurrentTime() return TimestampIts
*/ */
INTEGER fx__getCurrentTime( INTEGER fx__getCurrentTime() {
) {
INTEGER i; INTEGER i;
i.set_long_long_val(base_time::get_instance().get_its_current_time_ms()); i.set_long_long_val(base_time::get_instance().get_its_current_time_ms());
loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i); loggers::get_instance().log_msg("<<< fx__getCurrentTime: ", i);
...@@ -30,8 +28,7 @@ namespace LibItsCommon__Functions ...@@ -30,8 +28,7 @@ namespace LibItsCommon__Functions
* @return The current time since 01/01/1970 in UTC format * @return The current time since 01/01/1970 in UTC format
* @see fx_getCurrentTimeUtc() return UInt64 * @see fx_getCurrentTimeUtc() return UInt64
*/ */
INTEGER fx__getCurrentTimeUtc( INTEGER fx__getCurrentTimeUtc() {
) {
INTEGER i; INTEGER i;
i.set_long_long_val(base_time::get_instance().get_current_time_ms()); i.set_long_long_val(base_time::get_instance().get_current_time_ms());
loggers::get_instance().log_msg("<<< fx__getCurrentTimeUtc: ", i); loggers::get_instance().log_msg("<<< fx__getCurrentTimeUtc: ", i);
...@@ -42,8 +39,7 @@ namespace LibItsCommon__Functions ...@@ -42,8 +39,7 @@ namespace LibItsCommon__Functions
* @return TimeMark - tenths of a second in the current or next hour in units of 1/10th second from UTC time * @return TimeMark - tenths of a second in the current or next hour in units of 1/10th second from UTC time
* @see function f_getCurrentTimeMark() return TimeMark * @see function f_getCurrentTimeMark() return TimeMark
*/ */
INTEGER fx__getCurrentTimeMark( INTEGER fx__getCurrentTimeMark() {
) {
// TODO: this is just a sceleton. fill in the function // TODO: this is just a sceleton. fill in the function
return 0; return 0;
} }
...@@ -53,8 +49,7 @@ namespace LibItsCommon__Functions ...@@ -53,8 +49,7 @@ namespace LibItsCommon__Functions
* @return MinuteOfTheYear - tenths of a second in the current or next hour in units of 1/10th second from UTC time * @return MinuteOfTheYear - tenths of a second in the current or next hour in units of 1/10th second from UTC time
* @see function f_getMinuteOfTheYear() return MinuteOfTheYear * @see function f_getMinuteOfTheYear() return MinuteOfTheYear
*/ */
INTEGER fx__getMinuteOfTheYear( INTEGER fx__getMinuteOfTheYear() {
) {
// TODO: this is just a sceleton. fill in the function // TODO: this is just a sceleton. fill in the function
return 0; return 0;
} }
...@@ -64,8 +59,7 @@ namespace LibItsCommon__Functions ...@@ -64,8 +59,7 @@ namespace LibItsCommon__Functions
* @return DSecond - The milliseconds point in the current UTC minute (0..60000) * @return DSecond - The milliseconds point in the current UTC minute (0..60000)
* @see function f_getDSecond() return DSecond * @see function f_getDSecond() return DSecond
*/ */
INTEGER fx__getDSecond( INTEGER fx__getDSecond() {
) {
// TODO: this is just a sceleton. fill in the function // TODO: this is just a sceleton. fill in the function
return 0; return 0;
} }
...@@ -78,25 +72,20 @@ namespace LibItsCommon__Functions ...@@ -78,25 +72,20 @@ namespace LibItsCommon__Functions
* @return Computed distance in meters * @return Computed distance in meters
fx_computeDistance(in Int32 p_latitudeA, in Int32 p_longitudeA, in Int32 p_latitudeB, in Int32 p_longitudeB) return float; fx_computeDistance(in Int32 p_latitudeA, in Int32 p_longitudeA, in Int32 p_latitudeB, in Int32 p_longitudeB) return float;
*/ */
FLOAT fx__computeDistance( FLOAT fx__computeDistance(const INTEGER &p__latitudeA, const INTEGER &p__longitudeA, const INTEGER &p__latitudeB, const INTEGER &p__longitudeB) {
const INTEGER& p__latitudeA, double d_latA = ((double)p__latitudeA) / 10000000.0;
const INTEGER& p__longitudeA, double d_latB = ((double)p__latitudeB) / 10000000.0;
const INTEGER& p__latitudeB,
const INTEGER& p__longitudeB
) {
double d_latA = ((double)p__latitudeA)/10000000.0;
double d_latB = ((double)p__latitudeB)/10000000.0;
double d_lonA = ((double)p__longitudeA)/10000000.0; double d_lonA = ((double)p__longitudeA) / 10000000.0;
double d_lonB = ((double)p__longitudeB)/10000000.0; double d_lonB = ((double)p__longitudeB) / 10000000.0;
double d_lat = (d_latB - d_latA) * (M_PI/180.0); double d_lat = (d_latB - d_latA) * (M_PI / 180.0);
double d_lon = (d_lonB - d_lonA) * (M_PI/180.0); double d_lon = (d_lonB - d_lonA) * (M_PI / 180.0);
double a = sin(d_lat/2)*sin(d_lat/2) + cos(d_latA*M_PI/180.0)*cos(d_latB*M_PI/180.0)*sin(d_lon/2)*sin(d_lon/2); double a = sin(d_lat / 2) * sin(d_lat / 2) + cos(d_latA * M_PI / 180.0) * cos(d_latB * M_PI / 180.0) * sin(d_lon / 2) * sin(d_lon / 2);
double c = 2*atan2(sqrt(a), sqrt(1-a)); double c = 2 * atan2(sqrt(a), sqrt(1 - a));
return FLOAT(earthRadius*c); return FLOAT(earthRadius * c);
} }
/* * @desc External function to compute a position using a reference position, a distance and an orientation /* * @desc External function to compute a position using a reference position, a distance and an orientation
...@@ -105,16 +94,11 @@ namespace LibItsCommon__Functions ...@@ -105,16 +94,11 @@ namespace LibItsCommon__Functions
* @param p_orientation Direction of the computed position (0 to 359; 0 means North) * @param p_orientation Direction of the computed position (0 to 359; 0 means North)
* @param p_latitude Computed position's latitude * @param p_latitude Computed position's latitude
* @param p_longitude Computed position's longitude * @param p_longitude Computed position's longitude
fx_computePositionUsingDistance(in Int32 p_refLatitude,in Int32 p_refLongitude,in float p_distance,in integer p_orientation,out Int32 p_latitude,out Int32 p_longitude); fx_computePositionUsingDistance(in Int32 p_refLatitude,in Int32 p_refLongitude,in float p_distance,in integer p_orientation,out Int32 p_latitude,out Int32
p_longitude);
*/ */
void fx__computePositionUsingDistance( void fx__computePositionUsingDistance(const INTEGER &p__refLatitude, const INTEGER &p__refLongitude, const FLOAT &p__distance, const INTEGER &p__orientation,
const INTEGER& p__refLatitude, INTEGER &p__latitude, INTEGER &p__longitude) {
const INTEGER& p__refLongitude,
const FLOAT& p__distance,
const INTEGER& p__orientation,
INTEGER& p__latitude,
INTEGER& p__longitude
) {
double angularD = static_cast<const float>(p__distance) / earthRadius; double angularD = static_cast<const float>(p__distance) / earthRadius;
double radHeading = (double)static_cast<const int>(p__orientation) * M_PI / 180; double radHeading = (double)static_cast<const int>(p__orientation) * M_PI / 180;
...@@ -132,8 +116,9 @@ namespace LibItsCommon__Functions ...@@ -132,8 +116,9 @@ namespace LibItsCommon__Functions
long rlat2 = round(lat2 * 10000000 / M_PI * 180); long rlat2 = round(lat2 * 10000000 / M_PI * 180);
long rlong2 = round(long2 * 10000000 / M_PI * 180); long rlong2 = round(long2 * 10000000 / M_PI * 180);
p__latitude = rlat2;//asin(sin(ref_lat)*cos(distance) + cos(ref_lat)*sin(distance)*cos(angle)) * 180.0 / M_PI; p__latitude = rlat2; // asin(sin(ref_lat)*cos(distance) + cos(ref_lat)*sin(distance)*cos(angle)) * 180.0 / M_PI;
p__longitude = rlong2;//((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI); p__longitude =
rlong2; //((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI);
} }
/* * @desc External function to compute radius of a given circular area /* * @desc External function to compute radius of a given circular area
...@@ -141,10 +126,6 @@ namespace LibItsCommon__Functions ...@@ -141,10 +126,6 @@ namespace LibItsCommon__Functions
* @return Computed radius in meters * @return Computed radius in meters
fx_computeRadiusFromCircularArea(in float p_squareMeters) return float; fx_computeRadiusFromCircularArea(in float p_squareMeters) return float;
*/ */
FLOAT fx__computeRadiusFromCircularArea( FLOAT fx__computeRadiusFromCircularArea(const FLOAT &p__squareMeters) { return FLOAT(sqrt(p__squareMeters / M_PI)); }
const FLOAT& p__squareMeters
) {
return FLOAT(sqrt(p__squareMeters/M_PI));
}
} // end of Namespace } // namespace LibItsCommon__Functions
#include "LibItsDcc_Functions.hh" #include "LibItsDcc_Functions.hh"
namespace LibItsDcc__Functions namespace LibItsDcc__Functions {
{ /* * @desc Returns the string representation of the float value
/* * @desc Returns the string representation of the float value
* @param p_float The float value * @param p_float The float value
* @return The string representation of the float value * @return The string representation of the float value
fx_float2str(float p_float) return charstring; fx_float2str(float p_float) return charstring;
*/ */
//RGY no C++ implementation is needed, Titan supports this function natively // RGY no C++ implementation is needed, Titan supports this function natively
} // end of namespace } // namespace LibItsDcc__Functions
...@@ -3,17 +3,19 @@ ...@@ -3,17 +3,19 @@
#include "base_time.hh" #include "base_time.hh"
#include "loggers.hh" #include "loggers.hh"
namespace LibItsGeoNetworking__Functions namespace LibItsGeoNetworking__Functions {
{ /* * @desc External function to compute timestamp based on current time
/* * @desc External function to compute timestamp based on current time
* @return Unix-Epoch-Time mod 2^32 * @return Unix-Epoch-Time mod 2^32
fx_computeGnTimestamp() return UInt32; fx_computeGnTimestamp() return UInt32;
*/ */
INTEGER fx__computeGnTimestamp() { INTEGER fx__computeGnTimestamp() {
INTEGER i; INTEGER i;
i.set_long_long_val(base_time::get_instance().get_its_current_time_ms() % 4294967296); // Expresses the time in milliseconds at which the latitude and longitude of the ITS-S were acquired by the GeoAdhoc router. The time is encoded as: TST =TST(TAI)mod232 where TST(TAI) is the number of elapsed TAI milliseconds since 2004-01-01 00:00:00.000 UTC i.set_long_long_val(
base_time::get_instance().get_its_current_time_ms() %
4294967296); // Expresses the time in milliseconds at which the latitude and longitude of the ITS-S were acquired by the GeoAdhoc router. The time is
// encoded as: TST =TST(TAI)mod232 where TST(TAI) is the number of elapsed TAI milliseconds since 2004-01-01 00:00:00.000 UTC
loggers::get_instance().log_msg("<<< fx__computeGnTimestamp: ", i); loggers::get_instance().log_msg("<<< fx__computeGnTimestamp: ", i);
return i; return i;
} }
} //end namespace } // namespace LibItsGeoNetworking__Functions
#include "LibItsIpv6OverGeoNetworking_Functions.hh" #include "LibItsIpv6OverGeoNetworking_Functions.hh"
#include <time.h>
#include <math.h> #include <math.h>
#include <time.h>
namespace LibItsIpv6OverGeoNetworking__Functions namespace LibItsIpv6OverGeoNetworking__Functions {
{ /* * @desc Calculate ICMPv6 checksum on pseudo header according RFC 4443 - Clause 2.3
/* * @desc Calculate ICMPv6 checksum on pseudo header according RFC 4443 - Clause 2.3
* @param p_sourceAddress Source address, * @param p_sourceAddress Source address,
* @param p_destinationAddress Destination address * @param p_destinationAddress Destination address
* @param p_payloadLength Upper-Layer Packet Length * @param p_payloadLength Upper-Layer Packet Length
...@@ -42,17 +41,12 @@ namespace LibItsIpv6OverGeoNetworking__Functions ...@@ -42,17 +41,12 @@ namespace LibItsIpv6OverGeoNetworking__Functions
in template (value) octetstring p_payload, in template (value) octetstring p_payload,
in template (value) UInt8 p_nextHdr in template (value) UInt8 p_nextHdr
) return Oct2; ) return Oct2;
*/ */
OCTETSTRING fx__computeIPv6CheckSum( OCTETSTRING fx__computeIPv6CheckSum(const OCTETSTRING_template &p__sourceAddress, const OCTETSTRING_template &p__destinationAddress,
const OCTETSTRING_template& p__sourceAddress, const INTEGER_template &p__payloadLength, const OCTETSTRING_template &p__payload, const INTEGER_template &p__nextHdr) {
const OCTETSTRING_template& p__destinationAddress, OCTETSTRING ret_val = int2oct(0, 1);
const INTEGER_template& p__payloadLength,
const OCTETSTRING_template& p__payload,
const INTEGER_template& p__nextHdr
) {
OCTETSTRING ret_val = int2oct(0,1);
return ret_val; return ret_val;
} }
} //end namespace } // namespace LibItsIpv6OverGeoNetworking__Functions