X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FTermlib%2FTelnet.cc;h=19b90582a4b87cb6f8995daf27eb5e33f7db6bc0;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=23e6984652d878f3e86273ea2f3dca97fa5c81b6;hpb=733d6e35453c9df1b281b24d2b0af8538ca9ccf7;p=senf.git diff --git a/Utils/Termlib/Telnet.cc b/Utils/Termlib/Telnet.cc index 23e6984..19b9058 100644 --- a/Utils/Termlib/Telnet.cc +++ b/Utils/Termlib/Telnet.cc @@ -27,6 +27,7 @@ //#include "Telnet.ih" // Custom includes +#include #include "../membind.hh" #include "../Logger/SenfLog.hh" @@ -350,7 +351,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(); } @@ -402,7 +404,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; @@ -455,6 +457,7 @@ v_handleOptionParameters(std::string const & data) return; if (data[0] == '\x00') { type_ = data.substr(1); + boost::algorithm::to_lower(type_); decrementRequestCounter(); } }