fix for_gcc4.7 degrade #30300 patch.

[ultramonkey-l7/ultramonkey-l7-v3.git] / l7vsd / module / protocol / protocol_module_ip.cpp

diff --git a/l7vsd/module/protocol/protocol_module_ip.cpp b/l7vsd/module/protocol/protocol_module_ip.cpp
index 9b4e32b..417505b 100644 (file)
--- a/l7vsd/module/protocol/protocol_module_ip.cpp
+++ b/l7vsd/module/protocol/protocol_module_ip.cpp
@@ -447,8 +447,9 @@ protocol_module_base::check_message_result protocol_module_ip::check_parameter(c
                                 }
                         }
                         //option string = "-F"
-                        if (*it == "-F" || *it == "--forwarded-for") {
+                        else if (*it == "-F" || *it == "--forwarded-for") {
                                 //set forward flag ON
+                                ++it;
                                 continue;
                         }
                         //option string = "-S"
@@ -5656,6 +5657,11 @@ bool protocol_module_ip::put_data_into_sendbuffer(
                         buffer_element.first += sendbuffer_rest_size;
                         buffer_element.second -= sendbuffer_rest_size;
                         sendbuffer_rest_size = 0;
+
+                        //add remain item
+                        data_ptr->buffer_sequence.push_back(buffer_element);
+                        //delete the item
+                        data_ptr->buffer_sequence.pop_front();
                         break;
                 }
         }