Commit: b91c7fbdc8cc34bd53a554c2953c1c2aa3081451 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revision: b91c7fbdc8cc34bd53a554c2953c1c2aa3081451 (tree)
• Time: 2012-09-18 15:42:25
• Author: hibari <l05102@shib...>
• Commiter: hibari

Log Message

・SorryServerへの振り分け時、接続が切断されてしまう問題を修正

SorryServer接続と同時にリクエストが送られない場合に
(HTTPであればtelnet で接続して、"GET /"を送る場合など）、
接続が切断されてしまう問題を修正した。

Change Summary

• modified: l7vsd/src/tcp_session.cpp

Incremental Difference

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -2255,9 +2255,34 @@ void tcp_session::up_thread_sorryserver_connect(const TCP_PROCESS_TYPE_TAG proce
                 Logger::putLogDebug(LOG_CAT_L7VSD_SESSION, 999, formatter.str(), __FILE__, __LINE__);
         }
 
-        sorryserver_socket.reset(new tcp_socket(parent_dispatcher, socket_opt_info));
         boost::system::error_code       error_code;
 
+        if (sorryserver_socket && sorryserver_socket->is_open()) {
+                up_thread_data_dest_side.initialize();
+                boost::array<char, MAX_BUFFER_SIZE>& data_buff = up_thread_data_dest_side.get_data();
+                size_t data_size = 0;
+                protocol_module_base::EVENT_TAG module_event = protocol_module->handle_sorryserver_connect(up_thread_id, data_buff, data_size);
+#ifdef  DEBUG
+                {
+                        boost::format   fmt("Thread ID[%d] protocol_module->handle_sorryserver_connect() return: %s");
+                        fmt % boost::this_thread::get_id()
+                        % func_tag_to_string(module_event);
+                        Logger::putLogInfo(LOG_CAT_L7VSD_SESSION, 0, fmt.str(), __FILE__, __LINE__);
+                }
+#endif
+                up_thread_data_dest_side.set_size(data_size);
+                // next call function setup.
+                up_thread_next_call_function = up_thread_function_array[ up_thread_module_event_map[module_event] ];
+                if (unlikely(LOG_LV_DEBUG == Logger::getLogLevel(LOG_CAT_L7VSD_SESSION))) {
+                        boost::format formatter("Thread ID[%d] FUNC OUT up_thread_sorryserver_connect_event: NEXT_FUNC[%s]");
+                        formatter % boost::this_thread::get_id() % func_tag_to_string(up_thread_module_event_map[module_event]);
+                        Logger::putLogDebug(LOG_CAT_L7VSD_SESSION, 999, formatter.str(), __FILE__, __LINE__);
+                }
+                return ;
+        }
+
+        sorryserver_socket.reset(new tcp_socket(parent_dispatcher, socket_opt_info));
+
         // up thread pause on
         upthread_status = UPTHREAD_LOCK;
         up_thread_next_call_function = up_thread_function_array[UP_FUNC_SORRYSERVER_CONNECT_EVENT];