uncomment CFG (ae5dc54f) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

.jenkins.sh

+2 −4

Original line number	Diff line number	Diff line
		@@ -9,7 +9,5 @@ cd "$(dirname "$0")"

		run_dir="$(pwd)"

		cd docker

		./build-container.sh
		./run-container.sh "${run_dir}"
		./docker/build-container.sh
		./docker/run-container.sh "${run_dir}"

ccsrc/Protocols/Sip/sip_codec_request.cc

+254 −101

File changed.

Preview size limit exceeded, changes collapsed.

ccsrc/Protocols/Sip/sip_codec_request.hh

+11 −4

Original line number	Diff line number	Diff line
		@@ -54,12 +54,15 @@ private: //! \todo Move this section into a sip_codec_helper class, need to deco
		int encode_request_headers(const LibSip__SIPTypesAndValues::MessageHeader& p_msg_header, osip_message_t* p_sip_message);
		int encode_request_message_body(const LibSip__MessageBodyTypes::MessageBody& p_message_body, osip_message_t* p_sip_message);
		int encode_request_payload(const LibSip__SIPTypesAndValues::Payload& p_payload, osip_message_t* p_sip_message);
		int encode_from_header(const LibSip__SIPTypesAndValues::From& p_from, osip_from_t* p_from_header);
		int encode_to_header(const LibSip__SIPTypesAndValues::To& p_to, osip_to_t* p_to_header);
		int encode_via_header(const LibSip__SIPTypesAndValues::Via& p_via, osip_via_t* p_via_header);
		int encode_authorization_header(const LibSip__SIPTypesAndValues::Authorization& p_authorization, osip_authorization_t** p_authorization_header);
		int encode_c_seq_header(const LibSip__SIPTypesAndValues::CSeq& p_c_seq, osip_cseq_t** p_c_seq_header);
		int encode_from_header(const LibSip__SIPTypesAndValues::From& p_from, osip_from_t** p_from_header);
		int encode_max_forwards_header(const OPTIONAL<LibSip__SIPTypesAndValues::MaxForwards>& p_max_forwards, osip_message_t** p_sip_message);
		int encode_supported_header(const OPTIONAL<LibSip__SIPTypesAndValues::Supported>& p_supported, osip_message_t** p_sip_message);
		int encode_to_header(const LibSip__SIPTypesAndValues::To& p_to, osip_to_t** p_to_header);
		int encode_via_header(const LibSip__SIPTypesAndValues::Via& p_via, osip_via_t** p_via_header);

		int encode_sip_url(const LibSip__SIPTypesAndValues::SipUrl& p_sip_uri, osip_uri_t** p_uri);
		void encode_host_port(const LibSip__SIPTypesAndValues::HostPort& p_host_port, std::string& p_host, std::string& p_port);

		private: //! \todo Move this section into a sip_codec_helper class, need to decode Response too
		void decode_message_body(const osip_message_t* p_sip_message, LibSip__SIPTypesAndValues::Request& p_request);
		@@ -88,9 +91,13 @@ private: //! \todo Move this section into a sip_codec_helper class, need to deco
		void decode_to_header(const osip_to_t* p_sip_to, LibSip__SIPTypesAndValues::To& p_to_header);
		void decode_via_header(const osip_message_t* p_sip_via_list, LibSip__SIPTypesAndValues::Via& p_via_header);

		void encode_host_port(const LibSip__SIPTypesAndValues::HostPort& p_host_port, std::string& p_host, std::string& p_port);
		void decode_host_port(const char* p_host, const char* p_port, LibSip__SIPTypesAndValues::HostPort& p_host_port);
		int encode_semi_colon_params(const LibSip__Common::SemicolonParam__List& p_list, osip_list_t* p_sip_list);
		void decode_semi_colon_params(const osip_list_t& p_sip_list, OPTIONAL<LibSip__Common::SemicolonParam__List>& p_list);
		int encode_ampersand_params(const LibSip__Common::AmpersandParam__List& p_list, osip_list_t** p_sip_list);
		void decode_ampersand_params(const osip_list_t& p_sip_list, OPTIONAL<LibSip__Common::AmpersandParam__List>& p_list);
		int encode_option_tag_list(const LibSip__SIPTypesAndValues::OptionTag__List& p_options_tags, osip_message_t** p_sip_message);
		void decode_option_tag_list(const char* p_list, OPTIONAL<LibSip__SIPTypesAndValues::OptionTag__List>& p_options_tags);

		}; // End of class sip_codec_request

