提交: 35a23ecbf5a16685f56790c8c95545be954ae09a - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: 35a23ecbf5a16685f56790c8c95545be954ae09a (tree)
• 時間: 2010-10-13 16:54:26
• 作者: 0809216 <0809216@1ed6...>
• Commiter: 0809216

Log Message

#534 Fixed: Delete short option / Modified all related script...

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10365 1ed66053-1c2d-0410-8867-f7571e6e31d3

Change Summary

• modified: l7directord/l7directord
• modified: l7vsd/src/l7vsadm.cpp
• modified: test/script/l7directord/materials/l7directord-3-2-9.log
• modified: test/script/l7vsadm/l7vsadm-4-1-2.sh
• modified: test/script/l7vsadm/l7vsadm-4-1-49.sh
• modified: test/script/l7vsadm/l7vsadm-4-1-50.sh
• modified: test/script/l7vsadm/l7vsadm-4-1-51.sh
• modified: test/script/l7vsadm/l7vsadm-4-3-1.sh
• modified: test/script/l7vsadm/l7vsadm-4-3-36.sh
• modified: test/script/l7vsadm/l7vsadm-4-3-37.sh
• modified: test/script/l7vsadm/l7vsadm-4-3-38.sh
• modified: test/script/l7vsadm/l7vsadm-4-3-39.sh
• modified: test/script/l7vsadm/l7vsadm-5-1-1.sh
• modified: test/script/l7vsadm/l7vsadm-5-1-13.sh
• modified: test/script/l7vsadm/l7vsadm-5-1-14.sh
• modified: test/script/l7vsadm/l7vsadm-5-1-15.sh
• modified: test/script/l7vsadm/l7vsadm-5-3-1.sh
• modified: test/script/l7vsadm/l7vsadm-5-3-12.sh
• modified: test/script/l7vsadm/l7vsadm-5-3-13.sh
• modified: test/script/l7vsadm/l7vsadm-5-3-14.sh
• modified: test/script/l7vsadm/l7vsadm-5-3-15.sh
• modified: test/script/l7vsadm/l7vsadm-9-1-1.sh
• modified: test/script/l7vsadm/l7vsadm-9-1-2.sh
• modified: test/script/l7vsadm/l7vsadm-9-2-1.sh
• modified: test/script/session/session-76-1.sh
• modified: test/script/session/session-76-2.sh
• modified: test/script/session/session-77-1.sh
• modified: test/script/session/session-77-2.sh
• modified: test/script/session/session-78-1.sh
• modified: test/script/session/session-78-2.sh
• modified: test/script/session/session-79-1.sh
• modified: test/script/session/session-79-2.sh
• modified: test/script/session/session-80-1.sh
• modified: test/script/session/session-80-2.sh
• modified: test/script/session/session-81-1.sh
• modified: test/script/session/session-81-2.sh
• modified: test/script/session/session-82-1.sh
• modified: test/script/session/session-82-2.sh
• modified: test/script/session/session-83-1.sh
• modified: test/script/session/session-83-2.sh

差異

--- a/l7directord/l7directord
+++ b/l7directord/l7directord
@@ -4068,10 +4068,10 @@ sub get_forward_flag {
     my $forward = shift;
 
     if (defined $forward && $forward =~ /^masq$/i) {
-        return '-M';
+        return '--masq';
     }
     elsif (defined $forward && $forward =~ /^tproxy$/i) {
-        return '-T';
+        return '--tproxy';
     }
     return q{};
 }

--- a/l7vsd/src/l7vsadm.cpp
+++ b/l7vsd/src/l7vsadm.cpp
@@ -244,9 +244,7 @@ bool l7vs::l7vsadm::parse_vs_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd, i
                     count_map["--bypass"] == 0 &&
                     count_map["-f"] == 0 &&
                     count_map["--flag"] == 0 &&
-                    count_map["-M"] == 0 &&
                     count_map["--masq"] == 0 &&
-                    count_map["-T"] == 0 &&
                     count_map["--tproxy"] == 0 &&
                     count_map["-Q"] == 0 &&
                     count_map["--qos-up"] == 0 &&
@@ -312,20 +310,7 @@ bool l7vs::l7vsadm::parse_vs_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd, i
                 is_conflict = true;
         }
         if (is_conflict == false &&
-            count_map["-M"] == 1 && count_map["--masq"] == 1) {
-                //-M(--masq)
-                conflict_option_name = "--masq";
-                is_conflict = true;
-        }
-        if (is_conflict == false &&
-            count_map["-T"] == 1 && count_map["--tproxy"] == 1) {
-                //-T(--tproxy)
-                conflict_option_name = "--tproxy";
-                is_conflict = true;
-        }
-        if (is_conflict == false &&
-            count_map["-M"] + count_map["--masq"] +
-            count_map["-T"] + count_map["--tproxy"] > 1) {
+            count_map["--masq"] + count_map["--tproxy"] > 1) {
                 conflict_option_name = "--masq/tproxy";
                 is_conflict = true;
         }
@@ -743,9 +728,9 @@ bool l7vs::l7vsadm::parse_opt_vs_fwdmode_func(int &pos, int argc, char *argv[])
         Logger logger(LOG_CAT_L7VSADM_COMMON, /*XXX*/999, "l7vsadm::parse_opt_vs_fwdmode_func", __FILE__, __LINE__);
 
         std::string opt(argv[pos]);
