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

Merge branch 'devel' into 'TTF033' 

Closing of TTF T033

# Conflicts:
#   test_purposes/ngap/TP_GNB_NGAP.tplan2
parents d77a0de8 38f544f9

.gitmodules

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
[submodule "titan-test-system-framework"]

	path = titan-test-system-framework

	url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

	branch = devel

[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module"]

	path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module

	url = https://gitlab.eclipse.org/eclipse/titan/titan.TestPorts.Common_Components.Abstract_Socket.git

[submodule "ttcn/LibCommon"]

	path = ttcn/LibCommon

	url = https://forge.etsi.org/rep/LIBS/LibCommon.git

Makefile

0 → 100644
+167 −0
Original line number Original line Diff line number Diff line 
-include config.mk



ifeq (,$(ATS))

 $(error ATS shall be defined)

endif



ifeq (,$(TOPDIR))

 TOPDIR := .

endif



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

undefine sources

undefine modules

undefine includes

include $(1)/module.mk

$$(foreach S, $$(sources),  $$(eval all_sources +=  $$(if $$(filter /%, $$(S)), $$(TOPDIR)$$(S), $(1)/$$(S))))

$$(foreach I, $$(includes), $$(eval all_includes += $$(if $$(filter /%, $$(I)), $$(TOPDIR)$$(I), $(1)/$$(I))))

$$(foreach M, $$(modules),  $$(eval $$(call IncludeModule, $$(if $$(filter /%, $$(M)), $$(TOPDIR)$$(M), $(1)/$$(M)))))

endef



all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src /usr/include/jsoncpp /usr/include/libxml2

defines  += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS)  AS_USE_SSL _GNU_SOURCE

libs     += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs



ifeq (Windows_NT,$(OS))

# Silence linker warnings.

LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc

defines += WIN32

libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR))

all_includes += $(addsuffix /include, $(OPENSSL_DIR))

libs += $(WPCAP_DLL_PATH)

else

defines += LINUX

libs += -lpcap -lrt -lpthread

endif



libs += -lssl -lcrypto -lxml2 -ljsoncpp -L$(OSIP_LIB) -losipparser2 -lsctp



$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS)))



outdir := $(TOPDIR)/build/$(ATS)

bindir := $(TOPDIR)/bin



sources     := $(all_sources)

includes    := $(outdir) $(outdir)/.. $(outdir)/asn1 $(all_includes) $(NPCAP_INCLUDE) $(OSIP_INCLUDE) 



ifeq (Windows_NT,$(OS))

  EXE=.exe

endif



ttcn_sources  := $(filter %.ttcn , $(sources))

ttcn3_sources := $(filter %.ttcn3, $(sources))

asn_sources   := $(filter %.asn,   $(sources))

asn1_sources  := $(filter %.asn1,  $(sources))



tt_sources    := $(ttcn_sources) $(ttcn3_sources) $(asn_sources) $(asn1_sources)

cc_sources    := $(filter %.cc,    $(sources))



gen_ttcn_sources  := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn,  %.cc, $(ttcn_sources))))

gen_ttcn_headers  := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn,  %.hh, $(ttcn_sources))))

gen_ttcn3_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn3, %.cc, $(ttcn3_sources))))

gen_ttcn3_headers := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn3, %.hh, $(ttcn3_sources))))

gen_asn_sources   := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn,   %.cc, $(asn_sources))))

gen_asn_headers   := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn,   %.hh, $(asn_sources))))

gen_asn1_sources  := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1,  %.cc, $(asn1_sources))))

gen_asn1_headers  := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1,  %.hh, $(asn1_sources))))



gen_sources := $(gen_ttcn_sources) $(gen_ttcn3_sources) $(gen_asn_sources) $(gen_asn1_sources)

gen_headers := $(gen_ttcn_headers) $(gen_ttcn3_headers) $(gen_asn_headers) $(gen_asn1_headers)



gen_objects := $(patsubst %.cc, %.o, $(gen_sources))

cc_objects  := $(patsubst  %.cc, $(outdir)/%.o, $(cc_sources))



.PHONY: all FORCE echo



all: $(bindir) $(outdir) $(bindir)/$(ATS)$(EXE)



echo_sources:

	@echo -e "$(addsuffix \n,$(all_sources))"



echo: echo_sources

	@echo -e "sources:\n $(addsuffix \n, $(sources))"

	@echo -e "gen_sources:\n $(addsuffix \n, $(gen_sources))"

	@echo -e "gen_objects:\n $(addsuffix \n, $(gen_objects))"

	@echo -e "cc_objects:\n $(addsuffix \n, $(cc_objects))"

	@echo -e "includes:\n $(addsuffix \n, $(includes))"

	@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



regen: force_regen $(outdir)/.generate

force_regen:

	rm -f $(outdir)/.generate



t3q: all

	@echo -e "Code checking in progress..."

	@java -Xmx3g -Xss512m -jar $(T3Q_PATH)/t3q.jar --config $(T3Q_PATH)/$(T3Q_CONFIG) $(tt_sources) > $(outdir)/t3q.out 2>&1 ; cd -

	@echo -e "Code checking in done..."

	@echo -e "Output file is located here: $(outdir)/t3q.out"



t3d: all

	@echo -e "TTCN-3 doc generation in progress..."

	@java -Xmx3g -Xss512m -jar $(T3D_PATH)/t3d.jar --config $(T3D_PATH)/$(T3D_CONFIG) $(tt_sources) > $(outdir)/t3d.out 2>&1 ; cd -

	@echo -e "TTCN-3 doc generation done..."

	@echo -e "Output file is located here: $(outdir)/t3d.out"



$(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)



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

	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<



$(cc_objects) : $(outdir)/%.o : %.cc

	mkdir -p $(dir $@)

	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)



$(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

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

NGAP_ETSI.code-workspace

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
{

	"folders": [

		{

			"path": "."

		},

		{

			"path": "../../../tmp/osmo-ttcn3-hacks"

		}

	],

	"settings": {

		"files.associations": {

			"pdusessionresourcemodifyindication.h": "c"

		}

	}

}
 
 No newline at end of file

ccsrc/Asn1c/asn1_recoder.cc

0 → 100644
+56 −0
Original line number Original line 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

0 → 100644
+29 −0
Original line number Original line 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