docker/Dockerfile

+10 −7

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
		RUN echo "docker-titan-STF549" > /etc/hostname \
		&& echo "root:etsi" \| chpasswd

		RUN useradd --create-home --shell /bin/bash --groups sudo etsi \
		RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \
		&& echo "etsi:etsi" \| chpasswd \
		&& adduser etsi sudo

		@@ -100,14 +100,17 @@ RUN cd /home/etsi/frameworks \
		RUN cd /home/etsi/frameworks \
		&& wget -q 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz

		RUN cd /home/etsi/dev/STF549_Ng112 \
		&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& find $HOME -name "*" \
		&& cd /home/etsi/dev/STF549_Ng112 \
		&& ls \
		&& cd /home/etsi/dev/STF549_Ng112/ttcn \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibSip/trunk ./LibSip \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibCommon/trunk/ttcn ./LibCommon \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibIts/branches/STF525/ttcn/Http ./LibHttp \
		&& git clone https://forge.etsi.org/gitlab/LIBS/LibSip.git ./LibSip \
		&& git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon \
		&& git clone -bSTF525 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts \
		&& cd /home/etsi/dev/STF549_Ng112/ttcn/LibIts \
		&& rm -fr asn1 t3q xsd \
		&& cd ttcn && rm -fr BTP CALM CAM Common DCC DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem V2G \
		&& cd /home/etsi/dev/STF549_Ng112/scripts \
		&& chmod 775 .bash devenv.bash. \
		&& cd /home/etsi \

etc/AtsNg112/AtsNg112.cfg

+14 −7

Original line number	Diff line number	Diff line
		@@ -3,18 +3,21 @@

		LibCommon_Time.PX_TAC := 30.0

		#LibItsHttp_Pics.PICS_HEADER_HOST := "location-information-service.azurewebsites.net"
		LibItsHttp_Pics.PICS_HEADER_HOST := "ecrf-service.azurewebsites.net"
		#LibItsHttp_Pics.PICS_HEADER_HOST := "e4iutdpic5.execute-api.eu-central-1.amazonaws.com" # Used for LIS
		LibItsHttp_Pics.PICS_HEADER_HOST := "6fsrcxrqm1.execute-api.eu-central-1.amazonaws.com" # Used for ECRF
		#LibItsHttp_Pics.PICS_HEADER_HOST := "ptsv2.com"

		LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8";
		#LibNg112_Pics.PICS_LIS_URI := "/Prod";
		LibNg112_Pics.PICS_ECRF_URI := "/Prod";

		#LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8";
		LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/lost+xml;charset=utf-8";

		#LibNg112_Pics.PICS_HTTP_GET_REQUEST := false

		#LibNg112_Pixits.PX_DEVICE_URI_TEL := "<uri>+331234567890</uri>" # Position location
		#LibNg112_Pixits.PX_DEVICE_URI_TEL := "<uri>+331234567891</uri>" # Circle location
		LibNg112_Pixits.PX_DEVICE_URI_TEL := "<uri>+331234567892</uri>" # Civic location
		LibNg112_Pixits.PX_DEVICE_URI_TEL := "<uri>+331234567891</uri>" # Circle location
		#LibNg112_Pixits.PX_DEVICE_URI_TEL := "<uri>+331234567892</uri>" # Civic location
		LibNg112_Pixits.PX_DEVICE_NUMBER_POINT := { 43.616891, 7.053179 }
		LibNg112_Pixits.PX_CIRCLE_POS := { 43.617174, 7.05275 }
		LibNg112_Pixits.PX_CIRCLE_RADIUS := 15.000
		@@ -35,8 +38,12 @@ LogEventTypes:= Yes

		[TESTPORT_PARAMETERS]
		# In this section you can specify parameters that are passed to Test Ports.
		#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=location-information-service.azurewebsites.net,port=80,use_ssl=0)"
		system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ecrf-service.azurewebsites.net,port=80,use_ssl=0)"

		# LIS
		#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=e4iutdpic5.execute-api.eu-central-1.amazonaws.com,use_ssl=1)"
		# ECRF
		system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=6fsrcxrqm1.execute-api.eu-central-1.amazonaws.com,use_ssl=1)"
		# Test
		#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ptsv2.com,port=80,use_ssl=0)"

		#system.SIPP.params := "SIP/UDP(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)"