Commit 7d953e64 authored by YannGarcia's avatar YannGarcia
Browse files

Merging TTF002 in TTF011 - Phase1: AtsCAM, AtsDENM, AtsGeoNetworking, AtsSecurity, AtsPki

parent aeefd2c6

Makefile

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

asn1/Makefile

100755 → 100644
+2 −2
Changes for asn1/Makefile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
# The name of the library

ASN_LIBRARY = libItsAsn.a

# ASN.1 files to be included in the library

ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn \

            AtsCAM/lib/asn1/cdd/ITS_Container.asn \

ASN_FILES = AtsCAM/lib_cam_bases/asn1/CAM_PDU_Descriptions.asn \

            AtsCAM/lib_cam_bases/asn1/cdd/ITS_Container.asn \

            AtsDENM/lib/asn1/DENM_PDU_Descriptions.asn \

            AtsSecurity/lib/asn1/EtsiTs103097ExtensionModule.asn \

            AtsSecurity/lib/asn1/EtsiTs103097Module.asn \

ccsrc/Asn1c/asn1_recode_per.cc

100755 → 100644
+4 −12
Changes for ccsrc/Asn1c/asn1_recode_per.cc: 4 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -5,16 +5,14 @@ 
#include <TTCN3.hh>



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;

  tb->put_s(size, (unsigned char *)buffer);

  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;

  void *         ptr = NULL;

  asn_dec_rval_t rc_d;
@@ -32,15 +30,9 @@ int asn1_recode_per::recode(const asn_TYPE_descriptor_s & td, int from, int to, 
  return rc;

}



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);

}

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); }



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);

}

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); }



/*int asn1_recode_oer::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)

{

ccsrc/Asn1c/asn1_recode_per.hh

100755 → 100644
+1 −3
Changes for ccsrc/Asn1c/asn1_recode_per.hh: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class 


struct asn_TYPE_descriptor_s; //! Forward declaration of asn1c class



class asn1_recode_per

{

class asn1_recode_per {

protected:

  int ber2per(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);

}; // End of class asn1_recode_per

ccsrc/Asn1c/module.mk

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file