Commit 6bf016f0 authored by nikolajev's avatar nikolajev
Browse files

Updated issues identified by T3Q

parent f3cd2013
Loading
Loading
Loading
Loading
+22 −22
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ module LibSip_Interface {
    import from LibSip_PIXITS all;

    group AdressTypes {
        type record address4SIP {
        type record Address4SIP {
            // HostPort
            charstring host optional,
            // hostname, IPv4 or IPv6
@@ -30,7 +30,7 @@ module LibSip_Interface {
            encode "SIPCodec";
        }

        type address4SIP address;
        type Address4SIP address;


    } // end group AdressTypes
@@ -43,34 +43,34 @@ module LibSip_Interface {
    }

    signature s_SIP_conversation(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_ringing(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_announcementA(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_announcementB(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_announcement(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_voiceMessage(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    signature s_SIP_mediastopped(
        in charstring text,
        out boolean answer
        in charstring p_text,
        out boolean p_answer
    ) ;
    type port operatorPort procedure {
    type port OperatorPort procedure {
        inout s_SIP_conversation;
        inout s_SIP_ringing;
        inout s_SIP_announcementA;
@@ -92,7 +92,7 @@ module LibSip_Interface {
        // port
        port SipPort SIPP;
        // used for communication with the operator
        port operatorPort opPort;
        port OperatorPort opPort;

        // current address to send TCP/UDP messages
        var SipUserProfile vc_userprofile; // PIXIT userinformation
@@ -199,22 +199,22 @@ module LibSip_Interface {
        var boolean vc_firstREGISTER_sent := false; // true after sent of first REGISTER message
        var boolean vc_DeregDone := false; // true after first DeREGISTRATION trail (avoid loop)
        var boolean vc_interface_isc := false; // true if isc interface is in use
        var boolean v_white_space := false; // MRO
        var boolean vc_white_space := false; // MRO
        // TODO: TT change
        var boolean vc_subscribed := false;
        // ETS address
        var address v_ets_label; /*STF471 removed assignment, should be performed in specific ATS 
        var address vc_ets_label; /*STF471 removed assignment, should be performed in specific ATS 
            := {
                host := PX_SIP_TS1_IPADDR,
                portField := PX_SIP_TS1_PORT
            };*/

        // parts needed for Client/SelfSyncComp type compatibility
        var StringStack v_stateStack := c_initStringStack;
        var StringStack vc_stateStack := c_initStringStack;
        port SyncPort syncSendPort;
        port SyncPort syncPort;
        timer tc_sync := PX_TSYNC_TIME_LIMIT;
    // // used for communication with the operator
    // port operatorPort_SIP opPort;
    // port OperatorPort_SIP opPort;
    } // end SipComponent
} // end module LibSip_Interface
+18 −18
Original line number Diff line number Diff line
@@ -17,77 +17,77 @@ module LibSip_PIXITS {
            /**
             * @desc charstring for SDP user name
             */
            modulepar charstring PX_SIP_SDP_user_name := "voicesession";
            modulepar charstring PX_SIP_SDP_USER_NAME := "voicesession";

            /**
             * @desc charstring for SDP session identifier
             */
            modulepar charstring PX_SIP_SDP_session_id := "30000";
            modulepar charstring PX_SIP_SDP_SESSION_ID := "30000";

            /**
             * @desc charstring for SDP dynamic port
             */
            modulepar charstring PX_SIP_SDP_dyn := "0";
            modulepar charstring PX_SIP_SDP_DYN := "0";

            /**
             * @desc charstring for SDP bandwidth modifier
             */
            modulepar charstring PX_SIP_SDP_b_modifier := "AS";
            modulepar charstring PX_SIP_SDP_B_MODIFIER := "AS";

            /**
             * @desc integer for SDP bandwidth value
             */
            modulepar integer PX_SIP_SDP_b_bandwidth := 64;
            modulepar integer PX_SIP_SDP_B_BANDWIDTH := 64;

            /**
             * @desc charstring for SDP media attribute encoding supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_encoding := "PCMU/8000";
            modulepar charstring PX_SIP_SDP_ENCODING := "PCMU/8000";

            /**
             * @desc charstring for SDP media type supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_video := "video";
            modulepar charstring PX_SIP_SDP_MEDIA_VIDEO := "video";

            /**
             * @desc charstring for SDP media transport supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_transport_G722 := "G722/8000";
            modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_G722 := "G722/8000";

            /**
             * @desc charstring for SDP media transport supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_transport_PCMU := "PCMU/8000";
            modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_PCMU := "PCMU/8000";

            /**
             * @desc charstring for SDP media transport supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_transport_PCMA := "PCMA/8000";
            modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_PCMA := "PCMA/8000";

            /**
             * @desc charstring for SDP media transport supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_transport_AMR := "AMR";
            modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_AMR := "AMR";

            /**
             * @desc charstring for SDP media transport supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_media_transport_Cle := "CLEARMODE/8000";
            modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_CLE := "CLEARMODE/8000";
            
            /**
             * @desc charstring for SDP media attribute encoding supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_encoding_attribute_G222 := "9 " & PX_SIP_SDP_media_transport_G722;
            modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_G222 := "9 " & PX_SIP_SDP_MEDIA_TRANSPORT_G722;

            /**
             * @desc charstring for SDP media attribute encoding supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_encoding_attribute_PCMU := "0 " & PX_SIP_SDP_media_transport_PCMU;
            modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMU := "0 " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMU;

            /**
             * @desc charstring for SDP media attribute encoding supported by the IUT
             */
            modulepar charstring PX_SIP_SDP_encoding_attribute_PCMA := "8 " & PX_SIP_SDP_media_transport_PCMA;
            modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMA := "8 " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMA;

        } // group SDP Parameter

@@ -129,12 +129,12 @@ module LibSip_PIXITS {
            /**
             * @desc boolean for True, if conversation check is implemented.
             */
            modulepar boolean PX_SIP_CheckConversation := false;
            modulepar boolean PX_SIP_CHECK_CONVERSATION := false;

            /**
             * @desc boolean for True, if ringing check is implemented.
             */
            modulepar boolean PX_SIP_CheckRinging := false;
            modulepar boolean PX_SIP_CHECK_RINGING := false;


        } // group RTPStreamControlAndCheck
@@ -181,7 +181,7 @@ module LibSip_PIXITS {
            /**
             * @desc charstring for delimiter value used in mime multipart message to separate message body parts
             */
            modulepar charstring PX_SIP_MIME_Boundary := "boundary1";
            modulepar charstring PX_SIP_MIME_BOUNDARY := "boundary1";

        // application/vnd.etsi.simservs+xml
        } // group MimePart
+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ module LibSip_SIPTypesAndValues {

            // MIME name application
            // TODO TT change: added boundary delimiter
            const charstring c_mimeMultipart := "multipart/mixed;boundary=""" & PX_SIP_MIME_Boundary & """";
            const charstring c_mimeMultipart := "multipart/mixed;boundary=""" & PX_SIP_MIME_BOUNDARY & """";

            // IMS 3GPP name application
            const charstring c_ims3gppApplication := "application/3gpp-ims+xml";
+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ module LibSip_SMSFunctions {
        charstring p_ASCII_String
    ) return octetstring  {
        var integer i;
        var integer k;
        var integer j;
        var integer v_Length := lengthof(p_ASCII_String);
        var integer v_Temp;
        var octetstring v_Noctets := ''O;
@@ -20,18 +20,18 @@ module LibSip_SMSFunctions {
        var bitstring v_TempBitDes := ''B;

        if ((v_Length <= 0) or (v_Length > 160) or (((v_Length * 7) mod 8) != 0)) {
            log("Invalid value of input string length.");
            log("*** " & __SCOPE__ & "INFO: Invalid value of input string length ***");
        }

        for (i := 0; i < v_Length; i := i + 1) {
            v_Temp := char2int(p_ASCII_String[i]);
            v_TempBitSrc := int2bit(v_Temp, 8);

            for (k := 1; k <= 7; k := k + 1) {
            for (j := 1; j <= 7; j := j + 1) {

                v_TempBitDes := v_TempBitSrc[8 - k] & v_TempBitDes;
                v_TempBitDes := v_TempBitSrc[8 - j] & v_TempBitDes;

                if (((7 * i + k) mod 8) == 0) {
                if (((7 * i + j) mod 8) == 0) {

                    v_Noctets := v_Noctets & bit2oct(v_TempBitDes);
                    v_TempBitDes := ''B;
+76 −76

File changed.

Preview size limit exceeded, changes collapsed.

Loading