Commit f14e9579 authored by YannGarcia's avatar YannGarcia

Bug fixed in SREM/SSEM ATS

parent 53b9f4c6
......@@ -15,15 +15,20 @@ class TTCN_EncDec;
int UpperTesterSremSsemCodec::encode (const Record_Type& msg, OCTETSTRING& data)
{
loggers::get_instance().log_msg(">>> UpperTesterSremSsemCodec::encode: ", (const Record_Type&)msg);
loggers::get_instance().log(">>> UpperTesterSremSsemCodec::encode: %s", msg.get_descriptor()->name);
TTCN_EncDec::clear_error();
TTCN_Buffer encoding_buffer;
if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremSsemInitialize") == 0) {
if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremInitialize") == 0) {
encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemInitialize));
} else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremSsemTrigger") == 0) {
} else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSsemInitialize") == 0) {
encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemInitialize));
} else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremTrigger") == 0) {
encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemTrigger));
} else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremUpdate") == 0) {
encoding_buffer.put_c(static_cast<const unsigned char>(UpperTesterSremSsemCodec::c_utSremSsemUpdate));
} else { // Error
data = OCTETSTRING();
data = OCTETSTRING(0, nullptr);
loggers::get_instance().log("<<< UpperTesterSremSsemCodec::encode: Return -1");
return -1;
}
......
......@@ -57,7 +57,7 @@ int uppertester_ivim_codec::encode (const Record_Type& msg, OCTETSTRING& data)
// See ETSI TR 103 099 V1.4.1 Clause C.9.3 TerminateIvimEvent
encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_ivim_codec::c_utIvimTermination));
} else { // Error
data = OCTETSTRING();
data = OCTETSTRING(0, nullptr);
loggers::get_instance().log("<<< uppertester_ivim_codec::encode: Return -1");
return -1;
}
......
......@@ -23,7 +23,7 @@ int uppertester_mapem_spatem_codec::encode (const Record_Type& msg, OCTETSTRING&
} else if (std::string(msg.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemSpatemTrigger") == 0) {
encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_mapem_spatem_codec::c_utMapemSpatemTrigger));
} else { // Error
data = OCTETSTRING();
data = OCTETSTRING(0, nullptr);
loggers::get_instance().log("<<< uppertester_mapem_spatem_codec::encode: Return -1");
return -1;
}
......
......@@ -90,10 +90,10 @@ LogEventTypes:= Yes
# time_offset : Time offset, used to skip packets with time offset < time_offset
# save_mode : 1 to save sent packet, 0 otherwise
system.ivimPort.params := "IVIM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
system.ivimPort.params := "IVIM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
# IVIM UpperTester port based on UDP (ETSI Wlan)
system.utPort.params := "UT_IVIM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
system.utPort.params := "UT_IVIM/UDP(dst_ip=192.168.1.252)"
[EXECUTE]
#ItsIvim_TestCases.TC_IS_IVI_MSGF_BV_01
......
......@@ -90,10 +90,10 @@ LogEventTypes:= Yes
# time_offset : Time offset, used to skip packets with time offset < time_offset
# save_mode : 1 to save sent packet, 0 otherwise
system.mapemSpatemPort.params := "MapemSpatem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
system.mapemSpatemPort.params := "MapemSpatem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
# MapemSpatem UpperTester port based on UDP (ETSI Wlan)
system.utPort.params := "UT_MAPEMSPATEM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
system.utPort.params := "UT_MAPEMSPATEM/UDP(dst_ip=192.168.0.252)"
[EXECUTE]
ItsMapem_TestCases.TC_IS_RLT_MSGF_BV_01
......
......@@ -90,10 +90,10 @@ LogEventTypes:= Yes
# time_offset : Time offset, used to skip packets with time offset < time_offset
# save_mode : 1 to save sent packet, 0 otherwise
system.sremSsemPort.params := "SremSsem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and ether proto 0x8947)"
system.sremSsemPort.params := "SremSsem/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"
# SremSsem UpperTester port based on UDP (ETSI Wlan)
system.utPort.params := "UT_SREMSSEM/UDP(dst_ip=192.168.0.102,dst_port=12345,src_ip=192.168.0.104,src_port=12345)/ETH(mac_src=0800275c4959,mac_dst=F8CAB8083918,eth_type=0800)/PCAP(mac_src=0800275c4959,nic=enp0s8,filter=and udp port 12345)"
# SremSsem UpperTester port based on UDP
system.utPort.params := "UT_SREMSSEM/UDP(dst_ip=192.168.1.252)"
[EXECUTE]
ItsSrem_TestCases.TC_IS_RLT_MSGF_BV_01
......
......@@ -69,3 +69,7 @@ fi
export BROWSER=netsurf
export OPENSSL_DIR=/usr/local
export LSAN_OPTIONS=verbosity=1:log_threads=1
......@@ -1149,7 +1149,7 @@ module ItsRSUsSimulator_Functions {
v_t.stop;
log("f_trigger_enrolment_request_await_response: receive ", v_response);
if (f_verify_pki_response_message(v_private_key, v_aes_sym_key, v_authentication_vector, vc_eaWholeHash, v_response.response.body.binary_body.ieee1609dot2_data, false, v_etsi_ts_102941_data) == false) {
if (f_verify_pki_response_message(v_private_key, v_aes_sym_key, v_authentication_vector, vc_eaWholeHash, v_response.response.body.binary_body.ieee1609dot2_data, false, -, v_etsi_ts_102941_data) == false) {
log("f_trigger_enrolment_request_await_response: Failed to verify PKI message ***");
} else {
log("f_trigger_enrolment_request_await_response: Receive ", v_etsi_ts_102941_data, " ***");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment