[Python-checkins] CVS: python/dist/src/Lib telnetlib.py,1.14,1.15

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv25001/Lib

Modified Files:
	telnetlib.py 
Log Message:
Patch #416079: fix the debug string output when receiving telnet commands.
added all the telnet options known to arpa/telnet.h 
added all the options registered with IANA as of today
added the possibility for the user to have it's own option negotiation callback


Index: telnetlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/telnetlib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** telnetlib.py	2001/07/31 08:40:21	1.14
--- telnetlib.py	2001/09/06 08:51:38	1.15
***************
*** 58,61 ****
--- 58,121 ----
  theNULL = chr(0)
  
+ # Telnet protocol options code (don't change)
+ # These ones all come from arpa/telnet.h
+ BINARY = chr(0) # 8-bit data path
+ ECHO = chr(1) # echo
+ RCP = chr(2) # prepare to reconnect
+ SGA = chr(3) # suppress go ahead
+ NAMS = chr(4) # approximate message size
+ STATUS = chr(5) # give status
+ TM = chr(6) # timing mark
+ RCTE = chr(7) # remote controlled transmission and echo
+ NAOL = chr(8) # negotiate about output line width
+ NAOP = chr(9) # negotiate about output page size
+ NAOCRD = chr(10) # negotiate about CR disposition
+ NAOHTS = chr(11) # negotiate about horizontal tabstops
+ NAOHTD = chr(12) # negotiate about horizontal tab disposition
+ NAOFFD = chr(13) # negotiate about formfeed disposition
+ NAOVTS = chr(14) # negotiate about vertical tab stops
+ NAOVTD = chr(15) # negotiate about vertical tab disposition
+ NAOLFD = chr(16) # negotiate about output LF disposition
+ XASCII = chr(17) # extended ascii character set
+ LOGOUT = chr(18) # force logout
+ BM = chr(19) # byte macro
+ DET = chr(20) # data entry terminal
+ SUPDUP = chr(21) # supdup protocol
+ SUPDUPOUTPUT = chr(22) # supdup output
+ SNDLOC = chr(23) # send location
+ TTYPE = chr(24) # terminal type
+ EOR = chr(25) # end or record
+ TUID = chr(26) # TACACS user identification
+ OUTMRK = chr(27) # output marking
+ TTYLOC = chr(28) # terminal location number
+ VT3270REGIME = chr(29) # 3270 regime
+ X3PAD = chr(30) # X.3 PAD
+ NAWS = chr(31) # window size
+ TSPEED = chr(32) # terminal speed
+ LFLOW = chr(33) # remote flow control
+ LINEMODE = chr(34) # Linemode option
+ XDISPLOC = chr(35) # X Display Location
+ OLD_ENVIRON = chr(36) # Old - Environment variables
+ AUTHENTICATION = chr(37) # Authenticate
+ ENCRYPT = chr(38) # Encryption option
+ NEW_ENVIRON = chr(39) # New - Environment variables
+ # the following ones come from
+ # http://www.iana.org/assignments/telnet-options
+ # Unfortunately, that document does not assign identifiers
+ # to all of them, so we are making them up
+ TN3270E = chr(40) # TN3270E
+ XAUTH = chr(41) # XAUTH
+ CHARSET = chr(42) # CHARSET
+ RSP = chr(43) # Telnet Remote Serial Port
+ COM_PORT_OPTION = chr(44) # Com Port Control Option
+ SUPPRESS_LOCAL_ECHO = chr(45) # Telnet Suppress Local Echo
+ TLS = chr(46) # Telnet Start TLS
+ KERMIT = chr(47) # KERMIT
+ SEND_URL = chr(48) # SEND-URL
+ FORWARD_X = chr(49) # FORWARD_X
+ PRAGMA_LOGON = chr(138) # TELOPT PRAGMA LOGON
+ SSPI_LOGON = chr(139) # TELOPT SSPI LOGON
+ PRAGMA_HEARTBEAT = chr(140) # TELOPT PRAGMA HEARTBEAT
+ EXOPL = chr(255) # Extended-Options-List
  
  class Telnet:
***************
*** 102,105 ****
--- 162,171 ----
          I/O.
  
+     set_option_negotiation_callback(callback)
+         Each time a telnet option is read on the input flow, this callback
+         (if set) is called with the following parameters :
+         callback(telnet socket, command (DO/DONT/WILL/WONT), option)
+         No other action is done afterwards by telnetlib.
+ 
      """
  
***************
*** 120,123 ****
--- 186,190 ----
          self.cookedq = ''
          self.eof = 0
+         self.option_callback = None
          if host:
              self.open(host, port)
***************
*** 313,316 ****
--- 380,387 ----
          return buf
  
+     def set_option_negotiation_callback(self, callback):
+         """Provide a callback function called after each receipt of a telnet option."""
+         self.option_callback = callback
+ 
      def process_rawq(self):
          """Transfer from raw queue to cooked queue.
***************
*** 336,348 ****
                  elif c in (DO, DONT):
                      opt = self.rawq_getchar()
!                     self.msg('IAC %s %d', c == DO and 'DO' or 'DONT', ord(c))
!                     self.sock.send(IAC + WONT + opt)
                  elif c in (WILL, WONT):
                      opt = self.rawq_getchar()
                      self.msg('IAC %s %d',
!                              c == WILL and 'WILL' or 'WONT', ord(c))
!                     self.sock.send(IAC + DONT + opt)
                  else:
!                     self.msg('IAC %s not recognized' % `c`)
          except EOFError: # raised by self.rawq_getchar()
              pass
--- 407,425 ----
                  elif c in (DO, DONT):
                      opt = self.rawq_getchar()
!                     self.msg('IAC %s %d', c == DO and 'DO' or 'DONT', ord(opt))
!                     if self.option_callback:
!                         self.option_callback(self.sock, c, opt)
!                     else:
!                         self.sock.send(IAC + WONT + opt)
                  elif c in (WILL, WONT):
                      opt = self.rawq_getchar()
                      self.msg('IAC %s %d',
!                              c == WILL and 'WILL' or 'WONT', ord(opt))
!                     if self.option_callback:
!                         self.option_callback(self.sock, c, opt)
!                     else:
!                         self.sock.send(IAC + DONT + opt)
                  else:
!                     self.msg('IAC %d not recognized' % ord(opt))
          except EOFError: # raised by self.rawq_getchar()
              pass