X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUDPServer.cc;h=55bf253319539511824837ee9c2daa098289a39f;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=7f7788442a812d0e38e2b48b55223d0f78c53225;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/UDPServer.cc b/senf/Utils/Console/UDPServer.cc
index 7f77884..55bf253 100644
--- a/senf/Utils/Console/UDPServer.cc
+++ b/senf/Utils/Console/UDPServer.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program 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 General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU 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.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief UDPServer non-inline non-template implementation */
@@ -32,14 +37,14 @@
 
 //#include "UDPServer.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::console::UDPServer::UDPServer(senf::INet4SocketAddress const & address)
-    : replies_ (true), emptyReplies_ (true), target_ (), 
-      handle_ (senf::UDPv4ClientSocketHandle(address)), 
-      readevent_ ("senf::console::UDPServer::readevent", 
-                  senf::membind(&UDPServer::handleInput, this), 
-                  handle_, 
+    : replies_ (true), emptyReplies_ (true), target_ (),
+      handle_ (senf::UDPv4ClientSocketHandle(address)),
+      readevent_ ("senf::console::UDPServer::readevent",
+                  senf::membind(&UDPServer::handleInput, this),
+                  handle_,
                   senf::scheduler::FdEvent::EV_READ),
       parser_ (), executor_ ()
 {
@@ -49,10 +54,10 @@ prefix_ senf::console::UDPServer::UDPServer(senf::INet4SocketAddress const & add
 }
 
 prefix_ senf::console::UDPServer::UDPServer(senf::INet6SocketAddress const & address)
-    : replies_ (true), target_ (), handle_ (senf::UDPv6ClientSocketHandle(address)), 
-      readevent_ ("senf::console::UDPServer::readevent", 
-                  senf::membind(&UDPServer::handleInput, this), 
-                  handle_, 
+    : replies_ (true), target_ (), handle_ (senf::UDPv6ClientSocketHandle(address)),
+      readevent_ ("senf::console::UDPServer::readevent",
+                  senf::membind(&UDPServer::handleInput, this),
+                  handle_,
                   senf::scheduler::FdEvent::EV_READ),
       parser_ (), executor_ ()
 {
@@ -70,15 +75,17 @@ prefix_ senf::console::UDPServer & senf::console::UDPServer::replies(bool enable
 prefix_ senf::console::UDPServer &
 senf::console::UDPServer::replies(senf::INet4SocketAddress const & address)
 {
-    SENF_ASSERT( handle_.local().family() == senf::INet4SocketAddress::addressFamily );
-    target_ = address; 
+    SENF_ASSERT( handle_.local().family() == senf::INet4SocketAddress::addressFamily,
+                 "Internal failure: INet6 address on INet4 socket ??" );
+    target_ = address;
     return *this;
 }
 
 prefix_ senf::console::UDPServer &
 senf::console::UDPServer::replies(senf::INet6SocketAddress const & address)
 {
-    SENF_ASSERT( handle_.local().family() == senf::INet6SocketAddress::addressFamily );
+    SENF_ASSERT( handle_.local().family() == senf::INet6SocketAddress::addressFamily,
+                 "Internal failure: INet4 address on INet6 socket ??" );
     target_ = address;
     return *this;
 }
@@ -139,10 +146,10 @@ prefix_ void senf::console::UDPServer::handleInput(int events)
             stream << '\0';
         handle_.writeto(address, stream.str());
     }
-    
+
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "UDPServer.mpp"