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

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 30bf7d3..79b95b4 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -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.
+*/
 
 #include <sstream>
 #include <stdexcept>
@@ -30,12 +33,19 @@ namespace libt2n
 {
 
 server_connection::server_connection(int _timeout)
-    : connection()
+    : connection_id(0)
+    , my_server(NULL)
+    , connection()
 {
     set_timeout(_timeout);
     reset_timeout();
-    connection_id=0;
-    my_server=0;
+}
+
+/**
+ * Destructor
+ */
+server_connection::~server_connection()
+{
 }
 
 /// get pointer to logging stream, returns NULL if no logging needed
@@ -94,6 +104,18 @@ server::~server()
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         delete i->second;
+
+    connections.clear();
+}
+
+/**
+ * Close all open connections
+ */
+void server::close()
+{
+    std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+    for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; ++i)
+        i->second->close();
 }
 
 /** @brief add a callback
@@ -131,7 +153,7 @@ void server::do_callbacks(callback_event_type event, unsigned int conn_id)
 }
 
 /// add a new connection to the server
-int server::add_connection(server_connection* newconn)
+unsigned int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
     newconn->set_id(cid);