switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Termlib / Telnet.cc

diff --git a/senf/Utils/Termlib/Telnet.cc b/senf/Utils/Termlib/Telnet.cc
index 9efb101..a0d7065 100644 (file)
--- a/senf/Utils/Termlib/Telnet.cc
+++ b/senf/Utils/Termlib/Telnet.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // 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 Telnet non-inline non-template implementation */
@@ -33,20 +38,20 @@
 
 //#include "Telnet.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::term::BaseTelnetProtocol::BaseTelnetProtocol(Handle handle)
     : handle_ (handle), charState_ (NORMAL), command_ (CMD_NONE), option_ (0),
       inputEvent_ ("senf::term::BaseTelnetProtocol::input",
-                   senf::membind(&BaseTelnetProtocol::readHandler, this), handle,
-                   senf::scheduler::FdEvent::EV_READ),
+                   membind(&BaseTelnetProtocol::readHandler, this), handle,
+                   scheduler::FdEvent::EV_READ),
       outputEvent_ ("senf::term::BaseTelnetProtocol::output",
-                    senf::membind(&BaseTelnetProtocol::writeHandler, this), handle,
-                    senf::scheduler::FdEvent::EV_WRITE, false),
+                    membind(&BaseTelnetProtocol::writeHandler, this), handle,
+                    scheduler::FdEvent::EV_WRITE, false),
       pendingRequests_ (0u),
       requestTimeout_ (ClockService::milliseconds(DEFAULT_REQUEST_TIMEOUT_MS)),
       timeout_ ("senf::term::BaseTelnetProtocol::configTimeout",
-                senf::membind(&BaseTelnetProtocol::timeout, this))
+                membind(&BaseTelnetProtocol::timeout, this))
 {}
 
 prefix_ senf::term::BaseTelnetProtocol::BaseTelnetProtocol()
@@ -334,7 +339,7 @@ prefix_ void senf::term::BaseTelnetProtocol::transmit(char c)
 
 prefix_ void senf::term::BaseTelnetProtocol::readHandler(int state)
 {
-    if (state != senf::scheduler::FdEvent::EV_READ || handle_.eof()) {
+    if (state != scheduler::FdEvent::EV_READ || handle_.eof()) {
         inputEvent_.disable();
         v_eof();
         return;
@@ -347,7 +352,7 @@ prefix_ void senf::term::BaseTelnetProtocol::readHandler(int state)
 
 prefix_ void senf::term::BaseTelnetProtocol::writeHandler(int state)
 {
-    if (state != senf::scheduler::FdEvent::EV_WRITE) {
+    if (state != scheduler::FdEvent::EV_WRITE) {
         outputEvent_.disable();
         inputEvent_.disable();
         v_eof();
@@ -440,7 +445,7 @@ prefix_ void senf::term::BaseTelnetProtocol::decrementRequestCounter()
     }
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::telnethandler::TerminalType
 
 prefix_ senf::term::telnethandler::TerminalType::TerminalType()
@@ -471,7 +476,7 @@ prefix_ void senf::term::telnethandler::TerminalType::v_init()
     incrementRequestCounter();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::telnethandler::NAWS
 
 prefix_ senf::term::telnethandler::NAWS::NAWS()
@@ -497,7 +502,7 @@ senf::term::telnethandler::NAWS::v_handleOptionParameters(std::string const & da
     decrementRequestCounter();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Telnet.mpp"