Utils/Termlib: Fix broken history handling

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

diff --git a/Utils/Termlib/Telnet.cc b/Utils/Termlib/Telnet.cc
index b32747a..5c79e1f 100644 (file)
--- a/Utils/Termlib/Telnet.cc
+++ b/Utils/Termlib/Telnet.cc
@@ -44,7 +44,7 @@ prefix_ senf::term::BaseTelnetProtocol::BaseTelnetProtocol(Handle handle)
                     senf::scheduler::FdEvent::EV_WRITE, false),
       pendingRequests_ (0u),
       requestTimeout_ (ClockService::milliseconds(DEFAULT_REQUEST_TIMEOUT_MS)),
-      timeout_ ("senf::term::BaseTelnetProtocol::timeout",
+      timeout_ ("senf::term::BaseTelnetProtocol::configTimeout",
                 senf::membind(&BaseTelnetProtocol::timeout, this))
 {}
 
@@ -55,7 +55,9 @@ prefix_ senf::term::BaseTelnetProtocol::BaseTelnetProtocol()
       pendingRequests_ (0u),
       requestTimeout_ (ClockService::milliseconds(DEFAULT_REQUEST_TIMEOUT_MS)),
       timeout_ ("senf::term::BaseTelnetProtocol::timeout", 0)
-{}
+{
+    SENF_ASSERT( false );
+}
 
 prefix_ void senf::term::BaseTelnetProtocol::write(std::string const & s)
 {
@@ -348,7 +350,8 @@ prefix_ void senf::term::BaseTelnetProtocol::writeHandler(int state)
         return;
     }
     sendQueue_.erase(sendQueue_.begin(), 
-                     handle_.write(std::make_pair(sendQueue_.begin(), sendQueue_.end())));
+                     handle_.write(boost::make_iterator_range(
+                                       sendQueue_.begin(), sendQueue_.end())));
     if (sendQueue_.empty())
         outputEvent_.disable();
 }
@@ -400,7 +403,7 @@ prefix_ void senf::term::BaseTelnetProtocol::response(OptInfo & info, bool enabl
     else if (enabled != info.enabled) {
         // Request to change the current state
         if (!enabled || 
-            enabled && (info.wantState == OptInfo::WANTED || info.wantState == OptInfo::ACCEPTED)) {
+            (enabled && (info.wantState == OptInfo::WANTED || info.wantState == OptInfo::ACCEPTED))) {
             // accept the request
             info.optionState = OptInfo::ACKNOWLEDGED;
             info.enabled = enabled;