command系ヘッダは、細かい間違い修正

protocol_module_baseは間違い修正と、いくつかのメソッドをイベントメソッドに変更

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel@5485 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/include/l7vs_command_receiver.h b/include/l7vs_command_receiver.h
index d7b357f..70a07fa 100644 (file)
--- a/include/l7vs_command_receiver.h
+++ b/include/l7vs_command_receiver.h
@@ -11,14 +11,15 @@ protected:
        // l7vsd_mainthread                                                             main_thread;
        boost::asio::io_service&                                                dispatcher;
        boost::asio::local::stream_protocol::acceptor   acceptor_;
-       l7vsd                                                                                   parent;
+       l7vsd&                                                                                  vsd;
 
        void    handle_accept( boost::shared_ptr<command_session>, const boost::system::error_code& );
 
 public:
-       command_receiver(       boost::asio::io_service& io_service, const std::string& file ) 
+       command_receiver(       boost::asio::io_service& io_service, const std::string& file, l7vsd& parent ) 
                :       dispatcher( io_service ),
-                       acceptor_( io_service, boost::asio::local::stream_protocol::endpoint( file ) );
+                       acceptor_( io_service, boost::asio::local::stream_protocol::endpoint( file ) ),
+                       vsd( parent );
        ~command_receiver();
 };
 

diff --git a/include/l7vs_command_session.h b/include/l7vs_command_session.h
index 29f9356..52955fa 100644 (file)
--- a/include/l7vs_command_session.h
+++ b/include/l7vs_command_session.h
@@ -21,13 +21,13 @@ protected:
        boost::array<char, MAX_BUFFER_SIZE>             command_buffer;
        boost::array<char, MAX_BUFFER_SIZE>                     response_buffer;
        l7vsadm_request                                                         request_;
-       l7vsd                                                                           parent;
+       l7vsd&                                                                          vsd;
 
        command_session(){}
        void    handle_read( const boost::system::error_code&, size_t );
        void    handle_write( const boost::system::error_code& );
 public:
-       command_session( boost::asio::io_service& io_service ) : unixsocket( io_service );
+       command_session( boost::asio::io_service& io_service, l7vsd& parent ) : unixsocket( io_service ), vsd( parent );
        boost::asio::local::stream_protocol::socket&    socket(){ return unixsocket; }
        void    start();
 };

diff --git a/include/protocol_module_base.h b/include/protocol_module_base.h
index f1fc174..7cbe17f 100644 (file)
--- a/include/protocol_module_base.h
+++ b/include/protocol_module_base.h
@@ -40,7 +40,7 @@ public:
                CLIENT_CONNECTION_CHECK,
                CLIENT_SEND,
                //COMMON Status
-               CLIENT_RESPOND_SEND,
+               CLIENT_RESPONSE_SEND,
                REALSERVER_DISCONNECT,
                SORRYSERVER_DISCONNECT,
                CLIENT_DISCONNECT,
@@ -101,8 +101,8 @@ public:
 
        virtual void    handle_rslist_update() = 0;
 
-       virtual check_message_result    set_parameter( const std::vector<std::string>& args ) = 0;
-       virtual check_message_result    add_parameter( const std::vector<std::string>& args ) = 0;
+       virtual check_message_result&   set_parameter( const std::vector<std::string>& args ) = 0;
+       virtual check_message_result&   add_parameter( const std::vector<std::string>& args ) = 0;
 
        virtual void    register_schedule(
                                                                        boost::function< boost::asio::ip::basic_endpoint&(
@@ -176,6 +176,9 @@ public:
                                                                        const boost::array<char,MAX_BUFFER_SIZE>& readbuffer,
                                                                        const int recvlen ) = 0;
        
+       virtual EVENT_TAG       handle_response_send_inform(
+                                                                       const boost::thread::id thread_id );
+
        virtual EVENT_TAG       handle_client_connection_check(
                                                                        const boost::thread::id thread_id,
                                                                        const boost::asio::ip::basic_endpoint & recv_endpoint,