-/***************************************************************************
- * 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>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/time.h>
+#include <sys/stat.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netdb.h>
EXCEPTIONSTREAM(error,t2n_server_error,"failed listening on invalid ip " << ip);
if (bind (sock, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) < 0)
+ {
+ // FIXME: Calls virtual function socket_server::get_logstream() in constructor
EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno));
+ }
start_listening();
}
{
unix_path=path;
+ // TODO: Every EXCEPTIONSTREAM in here calls virtual function get_logstream()
+
/* Create the socket. */
sock = socket (PF_UNIX, SOCK_STREAM, 0);
if (sock < 0)
start_listening();
}
+/**
+ * Destructor
+ */
socket_server::~socket_server()
{
- socket_handler::close();
+ // close all client connections
+ server::close();
+
+ // server socket will be closed by destructor of socket_handler
if (get_type()==unix_s)
unlink(unix_path.c_str());
+
+ // disconnect connection<->server pointer
+ std::map<unsigned int, server_connection*>::iterator it, it_end = connections.end();
+ for (it = connections.begin(); it != it_end; ++it)
+ {
+ socket_server_connection *conn = dynamic_cast<socket_server_connection*>(it->second);
+ if (conn)
+ conn->my_server = NULL;
+ }
}
/// start listening on a new server socket (called by the constructors)
/* clear & insert server sock into the fd_tab to prepare select */
FD_ZERO(&connection_set);
FD_SET (sock, &connection_set);
+ sockets_set.insert(sock);
}
/// handle a new connection from a client
}
FD_SET (newsock, &connection_set);
+ sockets_set.insert(newsock);
socket_server_connection *nc=new socket_server_connection(newsock, get_type(), get_default_timeout());
nc->set_socket_options(newsock);
/// call fill_buffer() on all connections, called from fill_buffer()
bool socket_server::fill_connection_buffers()
{
- bool data_found;
+ bool data_found = false;
std::map<unsigned int, server_connection*>::iterator ie=connections.end();
for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
}
catch (t2n_transfer_error &e)
{ i->second->close(); }
- catch(...)
- { throw; }
}
return data_found;
void socket_server::remove_connection_socket(int sock)
{
FD_CLR(sock, &connection_set);
+ sockets_set.erase(sock);
+}
+
+/**
+ * Destructor
+ */
+socket_server_connection::~socket_server_connection()
+{
+ // Only notify parent server about going down.
+ // The real socket will be closed by the destructor of the base classes.
+ if (my_server && sock != -1)
+ {
+ socket_server *srv = dynamic_cast<socket_server*>(my_server);
+ if (srv)
+ srv->remove_connection_socket(sock);
+ }
}
/// close this connection. complete data waiting in the buffer can still be retrieved.
void socket_server_connection::close()
{
- if (!server_connection::is_closed())
+ if (my_server && sock != -1)
{
- socket_handler::close();
- server_connection::close();
+ socket_server *srv = dynamic_cast<socket_server*>(my_server);
+ if (srv)
+ srv->remove_connection_socket(sock);
}
- if (my_server)
+ if (!server_connection::is_closed())
{
- dynamic_cast<socket_server*>(my_server)->remove_connection_socket(sock);
+ socket_handler::close();
+ server_connection::close();
}
}