Commit fc85ff60 authored by Yann Garcia's avatar Yann Garcia
Browse files

Remove dependencies to asn1c to use TITAN codecs

parent 4ab655c7

Makefile

+5 −33
Original line number Diff line number Diff line
@@ -12,16 +12,6 @@ ifeq (,$(TTCN3_DIR)) 
 $(error TTCN3_DIR shall be defined in config.mk)

endif



ifeq (,$(ASN1C))

 ifneq (,$(ASN1C_PATH))

  ASN1C := $(ASN1C_PATH)/asn1c/.libs/asn1c -S $(ASN1C_PATH)/skeletons

 else

  ASN1C := asn1c

 endif

endif



export ASN1C_PATH



first: all



define IncludeModule
@@ -103,8 +93,7 @@ echo: echo_sources 
	@echo -e "defines: $(addsuffix \n, $(defines))"



clean:

	rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../lib5GNGAPAsn.so

#	rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec

	rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate



regen: force_regen $(outdir)/.generate

force_regen:
@@ -125,8 +114,8 @@ t3d: all 
$(outdir) $(outdir)/asn1 $(bindir):

	mkdir -p $@



$(bindir)/$(ATS)$(EXE): $(outdir)/asn1/lib5GNGAPAsn.a $(gen_objects) $(cc_objects) 

	g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/lib5GNGAPAsn.a $(libs)

$(bindir)/$(ATS)$(EXE): $(gen_objects) $(cc_objects) 

	g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(libs)



$(gen_objects) :%.o :%.cc

	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<
@@ -136,32 +125,15 @@ $(cc_objects) : $(outdir)/%.o : %.cc 
	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<



#$(gen_sources):

#	$(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)

#	$(TTCN3_DIR)/bin/asn1_compiler $(TTCN3_COMPILER_OPTIONS) -o $(outdir) $(tt_sources)



$(gen_sources): $(outdir)/.generate



$(outdir)/.generate: Makefile $(tt_sources)

	$(TTCN3_DIR)/bin/compiler $(TTCN3_COMPILER_OPTIONS) -o  $(outdir) $(tt_sources)

	touch $@



$(bindir)/lib5GNGAPAsn.so: $(outdir)/asn1/lib5GNGAPAsn.so

	cp -f $< $@



$(outdir)/asn1/lib5GNGAPAsn.a: $(asn_sources) $(asn1_sources) libNr5gcAsn1.mk Makefile

	mkdir -p $(outdir)/asn1

	echo TOP_DIR   := ../../..                                               >$(outdir)/asn1/Makefile

	echo ASN_PDU   := $(pdu)                                                >>$(outdir)/asn1/Makefile

	echo ASN_FILES := \\                                                    >>$(outdir)/asn1/Makefile

	for n in $(asn_sources) $(asn1_sources); do echo "        $$n \\"; done >>$(outdir)/asn1/Makefile

	echo                                                                    >>$(outdir)/asn1/Makefile

	cat libNr5gcAsn1.mk                                                     >>$(outdir)/asn1/Makefile

	$(MAKE) -C $(outdir)/asn1

	$(TTCN3_DIR)/bin/asn1_compiler $(TTCN3_COMPILER_OPTIONS) -o $(outdir) $(tt_sources)

	touch $@



$(foreach S, $(ttcn_sources),  $(eval $(outdir)/$(notdir $(patsubst %.ttcn, %.cc,  $(S))): $(S)))

$(foreach S, $(ttcn3_sources), $(eval $(outdir)/$(notdir $(patsubst %.ttcn3, %.cc, $(S))): $(S)))

$(foreach S, $(asn_sources),   $(eval $(outdir)/$(notdir $(patsubst %.asn, %.cc,   $(S))): $(S)))

$(foreach S, $(asn1_sources),  $(eval $(outdir)/$(notdir $(patsubst %.asn1, %.cc,  $(S))): $(S)))
 


$(asn_sources) $(asn1_sources):

ccsrc/Asn1c/asn1_recoder.cc

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
#include <asn1/asn_application.h>



#include "asn1_recoder.hh"



#include <TTCN3.hh>



extern "C" {

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_recoder::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;

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

    // Encode as PER

    asn_enc_rval_t rc_e;

    buf.clear();

    rc_e = asn_encode(NULL, (asn_transfer_syntax)to, (asn_TYPE_descriptor_s *)&td, ptr, asn1c_collect_encoded_data, &buf);

    rc   = rc_e.encoded;

  }

  if (ptr) {

    ASN_STRUCT_FREE(td, ptr);

  }

  return rc;

}



