Commit a70c33b8 authored by YannGarcia's avatar YannGarcia
Browse files

Recompile AtsNg112

parent 8da5ae9a
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ $$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $$(if $$(filter /%, $
endef

all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework/include
defines  += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS)
libs     += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a ) -L$(OSIP_LIB) -lstdc++fs
defines  += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) AS_USE_SSL
libs     += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs

ifeq (Windows_NT,$(OS))
# Silence linker warnings.
@@ -39,7 +39,7 @@ defines += LINUX
libs += -lpcap -lrt -lpthread
endif

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

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

@@ -108,9 +108,6 @@ $(cc_objects) : $(outdir)/%.o : %.cc
	mkdir -p $(dir $@)
	g++ -g -O0 -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)
+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ public: //! \publicsection

  static const std::string& loopback;

  static const std::string& timestamp;

  static const std::string& mac_src;               //! Source MAC address parameter name
  static const std::string& mac_dst;               //! Destination MAC address parameter name
  static const std::string& mac_bc;                //! Broadcast MAC address parameter name
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ const std::string& params::debug = std::string("debug");

const std::string& params::loopback = std::string("loopback");

const std::string& params::timestamp = std::string("timestamp");

const std::string& params::mac_src = std::string("mac_src");
const std::string& params::mac_dst = std::string("mac_dst");
const std::string& params::mac_bc = std::string("mac_bc");
+2 −0
Original line number Diff line number Diff line
#TTCN3_DIR      := /cygdrive/c/Tools/Titan
#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll
#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include
OSIP_INCLUDE=$(HOME)/frameworks/osip/include
OSIP_LIB=$(HOME)/frameworks/osip/src/osipparser2/.libs

etc/TestCodec/TestCodec.cfg

deleted100644 → 0
+0 −87
Original line number Diff line number Diff line
[MODULE_PARAMETERS]
# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.

#LibItsHttp_Pics.PICS_HEADER_HOST := "httpbin.org"
LibItsHttp_Pics.PICS_HEADER_HOST := "ptsv2.com"
#LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8";

LibCommon_Time.PX_TAC := 30.0

[LOGGING]
# In this section you can specify the name of the log file and the classes of events
# you want to log into the file or display on console (standard error).

LogFile := "../logs/%e.%h-%r.%s"
FileMask := LOG_ALL | USER | DEBUG | MATCHING | DEBUG_ENCDEC
ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING | DEBUG_ENCDEC
#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP
#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP
LogSourceInfo := Stack
LogEntityName:= Yes
LogEventTypes:= Yes
#TimeStampFormat := DateTime

[TESTPORT_PARAMETERS]
# In this section you can specify parameters that are passed to Test Ports.
system.httpPort.params := "HTTP(codecs=held:held_codec;html:html_codec;json:json_codec)/TCP(debug=1,server=ptsv2.com,port=80,use_ssl=0)"
# For manual testing, use this command: openssl s_client -connect nghttp2.org:443 -msg
#system.httpPort.params := "HTTP(codecs=held:held_codec;html:html_codec;json:json_codec)/TCP(debug=1,server=nghttp2.org,port=443,use_ssl=1)"

system.SIPP.params := "SIP/UDP_PCAP(dst_ip=192.168.1.250,dst_port=5060,src_ip=192.168.1.253,src_port=5060)/ETH(mac_src=080027d2b658,mac_dst=90fd61e61902,eth_type=0800)/PCAP(mac_src=080027d2b658,nic=eth1,filter=and udp port 12345)"

[DEFINE]
# In this section you can create macro definitions,
# that can be used in other configuration file sections except [INCLUDE] and [ORDERED_INCLUDE].

[INCLUDE]
# To use configuration settings given in other configuration files,
# the configuration files just need to be listed in this section, with their full or relative pathnames.

[ORDERED_INCLUDE]
# To use configuration settings given in other configuration files,
# the configuration files just need to be listed in this section, with their full or relative pathnames.

[EXTERNAL_COMMANDS]
# This section can define external commands (shell scripts) to be executed by the ETS
# whenever a control part or test case is started or terminated.

#BeginTestCase := ""
#EndTestCase := ""
#BeginControlPart := ""
#EndControlPart := ""

[EXECUTE]
# In this section you can specify what parts of your test suite you want to execute.
#TestCodec_Register.tc_register_request_1
#TestCodec_Register.tc_register_request_2
#TestCodec_Invite.tc_invite_request_1
#TestCodec_Invite.tc_invite_request_2
#TestCodec_Invite.tc_invite_request_3
#TestCodec_Invite.tc_invite_request_4
#TestCodec_Responses.tc_100_trying_1
#TestCodec_Responses.tc_180_ringing_1
#TestCodec_HttpRequest.tc_http_get_1
#TestCodec_HttpResponse.tc_http_200_ok_1
#TestCodec_HttpPort.tc_http_map_1
TestCodec_SipPort.tc_sip_map_1
#TestCodec_Xsd.tc_linear_ring_1
#TestCodec_Xsd.tc_test_vendor_response_1
#TestCodec_Xsd.tc_test_vendor_response_2
#TestCodec_Regexp.tc_regexp_1
#TestCodec_Regexp.tc_regexp_2
#TestCodec_External.tc_auth_1
#TestCodec_External.tc_base64_1

[GROUPS]
# In this section you can specify groups of hosts. These groups can be used inside the
# [COMPONENTS] section to restrict the creation of certain PTCs to a given set of hosts.

[COMPONENTS]
# This section consists of rules restricting the location of created PTCs.

[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
KillTimer := 10.0
LocalAddress := 127.0.0.1
TCPPort := 12000
NumHCs := 1
Loading