Hi All,
the attached patch allow netstress tests to be executed
with different IP configurations instead of using
hard-coded values.
It can be applied on ltp 20071031 (not tested on snapshot)
Kind regards,
Carmelo
This patch allows network stress tests to be run on different
subnet configuration by using some macros for IP addresses
configuration.
It doesn't affect default values.
Signed-off-by: Carmelo Amoroso <[EMAIL PROTECTED]>
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-checksum
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-checksum
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-checksum
2007-08-08 15:04:54.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-checksum
2007-08-09 09:59:13.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-dstaddr
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-dstaddr
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-dstaddr
2007-08-08 15:04:59.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-dstaddr
2007-08-09 10:00:21.000000000 +0200
@@ -114,14 +114,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-fragment
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-fragment
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-fragment
2007-08-08 15:04:52.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-fragment
2007-08-09 09:52:16.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-ihl
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-ihl
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-ihl 2007-08-08
15:04:51.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-ihl
2007-08-09 09:49:59.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-protcol
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-protcol
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-protcol
2007-08-08 15:04:55.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-protcol
2007-08-09 09:58:04.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-totlen
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-totlen
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-totlen
2007-08-08 15:04:53.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-totlen
2007-08-09 09:51:14.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/broken_ip/broken_ip4-version
ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-version
--- ltp_new/testcases/network/stress/broken_ip/broken_ip4-version
2007-08-08 15:04:58.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/broken_ip/broken_ip4-version
2007-08-09 09:40:33.000000000 +0200
@@ -113,14 +113,14 @@ do_cleanup
trap do_cleanup 0
# Network portion of the IPv4 address
-network_part="10.0.0"
+network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
-lhost_host_part="2" # local host
-rhost_host_part="1" # remote host
+lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/dns/dns4-stress
ltp_new.mod/testcases/network/stress/dns/dns4-stress
--- ltp_new/testcases/network/stress/dns/dns4-stress 2007-08-08
15:04:51.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/dns/dns4-stress 2007-08-09
11:55:47.000000000 +0200
@@ -66,16 +66,16 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Reverse network portion of the IPv4 address
-IPV4_NETWORK_REVERSE="0.0.10"
+IPV4_NETWORK_REVERSE=${IPV4_NETWORK_REVERSE:-"0.0.10"}
# Host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST="2"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Minumum host ID in the zone file. The ID is used as the host portion of
# of the address
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/ftp/ftp4-download-stress
ltp_new.mod/testcases/network/stress/ftp/ftp4-download-stress
--- ltp_new/testcases/network/stress/ftp/ftp4-download-stress 2007-08-08
15:05:01.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/ftp/ftp4-download-stress
2007-08-09 11:56:47.000000000 +0200
@@ -79,13 +79,13 @@ DOWNLOAD_REGFILESIZE=${DOWNLOAD_REGFILES
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST="2"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Network portion of the IPv6 address
IPV6_NETWORK="fd00:1:1:1"
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/ftp/ftp4-upload-stress
ltp_new.mod/testcases/network/stress/ftp/ftp4-upload-stress
--- ltp_new/testcases/network/stress/ftp/ftp4-upload-stress 2007-08-08
15:05:00.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/ftp/ftp4-upload-stress 2007-08-09
11:57:33.000000000 +0200
@@ -73,13 +73,13 @@ CONNECTION_TOTAL=${CONNECTION_TOTAL:-400
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST="2"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Network portion of the IPv6 address
IPV6_NETWORK="fd00:1:1:1"
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/http/http4-stress
ltp_new.mod/testcases/network/stress/http/http4-stress
--- ltp_new/testcases/network/stress/http/http4-stress 2007-08-08
15:04:55.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/http/http4-stress 2007-08-09
11:56:20.000000000 +0200
@@ -79,13 +79,13 @@ DOWNLOAD_REGFILESIZE=${DOWNLOAD_REGFILES
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST="2"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Network portion of the IPv6 address
IPV6_NETWORK="fd00:1:1:1"
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/icmp/uni-basic/icmp4-uni-basic01
ltp_new.mod/testcases/network/stress/icmp/uni-basic/icmp4-uni-basic01
--- ltp_new/testcases/network/stress/icmp/uni-basic/icmp4-uni-basic01
2007-08-08 15:04:53.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/icmp/uni-basic/icmp4-uni-basic01
2007-08-09 10:03:04.000000000 +0200
@@ -169,14 +169,14 @@ trap do_cleanup 0
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-addr-change
ltp_new.mod/testcases/network/stress/interface/if4-addr-change
--- ltp_new/testcases/network/stress/interface/if4-addr-change 2007-08-08
15:04:52.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-addr-change
2007-08-08 15:37:26.000000000 +0200
@@ -70,7 +70,7 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -79,10 +79,10 @@ IPV4_NETMASK="255.255.255.0"
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Minumum host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST_MIN="2"
+LHOST_IPV4_HOST_MIN=${LHOST_IPV4_HOST:-"2"}
# Maximum host portion of the IPv4 address on the local host
LHOST_IPV4_HOST_MAX="254"
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-alias-adddel
ltp_new.mod/testcases/network/stress/interface/if4-alias-adddel
--- ltp_new/testcases/network/stress/interface/if4-alias-adddel 2007-08-08
15:05:01.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-alias-adddel
2007-08-08 15:38:31.000000000 +0200
@@ -72,7 +72,7 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -82,10 +82,10 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address of the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Host portion of the non-alias
-LHOST_IPV4_HOST="254"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"254"}
#-----------------------------------------------------------------------
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-alias-addlarge
ltp_new.mod/testcases/network/stress/interface/if4-alias-addlarge
--- ltp_new/testcases/network/stress/interface/if4-alias-addlarge
2007-08-08 15:04:55.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-alias-addlarge
2007-08-08 15:46:22.000000000 +0200
@@ -72,7 +72,7 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.0.0.0"
@@ -82,8 +82,8 @@ IPV4_NETMASK_NUM=8
IPV4_BROADCAST=${IPV4_NETWORK}.255.255.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="0.0.2"
-RHOST_IPV4_HOST="0.0.1"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-mtu-change
ltp_new.mod/testcases/network/stress/interface/if4-mtu-change
--- ltp_new/testcases/network/stress/interface/if4-mtu-change 2007-08-08
15:05:00.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-mtu-change
2007-08-08 15:47:59.000000000 +0200
@@ -73,11 +73,11 @@ CHANGE_VALUES="784 1142 426 1500 68 1500
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # local host
-RHOST_IPV4_HOST="1" # remote host
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # remote host
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-route-adddel
ltp_new.mod/testcases/network/stress/interface/if4-route-adddel
--- ltp_new/testcases/network/stress/interface/if4-route-adddel 2007-08-08
15:04:58.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-route-adddel
2007-08-08 15:46:46.000000000 +0200
@@ -71,7 +71,7 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -81,8 +81,8 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2"
-RHOST_IPV4_HOST="1"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# The destination network to add and delete
ADDDEL_ROUTE="10.10.10.0"
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-route-addlarge
ltp_new.mod/testcases/network/stress/interface/if4-route-addlarge
--- ltp_new/testcases/network/stress/interface/if4-route-addlarge
2007-08-08 15:04:52.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-route-addlarge
2007-08-08 15:47:14.000000000 +0200
@@ -71,7 +71,7 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -84,8 +84,8 @@ IPV4_NETWORK_ADDR=${IPV4_NETWORK}.0
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2"
-RHOST_IPV4_HOST="1"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/interface/if4-updown
ltp_new.mod/testcases/network/stress/interface/if4-updown
--- ltp_new/testcases/network/stress/interface/if4-updown 2007-08-08
15:04:56.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/interface/if4-updown 2007-08-08
15:33:16.000000000 +0200
@@ -71,11 +71,11 @@ CHECK_INTERVAL=${CHECK_INTERVAL:-`expr $
LINK_NUM=0
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-10.0.0}
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # local host
-RHOST_IPV4_HOST="1" # remote host
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-2} # local host
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-1} # remote host
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope01
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope01
--- ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope01
2007-08-08 15:04:59.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope01
2007-08-09 11:49:23.000000000 +0200
@@ -64,14 +64,14 @@ MCASTNUM_HEAVY=${MCASTNUM_HEAVY:-40000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope02
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope02
--- ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope02
2007-08-08 15:05:01.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope02
2007-08-09 11:49:45.000000000 +0200
@@ -64,14 +64,14 @@ MCASTNUM_HEAVY=${MCASTNUM_HEAVY:-40000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope03
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope03
--- ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope03
2007-08-08 15:05:00.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope03
2007-08-09 11:50:04.000000000 +0200
@@ -67,14 +67,14 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Multicast Address
MCAST_ADDR=224.10.10.1
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope04
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope04
--- ltp_new/testcases/network/stress/multicast/grp-operation/mcast4-grpope04
2007-08-08 15:04:57.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/grp-operation/mcast4-grpope04
2007-08-09 11:50:20.000000000 +0200
@@ -68,14 +68,14 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Multicast Address
MCAST_ADDR=224.10.10.1
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/packet-flood/mcast4-pktfld01
ltp_new.mod/testcases/network/stress/multicast/packet-flood/mcast4-pktfld01
--- ltp_new/testcases/network/stress/multicast/packet-flood/mcast4-pktfld01
2007-08-08 15:04:53.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/multicast/packet-flood/mcast4-pktfld01
2007-08-09 11:51:04.000000000 +0200
@@ -64,14 +64,14 @@ NS_DURATION=${NS_DURATION:-3600} #
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Multicast Address
MCAST_ADDR=224.10.0.1
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/packet-flood/mcast4-pktfld02
ltp_new.mod/testcases/network/stress/multicast/packet-flood/mcast4-pktfld02
--- ltp_new/testcases/network/stress/multicast/packet-flood/mcast4-pktfld02
2007-08-08 15:04:52.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/multicast/packet-flood/mcast4-pktfld02
2007-08-09 11:51:18.000000000 +0200
@@ -64,14 +64,14 @@ NS_DURATION=${NS_DURATION:-3600} #
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the multicast address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld01
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld01
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld01
2007-08-08 15:04:57.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld01
2007-08-09 11:51:41.000000000 +0200
@@ -64,14 +64,14 @@ NS_DURATION=${NS_DURATION:-3600} # 1 hou
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld02
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld02
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld02
2007-08-08 15:04:57.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld02
2007-08-09 11:52:14.000000000 +0200
@@ -65,14 +65,14 @@ NS_DURATION=${NS_DURATION:-3600} # 1 hou
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld03
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld03
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld03
2007-08-08 15:04:52.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld03
2007-08-09 11:52:45.000000000 +0200
@@ -65,14 +65,14 @@ NS_DURATION=${NS_DURATION:-3600} # 1 hou
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld04
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld04
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld04
2007-08-08 15:04:53.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld04
2007-08-09 11:53:21.000000000 +0200
@@ -67,14 +67,14 @@ MCASTNUM_NORMAL=${MCASTNUM_NORMAL:-20}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld05
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld05
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld05
2007-08-08 15:04:55.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld05
2007-08-09 11:53:57.000000000 +0200
@@ -68,14 +68,14 @@ MCASTNUM_NORMAL=${MCASTNUM_NORMAL:-20}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld06
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld06
--- ltp_new/testcases/network/stress/multicast/query-flood/mcast4-queryfld06
2007-08-08 15:04:59.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/multicast/query-flood/mcast4-queryfld06
2007-08-09 11:54:34.000000000 +0200
@@ -68,14 +68,14 @@ MCASTNUM_NORMAL=${MCASTNUM_NORMAL:-20}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-NETWORK_PART="10.0.0"
+NETWORK_PART=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
NETWORK_MASK=24
# Host portion of the IPv4 address
-LHOST_HOST_PART="2" # local host
-RHOST_HOST_PART="1" # remote host
+LHOST_HOST_PART=${LHOST_IPV4_HOST:-"2"} # local host
+RHOST_HOST_PART=${RHOST_IPV4_HOST:-"1"} # remote host
# Prefix of the Multicast Address
MCAST_ADDR_PREFIX=224.10
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-change-dst
ltp_new.mod/testcases/network/stress/route/route4-change-dst
--- ltp_new/testcases/network/stress/route/route4-change-dst 2007-08-08
15:05:00.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-change-dst
2007-08-08 15:57:58.000000000 +0200
@@ -68,7 +68,7 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -78,8 +78,8 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # src
-RHOST_IPV4_HOST="1" # gateway
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway
# The destination network
DST_NETWORK_PREFIX="10.10" # destination network would be 10.10.n.0/24
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-change-gw
ltp_new.mod/testcases/network/stress/route/route4-change-gw
--- ltp_new/testcases/network/stress/route/route4-change-gw 2007-08-08
15:05:00.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-change-gw 2007-08-08
16:14:27.000000000 +0200
@@ -68,7 +68,7 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK_NUM=24
@@ -77,9 +77,9 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="1" # src
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"1"} # src
RHOST_IPV4_HOST_TOP="10" # gateway
-RHOST_IPV4_HOST_LAST="19"
+RHOST_IPV4_HOST_LAST=19
# The destination network
DST_NETWORK="10.10.0" # destination network would be 10.10.0.0/24
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-change-if
ltp_new.mod/testcases/network/stress/route/route4-change-if
--- ltp_new/testcases/network/stress/route/route4-change-if 2007-08-08
15:04:53.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-change-if 2007-08-08
16:22:18.000000000 +0200
@@ -65,14 +65,14 @@ source check_envval || exit $TST_TOTAL
NS_TIMES=${NS_TIMES:-10000}
# The first 2 ocnted of the Network portion of the gateway address
-IPV4_NETWORK_PRE="10.0"
+IPV4_NETWORK_PRE=${IPV4_NETWORK_PRE:-"10.0"}
# Netmask of for the gateway
IPV4_NETMASK_NUM=24
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # src
-RHOST_IPV4_HOST="1" # gateway
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway
# The destination network
DST_NETWORK="10.10.0" # destination network would be 10.10.0.0/24
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-ifdown
ltp_new.mod/testcases/network/stress/route/route4-ifdown
--- ltp_new/testcases/network/stress/route/route4-ifdown 2007-08-08
15:04:56.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-ifdown 2007-08-09
09:28:56.000000000 +0200
@@ -66,7 +66,7 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -76,8 +76,8 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # src
-RHOST_IPV4_HOST="1" # gateway
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway
# The destination network
DST_NETWORK="10.10.10" # destination network would be 10.10.10.0/24
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-redirect
ltp_new.mod/testcases/network/stress/route/route4-redirect
--- ltp_new/testcases/network/stress/route/route4-redirect 2007-08-08
15:04:56.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-redirect 2007-08-09
08:58:29.000000000 +0200
@@ -67,7 +67,7 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK_NUM=24
@@ -76,7 +76,7 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="1" # src
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"1"} # src
RHOST_IPV4_HOST="2" # gateway
# The destination network
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/route/route4-rmmod
ltp_new.mod/testcases/network/stress/route/route4-rmmod
--- ltp_new/testcases/network/stress/route/route4-rmmod 2007-08-08
15:05:00.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/route/route4-rmmod 2007-08-09
09:37:47.000000000 +0200
@@ -66,7 +66,7 @@ NS_TIMES=${NS_TIMES:-10000}
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Netmask of for the tested network
IPV4_NETMASK="255.255.255.0"
@@ -76,8 +76,8 @@ IPV4_NETMASK_NUM=24
IPV4_BROADCAST=${IPV4_NETWORK}.255
# Host portion of the IPv4 address
-LHOST_IPV4_HOST="2" # src
-RHOST_IPV4_HOST="1" # gateway
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway
# The destination network
DST_NETWORK="10.10.10" # destination network would be 10.10.10.0/24
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/ssh/ssh4-stress
ltp_new.mod/testcases/network/stress/ssh/ssh4-stress
--- ltp_new/testcases/network/stress/ssh/ssh4-stress 2007-08-08
15:04:59.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/ssh/ssh4-stress 2007-08-09
11:55:10.000000000 +0200
@@ -78,13 +78,13 @@ SSH_TMPDIR_PARENT="/root"
LINK_NUM=${LINK_NUM:-0}
# Network portion of the IPv4 address
-IPV4_NETWORK="10.0.0"
+IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"}
# Host portion of the IPv4 address on the local host
-LHOST_IPV4_HOST="2"
+LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"}
# Host portion of the IPv4 address on the remote host
-RHOST_IPV4_HOST="1"
+RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"}
# Network portion of the IPv6 address
IPV6_NETWORK="fd00:1:1:1"
@@ -240,7 +240,7 @@ PidFile ${sshd_dir}/sshd.pid
EOD
- SSHD -f ${sshd_dir}/sshd_config
+ $SSHD -f ${sshd_dir}/sshd_config
if [ $? -ne 0 ]; then
tst_resm TBROK "Failed to run sshd daemon."
exit 1
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/tcp/multi-diffport/tcp4-multi-diffport01
ltp_new.mod/testcases/network/stress/tcp/multi-diffport/tcp4-multi-diffport01
--- ltp_new/testcases/network/stress/tcp/multi-diffport/tcp4-multi-diffport01
2007-08-08 15:04:58.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/tcp/multi-diffport/tcp4-multi-diffport01
2007-08-09 11:08:29.000000000 +0200
@@ -193,14 +193,14 @@ trap do_cleanup 0
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/tcp/multi-sameport/tcp4-multi-sameport01
ltp_new.mod/testcases/network/stress/tcp/multi-sameport/tcp4-multi-sameport01
--- ltp_new/testcases/network/stress/tcp/multi-sameport/tcp4-multi-sameport01
2007-08-08 15:04:52.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/tcp/multi-sameport/tcp4-multi-sameport01
2007-08-09 11:07:38.000000000 +0200
@@ -192,14 +192,14 @@ trap do_cleanup 0
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/tcp/uni-basic/tcp4-uni-basic01
ltp_new.mod/testcases/network/stress/tcp/uni-basic/tcp4-uni-basic01
--- ltp_new/testcases/network/stress/tcp/uni-basic/tcp4-uni-basic01
2007-08-08 15:04:59.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/tcp/uni-basic/tcp4-uni-basic01
2007-08-09 11:02:04.000000000 +0200
@@ -317,14 +317,14 @@ do_setup()
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/udp/multi-diffport/udp4-multi-diffport01
ltp_new.mod/testcases/network/stress/udp/multi-diffport/udp4-multi-diffport01
--- ltp_new/testcases/network/stress/udp/multi-diffport/udp4-multi-diffport01
2007-08-08 15:04:56.000000000 +0200
+++
ltp_new.mod/testcases/network/stress/udp/multi-diffport/udp4-multi-diffport01
2007-08-09 10:57:43.000000000 +0200
@@ -169,14 +169,14 @@ trap do_cleanup 0
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt
ltp_new/testcases/network/stress/udp/uni-basic/udp4-uni-basic01
ltp_new.mod/testcases/network/stress/udp/uni-basic/udp4-uni-basic01
--- ltp_new/testcases/network/stress/udp/uni-basic/udp4-uni-basic01
2007-08-08 15:04:57.000000000 +0200
+++ ltp_new.mod/testcases/network/stress/udp/uni-basic/udp4-uni-basic01
2007-08-09 10:48:54.000000000 +0200
@@ -163,14 +163,14 @@ trap do_cleanup 0
case $IP_VER in
4)
# Network portion of the IPv4 address
- network_part="10.0.0"
+ network_part=${IPV4_NETWORK:-"10.0.0"}
# Netmask of the IPv4 network
network_mask=24
# Host portion of the IPv4 address
- lhost_host_part="2" # local host
- rhost_host_part="1" # remote host
+ lhost_host_part=${LHOST_IPV4_HOST:-"2"} # local host
+ rhost_host_part=${RHOST_IPV4_HOST:-"1"} # remote host
# Set IPv4 addresses to the interfaces
set_ipv4addr lhost $LINK_NUM $network_part $lhost_host_part
diff -upNr -X /u/condorg/dontdiff.txt ltp_new/testscripts/networkstress.sh
ltp_new.mod/testscripts/networkstress.sh
--- ltp_new/testscripts/networkstress.sh 2007-08-08 15:03:41.000000000
+0200
+++ ltp_new.mod/testscripts/networkstress.sh 2007-08-09 12:13:37.000000000
+0200
@@ -20,6 +20,14 @@ export HTTP_DOWNLOAD_DIR=
export FTP_DOWNLOAD_DIR=
export FTP_UPLOAD_DIR=
export FTP_UPLOAD_URLDIR=
+# Set firt three octets of the network address, by default 10.0.0
+export IPV4_NETWORK=
+# Set local host last octet, by default 2
+export LHOST_IPV4_HOST=
+# Set remote host last octet, by default 1
+export RHOST_IPV4_HOST=
+# Set the reverse of IPV4_NETWORK, by default 0.0.10
+export IPV4_NETWORK_REVERSE=
# ---***************************************************---=
# ---***** OPTIONAL SETTINGS *****---
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
