Commit 09a4180b authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'createsubmodules' into 'devel' 

Createsubmodules

See merge request !3
parents 20a36972 a7d6a25c

.gitmodules

+4 −0
Original line number Diff line number Diff line
@@ -40,3 +40,7 @@ 
[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module"]

	path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module

	url = https://github.com/eclipse/titan.TestPorts.Common_Components.Abstract_Socket.git

[submodule "titan-test-system-framework"]

	path = titan-test-system-framework

	url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

	branch = devel

LICENSE

+1 −1
Original line number Diff line number Diff line 
Copyright 2019 ETSI

Copyright 2019-2022 ETSI



Redistribution and use in source and binary forms, with or without 

modification, are permitted provided that the following conditions are met:

ccsrc/EncDec/LibItsHttp_Encdec.cc

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 


#include "LibItsHttp_MessageBodyTypes.hh"



#include "http_codec.hh"



#include "loggers.hh"



namespace LibItsHttp__EncdecDeclarations {



  BITSTRING fx__enc__http__message(const LibItsHttp__TypesAndValues::HttpMessage& p) {

    loggers::get_instance().log_msg(">>> fx__enc__http__message: ", (const Base_Type&)p);



    OCTETSTRING os;

    http_codec codec;

    codec.encode(p, os);



    return oct2bit(os);

  }

  INTEGER fx__dec__http__message(BITSTRING& pdu, LibItsHttp__TypesAndValues::HttpMessage& p) {

    loggers::get_instance().log_msg(">>> fx__dec__http__message: ", pdu);



    OCTETSTRING os = bit2oct(pdu);

    http_codec codec;

    codec.decode(os, p);



    return 0;

  }

} // End of namespace LibItsHttp__EncdecDeclarations

ccsrc/EncDec/module.mk

+1 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ sources += \ 
           LibItsBtp_Encdec.cc  \

           LibItsCam_Encdec.cc  \

           LibItsDenm_Encdec.cc  \

           LibItsHttp_Encdec.cc \

           LibItsMapemSpatem_Encdec.cc \

           LibItsSremSsem_Encdec.cc \

           LibItsRtcmem_Encdec.cc \
@@ -54,6 +53,5 @@ ifeq (AtsPki, $(ATS)) 
sources += \

           LibItsBtp_Encdec.cc \

           LibItsPki_Encdec.cc \

           LibItsCam_Encdec.cc \

           LibItsHttp_Encdec.cc

           LibItsCam_Encdec.cc

endif

ccsrc/Externals/LibItsSecurity_externals.cc

+1 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ namespace LibItsSecurity__Functions { 
      str += "/";

      str += std::string(static_cast<const char *>(p__configId));

    }

    params params;

    params_its params;

    params.insert(std::pair<std::string, std::string>(std::string("sec_db_path"), str));

    if (security_services::get_instance().setup(params) == -1) {

      return FALSE;