-/***************************************************************************
- * 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.
+*/
#include <stdio.h>
#include <errno.h>
{
lastErrorMsg=e.what();
LOGSTREAM(debug,"tcp connect error: " << lastErrorMsg);
+ // FIXME: Don't call virtual function in constructor. Currently not dangerous but bad design.
close();
}
{
lastErrorMsg=e.what();
LOGSTREAM(debug,"unix connect error: " << lastErrorMsg);
- // FIXME: Calls virtual function close in constructor
+ // FIXME: Don't call virtual function in constructor. Currently not dangerous
close();
}
do_callbacks(new_connection);
}
+/**
+ * Destructor. Closes an open connection.
+ */
+socket_client_connection::~socket_client_connection()
+{
+ // Destructor of socket_handler will close the socket!
+}
+
+
/// establish a connection via tcp
void socket_client_connection::tcp_connect(int max_retries)
{
void socket_client_connection::unix_connect(int max_retries)
{
struct sockaddr_un unix_addr;
+ size_t path_size = path.size();
unix_addr.sun_family = AF_UNIX;
- strcpy (unix_addr.sun_path, path.c_str());
+
+ if (path_size >= sizeof(unix_addr.sun_path))
+ {
+ throw t2n_connect_error((std::string)"path '"
+ + path
+ + "' exceeds permissible UNIX socket path length");
+ }
+
+ memcpy(unix_addr.sun_path, path.c_str(), path_size);
+ unix_addr.sun_path[path_size] = '\0';
sock = socket(PF_UNIX, SOCK_STREAM, 0);
if (!sock)