Commit 9dc581fd authored by garciay's avatar garciay
Browse files

Bug fixed in DENM generator

parent 33637d98

etc/AtsRSUsSimulator/AtsRSUSimulator.cfg

+15 −11
Original line number Diff line number Diff line
@@ -23,18 +23,22 @@ ItsRSUsSimulator_Pixits.PX_RSU_ID := 8; 
#   UC7 (CAM only):          PX_ETSI_USE_CASE_ID := 7

#   UC8 (EVCSN only):        PX_ETSI_USE_CASE_ID := 8

#   UC9 (CAM only):          PX_ETSI_USE_CASE_ID := 9

ItsRSUsSimulator_Pixits.PX_ETSI_USE_CASE_ID := 6

ItsRSUsSimulator_Pixits.PX_ETSI_USE_CASE_ID := 1 #6

# Indicate which zone to simulate

ItsRSUsSimulator_Pixits.PX_ETSI_ZONE_ID := 1



ItsRSUsSimulator_Pixits.PICS_GENERATE_BEACON   := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_CAM      := true

ItsRSUsSimulator_Pixits.PICS_GENERATE_DENM     := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_CAM      := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_DENM     := true

ItsRSUsSimulator_Pixits.PICS_GENERATE_IVIM     := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_MAPEM    := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_SPATEM   := false

ItsRSUsSimulator_Pixits.PICS_GENERATE_SSEM     := false



ItsRSUsSimulator_Pics.PICS_BEACON_FREQUENCY    := 0.5

ItsRSUsSimulator_Pics.PICS_CAM_FREQUENCY       := 0.5

ItsRSUsSimulator_Pics.PICS_DENM_FREQUENCY      := 0.5



[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).
@@ -67,9 +71,9 @@ LogEventTypes:= Yes 
#   its_aid                : ITS AID as defined by ETSI TS 102 965 V1.2.1. Default: 141

#   ll_address             : GeoNetworking address of the Test System

#   latitude               : Latitude of the Test System

#   longitude              : Kongitude of the Test System

#   longitude              : Longitude of the Test System

#   beaconing              : Set to 1 if the Test System shall start beaconing

#   Beaconning timer expiry: Expiry (ms)

#   expiry                 : Beaconning timer expiry (ms)

#   device_mode            : Set to 1 if the layer shall encapsulate upper layer PDU

#   secured_mode           : Set to 1 if message exchanges shall be signed

#   encrypted_mode         : Set to 1 if message exchanges shall be encrypted
@@ -100,10 +104,10 @@ LogEventTypes:= Yes 
#   interface_id: Interface id, used to discard packets

#   tx_power    : TX power (dB)

# UDP layer (IP/UDP based on Pcap)

#   dst_ip  : destination IPv4 address (aa.bb.cc.dd)

#   dst_port: destination port

#   src_ip  : source IPv4 address (aa.bb.cc.dd)

#   src_port: source port

#   dst_ip  : Destination IPv4 address (aa.bb.cc.dd)

#   dst_port: Destination port

#   src_ip  : Source IPv4 address (aa.bb.cc.dd)

#   src_port: Source port

# Pcap layer

#   mac_src    : Source MAC address, used to exclude from capture the acket sent by the Test System

#   filter     : Pcap filter (compliant with tcpdump syntax)
@@ -114,10 +118,10 @@ LogEventTypes:= Yes 
#     file        : File to read

#     frame_offset: Frame offset, used to skip packets with frame number < frame_offset

#     time_offset : Time offset, used to skip packets with time offset < time_offset

#     save_mode   : 1 to save sent packet, 0 otherwise

#     save_mode   : Set to 1 to save sent packet, 0 otherwise



# Single GeoNetworking component port

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,beaconing=0,device_mode=0,expiry=500,its_aid=36,secured_mode=1,encrypted_mode=0,certificate=CERT_IUT_F_AT,peer_certificate=CERT_TS_F_AT,sec_db_path=/home/ubuntu/tmp/test_01)/ETH(mac_src=0800275e8e00,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275e8e00,nic=enp0s8,filter=and ether proto 0x8947)"

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,beaconing=0,device_mode=0,expiry=500,its_aid=37,secured_mode=0,encrypted_mode=0,certificate=CERT_IUT_F_AT,peer_certificate=CERT_TS_F_AT,sec_db_path=/home/ubuntu/tmp/test_01)/ETH(mac_src=0800275e8e00,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275e8e00,nic=enp0s8,filter=and ether proto 0x8947)"

#system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,beaconing=0,device_mode=0,expiry=500,secured_mode=1,encrypted_mode=1,certificate=CERT_IUT_F_AT,peer_certificate=CERT_TS_F_AT,sec_db_path=/home/vagrant/tmp/test_01)/ETH(mac_src=dc536045af7e,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=dc536045af7e,nic=eth1,filter=and ether proto 0x8947)"



# Config port based on UDP

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn

+15 −0
Original line number Diff line number Diff line
@@ -777,6 +777,21 @@ module ItsRSUsSimulator_Functions { 
                },

                c_hopLimit1

            ));

        } else if (p_its_aid == 37) { // DENM

            v_geoNetworkingPdu := valueof(m_geoNwPdu( // FIXME Use PIXIT parameter to get a fully configurable template

                m_geoNwTsbPacket_payload(

                    f_incLocalSeqNumber(),

                    vc_longPosVectorRsu,

                    -,

                    -,

                    valueof(p_payload)

                ),

                Lifetime:{

                  multiplier := c_defaultLifetime,

                  ltBase := e_100s

                },

                c_hopLimit1

            ));

        } else {

            v_geoNetworkingPdu := valueof(m_geoNwPdu( // FIXME Use PIXIT parameter to get a fully configurable template

                m_geoNwBroadcastPacket_payload( // TODO modifes 'template (value) GnNonSecuredPacket m_geoNwBroadcastPacket' to set the field

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn

+5 −0
Original line number Diff line number Diff line
@@ -2660,6 +2660,11 @@ module ItsRSUsSimulator_Pics { 
        } // End of group denmUseCase1 

    

        modulepar DenmEventsParmsUseCaseRsu PICS_DENM_EVENTS_RSU := {

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW,

            c_PICS_DENM_PARMS_UC1_RWW