Changed option BBS_OPT_SEND_TELNET_GA to BBS_OPT_NO_TELNET_NOP

(sending NOPs instead of GAs and defaults is "on").

ctrl/sbbs.ini

@@ -26,7 +26,6 @@ ExternalYield=10
 AnswerSound=
 HangupSound=
 ; Supported options (separated with |):
-; 	SEND_TELNET_GA
 ; 	XTRN_MINIMIZED
 ; 	AUTO_LOGON
 ; 	DEBUG_TELNET
@@ -34,13 +33,14 @@ HangupSound=
 ; 	ALLOW_RLOGIN
 ; 	USE_2ND_RLOGIN
 ; 	NO_QWK_EVENTS
+; 	NO_TELNET_NOP
 ; 	NO_HOST_LOOKUP
 ;	NO_RECYCLE
 ; 	GET_IDENT
 ; 	NO_JAVASCRIPT
 ; 	LOCAL_TIMEZONE
 ; 	MUTE
-Options = XTRN_MINIMIZED | SEND_TELNET_GA | SYSOP_AVAILABLE
+Options = XTRN_MINIMIZED | SYSOP_AVAILABLE
 
 [Mail]
 AutoStart=true

src/sbbs3/getkey.cpp

@@ -266,11 +266,11 @@ char sbbs_t::getkey(long mode)
 			RESTORELINE; 
 		}
 
-		if(startup->options&BBS_OPT_SEND_TELNET_GA
+		if(!(startup->options&BBS_OPT_NO_TELNET_NOP)
 			&& now!=last_telnet_cmd && now-timeout>=60 && !((now-timeout)%60)) {
 			// Let's make sure the socket is up
 			// Sending will trigger a socket d/c detection
-			send_telnet_cmd(TELNET_GA,0);
+			send_telnet_cmd(TELNET_NOP,0);
 			last_telnet_cmd=now;
 		}
 			

src/sbbs3/sbbs_ini.c

@@ -49,7 +49,7 @@ static ini_bitdesc_t bbs_options[] = {
 	{ BBS_OPT_ALLOW_RLOGIN			,"ALLOW_RLOGIN"			},
 	{ BBS_OPT_USE_2ND_RLOGIN		,"USE_2ND_RLOGIN"		},
 	{ BBS_OPT_NO_QWK_EVENTS			,"NO_QWK_EVENTS"		},
-	{ BBS_OPT_SEND_TELNET_GA		,"SEND_TELNET_GA"		},
+	{ BBS_OPT_NO_TELNET_NOP			,"NO_TELNET_NOP"		},
 	{ BBS_OPT_NO_HOST_LOOKUP		,"NO_HOST_LOOKUP"		},
 	{ BBS_OPT_NO_RECYCLE			,"NO_RECYCLE"			},
 	{ BBS_OPT_GET_IDENT				,"GET_IDENT"			},

src/sbbs3/startup.h

@@ -104,7 +104,7 @@ typedef struct {
 #define BBS_OPT_ALLOW_RLOGIN		(1<<5)	/* Allow logins via BSD RLogin		*/
 #define BBS_OPT_USE_2ND_RLOGIN		(1<<6)	/* Use 2nd username in BSD RLogin	*/
 #define BBS_OPT_NO_QWK_EVENTS		(1<<7)	/* Don't run QWK-related events		*/
-#define BBS_OPT_SEND_TELNET_GA		(1<<8)	/* Send periodic Telnet go-aheads	*/
+#define BBS_OPT_NO_TELNET_NOP		(1<<8)	/* Don't send periodic Telnet NOPs	*/
 #define BBS_OPT_NO_HOST_LOOKUP		(1<<11)
 #define BBS_OPT_NO_RECYCLE			(1<<27)	/* Disable recycling of server		*/
 #define BBS_OPT_GET_IDENT			(1<<28)	/* Get Identity (RFC 1413)			*/

src/sbbs3/xtrn.cpp

@@ -874,8 +874,8 @@ int sbbs_t::external(char* cmdline, long mode, char* startup_dir)
 
 						// Let's make sure the socket is up
 						// Sending will trigger a socket d/c detection
-						if(startup->options&BBS_OPT_SEND_TELNET_GA)
-							send_telnet_cmd(TELNET_GA,0);
+						if(!(startup->options&BBS_OPT_NO_TELNET_NOP))
+							send_telnet_cmd(TELNET_NOP,0);
 
 						// Check if the node has been interrupted
 						getnodedat(cfg.node_num,&thisnode,0);