Commit 97007f2a authored by YannGarcia's avatar YannGarcia
Browse files

Update asn1/Makefile

parent 7b78eeb9

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -118,14 +118,14 @@ $(outdir) $(bindir): 
	mkdir -p $@



$(bindir)/$(ATS)$(EXE): $(outdir)/../asn1/libItsAsn.a $(gen_objects) $(cc_objects) 

	g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs)

	g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs)



$(gen_objects) :%.o :%.cc

	g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<

	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<



$(cc_objects) : $(outdir)/%.o : %.cc

	mkdir -p $(dir $@)

	g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<

	g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<



#$(gen_sources):

#	$(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+944 −940
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { 
      }

    }



    // By default incoming beacons are filtered by the test adapter

    if (_device_mode == 0) { // By default incoming beacons are filtered by the test adapter

      if (htst.ischosen(LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_beaconHdr)) {

        loggers::get_instance().log_msg("geonetworking_layer::receive_data: Pass beaconing filtering: ", sopv->gnAddr().mid());

        if (_pass_beacon_table.empty()) { // Discard beacon
@@ -365,6 +365,10 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { 
          } // else, continue

        }

      } // else, continue

    } else { // Manage Forwarding

      // Checks

      

    }

  } else {

    // Inavlid GeoNetworking payload, discard it

    loggers::get_instance().warning("geonetworking_layer::receive_data: Failed to decode payload, discard it");

scripts/devenv.bash.debian

+5 −3
Original line number Diff line number Diff line
@@ -57,11 +57,13 @@ then 
    export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat

    export PATH_DEV_TTCN=${HOME}/dev/ttcn3

    # ITS support

    export PATH_DEV_ITS=${HOME}/dev/etsi_its

    export PATH_DEV_ITS=${HOME}/dev/TS.ITS

    # Emergency Communication support

    export PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom

    export PATH_DEV_EMCOM=${HOME}/dev/NG112

    # Mobile-Edge Computing support

    export PATH_DEV_MEC=${HOME}/dev/etsi_mec

    export PATH_DEV_MEC=${HOME}/dev/gs032p3-ttcn-test-suite

    # CDM/CISE support

    export PATH_DEV_MEC=${HOME}/dev/cise

    # Validation folder

    export VALIDATION_DIR=${HOME}

fi

scripts/devenv.bash.ubuntu

+20 −22
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ 


# Turn on debug mode

#set -vx

#set -e



set -e



# Colors and Prompt

#export PS1="\w\$ "

#export PS1="\D{%Y-%m-%d %H:%M:%S} \w\n\$ "



export TERM=xterm

export EDITOR=emacs

set -o emacs
@@ -26,24 +28,24 @@ export HOME_INC=${HOME}/include 
export PATH=${HOME_BIN}:${PATH}



# Update LD_LIBRARY_PATH environment variable

if [ -z "${LD_LIBRARY_PATH}" ]

if [ "${LD_LIBRARY_PATH}" == "" ]

then

    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib

    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib

else 

    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib:${LD_LIBRARY_PATH}

    export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${LD_LIBRARY_PATH}

fi





# Add JAVA support

#export JAVA_VERSION=1.8.0_92

#export JAVA_JDK=jdk${JAVA_VERSION}

#if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]

#then

#    export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin

#else

#    unset JAVA_VERSION

#    unset JAVA_JDK

#fi

export JAVA_VERSION=1.8.0_92

export JAVA_JDK=jdk${JAVA_VERSION}

if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]

then

    export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin

else

    unset JAVA_VERSION

    unset JAVA_JDK

fi



# Add TITAN support

export TOP=${HOME_FRAMEWORKS}/titan/titan.core
@@ -57,19 +59,15 @@ then 
    export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat

    export PATH_DEV_TTCN=${HOME}/dev/ttcn3

    # ITS support

    export PATH_DEV_ITS=${HOME}/dev/etsi_its

    export PATH_DEV_ITS=${HOME}/dev/TS.ITS

    # Emergency Communication support

    export PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom

    export PATH_DEV_EMCOM=${HOME}/dev/NG112

    # Mobile-Edge Computing support

    export PATH_DEV_MEC=${HOME}/dev/etsi_mec

    export PATH_DEV_MEC=${HOME}/dev/gs032p3-ttcn-test-suite

    # CDM/CISE support

    export PATH_DEV_MEC=${HOME}/dev/cise

    # Validation folder

    export VALIDATION_DIR=${HOME}

fi



export BROWSER=netsurf
 


export OPENSSL_DIR=/usr/local



export LSAN_OPTIONS=verbosity=1:log_threads=1

AtsMBR @ 52a990bc

Compare 2fa2cb3e to 52a990bc
Original line number Diff line number Diff line 
Subproject commit 2fa2cb3e54c00b68682cf178c44b78abb95ffafa
 
Subproject commit 52a990bcf0047375129ffc75d67714fed77645a1