コミット: 275464d4414fd96a9d41b41817458ffeaa58a071 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

コミットメタ情報

• リビジョン: 275464d4414fd96a9d41b41817458ffeaa58a071 (tree)
• 日時: 2013-08-28 17:34:14
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• コミッター: Hiroaki Nakano

ログメッセージ

Merge branch 'v3.1.0-devel'

変更サマリ

• modified: l7vsd/module/protocol/protocol_module_ip.cpp
• modified: l7vsd/module/protocol/protocol_module_sessionless.cpp

差分

--- a/l7vsd/module/protocol/protocol_module_ip.cpp
+++ b/l7vsd/module/protocol/protocol_module_ip.cpp
@@ -446,6 +446,12 @@ protocol_module_base::check_message_result protocol_module_ip::check_parameter(c
                                         break;
                                 }
                         }
+                        //option string = "-F"
+                        else if (*it == "-F" || *it == "--forwarded-for") {
+                                //set forward flag ON
+                                ++it;
+                                continue;
+                        }
                         //option string = "-S"
                         else if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF

--- a/l7vsd/module/protocol/protocol_module_sessionless.cpp
+++ b/l7vsd/module/protocol/protocol_module_sessionless.cpp
@@ -404,8 +404,13 @@ protocol_module_base::check_message_result protocol_module_sessionless::check_pa
                 vec_str_it it_end = args.end();
                 //loop option strings
                 for (; it != it_end; ++it) {
+                        //option string = "-F"
+                        if (*it == "-F" || *it == "--forwarded-for") {
+                                //set forward flag ON
+                                continue;
+                        }
                         //option string = "-S"
-                        if (*it == "-S" || *it == "--sorry-uri") {
+                        else if (*it == "-S" || *it == "--sorry-uri") {
                                 //set sorryURI flag OFF
                                 if (!sorryuri_checked) {
                                         //next item exist