Commit 2531c40a authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in AtsGeoNetworking: Some tests cases were missing

parent e6963d54

ccsrc/Protocols/Pcap/pcap_linux_layer.cc

+6 −6
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ pcap_layer::pcap_layer(const std::string& p_type, const std::string& param) 
    }

  }

  // Open the device in promiscuous mode

  _device = pcap_open_live(nic.c_str(), 65535, 1, 100, error_buffer); // TODO Replace hard coded values by pcap_layer::<constants>

  _device = pcap_open_live(nic.c_str(), 65535/*64*1024*/, 1, 100, error_buffer); // TODO Replace hard coded values by pcap_layer::<constants>

  if (_device == NULL) {

    loggers::get_instance().error("pcap_layer::pcap_layer: Failed to open device %s", nic.c_str());

    return;
@@ -86,7 +86,7 @@ pcap_layer::pcap_layer(const std::string& p_type, const std::string& param) 
  if (it != _params.end()) { // Use online capture

    mac_src = it->second;

  } else {

    // detect MAC address of NIC

    // Detect MAC address of NIC

    struct ifreq	ifr;

    memset(&ifr, 0, sizeof(ifr));

    nic.copy(ifr.ifr_name, sizeof(ifr.ifr_name));

docker/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ USER etsi 


RUN cd ${HOME} \

    && export PATH=$HOME/bin:$PATH \

    && ls ${HOME}/etc/init.d/*.sh | while read S; do /bin/bash -c "$S" || exit 1; done

    && ls ${HOME}/etc/init.d/*.sh | while read S; do /bin/bash -c "$S" || exit 1; done \

    && rm -fr ${HOME}/etc



CMD ["/bin/bash"]

docker/build.sh

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
set -e

set -vx



# Temporary: Remove STF525 image

docker image rm --force stf525_its

# Temporary: Remove TTF002 image

docker image rm --force ttf002_its



#check and build stfubuntu image

if [ -z `docker images -q stfubuntu` ]; then

docker/home/etc/init.d/10-titan.sh

+9 −4
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ export PATH=$PATH:$TTCN3_DIR/bin 
mkdir -p "$SRC_DIR"

cd "$SRC_DIR/.." || exit 1



echo "export TTCN3_DIR=$TTCN3_DIR" >> $HOME/.bashrc

echo "export PATH=\$PATH:\$TTCN3_DIR/bin" >> $HOME/.bashrc



# Install titan core

git clone --progress "$TITAN_REPO" || exit 1
@@ -32,6 +29,14 @@ EOF 


make && make install || exit 1



# To be compiant with build_ttcn3.bash

# TODO Refactor build_ttcn3.bash & devenv.bash

mv ${TTCN3_DIR} ${SRC_DIR}

export TTCN3_DIR=${SRC_DIR}/Install



echo "export TTCN3_DIR=$TTCN3_DIR" >> $HOME/.bashrc

echo "export PATH=\$PATH:\$TTCN3_DIR/bin" >> $HOME/.bashrc



# Install other repos

cd $SRC_DIR/.. || exit 1

cat ${HOME}/etc/titan_repos.txt | grep -v -e '^\s*#' -e 'titan\.core' | while read REPO; do
@@ -42,4 +47,4 @@ cat ${HOME}/etc/titan_repos.txt | grep -v -e '^\s*#' -e 'titan\.core' | while re 
  fi

done



exit 0
 
cd $HOME

docker/home/etc/init.d/20-eclipse.sh

+0 −2
Original line number Diff line number Diff line
@@ -20,5 +20,3 @@ if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file 
fi



cd ${HOME}
 


exit 0