Commit 01b3c5bd authored by tepelmann's avatar tepelmann
Browse files

Updated to the latest version of the TSS/TP.

Added port module parameters instead of fixed values for ALG test cases.
parent 4b11a6f2
Loading
Loading
Loading
Loading
+20 −0
Original line number Original line Diff line number Diff line
@@ -120,4 +120,24 @@ module Ats464XLat_Pixits {
     */
     */
    modulepar UInt16 PX_464XLAT_PLAT_MTU := 1500;
    modulepar UInt16 PX_464XLAT_PLAT_MTU := 1500;
    
    
    /**
     * @desc The FTP data port
     */
    modulepar UInt16 PX_FTP_DATA_PORT := 20;
    
    /**
     * @desc The SIP port
     */
    modulepar UInt16 PX_SIP_PORT := 5060;
    
    /**
     * @desc The RTSP port
     */
    modulepar UInt16 PX_RTSP_PORT := 554;
    
    /**
     * @desc The PPTP port
     */
    modulepar UInt16 PX_PPTP_PORT := 1723;
    
} // End of module Ats464XLat_Pixits
} // End of module Ats464XLat_Pixits
 No newline at end of file
+14 −13
Original line number Original line Diff line number Diff line
@@ -946,10 +946,11 @@ module Ats464XLat_TestCases {
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *          from multiple client devices
                 *      }
                 *      }
                 *      then {
                 *      then {
                 *          the IUT does a 1:n NAT mapping for multiple public IPv6 client addresses sourced and,
                 *          the IUT does a 1:n NAT mapping for multiple public IPv6 client addresses sourced 
                 *          the IUT forwards packets to the destination with some of the same and some different public IPv4 source 
                 *          and the IUT forwards packets to the destination with some of the same and some different public IPv4 source 
                 *          address matching the NAT pools dependent on the prefix assigned
                 *          address matching the NAT pools dependent on the prefix assigned
                 *      }
                 *      }
                 *  }
                 *  }
