X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FTermlib%2FTelnetTerminal.cc;h=3445d5c244b9fe80646d03d505236dbc4332920b;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=5e08938e99af4d45606ac7f57765658454b85e9e;hpb=27d5a4aaebd8abb6c6bb842af3c170063b206f0f;p=senf.git diff --git a/Utils/Termlib/TelnetTerminal.cc b/Utils/Termlib/TelnetTerminal.cc index 5e08938..3445d5c 100644 --- a/Utils/Termlib/TelnetTerminal.cc +++ b/Utils/Termlib/TelnetTerminal.cc @@ -67,6 +67,8 @@ prefix_ void senf::term::TelnetTerminal::write(char ch) prefix_ void senf::term::TelnetTerminal::v_setupComplete() { + bool init (true); + if (setupFailed_) v_setupFailed(); else if (! (width() > 0 @@ -74,7 +76,27 @@ prefix_ void senf::term::TelnetTerminal::v_setupComplete() && localOption(telnetopt::SUPPRESS_GO_AHEAD) && peerOption(telnetopt::SUPPRESS_GO_AHEAD) && localOption(telnetopt::ECHO) - && callbacks_->cb_init())) { + && (init = callbacks_->cb_init()))) { + + SENF_LOG_BLOCK((senf::log::NOTICE)({ + log << "TelnetTerminal setup failed:\n"; + if (width() <= 0) + log << " missing telnet client NAWS support\n"; + else + log << " size=" << width() << "x" << height() << "\n"; + if (terminalType().empty()) + log << " missing telnet client TERMINAL_TYPE support\n"; + else + log << " TERM=" << terminalType() << "\n"; + if (! localOption(telnetopt::SUPPRESS_GO_AHEAD) || + ! peerOption(telnetopt::SUPPRESS_GO_AHEAD)) + log << " missing telnet clinet SGO support\n"; + if (! localOption(telnetopt::ECHO)) + log << " missing telnet client ECHO support\n"; + if (! init) + log << " terminal initialization (cb_init) failed\n"; + })); + setupFailed_ = true; requestPeerOption(telnetopt::SUPPRESS_GO_AHEAD, false); requestLocalOption(telnetopt::SUPPRESS_GO_AHEAD, false); @@ -84,6 +106,10 @@ prefix_ void senf::term::TelnetTerminal::v_setupComplete() if (! requestsPending()) v_setupFailed(); } + else + SENF_LOG((senf::log::NOTICE)( + "Initialized TelnetTerminal: TERM=" << terminalType() + << ", size=" << width() << "x" << height())); } prefix_ void senf::term::TelnetTerminal::v_charReceived(char ch)