Commit a90476b9 authored by Garcia's avatar Garcia
Browse files

Add RFC7459

parent 250b7e7f

ccsrc/Protocols/Http/http_codec.cc

+5 −3
Original line number Diff line number Diff line
@@ -322,8 +322,8 @@ int http_codec::encode_body(const LibItsHttp__MessageBodyTypes::HttpMessageBody& 
  loggers::get_instance().log_msg(">>> http_codec::encode_body: ", (const Base_Type&)p_message_body);

  loggers::get_instance().log("http_codec::encode_body: # of codecs=%d", _codecs.size());



  if (p_message_body.ischosen(LibItsHttp__MessageBodyTypes::HttpMessageBody::ALT_ms__body)) {

    p_encoding_buffer = p_message_body.ms__body();

  if (p_message_body.ischosen(LibItsHttp__MessageBodyTypes::HttpMessageBody::ALT_binary__body)) {

    p_encoding_buffer = p_message_body.binary__body().raw();

  } else if (p_message_body.ischosen(LibItsHttp__MessageBodyTypes::HttpMessageBody::ALT_html__body)) {

    p_encoding_buffer = OCTETSTRING(p_message_body.html__body().lengthof(), (unsigned char*)static_cast<const char*>(p_message_body.html__body()));

  } else if (p_message_body.ischosen(LibItsHttp__MessageBodyTypes::HttpMessageBody::ALT_text__body)) {
@@ -404,7 +404,9 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
  loggers::get_instance().log("http_codec::decode_body: Binary mode: %x", _dc.is_binary);

  LibItsHttp__MessageBodyTypes::HttpMessageBody v;

  if (_dc.is_binary == 0x01) {

    message_body.ms__body() = body;

    LibItsHttp__BinaryMessageBodyTypes::BinaryBody bb;

    bb.raw() = body;

    message_body.binary__body() = bb;

  } else {

    // Convert into string

    params p;

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ module AtsNg112_TestCases { 
                                                 mw_http_response_ok(

                                                                     mw_http_message_body_xml(

                                                                                              mw_body_xml_location_response(

                                                                                                                            mw_locationResponse_dummy

                                                                                                                            mw_locationResponse

            ))))) {

                tc_ac.stop;

                log("*** " & testcasename() & ": PASS: Security protocol version set to 3 ***");
@@ -152,7 +152,7 @@ module AtsNg112_TestCases { 
                                                 mw_http_response_ok(

                                                                     mw_http_message_body_xml(

                                                                                              mw_body_xml_location_response(

                                                                                                                            mw_locationResponse_dummy

                                                                                                                            mw_locationResponse

            ))))) {

                tc_ac.stop;

                log("*** " & testcasename() & ": PASS: Security protocol version set to 3 ***");

ttcn/TestCodec/TestCodec_HttpPort.ttcn

+8 −3
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ module TestCodec_HttpPort { 
  external function dec_Tuple(in octetstring p_pdu) return Tuple

  with { extension "prototype (convert) decode(XER:XER_EXTENDED)" };

  

  external function enc_Geopriv(in Geopriv p_tuple) return octetstring

  with { extension "prototype (convert) encode(XER:XER_EXTENDED)" };

  external function dec_Geopriv(in octetstring p_pdu) return Geopriv

  with { extension "prototype (convert) decode(XER:XER_EXTENDED)" };

  

  testcase tc_http_map_1() runs on HttpComponent system HttpTestAdapter {

    // Local variables

    var HeaderLines v_headers;
@@ -100,7 +105,7 @@ module TestCodec_HttpPort { 
                                                                                        )))) -> value v_response {

        var Presence v_presence;

        var Tuple v_tuple;

        var Status v_status;

        var Geopriv v_geopriv;

        

        tc_ac.stop;
@@ -108,8 +113,8 @@ module TestCodec_HttpPort { 
        v_tuple := v_presence.tuple_list[0];

        log("v_tuple = ", v_tuple);

        

        //v_status := dec_Status(v_tuple.status.elem_list[0]);

        //log("v_status = ", v_status);

        v_geopriv := dec_Geopriv(unichar2oct(v_tuple.status.elem_list[0]));

        log("v_geopriv = ", v_geopriv);

        

        setverdict(pass, "Get a response");

      }