client_wrapper.hxx, socket_wrapper.hxx: reorder member initialization order

[libt2n] / src / command_client.hxx

diff --git a/src/command_client.hxx b/src/command_client.hxx
index 1853e9c..fc72ca7 100644 (file)
--- a/src/command_client.hxx
+++ b/src/command_client.hxx
@@ -1,24 +1,30 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Gerd v. Egidy                                   *
- *   gve@intra2net.com                                                     *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Lesser General Public License for more details.                   *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
+
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
 #ifndef __LIBT2N_COMMAND_CLIENT
 #define __LIBT2N_COMMAND_CLIENT
 
+#include <functional>
+#include <string>
+
 #include "client.hxx"
 #include "container.hxx"
 
@@ -33,7 +39,7 @@ class command_client
         static const long long hello_timeout_usec_default=30000000;
 
     private:
-        client_connection &c;
+        client_connection *c;
 
         long long hello_timeout_usec;
         long long command_timeout_usec;
@@ -42,13 +48,15 @@ class command_client
         std::string read_packet(const long long &usec_timeout);
         bool check_hello(const std::string& hellostr);
 
+        t2n_exception *constructorException;
+
     public:
-        command_client(client_connection& _c,
+        command_client(client_connection* _c,
             long long _command_timeout_usec=command_timeout_usec_default,
             long long _hello_timeout_usec=hello_timeout_usec_default);
-        virtual ~command_client() {}
+        virtual ~command_client();
 
-        void replace_connection(client_connection& _c);
+        void replace_connection(client_connection* _c);
 
         void send_command(command* cmd, result_container &res);
 
@@ -60,6 +68,10 @@ class command_client
             { return command_timeout_usec; }
         long long get_hello_timeout_usec(void)
             { return hello_timeout_usec; }
+        bool is_connection_closed(void)
+            { return c->is_closed(); }
+        t2n_exception* get_constuctor_exception(void)
+            { return constructorException; }
 };
 
 }