X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fnet%2FTelnetInputStream.java;h=3e74561a40c20e6ea9b166dea9de4d2e24e00f1c;hb=1dac6b8d395e2bf3c1b58915f8f4f481d9e46793;hp=2d62ae5185078a8514d5a48e9f1dbbe7f8fb6ee5;hpb=8582f35a3ffb8212463076217eb89278f42331d4;p=fanfix.git diff --git a/src/jexer/net/TelnetInputStream.java b/src/jexer/net/TelnetInputStream.java index 2d62ae5..3e74561 100644 --- a/src/jexer/net/TelnetInputStream.java +++ b/src/jexer/net/TelnetInputStream.java @@ -1,29 +1,27 @@ /* * Jexer - Java Text User Interface * - * License: LGPLv3 or later + * The MIT License (MIT) * - * This module is licensed under the GNU Lesser General Public License - * Version 3. Please see the file "COPYING" in this directory for more - * information about the GNU Lesser General Public License Version 3. + * Copyright (C) 2019 Kevin Lamonte * - * Copyright (C) 2015 Kevin Lamonte + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see - * http://www.gnu.org/licenses/, or write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 @@ -36,14 +34,21 @@ import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; -import jexer.session.SessionInfo; +import jexer.backend.SessionInfo; import static jexer.net.TelnetSocket.*; /** * TelnetInputStream works with TelnetSocket to perform the telnet protocol. */ -public final class TelnetInputStream extends InputStream - implements SessionInfo { +public class TelnetInputStream extends InputStream implements SessionInfo { + + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ + + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ /** * The root TelnetSocket that has my telnet protocol state. @@ -78,6 +83,61 @@ public final class TelnetInputStream extends InputStream */ private int readBufferStart; + /** + * User name. + */ + private String username = ""; + + /** + * Language. + */ + private String language = "en_US"; + + /** + * Text window width. + */ + private int windowWidth = 80; + + /** + * Text window height. + */ + private int windowHeight = 24; + + /** + * When true, the last read byte from the remote side was IAC. + */ + private boolean iac = false; + + /** + * When true, we are in the middle of a DO/DONT/WILL/WONT negotiation. + */ + private boolean dowill = false; + + /** + * The telnet option being negotiated. + */ + private int dowillType = 0; + + /** + * When true, we are waiting to see the end of the sub-negotiation + * sequence. + */ + private boolean subnegEnd = false; + + /** + * When true, the last byte read from the remote side was CR. + */ + private boolean readCR = false; + + /** + * The subnegotiation buffer. + */ + private ArrayList subnegBuffer; + + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Package private constructor. * @@ -99,27 +159,9 @@ public final class TelnetInputStream extends InputStream subnegBuffer = new ArrayList(); } - // SessionInfo interface -------------------------------------------------- - - /** - * User name. - */ - private String username = ""; - - /** - * Language. - */ - private String language = "en_US"; - - /** - * Text window width. - */ - private int windowWidth = 80; - - /** - * Text window height. - */ - private int windowHeight = 24; + // ------------------------------------------------------------------------ + // SessionInfo ------------------------------------------------------------ + // ------------------------------------------------------------------------ /** * Username getter. @@ -157,6 +199,15 @@ public final class TelnetInputStream extends InputStream this.language = language; } + /** + * Get the terminal type as reported by the telnet Terminal Type option. + * + * @return the terminal type + */ + public String getTerminalType() { + return master.terminalType; + } + /** * Text window width getter. * @@ -182,7 +233,9 @@ public final class TelnetInputStream extends InputStream // NOP } - // InputStream interface -------------------------------------------------- + // ------------------------------------------------------------------------ + // InputStream ------------------------------------------------------------ + // ------------------------------------------------------------------------ /** * Returns an estimate of the number of bytes that can be read (or @@ -267,6 +320,7 @@ public final class TelnetInputStream extends InputStream // If we got something, return it. if (rc > 0) { + readBufferEnd += rc; readBufferStart++; return readBuffer[readBufferStart - 1]; } @@ -373,39 +427,9 @@ public final class TelnetInputStream extends InputStream return n; } - // Telnet protocol -------------------------------------------------------- - - - /** - * When true, the last read byte from the remote side was IAC. - */ - private boolean iac = false; - - /** - * When true, we are in the middle of a DO/DONT/WILL/WONT negotiation. - */ - private boolean dowill = false; - - /** - * The telnet option being negotiated. - */ - private int dowillType = 0; - - /** - * When true, we are waiting to see the end of the sub-negotiation - * sequence. - */ - private boolean subnegEnd = false; - - /** - * When true, the last byte read from the remote side was CR. - */ - private boolean readCR = false; - - /** - * The subnegotiation buffer. - */ - private ArrayList subnegBuffer; + // ------------------------------------------------------------------------ + // TelnetInputStream ------------------------------------------------------ + // ------------------------------------------------------------------------ /** * For debugging, return a descriptive string for this telnet option. @@ -729,15 +753,23 @@ public final class TelnetInputStream extends InputStream * fails to handle ESC as defined in RFC 1572. */ private void handleNewEnvironment() { - Map newEnv = - new TreeMap(); + Map newEnv = new TreeMap(); EnvState state = EnvState.INIT; StringBuilder name = new StringBuilder(); StringBuilder value = new StringBuilder(); - for (int i = 0; i < subnegBuffer.size(); i++) { + /* + System.err.printf("handleNewEnvironment() %d bytes\n", + subnegBuffer.size()); + */ + + for (int i = 1; i < subnegBuffer.size(); i++) { Byte b = subnegBuffer.get(i); + /* + System.err.printf(" b: %c %d 0x%02x\n", (char)b.byteValue(), + b, b); + */ switch (state) { @@ -786,14 +818,22 @@ public final class TelnetInputStream extends InputStream // VAR state = EnvState.NAME; if (value.length() > 0) { - newEnv.put(name, value); + /* + System.err.printf("NAME: '%s' VALUE: '%s'\n", + name, value); + */ + newEnv.put(name.toString(), value.toString()); } name = new StringBuilder(); } else if (b == 3) { // USERVAR state = EnvState.NAME; if (value.length() > 0) { - newEnv.put(name, value); + /* + System.err.printf("NAME: '%s' VALUE: '%s'\n", + name, value); + */ + newEnv.put(name.toString(), value.toString()); } name = new StringBuilder(); } else { @@ -809,18 +849,21 @@ public final class TelnetInputStream extends InputStream } if ((name.length() > 0) && (value.length() > 0)) { - newEnv.put(name, value); + /* + System.err.printf("NAME: '%s' VALUE: '%s'\n", name, value); + */ + newEnv.put(name.toString(), value.toString()); } - for (StringBuilder key: newEnv.keySet()) { + for (String key: newEnv.keySet()) { if (key.equals("LANG")) { - language = newEnv.get(key).toString(); + language = newEnv.get(key); } if (key.equals("LOGNAME")) { - username = newEnv.get(key).toString(); + username = newEnv.get(key); } if (key.equals("USER")) { - username = newEnv.get(key).toString(); + username = newEnv.get(key); } } } @@ -857,6 +900,10 @@ public final class TelnetInputStream extends InputStream get(i).byteValue()); } master.terminalType = terminalString.toString(); + /* + System.err.printf("terminal type: '%s'\n", + master.terminalType); + */ } break; @@ -873,6 +920,10 @@ public final class TelnetInputStream extends InputStream speedString.append((char)subnegBuffer.get(i).byteValue()); } master.terminalSpeed = speedString.toString(); + /* + System.err.printf("terminal speed: '%s'\n", + master.terminalSpeed); + */ } break; @@ -885,25 +936,41 @@ public final class TelnetInputStream extends InputStream if (subnegBuffer.get(i) == (byte)TELNET_IAC) { i++; } - windowWidth = subnegBuffer.get(i) * 256; + int width = subnegBuffer.get(i); + if (width < 0) { + width += 256; + } + windowWidth = width * 256; i++; if (subnegBuffer.get(i) == (byte)TELNET_IAC) { i++; } - windowWidth += subnegBuffer.get(i); + width = subnegBuffer.get(i); + windowWidth += width; + if (width < 0) { + windowWidth += 256; + } i++; if (subnegBuffer.get(i) == (byte)TELNET_IAC) { i++; } - windowHeight = subnegBuffer.get(i) * 256; + int height = subnegBuffer.get(i); + if (height < 0) { + height += 256; + } + windowHeight = height * 256; i++; if (subnegBuffer.get(i) == (byte)TELNET_IAC) { i++; } - windowHeight += subnegBuffer.get(i); + height = subnegBuffer.get(i); + windowHeight += height; + if (height < 0) { + windowHeight += 256; + } } break; @@ -1323,5 +1390,4 @@ public final class TelnetInputStream extends InputStream return bufN; } - }