Commit 22d71218 authored by YannGarcia's avatar YannGarcia
Browse files

Reorganize code due to new version of TITAN. No backward compatibility

parent 3a883fcc
Loading
Loading
Loading
Loading
+13 −13
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ Procedure on the host machine:
- Clone the ETSI ITS Test System

```sh
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS_r1
```

- From the ETSI ITS Test System root directory, build the Docker image executing the following commands:
@@ -275,10 +275,10 @@ Procedure:
- Clone the ETSI ITS protocols project into $HOME/dev folder

```sh
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git
$ git clone --recurse-submodules https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS_r1
```

- Update your default environment with the content of the script $HOME/dev/TS.ITS/scripts/devenv.bash.ubuntu
- Update your default environment with the content of the script $HOME/dev/TS.ITS_r1/scripts/devenv.bash.ubuntu
- Switch to the next clause (Usage)


@@ -296,7 +296,7 @@ These two files are used create the ETSI ITS project workspace on Eclipse TITAN.

NOTE: When the Eclipse TITAN workspace is created, you have to build manually the librairy 'libasn1c.so' following the commands below:
```sh
$ cd <eclipse workspace>/TS.ITS
$ cd <eclipse workspace>/TS.ITS_r1/
$ mkdir -p ./bin/asn1
$ cd ./bin/asn1
$ make CC=gcc -f ../../asn1/Makefile
@@ -316,7 +316,7 @@ Pre-requisites:
- Your are logged as 'etsi' or 'vagrant' user
- Procedure using TITAN command line (only):
    - Open several SSH session (PuTTY...)
    - Change to the directory ~/dev/TS.ITS/
    - Change to the directory ~/dev/TS.ITS_r1/
    - Modify the file config.mk according to your system:
        - On Linux, comment all the lines using the '#' character
        - On Windows, update the path accordingly
@@ -335,7 +335,7 @@ $ make
- To run the test suitem, execute the following command:

```sh
$ cd ~/dev/TS.ITS/scripts
$ cd ~/dev/TS.ITS_r1/scripts
$ ../run_all.bash
...
```
@@ -369,22 +369,22 @@ $ make

### Generate the certificates

After applying the previous clause, change to the folder '~/dev/TS.ITS/data/certificates' and execute 'make' command:
After applying the previous clause, change to the folder '~/dev/TS.ITS_r1/data/certificates' and execute 'make' command:
```
$ cd ~/dev/TS.ITS/data/certificates
$ cd ~/dev/TS.ITS_r1/data/certificates
$ CERTGEN=~/dev/itscertgen/ make
$ CERTGEN=~/dev/itscertgen/ make install
```
The certificates will be located in the folder '~/dev/TS.ITS/data/certificates/certificates'.
The certificates will be located in the folder '~/dev/TS.ITS_r1/data/certificates/certificates'.

To use this newly generated certificates, you shall update two parameters located in the TTCN-3 file LibItsSecurity_Pixits. These are:
- LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH, which is the path the certificates folder (e.g. LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/<user>/dev/TS.ITS/data/certificates")
- LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH, which is the path the certificates folder (e.g. LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/<user>/dev/TS.ITS_r1/data/certificates")
- LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME, which is the name of the certificates folder (e.g. LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "certificates")


### Modify or create new certificates

The folder '~/dev/TS.ITS/data/profiles' contains an XML file for each certificate to be generated.
The folder '~/dev/TS.ITS_r1/data/profiles' contains an XML file for each certificate to be generated.
This XML file describes the certificate content (e.g. CERT_IUT_A_RCA.xml describes the root certificate for all CERT_IUT_A certificates).

By modifying these files, you can change create new certificate with different geographical area, different validity periods or different SSPs.
@@ -405,7 +405,7 @@ In this cases, the following parameters shall be modified to match the ITS devic
In addition, the Test System shall be configured to support the security modifying the following settings as described below:
- device_mode=1
- secured_mode=1
- sec_db_path=/home/<user>/dev/TS.ITS/data/certificates/certificates
- sec_db_path=/home/<user>/dev/TS.ITS_r1/data/certificates/certificates


### ITS Protocol Test suites for Transport layer
@@ -418,7 +418,7 @@ In this cases, the following parameters shall be modified to match the ITS devic
In addition, the Test System shall be configured to support the security modifying the following settings as described below:
- device_mode=1
- secured_mode=1
- sec_db_path=/home/<user>/dev/TS.ITS/data/certificates/certificates
- sec_db_path=/home/<user>/dev/TS.ITS_r1/data/certificates/certificates


### ITS Protocol Test suites for Security
+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ void geonetworking_layer::send_data(OCTETSTRING &data, params &p_params) {

const TTCN_RAWdescriptor_t  _intx_raw_   = {RAW_INTX,          SG_NO, ORDER_MSB, ORDER_MSB, ORDER_LSB, ORDER_MSB, EXT_BIT_NO, ORDER_LSB, ORDER_LSB,
                                         TOP_BIT_INHERITED, 0,     0,         0,         8,         0,         NULL,       -1,        CharCoding::UNKNOWN};
const TTCN_Typedescriptor_t _intx_descr_ = {"IntX", NULL, &_intx_raw_, NULL, NULL, NULL, NULL, NULL, TTCN_Typedescriptor_t::DONTCARE};
const TTCN_Typedescriptor_t _intx_descr_ = {"IntX", NULL, &_intx_raw_, NULL, NULL, NULL, NULL, NULL, NULL, TTCN_Typedescriptor_t::DONTCARE};

void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) {
  loggers::get_instance().log_msg(">>> geonetworking_layer::receive_data: ", data);
+1 −1
Original line number Diff line number Diff line
TTCN3_COMPILER_OPTIONS := -d -e -f -g -l -L -R -U none -x -X
TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -H -l -L -R -U none -x -X
TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install
ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis
#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll
Original line number Diff line number Diff line
Subproject commit ffbcefb5dbe4bc24623f5738c8a64153c8f3599d
Subproject commit 0a28ff34d9ca15d6ed481dad98485210e4d6e179
Compare 76f1ea77 to 184eff8a
Original line number Diff line number Diff line
Subproject commit 76f1ea77ad27467cc39300c8599f1c0d37c0be76
Subproject commit 184eff8a35bdecab2980f74a7a4a5ba3f50e637a
Loading