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

Minor reviews

parent 831efd01
Loading
Loading
Loading
Loading
+4 −2
Changes for README.md: 4 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -226,6 +226,7 @@ The following procedure applies to build it:
```sh
```sh
$ git clone https://github.com/YannGarcia/wireshark-for-ITS.git wireshark-for-ITS
$ git clone https://github.com/YannGarcia/wireshark-for-ITS.git wireshark-for-ITS
$ git checkout ITS_Protocol_Support
$ git checkout ITS_Protocol_Support
...
```
```


- Create a folder ~/frameworks/wireshark-build
- Create a folder ~/frameworks/wireshark-build
@@ -234,11 +235,12 @@ $ git checkout ITS_Protocol_Support


```sh
```sh
$ cmake ../wireshark-for-ITS
$ cmake ../wireshark-for-ITS
...
```
```


- Add specific compiler options the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:
- Add specific compiler options to the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:
    - Find the variable C_FLAGS
    - Find the variable C_FLAGS
    - Append the following options: "-Wno-unused-const-variable -Wno-unsued-function "
    - Append at the end the following compiler options: "-Wno-unused-const-variable -Wno-unsued-function "
- Build Wireshark/tshark executing the following command
- Build Wireshark/tshark executing the following command


```sh
```sh
+5 −4
Changes for docker/Dockerfile: 5 added lines, 4 removed lines.
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@ LABEL description="STF525 Docker Image"
ENV TERM=linux
ENV TERM=linux
ENV HOSTNAME docker-titan-STF525
ENV HOSTNAME docker-titan-STF525


ARG USERNAME
ARG ssh_pub_key
ARG PASSWORD


RUN echo "docker-titan-STF525" > /etc/hostname \
RUN echo "docker-titan-STF525" > /etc/hostname \
    && DEBIAN_FRONTEND=noninteractive apt-get update \
    && DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -76,9 +75,11 @@ RUN echo "docker-titan-STF525" > /etc/hostname \
USER etsi
USER etsi


RUN cd /home/etsi \
RUN cd /home/etsi \
    && mkdir -p bin lib include tmp frameworks docs dev \
    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \
    && echo "$ssh_pub_key" > /home/etsi/.ssh/id_rsa.pub \
    && cat /home/etsi/.ssh/id_rsa.pub \
    && cd /home/etsi/dev \
    && cd /home/etsi/dev \
    && svn co --username $USERNAME --password $PASSWORD --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \
    && svn co --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \
    && cd /home/etsi/dev/STF525_Its/scripts \
    && cd /home/etsi/dev/STF525_Its/scripts \
    && chmod 775 *.bash devenv.bash.* \
    && chmod 775 *.bash devenv.bash.* \
    && cd /home/etsi \
    && cd /home/etsi \
+5 −1
Changes for docker/build-container.sh: 5 added lines, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -7,9 +7,13 @@ set -vx


DOCKER_FILE=./Dockerfile
DOCKER_FILE=./Dockerfile
if [ -f ${DOCKER_FILE} ]
if [ -f ${DOCKER_FILE} ]
then
    IMAGES=$(docker images -q)
    if [ "${IMAGES}" != "" ]
    then
    then
      docker rmi -f $(docker images -q)
      docker rmi -f $(docker images -q)
    docker build --tag stf525_its --force-rm --build-arg USERNAME=${USERNAME} --build-arg PASSWORD=${PASSWORD} .
    fi
    docker build --tag stf525_its --force-rm --build-arg ssh_pub_key="$(cat ~/.ssh/id_rsa.pub)" .
    if [ "$?" != "0" ]
    if [ "$?" != "0" ]
    then
    then
        echo "Docker build failed: $?"
        echo "Docker build failed: $?"