int asn1_recoder::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_ALIGNED_CANONICAL_PER, buf);

  return recode(td, (int)ATS_BER, (int)ATS_ALIGNED_BASIC_PER, buf);

  //return recode(td, (int)ATS_BER, (int)ATS_UNALIGNED_BASIC_PER, buf);

}



int asn1_recoder::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_ALIGNED_CANONICAL_PER, (int)ATS_BER, buf);

  return recode(td, (int)ATS_ALIGNED_BASIC_PER, (int)ATS_BER, buf);

}



int asn1_recoder::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)

{

  return recode(td, (int)ATS_BER, (int)ATS_CANONICAL_OER, buf);

}



int asn1_recoder::oer2ber(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf)

{

  return recode(td, (int)ATS_BASIC_OER, (int)ATS_BER, buf);

}

ccsrc/Asn1c/asn1_recoder.hh

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*!

 * \file      asn1_recode_per.hh

 * \brief     Header file ASN.1 PER codec based on asn1c external tool.

 * \author    ETSI STF525

 * \copyright ETSI Copyright Notification

 *            No part may be reproduced except as authorized by written permission.

 *            The copyright and the foregoing restriction extend to reproduction in all media.

 *            All rights reserved.

 * \version   0.1

 */

#pragma once



class OCTETSTRING;           //! Forward declaration of TITAN class

class CHARSTRING;            //! Forward declaration of TITAN class

class BITSTRING;             //! Forward declaration of TITAN class

class TTCN_Buffer;           //! Forward declaration of TITAN class

class TTCN_EncDec;           //! Forward declaration of TITAN class

class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class



struct asn_TYPE_descriptor_s; //! Forward declaration of asn1c class



class asn1_recoder {

protected:

  int ber2per(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf);

  int per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf);

  int ber2oer(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf);

  int oer2ber(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

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
sources := asn1_recoder.cc 

includes := .

ccsrc/Asn1c/per_codec.hh

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
/*!

 * \file      per_codec.hh

 * \brief     Header file for TITAN message to ASN.1 PER message codec.

 * \author    ETSI STF525

 * \copyright ETSI Copyright Notification

 *            No part may be reproduced except as authorized by written permission.

 *            The copyright and the foregoing restriction extend to reproduction in all media.

 *            All rights reserved.

 * \version   0.1

 */

#pragma once



#include "params.hh"

#include "asn1_recoder.hh"



class BITSTRING;             //! Forward declaration of TITAN class

class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class



struct asn_TYPE_descriptor_s; //! Declare asn1c class



/*!

 * \class per_codec

 * \brief  This class provides the interface for all ASN.1 PER codecs.

 * \remark This class uses asn1c external tool

 */

template<typename TPDU>

class per_codec : public asn1_recoder

{

public: //! \publicsection

  /*!

   * \fn int encode(const TPDU& p_message, BITSTRING& p_bitstring);

   * \brief Encode TITAN message into ASN.1 PER message

   * \param[in]  p_message   The PDU message to encode

   * \param[out] p_bitstring  The encoded PDU message in bit string format

   * \pure

   */

  virtual int encode(const TPDU& p_message, BITSTRING& p_bitstring) = 0;

  /*!

   * \fn int decode(const BITSTRING& p_bitstring, TPDU& p_message);

   * \brief Decode ASN.1 PER message into TITAN message

   * \param[in] p_bitstring  The network message in bit string format to decode

   * \param[out] p_message   The PDU message

   * \pure

   */

  virtual int decode(const BITSTRING& p_bitstring, TPDU& p_message) = 0;

  

protected: //! \protectedsection

  inline int _decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg);

  inline int _encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data);

}; // End of class per_codec



#include <TTCN3.hh>



template<class TPDU>

int per_codec<TPDU>::_decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg) {

  TTCN_Buffer buf(bit2oct(p_data));

  TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING);

  int rc = per2ber (td, buf);

  if (rc > 0) {

    msg.decode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL);

    rc = buf.get_len();

  }

  return rc;

}



template<class TPDU>

int per_codec<TPDU>::_encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data) {

  int rc = -1;

  TTCN_Buffer buf;

  TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT/*WARNING*/);

  msg.encode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER);

  if (buf.get_len() > 0) {

    rc = ber2per (td, buf);

    if (rc > 0) {

      p_data = oct2bit(OCTETSTRING(buf.get_len(), buf.get_data()));

    }

  }

  return rc;

}