X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FTermlib%2FTelnet.cc;h=d2196d6473cfebce6ee8703ce88eed9ec8dcd7c1;hb=394ced7000128fef7e753caea1deda8d55dec8e2;hp=df86304d57f3b97f8491393eb4470e754825a021;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Termlib/Telnet.cc b/senf/Utils/Termlib/Telnet.cc
index df86304..d2196d6 100644
--- a/senf/Utils/Termlib/Telnet.cc
+++ b/senf/Utils/Termlib/Telnet.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -33,20 +33,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()
@@ -57,7 +57,10 @@ prefix_ senf::term::BaseTelnetProtocol::BaseTelnetProtocol()
       requestTimeout_ (ClockService::milliseconds(DEFAULT_REQUEST_TIMEOUT_MS)),
       timeout_ ("senf::term::BaseTelnetProtocol::timeout", 0)
 {
-    SENF_ASSERT( false );
+    SENF_ASSERT( false,
+                 "Missing BaseTelnetProtocol constructor call in derived class "
+                 "(BaseTelnetProtocol is a VIRTUAL base and MUST be constructed explicitly "
+                 "in the most derived class." );
 }
 
 prefix_ void senf::term::BaseTelnetProtocol::write(std::string const & s)
@@ -173,7 +176,7 @@ prefix_ void senf::term::BaseTelnetProtocol::handleNormalChar(char c)
 
 prefix_ void senf::term::BaseTelnetProtocol::handleCommand(char c)
 {
-    switch (c) {
+    switch (static_cast<unsigned char>(c)) {
     case CMD_SE:
         // Ignore spurious SE commands .. they should only occur while in subnegotiation mode
         charState_ = NORMAL;
@@ -212,7 +215,7 @@ prefix_ void senf::term::BaseTelnetProtocol::handleCommand(char c)
         handleChar(c);
         break;
     }
-}        
+}
 
 prefix_ void senf::term::BaseTelnetProtocol::handleOption(char c)
 {
@@ -257,7 +260,7 @@ prefix_ void senf::term::BaseTelnetProtocol::handleSBData(char c)
 
 prefix_ void senf::term::BaseTelnetProtocol::handleSBIAC(char c)
 {
-    switch (c) {
+    switch (static_cast<unsigned char>(c)) {
     case CMD_IAC:
         data_.push_back(c);
         charState_ = SB_DATA;
@@ -331,7 +334,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;
@@ -343,14 +346,14 @@ 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();
         return;
     }
-    sendQueue_.erase(sendQueue_.begin(), 
+    sendQueue_.erase(sendQueue_.begin(),
                      handle_.write(boost::make_iterator_range(
                                        sendQueue_.begin(), sendQueue_.end())));
     if (sendQueue_.empty())
@@ -403,7 +406,7 @@ prefix_ void senf::term::BaseTelnetProtocol::response(OptInfo & info, bool enabl
     }
     else if (enabled != info.enabled) {
         // Request to change the current state
-        if (!enabled || 
+        if (!enabled ||
             (enabled && (info.wantState == OptInfo::WANTED || info.wantState == OptInfo::ACCEPTED))) {
             // accept the request
             info.optionState = OptInfo::ACKNOWLEDGED;
@@ -437,7 +440,7 @@ prefix_ void senf::term::BaseTelnetProtocol::decrementRequestCounter()
     }
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::telnethandler::TerminalType
 
 prefix_ senf::term::telnethandler::TerminalType::TerminalType()
@@ -468,7 +471,7 @@ prefix_ void senf::term::telnethandler::TerminalType::v_init()
     incrementRequestCounter();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::term::telnethandler::NAWS
 
 prefix_ senf::term::telnethandler::NAWS::NAWS()
@@ -494,7 +497,7 @@ senf::term::telnethandler::NAWS::v_handleOptionParameters(std::string const & da
     decrementRequestCounter();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Telnet.mpp"