-        if (opt == "-M" || opt == "--masq") {
+        if (opt == "--masq") {
                 request.vs_element.sorry_fwdmode = virtualservice_element::FWD_MASQ;
-        } else if (opt == "-T" || opt == "--tproxy") {
+        } else if (opt == "--tproxy") {
 #ifdef IP_TRANSPARENT
                 request.vs_element.sorry_fwdmode = virtualservice_element::FWD_TPROXY;
 #else
@@ -1297,9 +1282,7 @@ bool l7vs::l7vsadm::parse_rs_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd, i
                 // Existence check of the parameter
                 if (count_map["-w"] == 0 &&
                     count_map["--weight"] == 0 &&
-                    count_map["-M"] == 0 &&
                     count_map["--masq"] == 0 &&
-                    count_map["-T"] == 0 &&
                     count_map["--tproxy"] == 0) {
                         std::string buf("All option omitted for edit rs command.");
                         l7vsadm_err.setter(true, buf);
@@ -1347,24 +1330,9 @@ bool l7vs::l7vsadm::parse_rs_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd, i
                 is_conflict = true;
         }
         if ((is_conflict == false) &&
-            (count_map["-M"] == 1) && (count_map["--masq"] == 1) &&
-            (l7vsadm_request::CMD_DEL_RS != cmd)) {
-                //-M(--masq)
-                conflict_option_name = "--masq";
-                is_conflict = true;
-        }
-        if ((is_conflict == false) &&
-            (count_map["-T"] == 1) && (count_map["--tproxy"] == 1) &&
-            (l7vsadm_request::CMD_DEL_RS != cmd)) {
-                //-T(--tproxy)
-                conflict_option_name = "--tproxy";
-                is_conflict = true;
-        }
-        if ((is_conflict == false) &&
-            count_map["-M"] + count_map["--masq"] +
-            count_map["-T"] + count_map["--tproxy"] > 1 &&
+            count_map["--masq"] + count_map["--tproxy"] > 1 &&
             (l7vsadm_request::CMD_DEL_RS != cmd)) {
-                //-M/T(--masq/tproxy)
+                //--masq/tproxy
                 conflict_option_name = "--masq/tproxy";
                 is_conflict = true;
         }
@@ -1424,9 +1392,9 @@ bool l7vs::l7vsadm::parse_opt_rs_fwdmode_func(int &pos, int argc, char *argv[])
         Logger logger(LOG_CAT_L7VSADM_COMMON, /*XXX*/999, "l7vsadm::parse_opt_rs_fwdmode_func", __FILE__, __LINE__);
 
         std::string opt(argv[pos]);
-        if (opt == "-M" || opt == "--masq") {
+        if (opt == "--masq") {
                 request.vs_element.realserver_vector.front().fwdmode = realserver_element::FWD_MASQ;
-        } else if (opt == "-T" || opt == "--tproxy") {
+        } else if (opt == "--tproxy") {
 #ifdef IP_TRANSPARENT
                 request.vs_element.realserver_vector.front().fwdmode = realserver_element::FWD_TPROXY;
 #else
@@ -2280,8 +2248,8 @@ bool l7vs::l7vsadm::parse_help_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd,
                   "  --scheduler        -s scheduler           one of rr,lc,wrr\n"
                   "  --upper            -u connection-count    maximum number of connections\n"
                   "  --bypass           -b sorry-server        sorry server address is host:port\n"
-                  "  --tproxy           -T                     set sorry server connection to IP transparent mode.\n"
-                  "  --masq             -M                     set sorry server connection to IP masquerade mode.\n"
+                  "  --tproxy                                  set sorry server connection to IP transparent mode.\n"
+                  "  --masq                                    set sorry server connection to IP masquerade mode.\n"
 
                   "  --flag             -f sorry-flag          sorry status set to virtual service\n"
                   "  --qos-up           -Q QoSval-up           QoS Threshold(bps) set to real server direction\n"
@@ -2293,8 +2261,8 @@ bool l7vs::l7vsadm::parse_help_func(l7vs::l7vsadm_request::COMMAND_CODE_TAG cmd,
                   "                        [logrotate-args]\n"
                   "  --real-server      -r server-address      server-address is host:port\n"
                   "  --weight           -w weight              scheduling weight set to real server\n"
-                  "  --tproxy           -T                     set real server connection to IP transparent mode.\n"
-                  "  --masq             -M                     set real server connection to IP masquerade mode.\n"
+                  "  --tproxy                                  set real server connection to IP transparent mode.\n"
+                  "  --masq                                    set real server connection to IP masquerade mode.\n"
                   "  --switch           -s replication-switch  start or stop replication\n"
                   "  --force            -f                     force replication start\n"
                   "  --dump             -d                     dump replication memory\n"
@@ -2321,16 +2289,16 @@ std::string l7vs::l7vsadm::usage()
         stream <<
                "Usage: \n"
                "  l7vsadm -A -t service-address -m proto-module [module-args]\n"
-               "          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]\n"
+               "          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]\n"
                "          [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-z ssl-config-file]\n"
                "          [-O socket-option] [-L access-log-flag] [-a access-log-file [logrotate-args]]\n"
                "  l7vsadm -E -t service-address -m proto-module [module-args]\n"
-               "          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]\n"
+               "          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]\n"
                "          [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-L access-log-flag]\n"
                "  l7vsadm -D -t service-address -m proto-module [module-args]\n"
                "  l7vsadm -C\n"
                "  l7vsadm -a|e -t service-address -m proto-module [module-args]\n"
-               "          -r server-address [-w weight] [-T|M]\n"
+               "          -r server-address [-w weight] [--masq|tproxy]\n"
                "  l7vsadm -d -t service-address -m proto-module [module-args]\n"
                "          -r server-address\n"
                "  l7vsadm -R -s replication-switch\n"
@@ -2697,9 +2665,7 @@ l7vs::l7vsadm::l7vsadm()
         vs_option_dic["--upper"]           = boost::bind(&l7vsadm::parse_opt_vs_upper_func, this, _1, _2, _3);
         vs_option_dic["-b"]                = boost::bind(&l7vsadm::parse_opt_vs_bypass_func, this, _1, _2, _3);
         vs_option_dic["--bypass"]          = boost::bind(&l7vsadm::parse_opt_vs_bypass_func, this, _1, _2, _3);
-        vs_option_dic["-T"]                = boost::bind(&l7vsadm::parse_opt_vs_fwdmode_func, this, _1, _2, _3);
         vs_option_dic["--tproxy"]          = boost::bind(&l7vsadm::parse_opt_vs_fwdmode_func, this, _1, _2, _3);
-        vs_option_dic["-M"]                = boost::bind(&l7vsadm::parse_opt_vs_fwdmode_func, this, _1, _2, _3);
         vs_option_dic["--masq"]            = boost::bind(&l7vsadm::parse_opt_vs_fwdmode_func, this, _1, _2, _3);
         vs_option_dic["-f"]                = boost::bind(&l7vsadm::parse_opt_vs_flag_func, this, _1, _2, _3);
         vs_option_dic["--flag"]            = boost::bind(&l7vsadm::parse_opt_vs_flag_func, this, _1, _2, _3);
@@ -2723,9 +2689,7 @@ l7vs::l7vsadm::l7vsadm()
         rs_option_dic["--tcp-service"]  = boost::bind(&l7vsadm::parse_opt_vs_target_func, this, _1, _2, _3);
         rs_option_dic["-w"]             = boost::bind(&l7vsadm::parse_opt_rs_weight_func, this, _1, _2, _3);
         rs_option_dic["--weight"]       = boost::bind(&l7vsadm::parse_opt_rs_weight_func, this, _1, _2, _3);
-        rs_option_dic["-T"]             = boost::bind(&l7vsadm::parse_opt_rs_fwdmode_func, this, _1, _2, _3);
         rs_option_dic["--tproxy"]       = boost::bind(&l7vsadm::parse_opt_rs_fwdmode_func, this, _1, _2, _3);
-        rs_option_dic["-M"]             = boost::bind(&l7vsadm::parse_opt_rs_fwdmode_func, this, _1, _2, _3);
         rs_option_dic["--masq"]         = boost::bind(&l7vsadm::parse_opt_rs_fwdmode_func, this, _1, _2, _3);
         rs_option_dic["-m"]             = boost::bind(&l7vsadm::parse_opt_vs_module_func, this, _1, _2, _3);
         rs_option_dic["--proto-module"] = boost::bind(&l7vsadm::parse_opt_vs_module_func, this, _1, _2, _3);

--- a/test/script/l7directord/materials/l7directord-3-2-9.log
+++ b/test/script/l7directord/materials/l7directord-3-2-9.log
@@ -9,7 +9,7 @@ $VAR1 = {
                                                                'weight' => '0',
                                                                'option' => {
                                                                              'flags' => '-r 127.0.0.3:30000',
-                                                                             'forward' => '-M'
+                                                                             'forward' => '--masq'
                                                                            },
                                                                'server' => {
                                                                              'ip' => '127.0.0.3',
@@ -21,7 +21,7 @@ $VAR1 = {
                                                                'weight' => '1',
                                                                'option' => {
                                                                              'flags' => '-r 127.0.0.2:20000',
-                                                                             'forward' => '-M'
+                                                                             'forward' => '--masq'
                                                                            },
                                                                'server' => {
                                                                              'ip' => '127.0.0.2',
@@ -36,7 +36,7 @@ $VAR1 = {
                                                                         'weight' => '20',
                                                                         'option' => {
                                                                                       'flags' => '-r 127.0.0.3:30000',
-                                                                                      'forward' => '-M'
+                                                                                      'forward' => '--masq'
                                                                                     },
                                                                         'server' => {
                                                                                       'ip' => '127.0.0.3',
@@ -48,7 +48,7 @@ $VAR1 = {
                                                                         'weight' => '10',
                                                                         'option' => {
                                                                                       'flags' => '-r 127.0.0.2:20000',
-                                                                                      'forward' => '-M'
+                                                                                      'forward' => '--masq'
                                                                                     },
                                                                         'server' => {
                                                                                       'ip' => '127.0.0.2',
@@ -66,7 +66,7 @@ $VAR1 = {
                                                            'weight' => '0',
                                                            'option' => {
                                                                          'flags' => '-r 127.0.0.1:30000',
-                                                                         'forward' => '-M'
+                                                                         'forward' => '--masq'
                                                                        },
                                                            'server' => {
                                                                          'ip' => '127.0.0.1',
@@ -78,7 +78,7 @@ $VAR1 = {
                                                            'weight' => '1',
                                                            'option' => {
                                                                          'flags' => '-r 127.0.0.1:20000',
-                                                                         'forward' => '-M'
+                                                                         'forward' => '--masq'
                                                                        },
                                                            'server' => {
                                                                          'ip' => '127.0.0.1',
@@ -93,7 +93,7 @@ $VAR1 = {
                                                                 'weight' => '20',
                                                                 'option' => {
                                                                               'flags' => '-r [::3]:30000',
-                                                                              'forward' => '-M'
+                                                                              'forward' => '--masq'
                                                                             },
                                                                 'server' => {
                                                                               'ip' => '[::3]',
@@ -105,7 +105,7 @@ $VAR1 = {
                                                                 'weight' => '10',
                                                                 'option' => {
                                                                               'flags' => '-r [::2]:20000',
-                                                                              'forward' => '-M'
+                                                                              'forward' => '--masq'
                                                                             },
                                                                 'server' => {
                                                                               'ip' => '[::2]',

--- a/test/script/l7vsadm/l7vsadm-4-1-2.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-2.sh
@@ -22,17 +22,10 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -T -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -T -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -M -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -M -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -u 1000 -q 512 -Q 512 -b $SorryServer1_ADDR:$SorryServer1_PORT -f 1 -z /etc/l7vs/sslproxy/sslproxy.target.cf -O deferaccept -L 1 -a /var/log/l7vs/access_log"
         exit 1
 fi
 
@@ -87,29 +80,6 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP localhost:40001 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
-    Sorry Server                  localhost:50001 Tproxy
-    Max Connection                1000
-    Sorry Flag                    on
-  SSL Settings:
-    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
-  Logging Settings:
-    Access Log                    on
-    Access Log File               deferaccept
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              enable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.004096 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.004096 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
-TCP localhost:40002 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
     Sorry Server                  localhost:50001 Masq
     Max Connection                1000
     Sorry Flag                    on

--- a/test/script/l7vsadm/l7vsadm-4-1-49.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-49.sh
@@ -31,13 +31,6 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
-        exit 1
-fi
-
 $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
@@ -45,13 +38,6 @@ then
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
-        exit 1
-fi
-
 $L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq
 if [ $? -ne 0 ]
 then
@@ -108,29 +94,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Masq
@@ -154,29 +117,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Masq

--- a/test/script/l7vsadm/l7vsadm-4-1-50.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-50.sh
@@ -31,13 +31,6 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
-        exit 1
-fi
-
 $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
@@ -45,13 +38,6 @@ then
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T"
-        exit 1
-fi
-
 $L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --tproxy
 if [ $? -ne 0 ]
 then
@@ -108,29 +94,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Tproxy
@@ -154,29 +117,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Tproxy

--- a/test/script/l7vsadm/l7vsadm-4-1-51.sh
+++ b/test/script/l7vsadm/l7vsadm-4-1-51.sh
@@ -30,14 +30,6 @@ then
 fi
 usleep 100000
 
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -46,30 +38,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer1_ADDR:$SorryServer1_PORT --masq -T"
-        exit 1
-fi
-
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -78,21 +46,5 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost:40001 -m sessionless -b $SorryServer2_ADDR:$SorryServer2_PORT --masq -T"
-        exit 1
-fi
-
 exit 0
 

--- a/test/script/l7vsadm/l7vsadm-4-3-1.sh
+++ b/test/script/l7vsadm/l7vsadm-4-3-1.sh
@@ -109,10 +109,10 @@ then
 fi
 
 
-$L7VSADM -E -t 127.0.0.1:40001 -m ip -s lc -u 200 -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -f 1 -T -Q 1M -q 1M -L 1
+$L7VSADM -E -t 127.0.0.1:40001 -m ip -s lc -u 200 -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -f 1 --tproxy -Q 1M -q 1M -L 1
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m ip -s lc -u 200 -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -f 1 -T -Q 1M -q 1M -L 1"
+        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m ip -s lc -u 200 -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -f 1 --tproxy -Q 1M -q 1M -L 1"
         exit 1
 fi
 

--- a/test/script/l7vsadm/l7vsadm-4-3-36.sh
+++ b/test/script/l7vsadm/l7vsadm-4-3-36.sh
@@ -31,31 +31,17 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq"
         exit 1
 fi
 
@@ -108,29 +94,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Masq
@@ -154,29 +117,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Masq
@@ -206,13 +146,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40001 -m sessionless -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m sessionless -T"
-        exit 1
-fi
-
 $L7VSADM -E -t 127.0.0.1:40002 -m sessionless --tproxy
 if [ $? -ne 0 ]
 then
@@ -220,13 +153,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40003 -m sessionless -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40003 -m sessionless -T"
-        exit 1
-fi
-
 $L7VSADM -E -t 127.0.0.1:40004 -m sessionless --tproxy
 if [ $? -ne 0 ]
 then
@@ -283,29 +209,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Tproxy
@@ -329,29 +232,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Tproxy

--- a/test/script/l7vsadm/l7vsadm-4-3-37.sh
+++ b/test/script/l7vsadm/l7vsadm-4-3-37.sh
@@ -31,31 +31,17 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
+$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy"
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
+$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy"
         exit 1
 fi
 
@@ -108,29 +94,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Tproxy
@@ -154,29 +117,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Tproxy
@@ -206,13 +146,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40001 -m sessionless -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m sessionless -M"
-        exit 1
-fi
-
 $L7VSADM -E -t 127.0.0.1:40002 -m sessionless --masq
 if [ $? -ne 0 ]
 then
@@ -220,13 +153,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40003 -m sessionless -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40003 -m sessionless -M"
-        exit 1
-fi
-
 $L7VSADM -E -t 127.0.0.1:40004 -m sessionless --masq
 if [ $? -ne 0 ]
 then
@@ -283,29 +209,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  127.0.0.1:50001 Masq
@@ -329,29 +232,6 @@ TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0
-TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Masq

--- a/test/script/l7vsadm/l7vsadm-4-3-38.sh
+++ b/test/script/l7vsadm/l7vsadm-4-3-38.sh
@@ -30,68 +30,17 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40006 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40005 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40005 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40006 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40006 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40007 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40007 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40008 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40008 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T"
-        exit 1
-fi
-
-
-RET=`$L7VSADM -E -t localhost:40001 -m sessionless -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40001 -m sessionless -M -T"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40006 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq"
         exit 1
 fi
 
@@ -103,30 +52,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -E -t localhost:40003 -m sessionless -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40003 -m sessionless -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -E -t localhost:40004 -m sessionless --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40004 -m sessionless --masq -T"
-        exit 1
-fi
-
-RET=`$L7VSADM -E -t localhost:40005 -m sessionless -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40005 -m sessionless -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -E -t localhost:40006 -m sessionless --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -135,20 +60,4 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -E -t localhost:40007 -m sessionless -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40007 -m sessionless -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -E -t localhost:40008 -m sessionless --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -E -t localhost:40008 -m sessionless --masq -T"
-        exit 1
-fi
-
 exit 0

--- a/test/script/l7vsadm/l7vsadm-4-3-39.sh
+++ b/test/script/l7vsadm/l7vsadm-4-3-39.sh
@@ -31,31 +31,17 @@ then
 fi
 usleep 100000
 
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40002 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -A -t 127.0.0.1:40004 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer2_ADDR}:${SorryServer2_PORT} -T"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40003 -m sessionless -b ${SorryServer1_ADDR}:${SorryServer1_PORT} --tproxy"
         exit 1
 fi
 
@@ -108,29 +94,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Masq
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Masq
@@ -176,29 +139,6 @@ TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
   Statistics:
     HTTP Total Requests           0
     HTTP GET Requests             0
-    HTTP POST Requests            0
-TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Tproxy
-    Max Connection                0
-    Sorry Flag                    off
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
     HTTP POST Requests            0"
 if [ "${RET}" != "${EXPECT}" ]
 then
@@ -206,13 +146,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40001 -m sessionless -f 1
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m sessionless -f 1"
-        exit 1
-fi
-
 $L7VSADM -E -t 127.0.0.1:40002 -m sessionless -f 1
 if [ $? -ne 0 ]
 then
@@ -227,13 +160,6 @@ then
         exit 1
 fi
 
-$L7VSADM -E -t 127.0.0.1:40004 -m sessionless -f 1
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m sessionless -f 1"
-        exit 1
-fi
-
 RET=`$L7VSADM -V -n`
 EXPECT="Layer-7 Virtual Server version 3.0.0
 L7vsd Log Level:
@@ -283,29 +209,6 @@ total trap counts              none
 
 Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  127.0.0.1:50001 Masq
-    Max Connection                0
-    Sorry Flag                    on
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
-    HTTP POST Requests            0
 TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
   Bypass Settings:
     Sorry Server                  [::1]:50002 Masq
@@ -351,29 +254,6 @@ TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
   Statistics:
     HTTP Total Requests           0
     HTTP GET Requests             0
-    HTTP POST Requests            0
-TCP 127.0.0.1:40004 sessionless rr --sorry-uri '/' --statistic 0
-  Bypass Settings:
-    Sorry Server                  [::1]:50002 Tproxy
-    Max Connection                0
-    Sorry Flag                    on
-  SSL Settings:
-    SSL Config File               none
-  Logging Settings:
-    Access Log                    off
-    Access Log File               none
-    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  Socket Settings:
-    TCP_DEFER_ACCEPT              disable
-    TCP_NODELAY                   disable
-    TCP_CORK                      disable
-    TCP_QUICKACK                  disable
-  Throughput:
-    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
-    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
-  Statistics:
-    HTTP Total Requests           0
-    HTTP GET Requests             0
     HTTP POST Requests            0"
 if [ "${RET}" != "${EXPECT}" ]
 then

--- a/test/script/l7vsadm/l7vsadm-5-1-1.sh
+++ b/test/script/l7vsadm/l7vsadm-5-1-1.sh
@@ -38,17 +38,17 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 0 -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 0 --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 0 -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 0 --masq"
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -w 2 -T
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -w 2 --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -w 2 -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -w 2 --tproxy"
         exit 1
 fi
 

--- a/test/script/l7vsadm/l7vsadm-5-1-13.sh
+++ b/test/script/l7vsadm/l7vsadm-5-1-13.sh
@@ -2,26 +2,6 @@
 . ${SET_DEFAULT_CONF}
 
 #Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=[::1]
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
 RealServer3=RealServer3
 RealServer3_ADDR=127.0.0.1
 RealServer3_PORT=50003
@@ -58,20 +38,6 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M"
-        exit 1
-fi
-
 $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --masq
 if [ $? -ne 0 ]
 then
@@ -91,8 +57,6 @@ EXPECT="Layer-7 Virtual Server version 3.0.0
 Prot LocalAddress:Port ProtoMod Scheduler
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 ip rr
-  -> ${RealServer1_ADDR}:${RealServer1_PORT}              Masq    1      0          0         
-  -> ${RealServer2_ADDR}:${RealServer2_PORT}                  Masq    1      0          0         
   -> ${RealServer3_ADDR}:${RealServer3_PORT}              Masq    1      0          0         
   -> ${RealServer4_ADDR}:${RealServer4_PORT}                  Masq    1      0          0         "
 if [ "${RET}" != "${EXPECT}" ]

--- a/test/script/l7vsadm/l7vsadm-5-1-14.sh
+++ b/test/script/l7vsadm/l7vsadm-5-1-14.sh
@@ -2,26 +2,6 @@
 . ${SET_DEFAULT_CONF}
 
 #Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=[::1]
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
 RealServer3=RealServer3
 RealServer3_ADDR=127.0.0.1
 RealServer3_PORT=50003
@@ -58,20 +38,6 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T"
-        exit 1
-fi
-
 $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --tproxy
 if [ $? -ne 0 ]
 then
@@ -91,8 +57,6 @@ EXPECT="Layer-7 Virtual Server version 3.0.0
 Prot LocalAddress:Port ProtoMod Scheduler
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 ip rr
-  -> ${RealServer1_ADDR}:${RealServer1_PORT}              Tproxy  1      0          0         
-  -> ${RealServer2_ADDR}:${RealServer2_PORT}                  Tproxy  1      0          0         
   -> ${RealServer3_ADDR}:${RealServer3_PORT}              Tproxy  1      0          0         
   -> ${RealServer4_ADDR}:${RealServer4_PORT}                  Tproxy  1      0          0         "
 if [ "${RET}" != "${EXPECT}" ]

--- a/test/script/l7vsadm/l7vsadm-5-1-15.sh
+++ b/test/script/l7vsadm/l7vsadm-5-1-15.sh
@@ -37,14 +37,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -a -t localhost:40001 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40001 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -a -t localhost:40002 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -53,30 +45,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -a -t localhost:40003 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40003 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -a -t localhost:40004 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40004 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq -T"
-        exit 1
-fi
-
-RET=`$L7VSADM -a -t localhost:40005 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40005 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -a -t localhost:40006 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -85,21 +53,5 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -a -t localhost:40007 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40007 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -a -t localhost:40008 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost:40008 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq -T"
-        exit 1
-fi
-
 exit 0
 

--- a/test/script/l7vsadm/l7vsadm-5-3-1.sh
+++ b/test/script/l7vsadm/l7vsadm-5-3-1.sh
@@ -36,10 +36,10 @@ then
         exit 1
 fi
 
-$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 2 -T
+$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 2 --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 2 -T"
+        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -w 2 --tproxy"
         exit 1
 fi
 

--- a/test/script/l7vsadm/l7vsadm-5-3-12.sh
+++ b/test/script/l7vsadm/l7vsadm-5-3-12.sh
@@ -58,31 +58,31 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -T
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --tproxy"
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -T
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --tproxy"
         exit 1
 fi
 

--- a/test/script/l7vsadm/l7vsadm-5-3-13.sh
+++ b/test/script/l7vsadm/l7vsadm-5-3-13.sh
@@ -2,26 +2,6 @@
 . ${SET_DEFAULT_CONF}
 
 #Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=[::1]
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
 RealServer3=RealServer3
 RealServer3_ADDR=127.0.0.1
 RealServer3_PORT=50003
@@ -58,47 +38,17 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -T"
-        exit 1
-fi
-
-
-
-$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --tproxy"
         exit 1
 fi
 
-$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --tproxy"
         exit 1
 fi
 
@@ -122,8 +72,6 @@ EXPECT="Layer-7 Virtual Server version 3.0.0
 Prot LocalAddress:Port ProtoMod Scheduler
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 ip rr
-  -> ${RealServer1_ADDR}:${RealServer1_PORT}              Masq    1      0          0         
-  -> ${RealServer2_ADDR}:${RealServer2_PORT}                  Masq    1      0          0         
   -> ${RealServer3_ADDR}:${RealServer3_PORT}              Masq    1      0          0         
   -> ${RealServer4_ADDR}:${RealServer4_PORT}                  Masq    1      0          0         "
 if [ "${RET}" != "${EXPECT}" ]

--- a/test/script/l7vsadm/l7vsadm-5-3-14.sh
+++ b/test/script/l7vsadm/l7vsadm-5-3-14.sh
@@ -2,26 +2,6 @@
 . ${SET_DEFAULT_CONF}
 
 #Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=[::1]
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
 RealServer3=RealServer3
 RealServer3_ADDR=127.0.0.1
 RealServer3_PORT=50003
@@ -58,47 +38,17 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} --masq"
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer3_ADDR}:${RealServer3_PORT} -M"
-        exit 1
-fi
-
-$L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -M
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} -M"
-        exit 1
-fi
-
-
-
-$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
-        exit 1
-fi
-
-$L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -e -t 127.0.0.1:40001 -m ip -r ${RealServer2_ADDR}:${RealServer2_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m ip -r ${RealServer4_ADDR}:${RealServer4_PORT} --masq"
         exit 1
 fi
 
@@ -116,16 +66,11 @@ then
         exit 1
 fi
 
-
-
-
 RET=`$L7VSADM -l -n`
 EXPECT="Layer-7 Virtual Server version 3.0.0
 Prot LocalAddress:Port ProtoMod Scheduler
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP 127.0.0.1:40001 ip rr
-  -> ${RealServer1_ADDR}:${RealServer1_PORT}              Tproxy  1      0          0         
-  -> ${RealServer2_ADDR}:${RealServer2_PORT}                  Tproxy  1      0          0         
   -> ${RealServer3_ADDR}:${RealServer3_PORT}              Tproxy  1      0          0         
   -> ${RealServer4_ADDR}:${RealServer4_PORT}                  Tproxy  1      0          0         "
 if [ "${RET}" != "${EXPECT}" ]

--- a/test/script/l7vsadm/l7vsadm-5-3-15.sh
+++ b/test/script/l7vsadm/l7vsadm-5-3-15.sh
@@ -51,14 +51,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -e -t localhost:40001 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40001 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -e -t localhost:40002 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -67,30 +59,6 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -e -t localhost:40003 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40003 -m ip -r $RealServer1_ADDR:$RealServer1_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -e -t localhost:40004 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40004 -m ip -r $RealServer1_ADDR:$RealServer1_PORT --masq -T"
-        exit 1
-fi
-
-RET=`$L7VSADM -e -t localhost:40005 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40005 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M -T"
-        exit 1
-fi
-
 RET=`$L7VSADM -e -t localhost:40006 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
 EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
 if [ "${RET}" != "${EXPECT}" ]
@@ -99,21 +67,5 @@ then
         exit 1
 fi
 
-RET=`$L7VSADM -e -t localhost:40007 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M --tproxy 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40007 -m ip -r $RealServer2_ADDR:$RealServer2_PORT -M --tproxy"
-        exit 1
-fi
-
-RET=`$L7VSADM -e -t localhost:40008 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq -T 2>&1 | grep "PARSE ERROR: Option --masq/tproxy is conflict."`
-EXPECT="PARSE ERROR: Option --masq/tproxy is conflict."
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -e -t localhost:40008 -m ip -r $RealServer2_ADDR:$RealServer2_PORT --masq -T"
-        exit 1
-fi
-
 exit 0
 

--- a/test/script/l7vsadm/l7vsadm-9-1-1.sh
+++ b/test/script/l7vsadm/l7vsadm-9-1-1.sh
@@ -14,16 +14,16 @@ usleep 100000
 RET=`$L7VSADM --help`
 EXPECT="Usage: 
   l7vsadm -A -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-z ssl-config-file]
           [-O socket-option] [-L access-log-flag] [-a access-log-file [logrotate-args]]
   l7vsadm -E -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-L access-log-flag]
   l7vsadm -D -t service-address -m proto-module [module-args]
   l7vsadm -C
   l7vsadm -a|e -t service-address -m proto-module [module-args]
-          -r server-address [-w weight] [-T|M]
+          -r server-address [-w weight] [--masq|tproxy]
   l7vsadm -d -t service-address -m proto-module [module-args]
           -r server-address
   l7vsadm -R -s replication-switch
@@ -57,13 +57,13 @@ Commands:
 
 Options:
   --tcp-service      -t service-address     service-address is host:port
-  --proto-module     -m proto-module        protocol module name and module argment
+  --proto-module     -m proto-module        protocol module name and module argument
                         [module-args]
   --scheduler        -s scheduler           one of rr,lc,wrr
   --upper            -u connection-count    maximum number of connections
   --bypass           -b sorry-server        sorry server address is host:port
-  --tproxy           -T                     set sorry server connection to IP transparent mode.
-  --masq             -M                     set sorry server connection to IP masquarade mode.
+  --tproxy                                  set sorry server connection to IP transparent mode.
+  --masq                                    set sorry server connection to IP masquerade mode.
   --flag             -f sorry-flag          sorry status set to virtual service
   --qos-up           -Q QoSval-up           QoS Threshold(bps) set to real server direction
   --qos-down         -q QoSval-down         QoS Threshold(bps) set to client direction
@@ -74,8 +74,8 @@ Options:
                         [logrotate-args]
   --real-server      -r server-address      server-address is host:port
   --weight           -w weight              scheduling weight set to real server
-  --tproxy           -T                     set real server connection to IP transparent mode.
-  --masq             -M                     set real server connection to IP masquarade mode.
+  --tproxy                                  set real server connection to IP transparent mode.
+  --masq                                    set real server connection to IP masquerade mode.
   --switch           -s replication-switch  start or stop replication
   --force            -f                     force replication start
   --dump             -d                     dump replication memory

--- a/test/script/l7vsadm/l7vsadm-9-1-2.sh
+++ b/test/script/l7vsadm/l7vsadm-9-1-2.sh
@@ -14,16 +14,16 @@ usleep 100000
 RET=`$L7VSADM -h`
 EXPECT="Usage: 
   l7vsadm -A -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-z ssl-config-file]
           [-O socket-option] [-L access-log-flag] [-a access-log-file [logrotate-args]]
   l7vsadm -E -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-L access-log-flag]
   l7vsadm -D -t service-address -m proto-module [module-args]
   l7vsadm -C
   l7vsadm -a|e -t service-address -m proto-module [module-args]
-          -r server-address [-w weight] [-T|M]
+          -r server-address [-w weight] [--masq|tproxy]
   l7vsadm -d -t service-address -m proto-module [module-args]
           -r server-address
   l7vsadm -R -s replication-switch
@@ -57,13 +57,13 @@ Commands:
 
 Options:
   --tcp-service      -t service-address     service-address is host:port
-  --proto-module     -m proto-module        protocol module name and module argment
+  --proto-module     -m proto-module        protocol module name and module argument
                         [module-args]
   --scheduler        -s scheduler           one of rr,lc,wrr
   --upper            -u connection-count    maximum number of connections
   --bypass           -b sorry-server        sorry server address is host:port
-  --tproxy           -T                     set sorry server connection to IP transparent mode.
-  --masq             -M                     set sorry server connection to IP masquarade mode.
+  --tproxy                                  set sorry server connection to IP transparent mode.
+  --masq                                    set sorry server connection to IP masquerade mode.
   --flag             -f sorry-flag          sorry status set to virtual service
   --qos-up           -Q QoSval-up           QoS Threshold(bps) set to real server direction
   --qos-down         -q QoSval-down         QoS Threshold(bps) set to client direction
@@ -74,8 +74,8 @@ Options:
                         [logrotate-args]
   --real-server      -r server-address      server-address is host:port
   --weight           -w weight              scheduling weight set to real server
-  --tproxy           -T                     set real server connection to IP transparent mode.
-  --masq             -M                     set real server connection to IP masquarade mode.
+  --tproxy                                  set real server connection to IP transparent mode.
+  --masq                                    set real server connection to IP masquerade mode.
   --switch           -s replication-switch  start or stop replication
   --force            -f                     force replication start
   --dump             -d                     dump replication memory

--- a/test/script/l7vsadm/l7vsadm-9-2-1.sh
+++ b/test/script/l7vsadm/l7vsadm-9-2-1.sh
@@ -15,28 +15,33 @@ RET=`$L7VSADM -x 2>&1`
 EXPECT="PARSE ERROR: command not found.
 Usage: 
   l7vsadm -A -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-z ssl-config-file]
           [-O socket-option] [-L access-log-flag] [-a access-log-file [logrotate-args]]
   l7vsadm -E -t service-address -m proto-module [module-args]
-          [-s scheduler] [-u connection-count] [-b sorry-server] [-T|M]
+          [-s scheduler] [-u connection-count] [-b sorry-server] [--masq|tproxy]
           [-f sorry-flag] [-Q QoSval-up] [-q QoSval-down] [-L access-log-flag]
   l7vsadm -D -t service-address -m proto-module [module-args]
   l7vsadm -C
   l7vsadm -a|e -t service-address -m proto-module [module-args]
-          -r server-address [-w weight] [-T|M]
+          -r server-address [-w weight] [--masq|tproxy]
   l7vsadm -d -t service-address -m proto-module [module-args]
           -r server-address
   l7vsadm -R -s replication-switch
   l7vsadm -R -f
   l7vsadm -R -d
   l7vsadm -L -c log-category -l log-level
-  l7vsadm -S -c log-category -l log-level
+  l7vsadm -S [-f snmp-flag] [-i update-interval] [-t log-trap-flag] [-l log-trap-level]
+  l7vsadm -S -r [-t service-address -m proto-module]
   l7vsadm -P -r reload-parameter
   l7vsadm -l [-n]
   l7vsadm -V [-n]
   l7vsadm -K [-n]
   l7vsadm -h"
+
+echo "$RET">/tmp/1
+echo "$EXPECT">/tmp/2
+diff -u /tmp/1 /tmp/2
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -x"

--- a/test/script/session/session-76-1.sh
+++ b/test/script/session/session-76-1.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq"
         exit 1
 fi
 

--- a/test/script/session/session-76-2.sh
+++ b/test/script/session/session-76-2.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq"
         exit 1
 fi
 

--- a/test/script/session/session-77-1.sh
+++ b/test/script/session/session-77-1.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
+$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy"
         exit 1
 fi
 

--- a/test/script/session/session-77-2.sh
+++ b/test/script/session/session-77-2.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
+$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy"
         exit 1
 fi
 

--- a/test/script/session/session-78-1.sh
+++ b/test/script/session/session-78-1.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq
 "
         exit 1
 fi

--- a/test/script/session/session-78-2.sh
+++ b/test/script/session/session-78-2.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M
+$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M
+        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq
 "
         exit 1
 fi

--- a/test/script/session/session-79-1.sh
+++ b/test/script/session/session-79-1.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy
 "
         exit 1
 fi

--- a/test/script/session/session-79-2.sh
+++ b/test/script/session/session-79-2.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T
+$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T
+        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy
 "
         exit 1
 fi

--- a/test/script/session/session-80-1.sh
+++ b/test/script/session/session-80-1.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq"
         exit 1
 fi
 

--- a/test/script/session/session-80-2.sh
+++ b/test/script/session/session-80-2.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M
+$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -M"
+        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --masq"
         exit 1
 fi
 

--- a/test/script/session/session-81-1.sh
+++ b/test/script/session/session-81-1.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
+$L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy"
         exit 1
 fi
 

--- a/test/script/session/session-81-2.sh
+++ b/test/script/session/session-81-2.sh
@@ -29,10 +29,10 @@ then
         exit 1
 fi
 
-$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T
+$L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} -T"
+        echo "Test failed: $L7VSADM -a -t [::1]:40001 -m sessionless -r ${RealServer1_ADDR}:${RealServer1_PORT} --tproxy"
         exit 1
 fi
 

--- a/test/script/session/session-82-1.sh
+++ b/test/script/session/session-82-1.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
         exit 1
 fi
 

--- a/test/script/session/session-82-2.sh
+++ b/test/script/session/session-82-2.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
+$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -M -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
+        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --masq -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
         exit 1
 fi
 

--- a/test/script/session/session-83-1.sh
+++ b/test/script/session/session-83-1.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
+$L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
+        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
         exit 1
 fi
 

--- a/test/script/session/session-83-2.sh
+++ b/test/script/session/session-83-2.sh
@@ -22,10 +22,10 @@ fi
 usleep 100000
 
 # Add service
-$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
+$L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf
 if [ $? -ne 0 ]
 then
-        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} -T -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
+        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT} --tproxy -z $L7VSD_CONF_DIR/sslproxy/sslproxy.target.cf"
         exit 1
 fi