X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fnet%2FTelnetInputStream.java;h=9ae77476de7d5d39305ce356149d58494fd6e2d3;hb=d36057dfab8def933a64be042b039d76708ac5ba;hp=c594d1a275aff7c91435c2b62fc3a58d522a521e;hpb=e16dda65585466c8987bd1efd718431450a96605;p=fanfix.git diff --git a/src/jexer/net/TelnetInputStream.java b/src/jexer/net/TelnetInputStream.java index c594d1a..9ae7747 100644 --- a/src/jexer/net/TelnetInputStream.java +++ b/src/jexer/net/TelnetInputStream.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2016 Kevin Lamonte + * Copyright (C) 2017 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -34,7 +34,7 @@ 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.*; /** @@ -43,6 +43,14 @@ import static jexer.net.TelnetSocket.*; public final class TelnetInputStream extends InputStream implements SessionInfo { + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ + + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * The root TelnetSocket that has my telnet protocol state. */ @@ -76,6 +84,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. * @@ -97,27 +160,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. @@ -180,7 +225,9 @@ public final class TelnetInputStream extends InputStream // NOP } - // InputStream interface -------------------------------------------------- + // ------------------------------------------------------------------------ + // InputStream ------------------------------------------------------------ + // ------------------------------------------------------------------------ /** * Returns an estimate of the number of bytes that can be read (or @@ -371,39 +418,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. @@ -727,15 +744,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) { @@ -784,14 +809,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 { @@ -807,18 +840,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); } } } @@ -855,6 +891,10 @@ public final class TelnetInputStream extends InputStream get(i).byteValue()); } master.terminalType = terminalString.toString(); + /* + System.err.printf("terminal type: '%s'\n", + master.terminalType); + */ } break; @@ -871,6 +911,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; @@ -1321,5 +1365,4 @@ public final class TelnetInputStream extends InputStream return bufN; } - }