Commit c6e3e5c3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/emergency-communications/NG112

parents 66f03098 9d271cbd

ccsrc/Protocols/Sip/sip_codec_request.cc

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ void sip_codec_request::decode_headers(const osip_message_t* p_sip_message, LibS 
    headers.supported().set_to_omit();

  }

  

  headers.timestamp().set_to_omit();

  headers.timestamp__().set_to_omit();

  headers.unsupported().set_to_omit();

  headers.userToUser().set_to_omit();

  headers.userAgent().set_to_omit();

docker/Dockerfile

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ RUN cd /home/etsi/frameworks \ 
    && git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon \

    && git clone -bSTF525 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts \

    && cd /home/etsi/dev/STF549_Ng112/ttcn/LibIts \

    && cat ./ttcn/Http/LibItsHttp_TypesAndValues.ttcn \

    && cat ./ttcn/Http/LibItsHttp_TestSystem.ttcn \

    && rm -fr asn1 t3q xsd \

    && cd ttcn && rm -fr BTP CALM CAM Common DCC DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem V2G \

    && cd /home/etsi/dev/STF549_Ng112/scripts \

scripts/update_emcom_project.bash

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ then 
        mv ${HOME}/tmp/emcom.tar.bz2 ${HOME}/tmp/emcom.tar.`date +'%Y%m%d'`.bz2

    fi

    find ${PATH_DEV_EMCOM} -name "*.o" -exec rm {} \;

    tar jcvf ${HOME}/tmp/emcom.tar.bz2 ${PATH_DEV_EMCOM}

    tar jchvf ${HOME}/tmp/emcom.tar.bz2 ${PATH_DEV_EMCOM}

    rm -fr ${PATH_DEV_EMCOM}

fi

ttcn/LibEmcom/LibNg112/xsd/urn_ietf_params_xml_ns_pidf.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ type record Tuple 
	record of XSD.String elem_list,

	Contact contact optional,

	record of Note note_list,

	XSD.DateTime timestamp optional

	XSD.DateTime timestamp_ optional

}

with {

  variant "name as uncapitalized";

ttcn/patch_lib_http/LibItsHttp_XmlTemplates.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ module LibItsHttp_XmlTemplates { 
      elem_list  := p_elem_list,

      contact    := p_contact,

      note_list  := p_note_list,

      timestamp := *

      timestamp_ := *

    } // End of template mw_tuple

    

  } // End of group rfc3863_pidf