Mrege from crypto telnet with "make unifdef". This gets a bunch of
$FreeBSD$ tags and some debug variable safety belts.
This commit is contained in:
parent
074e8e8ee9
commit
0813637235
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=114912
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef lint
|
|
||||||
#if 0
|
#if 0
|
||||||
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
|
static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
|
||||||
#endif
|
|
||||||
static const char rcsid[] =
|
|
||||||
"$FreeBSD$";
|
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate global variables. We do this
|
* Allocate global variables. We do this
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include "telnetd.h"
|
#include "telnetd.h"
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "telnetd.h"
|
#include "telnetd.h"
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/tty.h>
|
#include <sys/tty.h>
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include "telnetd.h"
|
#include "telnetd.h"
|
||||||
#include "pathnames.h"
|
#include "pathnames.h"
|
||||||
@ -71,7 +71,7 @@ int terminaltypeok(char *);
|
|||||||
|
|
||||||
int hostinfo = 1; /* do we print login banner? */
|
int hostinfo = 1; /* do we print login banner? */
|
||||||
|
|
||||||
int debug = 0;
|
static int debug = 0;
|
||||||
int keepalive = 1;
|
int keepalive = 1;
|
||||||
const char *altlogin;
|
const char *altlogin;
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include "telnetd.h"
|
#include "telnetd.h"
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef lint
|
|
||||||
#if 0
|
#if 0
|
||||||
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
|
||||||
#endif
|
|
||||||
static const char rcsid[] =
|
|
||||||
"$FreeBSD$";
|
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#ifdef __FreeBSD__
|
#ifdef __FreeBSD__
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
@ -517,11 +517,11 @@ togdebug(void)
|
|||||||
{
|
{
|
||||||
#ifndef NOT43
|
#ifndef NOT43
|
||||||
if (net > 0 &&
|
if (net > 0 &&
|
||||||
(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) {
|
(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) {
|
||||||
perror("setsockopt (SO_DEBUG)");
|
perror("setsockopt (SO_DEBUG)");
|
||||||
}
|
}
|
||||||
#else /* NOT43 */
|
#else /* NOT43 */
|
||||||
if (debug) {
|
if (telnet_debug) {
|
||||||
if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
|
if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
|
||||||
perror("setsockopt (SO_DEBUG)");
|
perror("setsockopt (SO_DEBUG)");
|
||||||
} else
|
} else
|
||||||
@ -692,7 +692,7 @@ static struct togglelist Togglelist[] = {
|
|||||||
{ "debug",
|
{ "debug",
|
||||||
"debugging",
|
"debugging",
|
||||||
(int (*)(int))togdebug,
|
(int (*)(int))togdebug,
|
||||||
&debug,
|
&telnet_debug,
|
||||||
"turn on socket level debugging" },
|
"turn on socket level debugging" },
|
||||||
{ "netdata",
|
{ "netdata",
|
||||||
"printing of hexadecimal network data (debugging)",
|
"printing of hexadecimal network data (debugging)",
|
||||||
@ -2146,7 +2146,7 @@ tn(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
|
#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
|
||||||
|
|
||||||
if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
|
if (telnet_debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
|
||||||
perror("setsockopt (SO_DEBUG)");
|
perror("setsockopt (SO_DEBUG)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ extern int
|
|||||||
netdata, /* Print out network data flow */
|
netdata, /* Print out network data flow */
|
||||||
prettydump, /* Print "netdata" output in user readable format */
|
prettydump, /* Print "netdata" output in user readable format */
|
||||||
termdata, /* Print out terminal data flow */
|
termdata, /* Print out terminal data flow */
|
||||||
debug, /* Debug level */
|
telnet_debug, /* Debug level */
|
||||||
doaddrlookup, /* do a reverse lookup? */
|
doaddrlookup, /* do a reverse lookup? */
|
||||||
clienteof; /* Client received EOF */
|
clienteof; /* Client received EOF */
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
@ -180,7 +180,7 @@ main(int argc, char *argv[])
|
|||||||
skiprc = 1;
|
skiprc = 1;
|
||||||
break;
|
break;
|
||||||
case 'd':
|
case 'd':
|
||||||
debug = 1;
|
telnet_debug = 1;
|
||||||
break;
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
set_escape_char(optarg);
|
set_escape_char(optarg);
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93";
|
static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This defines a structure for a ring buffer.
|
* This defines a structure for a ring buffer.
|
||||||
|
@ -31,15 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
#include <stdlib.h>
|
|
||||||
#include <err.h>
|
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following routines try to encapsulate what is system dependent
|
* The following routines try to encapsulate what is system dependent
|
||||||
@ -49,9 +47,11 @@ static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
|
|||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
#include <err.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <arpa/telnet.h>
|
#include <arpa/telnet.h>
|
||||||
|
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ int
|
|||||||
connected,
|
connected,
|
||||||
showoptions,
|
showoptions,
|
||||||
ISend, /* trying to send network data in */
|
ISend, /* trying to send network data in */
|
||||||
debug = 0,
|
telnet_debug = 0,
|
||||||
crmod,
|
crmod,
|
||||||
netdata, /* Print out network data flow */
|
netdata, /* Print out network data flow */
|
||||||
crlf, /* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */
|
crlf, /* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
|
static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <arpa/telnet.h>
|
#include <arpa/telnet.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -31,13 +31,13 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#if 0
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
|
static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#define TELOPTS
|
#define TELOPTS
|
||||||
#define TELCMDS
|
#define TELCMDS
|
||||||
|
Loading…
Reference in New Issue
Block a user