--- sbbs/src/sbbs3/telnet.h	2018/04/24 16:41:23	1.1.1.1
+++ sbbs/src/sbbs3/telnet.h	2018/04/24 16:42:39	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet telnet-related constants and function prototypes */
 
-/* $Id: telnet.h,v 1.1.1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: telnet.h,v 1.1.1.2 2018/04/24 16:42:39 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2008 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -67,14 +67,14 @@ enum {
  	 TELNET_BINARY_TX
 	,TELNET_ECHO
 	,TELNET_RECONN
-	,TELNET_SUP_GA		/* suppress go ahead */
+	,TELNET_SUP_GA					/* suppress go ahead */
 	,TELNET_APPROX_MSG_SIZE
 	,TELNET_STATUS
 	,TELNET_TIMING_MARK
 	,TELNET_REMOTE_CTRL
 	,TELNET_OUTPUT_LINE_WIDTH
 	,TELNET_OUTPUT_PAGE_SIZE
-	,TELNET_OUTPUT_CR_DISP		/* 10 */
+	,TELNET_OUTPUT_CR_DISP			/* 10 */
 	,TELNET_OUTPUT_HTAB_STOPS
 	,TELNET_OUTPUT_HTAB_DISP
 	,TELNET_OUTPUT_FF_DISP
@@ -84,27 +84,37 @@ enum {
 	,TELNET_EXASCII
 	,TELNET_LOGOUT
 	,TELNET_BYTE_MACRO
-	,TELNET_DATA_ENTRY_TERM		/* 20 */
+	,TELNET_DATA_ENTRY_TERM			/* 20 */
 	,TELNET_SUPDUP
 	,TELNET_SUPDUP_OUTPUT
-	,TELNET_SEND_LOCATION
+	,TELNET_SEND_LOCATION			/* [RFC779], ASCII string argument */
 	,TELNET_TERM_TYPE
 	,TELNET_END_OF_RECORD
 	,TELNET_TACACS_USERID
 	,TELNET_OUTPUT_MARKING
-	,TELNET_TERM_LOCATION_NUMBER
+	,TELNET_TERM_LOCATION_NUMBER	/* 64-bit argument */
 	,TELNET_3270
-	,TELNET_X3_PAD				/* 30 */
+	,TELNET_X3_PAD					/* 30 */
 	,TELNET_NEGOTIATE_WINDOW_SIZE
 	,TELNET_TERM_SPEED
 	,TELNET_REMOTE_FLOW
 	,TELNET_LINE_MODE
 	,TELNET_X_DISPLAY_LOCATION
-	,TELNET_ENV_OPTION
+	,TELNET_ENVIRON					/* Not used */
 	,TELNET_AUTH_OPTION
 	,TELNET_ENCRYPTION_OPTION
-	,TELNET_NEW_ENV_OPTION		
-	,TELNET_3270E				/* 40 */
+	,TELNET_NEW_ENVIRON				/* RFC 1572 */
+	,TELNET_3270E					/* 40 */
+	,TELNET_XAUTH					/* [Earhart] */
+	,TELNET_CHARSET					/* [RFC2066] */
+	,TELNET_RSP	                    /* [Barnes] */
+	,TELNET_COMPORT_CTRL			/* [RFC2217] */
+	,TLENET_SUP_LOCAL_ECHO			/* [Atmar] */
+	,TELNET_START_TLS               /* [Boe] */
+	,TELNET_KERMIT                  /* [RFC2840] */
+	,TELNET_SEND_URL                /* [Croft] */
+	,TELNET_FORWARD_X				/* [Altman] */
+
 
 	,TELNET_EXOPL=255	/* Extended options list */
 };
@@ -114,6 +124,16 @@ enum {
 #define TELNET_TERM_SEND	1
 #define TELNET_TERM_MAXLEN	40
 
+/* New environment sub option codes, see RFC 1572 */
+#define TELNET_ENVIRON_IS		0
+#define TELNET_ENVIRON_SEND		1
+#define TELNET_ENVIRON_INFO		2
+
+#define TELNET_ENVIRON_VAR		0
+#define TELNET_ENVIRON_VALUE	1
+#define TELNET_ENVIRON_ESC		2
+#define TELNET_ENVIRON_USERVAR	3
+
 /* bits for telnet_mode */   
    
 #define TELNET_MODE_GATE	(1<<2)	/* Pass-through telnet commands/responses */