Change license from LGPL to GPL version 2 + linking exception. This fixes C++ templat...

[libt2n] / src / socket_client.hxx

diff --git a/src/socket_client.hxx b/src/socket_client.hxx
index a7fe64e..037c6ca 100644 (file)
--- a/src/socket_client.hxx
+++ b/src/socket_client.hxx
@@ -1,21 +1,24 @@
-/***************************************************************************
- *   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_SOCKET_CLIENT
 #define __LIBT2N_SOCKET_CLIENT
 
@@ -51,16 +54,24 @@ class socket_client_connection : public client_connection, public socket_handler
         std::string server;
         int port;
 
+        std::string lastErrorMsg;
+
+    protected:
+
         std::ostream* get_logstream(log_level_values level)
             { return client_connection::get_logstream(level); }
 
     public:
         socket_client_connection(int _port, const std::string& _server="127.0.0.1", 
             long long _connect_timeout_usec=connect_timeout_usec_default, 
-            int _max_retries=max_retries_default);
+            int _max_retries=max_retries_default,
+            std::ostream *_logstream=NULL, log_level_values _log_level=none);
         socket_client_connection(const std::string& _path,
             long long _connect_timeout_usec=connect_timeout_usec_default, 
-            int _max_retries=max_retries_default);
+            int _max_retries=max_retries_default,
+            std::ostream *_logstream=NULL, log_level_values _log_level=none);
+
+        ~socket_client_connection();
 
         /** @brief read data from the socket and copy it into buffer
             @param usec_timeout wait until new data is found, max timeout usecs.
@@ -74,9 +85,12 @@ class socket_client_connection : public client_connection, public socket_handler
         bool fill_buffer(long long usec_timeout=-1, long long *usec_timeout_remaining=NULL)
             { return socket_handler::fill_buffer(buffer,usec_timeout,usec_timeout_remaining); }
 
-        void close();
+        virtual void close();
 
         void reconnect();
+
+        std::string get_last_error_msg(void)
+            { return lastErrorMsg; }
 };
 
 }