@@ -1738,7 +1739,7 @@ module Ats464XLat_TestCases {
                 * Expected behaviour:
                 * Expected behaviour:
                 *  ensure that {
                 *  ensure that {
                 *      when {
                 *      when {
                 *          the IUT receives an HTML IPv4 packet from the internet
                 *          the IUT receives an HTML IPv4 packet
                 *              containing source address
                 *              containing source address
                 *                  indicating a private IPv4 address
                 *                  indicating a private IPv4 address
                 *              containing the DF bit
                 *              containing the DF bit
@@ -2389,7 +2390,7 @@ module Ats464XLat_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 20)) {
                                    if (not match(v_tcpPacket.srcPort, PX_FTP_DATA_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2432,7 +2433,7 @@ module Ats464XLat_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_ftpSendData(p_srcAddress, p_dstAddress, 20, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_ftpSendData(p_srcAddress, p_dstAddress, PX_FTP_DATA_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_ftp();
                        f_postamble_host_ftp();
@@ -2550,7 +2551,7 @@ module Ats464XLat_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_SIP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2593,7 +2594,7 @@ module Ats464XLat_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_sipSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_sipSendPacket(p_srcAddress, p_dstAddress, PX_SIP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_sip();
                        f_postamble_host_sip();
@@ -2711,7 +2712,7 @@ module Ats464XLat_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_RTSP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2754,7 +2755,7 @@ module Ats464XLat_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_rtspSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_rtspSendPacket(p_srcAddress, p_dstAddress, PX_RTSP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_rtsp();
                        f_postamble_host_rtsp();
@@ -2872,7 +2873,7 @@ module Ats464XLat_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_PPTP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2915,7 +2916,7 @@ module Ats464XLat_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_pptpSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_pptpSendPacket(p_srcAddress, p_dstAddress, PX_PPTP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_pptp();
                        f_postamble_host_pptp();
@@ -2945,7 +2946,7 @@ module Ats464XLat_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *      }
                 *      }
                 *      then {
                 *      then {
                 *          the IUT forwards the ICMP packets in IPv4 after translation
                 *          the IUT forwards the ICMP packets in IPv4 after translation
+20 −0
Original line number Original line Diff line number Diff line
@@ -159,4 +159,24 @@ module AtsNat64_Pixits {
     */
     */
    modulepar UInt PX_NAT64_TUNNEL_MTU := 1500;
    modulepar UInt PX_NAT64_TUNNEL_MTU := 1500;
    
    
    /**
     * @desc The FTP data port
     */
    modulepar UInt16 PX_FTP_DATA_PORT := 20;
    
    /**
     * @desc The SIP port
     */
    modulepar UInt16 PX_SIP_PORT := 5060;
    
    /**
     * @desc The RTSP port
     */
    modulepar UInt16 PX_RTSP_PORT := 554;
    
    /**
     * @desc The PPTP port
     */
    modulepar UInt16 PX_PPTP_PORT := 1723;
    
} // End of module AtsNat64_Pixits
} // End of module AtsNat64_Pixits
 No newline at end of file
+18 −16
Original line number Original line Diff line number Diff line
@@ -380,11 +380,13 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits from multiple client devices
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits 
                 *          from multiple client devices
                 *      }
                 *      }
                 *      then {
                 *      then {
                 *          the IUT does a 1:n NAT mapping for multiple public IPv6 client addresses sourced and,
                 *          the IUT does a 1:n NAT mapping for multiple public IPv6 client addresses sourced 
                 *          the IUT forwards packets to the destination with some of the same and some different public IPv4 source address matching the NAT pools dependent on the prefix assigned
                 *          and the IUT forwards packets to the destination with some of the same and some different public IPv4 source 
                 *          address matching the NAT pools dependent on the prefix assigned
                 *      }
                 *      }
                 *  }
                 *  }
                 * </pre>
                 * </pre>
@@ -1827,7 +1829,7 @@ module AtsNat64_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 20)) {
                                    if (not match(v_tcpPacket.srcPort, PX_FTP_DATA_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -1870,7 +1872,7 @@ module AtsNat64_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_ftpSendData(p_srcAddress, p_dstAddress, 20, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_ftpSendData(p_srcAddress, p_dstAddress, PX_FTP_DATA_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_ftp();
                        f_postamble_host_ftp();
@@ -1988,7 +1990,7 @@ module AtsNat64_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_SIP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2031,7 +2033,7 @@ module AtsNat64_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_sipSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_sipSendPacket(p_srcAddress, p_dstAddress, PX_SIP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_sip();
                        f_postamble_host_sip();
@@ -2063,7 +2065,7 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *              containing TCP payload
                 *              containing TCP payload
                 *                  indicating port number 5060
                 *                  indicating port number 5060
                 *      }
                 *      }
@@ -2149,7 +2151,7 @@ module AtsNat64_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_RTSP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2192,7 +2194,7 @@ module AtsNat64_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_rtspSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_rtspSendPacket(p_srcAddress, p_dstAddress, PX_RTSP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_rtsp();
                        f_postamble_host_rtsp();
@@ -2224,7 +2226,7 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *              containing TCP payload
                 *              containing TCP payload
                 *                  indicating port number 5060
                 *                  indicating port number 5060
                 *      }
                 *      }
@@ -2310,7 +2312,7 @@ module AtsNat64_TestCases {
                            ) -> value v_ipv4Packet {
                            ) -> value v_ipv4Packet {
                                tc_ac.stop;
                                tc_ac.stop;
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                if (e_success == f_decTcpPacket(v_ipv4Packet.ipv4Payload.rawPacket, v_tcpPacket)) {
                                    if (not match(v_tcpPacket.srcPort, 5060)) {
                                    if (not match(v_tcpPacket.srcPort, PX_PPTP_PORT)) {
                                        tc_ac.start;
                                        tc_ac.start;
                                        repeat;
                                        repeat;
                                    }
                                    }
@@ -2353,7 +2355,7 @@ module AtsNat64_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        
                        // Test Body
                        // Test Body
                        v_result := f_pptpSendPacket(p_srcAddress, p_dstAddress, 5060, p_noOfDataRequests); // any kind of data transfer
                        v_result := f_pptpSendPacket(p_srcAddress, p_dstAddress, PX_PPTP_PORT, p_noOfDataRequests); // any kind of data transfer
                        
                        
                        // Postamble
                        // Postamble
                        f_postamble_host_pptp();
                        f_postamble_host_pptp();
@@ -2869,7 +2871,7 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *          from multiple clients
                 *          from multiple clients
                 *      }
                 *      }
                 *      then {
                 *      then {
@@ -3361,7 +3363,7 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *          from multiple clients
                 *          from multiple clients
                 *          and all NPUs are removed from the IUT
                 *          and all NPUs are removed from the IUT
                 *      }
                 *      }
@@ -3519,7 +3521,7 @@ module AtsNat64_TestCases {
                 *                      indicating client IPv6 address
                 *                      indicating client IPv6 address
                 *                  containing destination address
                 *                  containing destination address
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT GW IPv6 prefix first 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 64 bits
                 *                      indicating IUT IPv4 embedded into the IPv6 address in last 32 bits
                 *          from multiple devices
                 *          from multiple devices
                 *          and the NAT64 function on the IUT is shut down
                 *          and the NAT64 function on the IUT is shut down
                 *      }
                 *      }