-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights
- * Reserved. This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 1.0 (the 'License'). You may not use this file
- * except in compliance with the License. Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License."
- *
- * @APPLE_LICENSE_HEADER_END@
- */
/*
* Copyright (c) 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+
+#ifdef __FBSDID
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.12.2.5 2002/04/13 10:59:08 markm Exp $");
+#endif
+
+#ifndef __unused
+#define __unused __attribute__((__unused__))
+#endif
+
#ifndef lint
-static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
+static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
+#endif
-#if defined(unix) || defined(__APPLE__)
#include <sys/param.h>
-#if defined(CRAY) || defined(sysV88)
-#include <sys/types.h>
-#endif
+#include <sys/un.h>
#include <sys/file.h>
-#else
-#include <sys/types.h>
-#endif /* defined(unix) || defined(__APPLE__) */
#include <sys/socket.h>
#include <netinet/in.h>
-#ifdef CRAY
-#include <fcntl.h>
-#endif /* CRAY */
-#include <signal.h>
-#include <netdb.h>
#include <ctype.h>
-#include <pwd.h>
-#if !defined(__APPLE__)
-#include <varargs.h>
-#endif
+#include <err.h>
#include <errno.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <arpa/telnet.h>
+#include <arpa/inet.h>
#include "general.h"
#include "externs.h"
#include "defines.h"
#include "types.h"
+#include "misc.h"
+
+#ifdef AUTHENTICATION
+#include <libtelnet/auth.h>
+#endif
+#ifdef ENCRYPTION
+#include <libtelnet/encrypt.h>
+#endif
-#if !defined(CRAY) && !defined(sysV88)
#include <netinet/in_systm.h>
-# if (defined(vax) || defined(tahoe) || defined(hp300)) && !defined(ultrix)
-# include <machine/endian.h>
-# endif /* vax */
-#endif /* !defined(CRAY) && !defined(sysV88) */
#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 256
+#endif MAXHOSTNAMELEN
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 64
-#endif MAXHOSTNAMELEN
+typedef int (*intrtn_t)(int, char **);
+#ifdef AUTHENTICATION
+extern int auth_togdebug(int);
+#endif
+#ifdef ENCRYPTION
+extern int EncryptAutoEnc(int);
+extern int EncryptAutoDec(int);
+extern int EncryptDebug(int);
+extern int EncryptVerbose(int);
+#endif /* ENCRYPTION */
#if defined(IPPROTO_IP) && defined(IP_TOS)
int tos = -1;
#endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
char *hostname;
static char _hostname[MAXHOSTNAMELEN];
-extern char *getenv();
-
-extern int isprefix();
-extern char **genget();
-extern int Ambiguous();
-
-typedef int (*intrtn_t)();
-#if __STDC__
-static call(intrtn_t routine, ...);
-#else
-static call();
+static int help(int, char **);
+static int call(intrtn_t, ...);
+static void cmdrc(char *, char *);
+#ifdef INET6
+static int switch_af(struct addrinfo **);
#endif
+static int togglehelp(void);
+static int send_tncmd(void (*)(int, int), const char *, char *);
+static int setmod(int);
+static int clearmode(int);
+static int modehelp(void);
+static int sourceroute(struct addrinfo *, char *, char **, int *, int *, int *);
typedef struct {
- char *name; /* command name */
- char *help; /* help string (NULL for no help) */
- int (*handler)(); /* routine which executes command */
+ const char *name; /* command name */
+ const char *help; /* help string (NULL for no help) */
+ int (*handler)(int, char **); /* routine which executes command */
int needconnect; /* Do we need to be connected to execute? */
} Command;
static int margc;
static char *margv[20];
- static void
-makeargv()
+#ifdef OPIE
+#include <sys/wait.h>
+#define PATH_OPIEKEY "/usr/bin/opiekey"
+static int
+opie_calc(int argc, char *argv[])
{
- register char *cp, *cp2, c;
- register char **argp = margv;
+ int status;
+
+ if(argc != 3) {
+ printf("%s sequence challenge\n", argv[0]);
+ return (0);
+ }
+
+ switch(fork()) {
+ case 0:
+ execv(PATH_OPIEKEY, argv);
+ exit (1);
+ case -1:
+ perror("fork");
+ break;
+ default:
+ (void) wait(&status);
+ if (WIFEXITED(status))
+ return (WEXITSTATUS(status));
+ }
+ return (0);
+}
+#endif
+
+static void
+makeargv(void)
+{
+ char *cp, *cp2, c;
+ char **argp = margv;
margc = 0;
cp = line;
if (*cp == '!') { /* Special case shell escape */
strcpy(saveline, line); /* save for shell command */
- *argp++ = "!"; /* No room in string to get this */
+ *argp++ = strdup("!"); /* No room in string to get this */
margc++;
cp++;
}
- while (c = *cp) {
- register int inquote = 0;
+ while ((c = *cp)) {
+ int inquote = 0;
while (isspace(c))
c = *++cp;
if (c == '\0')
* Todo: 1. Could take random integers (12, 0x12, 012, 0b1).
*/
- static
-special(s)
- register char *s;
+static int
+special(char *s)
{
- register char c;
+ char c;
char b;
switch (*s) {
* Construct a control character sequence
* for a special character.
*/
- static char *
-control(c)
- register cc_t c;
+static const char *
+control(cc_t c)
{
static char buf[5];
/*
* was to assign "c" to an unsigned int variable...
* Arggg....
*/
- register unsigned int uic = (unsigned int)c;
+ unsigned int uic = (unsigned int)c;
if (uic == 0x7f)
return ("^?");
return (buf);
}
-
-
/*
* The following are data structures and routines for
* the "send" command.
*/
struct sendlist {
- char *name; /* How user refers to it (case independent) */
- char *help; /* Help information (0 ==> no help) */
+ const char *name; /* How user refers to it (case independent) */
+ const char *help; /* Help information (0 ==> no help) */
int needconnect; /* Need to be connected */
int narg; /* Number of arguments */
- int (*handler)(); /* Routine to perform (for special ops) */
+ int (*handler)(char *, ...); /* Routine to perform (for special ops) */
int nbyte; /* Number of bytes to send this command */
int what; /* Character to be sent (<0 ==> special) */
};
\f
static int
- send_esc P((void)),
- send_help P((void)),
- send_docmd P((char *)),
- send_dontcmd P((char *)),
- send_willcmd P((char *)),
- send_wontcmd P((char *));
+ send_esc(void),
+ send_help(void),
+ send_docmd(char *),
+ send_dontcmd(char *),
+ send_willcmd(char *),
+ send_wontcmd(char *);
static struct sendlist Sendlist[] = {
- { "ao", "Send Telnet Abort output", 1, 0, 0, 2, AO },
- { "ayt", "Send Telnet 'Are You There'", 1, 0, 0, 2, AYT },
- { "brk", "Send Telnet Break", 1, 0, 0, 2, BREAK },
- { "break", 0, 1, 0, 0, 2, BREAK },
- { "ec", "Send Telnet Erase Character", 1, 0, 0, 2, EC },
- { "el", "Send Telnet Erase Line", 1, 0, 0, 2, EL },
- { "escape", "Send current escape character", 1, 0, send_esc, 1, 0 },
- { "ga", "Send Telnet 'Go Ahead' sequence", 1, 0, 0, 2, GA },
- { "ip", "Send Telnet Interrupt Process", 1, 0, 0, 2, IP },
- { "intp", 0, 1, 0, 0, 2, IP },
- { "interrupt", 0, 1, 0, 0, 2, IP },
- { "intr", 0, 1, 0, 0, 2, IP },
- { "nop", "Send Telnet 'No operation'", 1, 0, 0, 2, NOP },
- { "eor", "Send Telnet 'End of Record'", 1, 0, 0, 2, EOR },
- { "abort", "Send Telnet 'Abort Process'", 1, 0, 0, 2, ABORT },
- { "susp", "Send Telnet 'Suspend Process'", 1, 0, 0, 2, SUSP },
- { "eof", "Send Telnet End of File Character", 1, 0, 0, 2, xEOF },
- { "synch", "Perform Telnet 'Synch operation'", 1, 0, dosynch, 2, 0 },
- { "getstatus", "Send request for STATUS", 1, 0, get_status, 6, 0 },
- { "?", "Display send options", 0, 0, send_help, 0, 0 },
- { "help", 0, 0, 0, send_help, 0, 0 },
- { "do", 0, 0, 1, send_docmd, 3, 0 },
- { "dont", 0, 0, 1, send_dontcmd, 3, 0 },
- { "will", 0, 0, 1, send_willcmd, 3, 0 },
- { "wont", 0, 0, 1, send_wontcmd, 3, 0 },
- { 0 }
+ { "ao", "Send Telnet Abort output", 1, 0, NULL, 2, AO },
+ { "ayt", "Send Telnet 'Are You There'", 1, 0, NULL, 2, AYT },
+ { "brk", "Send Telnet Break", 1, 0, NULL, 2, BREAK },
+ { "break", NULL, 1, 0, NULL, 2, BREAK },
+ { "ec", "Send Telnet Erase Character", 1, 0, NULL, 2, EC },
+ { "el", "Send Telnet Erase Line", 1, 0, NULL, 2, EL },
+ { "escape", "Send current escape character",1, 0, (int (*)(char *, ...))send_esc, 1, 0 },
+ { "ga", "Send Telnet 'Go Ahead' sequence", 1, 0, NULL, 2, GA },
+ { "ip", "Send Telnet Interrupt Process",1, 0, NULL, 2, IP },
+ { "intp", NULL, 1, 0, NULL, 2, IP },
+ { "interrupt", NULL, 1, 0, NULL, 2, IP },
+ { "intr", NULL, 1, 0, NULL, 2, IP },
+ { "nop", "Send Telnet 'No operation'", 1, 0, NULL, 2, NOP },
+ { "eor", "Send Telnet 'End of Record'", 1, 0, NULL, 2, EOR },
+ { "abort", "Send Telnet 'Abort Process'", 1, 0, NULL, 2, ABORT },
+ { "susp", "Send Telnet 'Suspend Process'",1, 0, NULL, 2, SUSP },
+ { "eof", "Send Telnet End of File Character", 1, 0, NULL, 2, xEOF },
+ { "synch", "Perform Telnet 'Synch operation'", 1, 0, (int (*)(char *, ...))dosynch, 2, 0 },
+ { "getstatus", "Send request for STATUS", 1, 0, (int (*)(char *, ...))get_status, 6, 0 },
+ { "?", "Display send options", 0, 0, (int (*)(char *, ...))send_help, 0, 0 },
+ { "help", NULL, 0, 0, (int (*)(char *, ...))send_help, 0, 0 },
+ { "do", NULL, 0, 1, (int (*)(char *, ...))send_docmd, 3, 0 },
+ { "dont", NULL, 0, 1, (int (*)(char *, ...))send_dontcmd, 3, 0 },
+ { "will", NULL, 0, 1, (int (*)(char *, ...))send_willcmd, 3, 0 },
+ { "wont", NULL, 0, 1, (int (*)(char *, ...))send_wontcmd, 3, 0 },
+ { NULL, NULL, 0, 0, NULL, 0, 0 }
};
#define GETSEND(name) ((struct sendlist *) genget(name, (char **) Sendlist, \
sizeof(struct sendlist)))
- static int
-sendcmd(argc, argv)
- int argc;
- char **argv;
+static int
+sendcmd(int argc, char *argv[])
{
int count; /* how many bytes we are going to need to send */
int i;
- int question = 0; /* was at least one argument a question */
struct sendlist *s; /* pointer to current command */
int success = 0;
int needconnect = 0;
printf("Unknown send argument '%s'\n'send ?' for help.\n",
argv[i]);
return 0;
- } else if (Ambiguous(s)) {
+ } else if (Ambiguous((void *)s)) {
printf("Ambiguous send argument '%s'\n'send ?' for help.\n",
argv[i]);
return 0;
return 0;
}
count += s->nbyte;
- if (s->handler == send_help) {
+ if ((void *)s->handler == (void *)send_help) {
send_help();
return 0;
}
for (i = 1; i < argc; i++) {
if ((s = GETSEND(argv[i])) == 0) {
fprintf(stderr, "Telnet 'send' error - argument disappeared!\n");
- (void) quit();
+ quit();
/*NOTREACHED*/
}
if (s->handler) {
return (count == success);
}
- static int
-send_esc()
+static int
+send_esc(void)
{
NETADD(escape);
return 1;
}
- static int
-send_docmd(name)
- char *name;
+static int
+send_docmd(char *name)
{
return(send_tncmd(send_do, "do", name));
}
- static int
+static int
send_dontcmd(name)
char *name;
{
return(send_tncmd(send_dont, "dont", name));
}
- static int
-send_willcmd(name)
- char *name;
+
+static int
+send_willcmd(char *name)
{
return(send_tncmd(send_will, "will", name));
}
- static int
-send_wontcmd(name)
- char *name;
+
+static int
+send_wontcmd(char *name)
{
return(send_tncmd(send_wont, "wont", name));
}
- int
-send_tncmd(func, cmd, name)
- void (*func)();
- char *cmd, *name;
+static int
+send_tncmd(void (*func)(int, int), const char *cmd, char *name)
{
char **cpp;
extern char *telopts[];
- register int val = 0;
+ int val = 0;
if (isprefix(name, "help") || isprefix(name, "?")) {
- register int col, len;
+ int col, len;
printf("Usage: send %s <value|option>\n", cmd);
printf("\"value\" must be from 0 to 255\n");
if (cpp) {
val = cpp - telopts;
} else {
- register char *cp = name;
+ char *cp = name;
while (*cp >= '0' && *cp <= '9') {
val *= 10;
return 1;
}
- static int
-send_help()
+static int
+send_help(void)
{
struct sendlist *s; /* pointer to current command */
for (s = Sendlist; s->name; s++) {
* to by the arguments to the "toggle" command.
*/
- static int
-lclchars()
+static int
+lclchars(void)
{
donelclchars = 1;
return 1;
}
- static int
-togdebug()
+static int
+togdebug(void)
{
#ifndef NOT43
if (net > 0 &&
}
#else /* NOT43 */
if (debug) {
- if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
+ if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
perror("setsockopt (SO_DEBUG)");
} else
printf("Cannot turn off socket debugging\n");
}
- static int
-togcrlf()
+static int
+togcrlf(void)
{
if (crlf) {
printf("Will send carriage returns as telnet <CR><LF>.\n");
int binmode;
- static int
-togbinary(val)
- int val;
+static int
+togbinary(int val)
{
donebinarytoggle = 1;
return 1;
}
- static int
-togrbinary(val)
- int val;
+static int
+togrbinary(int val)
{
donebinarytoggle = 1;
return 1;
}
- static int
-togxbinary(val)
- int val;
+static int
+togxbinary(int val)
{
donebinarytoggle = 1;
return 1;
}
-
-static int togglehelp P((void));
-#if defined(AUTHENTICATION)
-extern int auth_togdebug P((int));
-#endif
-#ifdef ENCRYPTION
-extern int EncryptAutoEnc P((int));
-extern int EncryptAutoDec P((int));
-extern int EncryptDebug P((int));
-extern int EncryptVerbose P((int));
-#endif /* ENCRYPTION */
-
struct togglelist {
- char *name; /* name of toggle */
- char *help; /* help message */
- int (*handler)(); /* routine to do actual setting */
+ const char *name; /* name of toggle */
+ const char *help; /* help message */
+ int (*handler)(int); /* routine to do actual setting */
int *variable;
- char *actionexplanation;
+ const char *actionexplanation;
};
static struct togglelist Togglelist[] = {
0,
&autosynch,
"send interrupt characters in urgent mode" },
-#if defined(AUTHENTICATION)
+#ifdef AUTHENTICATION
{ "autologin",
"automatic sending of login and/or authentication info",
0,
0 },
{ "crlf",
"sending carriage returns as telnet <CR><LF>",
- togcrlf,
+ (int (*)(int))togcrlf,
&crlf,
0 },
{ "crmod",
"map carriage return on output" },
{ "localchars",
"local recognition of certain control characters",
- lclchars,
+ (int (*)(int))lclchars,
&localchars,
"recognize certain control characters" },
- { " ", "", 0 }, /* empty line */
-#if (defined(unix) || defined(__APPLE__)) && defined(TN3270)
- { "apitrace",
- "(debugging) toggle tracing of API transactions",
- 0,
- &apitrace,
- "trace API transactions" },
- { "cursesdata",
- "(debugging) toggle printing of hexadecimal curses data",
- 0,
- &cursesdata,
- "print hexadecimal representation of curses data" },
-#endif /* (defined(unix) || defined(__APPLE__)) && defined(TN3270) */
+ { " ", "", NULL, NULL, NULL }, /* empty line */
{ "debug",
"debugging",
- togdebug,
+ (int (*)(int))togdebug,
&debug,
"turn on socket level debugging" },
{ "netdata",
0,
&showoptions,
"show option processing" },
-#if defined(unix) || defined(__APPLE__)
{ "termdata",
"(debugging) toggle printing of hexadecimal terminal data",
0,
&termdata,
"print hexadecimal representation of terminal traffic" },
-#endif /* defined(unix) || defined(__APPLE__) */
{ "?",
- 0,
- togglehelp },
+ NULL,
+ (int (*)(int))togglehelp,
+ NULL,
+ NULL },
+ { NULL, NULL, NULL, NULL, NULL },
{ "help",
- 0,
- togglehelp },
- { 0 }
+ NULL,
+ (int (*)(int))togglehelp,
+ NULL,
+ NULL },
+ { NULL, NULL, NULL, NULL, NULL }
};
- static int
-togglehelp()
+static int
+togglehelp(void)
{
struct togglelist *c;
return 0;
}
- static void
-settogglehelp(set)
- int set;
+static void
+settogglehelp(int set)
{
struct togglelist *c;
#define GETTOGGLE(name) (struct togglelist *) \
genget(name, (char **) Togglelist, sizeof(struct togglelist))
- static int
-toggle(argc, argv)
- int argc;
- char *argv[];
+static int
+toggle(int argc, char *argv[])
{
int retval = 1;
char *name;
while (argc--) {
name = *argv++;
c = GETTOGGLE(name);
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('toggle ?' for help).\n",
name);
return 0;
*/
#ifdef USE_TERMIO
-struct termio new_tc = { 0 };
+struct termio new_tc = { 0, 0, 0, 0, {}, 0, 0 };
#endif
struct setlist {
- char *name; /* name */
- char *help; /* help information */
- void (*handler)();
+ const char *name; /* name */
+ const char *help; /* help information */
+ void (*handler)(char *);
cc_t *charp; /* where it is located at */
};
static struct setlist Setlist[] = {
#ifdef KLUDGELINEMODE
- { "echo", "character to toggle local echoing on/off", 0, &echoc },
+ { "echo", "character to toggle local echoing on/off", NULL, &echoc },
#endif
- { "escape", "character to escape back to telnet command mode", 0, &escape },
+ { "escape", "character to escape back to telnet command mode", NULL, &escape },
{ "rlogin", "rlogin escape character", 0, &rlogin },
{ "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile},
- { " ", "" },
- { " ", "The following need 'localchars' to be toggled true", 0, 0 },
- { "flushoutput", "character to cause an Abort Output", 0, termFlushCharp },
- { "interrupt", "character to cause an Interrupt Process", 0, termIntCharp },
- { "quit", "character to cause an Abort process", 0, termQuitCharp },
- { "eof", "character to cause an EOF ", 0, termEofCharp },
- { " ", "" },
- { " ", "The following are for local editing in linemode", 0, 0 },
- { "erase", "character to use to erase a character", 0, termEraseCharp },
- { "kill", "character to use to erase a line", 0, termKillCharp },
- { "lnext", "character to use for literal next", 0, termLiteralNextCharp },
- { "susp", "character to cause a Suspend Process", 0, termSuspCharp },
- { "reprint", "character to use for line reprint", 0, termRprntCharp },
- { "worderase", "character to use to erase a word", 0, termWerasCharp },
- { "start", "character to use for XON", 0, termStartCharp },
- { "stop", "character to use for XOFF", 0, termStopCharp },
- { "forw1", "alternate end of line character", 0, termForw1Charp },
- { "forw2", "alternate end of line character", 0, termForw2Charp },
- { "ayt", "alternate AYT character", 0, termAytCharp },
- { 0 }
+ { " ", "", NULL, NULL },
+ { " ", "The following need 'localchars' to be toggled true", NULL, NULL },
+ { "flushoutput", "character to cause an Abort Output", NULL, termFlushCharp },
+ { "interrupt", "character to cause an Interrupt Process", NULL, termIntCharp },
+ { "quit", "character to cause an Abort process", NULL, termQuitCharp },
+ { "eof", "character to cause an EOF ", NULL, termEofCharp },
+ { " ", "", NULL, NULL },
+ { " ", "The following are for local editing in linemode", NULL, NULL },
+ { "erase", "character to use to erase a character", NULL, termEraseCharp },
+ { "kill", "character to use to erase a line", NULL, termKillCharp },
+ { "lnext", "character to use for literal next", NULL, termLiteralNextCharp },
+ { "susp", "character to cause a Suspend Process", NULL, termSuspCharp },
+ { "reprint", "character to use for line reprint", NULL, termRprntCharp },
+ { "worderase", "character to use to erase a word", NULL, termWerasCharp },
+ { "start", "character to use for XON", NULL, termStartCharp },
+ { "stop", "character to use for XOFF", NULL, termStopCharp },
+ { "forw1", "alternate end of line character", NULL, termForw1Charp },
+ { "forw2", "alternate end of line character", NULL, termForw2Charp },
+ { "ayt", "alternate AYT character", NULL, termAytCharp },
+ { NULL, NULL, NULL, NULL }
};
-#if defined(CRAY) && !defined(__STDC__)
-/* Work around compiler bug in pcc 4.1.5 */
- void
-_setlist_init()
-{
-#ifndef KLUDGELINEMODE
-#define N 5
-#else
-#define N 6
-#endif
- Setlist[N+0].charp = &termFlushChar;
- Setlist[N+1].charp = &termIntChar;
- Setlist[N+2].charp = &termQuitChar;
- Setlist[N+3].charp = &termEofChar;
- Setlist[N+6].charp = &termEraseChar;
- Setlist[N+7].charp = &termKillChar;
- Setlist[N+8].charp = &termLiteralNextChar;
- Setlist[N+9].charp = &termSuspChar;
- Setlist[N+10].charp = &termRprntChar;
- Setlist[N+11].charp = &termWerasChar;
- Setlist[N+12].charp = &termStartChar;
- Setlist[N+13].charp = &termStopChar;
- Setlist[N+14].charp = &termForw1Char;
- Setlist[N+15].charp = &termForw2Char;
- Setlist[N+16].charp = &termAytChar;
-#undef N
-}
-#endif /* defined(CRAY) && !defined(__STDC__) */
-
- static struct setlist *
-getset(name)
- char *name;
+static struct setlist *
+getset(char *name)
{
return (struct setlist *)
genget(name, (char **) Setlist, sizeof(struct setlist));
}
- void
-set_escape_char(s)
- char *s;
+void
+set_escape_char(char *s)
{
if (rlogin != _POSIX_VDISABLE) {
rlogin = (s && *s) ? special(s) : _POSIX_VDISABLE;
}
}
- static int
-setcmd(argc, argv)
- int argc;
- char *argv[];
+static int
+setcmd(int argc, char *argv[])
{
int value;
struct setlist *ct;
fprintf(stderr, "'%s': unknown argument ('set ?' for help).\n",
argv[1]);
return 0;
- } else if (Ambiguous(c)) {
+ } else if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n",
argv[1]);
return 0;
} else if (argc != 3) {
printf("Format is 'set Name Value'\n'set ?' for help.\n");
return 0;
- } else if (Ambiguous(ct)) {
+ } else if (Ambiguous((void *)ct)) {
fprintf(stderr, "'%s': ambiguous argument ('set ?' for help).\n",
argv[1]);
return 0;
return 1;
}
- static int
-unsetcmd(argc, argv)
- int argc;
- char *argv[];
+static int
+unsetcmd(int argc, char *argv[])
{
struct setlist *ct;
struct togglelist *c;
- register char *name;
+ char *name;
if (argc < 2) {
fprintf(stderr,
fprintf(stderr, "'%s': unknown argument ('unset ?' for help).\n",
name);
return 0;
- } else if (Ambiguous(c)) {
+ } else if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n",
name);
return 0;
}
if (c->handler)
(*c->handler)(0);
- } else if (Ambiguous(ct)) {
+ } else if (Ambiguous((void *)ct)) {
fprintf(stderr, "'%s': ambiguous argument ('unset ?' for help).\n",
name);
return 0;
#ifdef KLUDGELINEMODE
extern int kludgelinemode;
- static int
-dokludgemode()
+static int
+dokludgemode(void)
{
kludgelinemode = 1;
send_wont(TELOPT_LINEMODE, 1);
send_dont(TELOPT_SGA, 1);
send_dont(TELOPT_ECHO, 1);
+ return 1;
}
#endif
- static int
-dolinemode()
+static int
+dolinemode(void)
{
#ifdef KLUDGELINEMODE
if (kludgelinemode)
return 1;
}
- static int
-docharmode()
+static int
+docharmode(void)
{
#ifdef KLUDGELINEMODE
if (kludgelinemode)
return 1;
}
- static int
-dolmmode(bit, on)
- int bit, on;
+static int
+dolmmode(int bit, int on)
{
unsigned char c;
extern int linemode;
return 1;
}
- int
-setmode(bit)
+static int
+setmod(int bit)
{
return dolmmode(bit, 1);
}
- int
-clearmode(bit)
+static int
+clearmode(int bit)
{
return dolmmode(bit, 0);
}
struct modelist {
- char *name; /* command name */
- char *help; /* help string */
- int (*handler)(); /* routine which executes command */
+ const char *name; /* command name */
+ const char *help; /* help string */
+ int (*handler)(int);/* routine which executes command */
int needconnect; /* Do we need to be connected to execute? */
int arg1;
};
-extern int modehelp();
-
static struct modelist ModeList[] = {
- { "character", "Disable LINEMODE option", docharmode, 1 },
+ { "character", "Disable LINEMODE option", (int (*)(int))docharmode, 1, 0 },
#ifdef KLUDGELINEMODE
- { "", "(or disable obsolete line-by-line mode)", 0 },
+ { "", "(or disable obsolete line-by-line mode)", NULL, 0, 0 },
#endif
- { "line", "Enable LINEMODE option", dolinemode, 1 },
+ { "line", "Enable LINEMODE option", (int (*)(int))dolinemode, 1, 0 },
#ifdef KLUDGELINEMODE
- { "", "(or enable obsolete line-by-line mode)", 0 },
+ { "", "(or enable obsolete line-by-line mode)", NULL, 0, 0 },
#endif
- { "", "", 0 },
- { "", "These require the LINEMODE option to be enabled", 0 },
- { "isig", "Enable signal trapping", setmode, 1, MODE_TRAPSIG },
- { "+isig", 0, setmode, 1, MODE_TRAPSIG },
+ { "", "", NULL, 0, 0 },
+ { "", "These require the LINEMODE option to be enabled", NULL, 0, 0 },
+ { "isig", "Enable signal trapping", setmod, 1, MODE_TRAPSIG },
+ { "+isig", 0, setmod, 1, MODE_TRAPSIG },
{ "-isig", "Disable signal trapping", clearmode, 1, MODE_TRAPSIG },
- { "edit", "Enable character editing", setmode, 1, MODE_EDIT },
- { "+edit", 0, setmode, 1, MODE_EDIT },
+ { "edit", "Enable character editing", setmod, 1, MODE_EDIT },
+ { "+edit", 0, setmod, 1, MODE_EDIT },
{ "-edit", "Disable character editing", clearmode, 1, MODE_EDIT },
- { "softtabs", "Enable tab expansion", setmode, 1, MODE_SOFT_TAB },
- { "+softtabs", 0, setmode, 1, MODE_SOFT_TAB },
+ { "softtabs", "Enable tab expansion", setmod, 1, MODE_SOFT_TAB },
+ { "+softtabs", 0, setmod, 1, MODE_SOFT_TAB },
{ "-softtabs", "Disable character editing", clearmode, 1, MODE_SOFT_TAB },
- { "litecho", "Enable literal character echo", setmode, 1, MODE_LIT_ECHO },
- { "+litecho", 0, setmode, 1, MODE_LIT_ECHO },
+ { "litecho", "Enable literal character echo", setmod, 1, MODE_LIT_ECHO },
+ { "+litecho", 0, setmod, 1, MODE_LIT_ECHO },
{ "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO },
- { "help", 0, modehelp, 0 },
+ { "help", 0, (int (*)(int))modehelp, 0, 0 },
#ifdef KLUDGELINEMODE
- { "kludgeline", 0, dokludgemode, 1 },
+ { "kludgeline", 0, (int (*)(int))dokludgemode, 1, 0 },
#endif
- { "", "", 0 },
- { "?", "Print help information", modehelp, 0 },
- { 0 },
+ { "", "", NULL, 0, 0 },
+ { "?", "Print help information", (int (*)(int))modehelp, 0, 0 },
+ { NULL, NULL, NULL, 0, 0 },
};
- int
-modehelp()
+static int
+modehelp(void)
{
struct modelist *mt;
#define GETMODECMD(name) (struct modelist *) \
genget(name, (char **) ModeList, sizeof(struct modelist))
- static int
-modecmd(argc, argv)
- int argc;
- char *argv[];
+static int
+modecmd(int argc, char *argv[])
{
struct modelist *mt;
printf("'mode ?' for help.\n");
} else if ((mt = GETMODECMD(argv[1])) == 0) {
fprintf(stderr, "Unknown mode '%s' ('mode ?' for help).\n", argv[1]);
- } else if (Ambiguous(mt)) {
+ } else if (Ambiguous((void *)mt)) {
fprintf(stderr, "Ambiguous mode '%s' ('mode ?' for help).\n", argv[1]);
} else if (mt->needconnect && !connected) {
printf("?Need to be connected first.\n");
* "display" command.
*/
- static int
-display(argc, argv)
- int argc;
- char *argv[];
+static int
+display(int argc, char *argv[])
{
struct togglelist *tl;
struct setlist *sl;
for (i = 1; i < argc; i++) {
sl = getset(argv[i]);
tl = GETTOGGLE(argv[i]);
- if (Ambiguous(sl) || Ambiguous(tl)) {
+ if (Ambiguous((void *)sl) || Ambiguous((void *)tl)) {
printf("?Ambiguous argument '%s'.\n", argv[i]);
return 0;
} else if (!sl && !tl) {
/*
* Set the escape character.
*/
- static int
-setescape(argc, argv)
- int argc;
- char *argv[];
+static int
+setescape(int argc, char *argv[])
{
- register char *arg;
+ char *arg;
char buf[50];
printf(
}
if (arg[0] != '\0')
escape = arg[0];
- if (!In3270) {
- printf("Escape character is '%s'.\n", control(escape));
- }
(void) fflush(stdout);
return 1;
}
- /*VARARGS*/
- static int
-togcrmod()
+static int
+togcrmod(void)
{
crmod = !crmod;
printf("Deprecated usage - please use 'toggle crmod' in the future.\n");
return 1;
}
- /*VARARGS*/
- int
-suspend()
+static int
+suspend(void)
{
#ifdef SIGTSTP
setcommandmode();
{
- long oldrows, oldcols, newrows, newcols, err;
+ long oldrows, oldcols, newrows, newcols, err_;
- err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
+ err_ = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
(void) kill(0, SIGTSTP);
/*
* If we didn't get the window size before the SUSPEND, but we
* we are set up for the right window size.
*/
if (TerminalWindowSize(&newrows, &newcols) && connected &&
- (err || ((oldrows != newrows) || (oldcols != newcols)))) {
+ (err_ || ((oldrows != newrows) || (oldcols != newcols)))) {
sendnaws();
}
}
return 1;
}
-#if !defined(TN3270)
- /*ARGSUSED*/
- int
-shell(argc, argv)
- int argc;
- char *argv[];
+static int
+shell(int argc, char *argv[] __unused)
{
- long oldrows, oldcols, newrows, newcols, err;
+ long oldrows, oldcols, newrows, newcols, err_;
setcommandmode();
- err = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
+ err_ = (TerminalWindowSize(&oldrows, &oldcols) == 0) ? 1 : 0;
switch(vfork()) {
case -1:
perror("Fork failed\n");
/*
* Fire up the shell in the child.
*/
- register char *shellp, *shellname;
- extern char *strrchr();
+ const char *shellp, *shellname;
shellp = getenv("SHELL");
if (shellp == NULL)
else
shellname++;
if (argc > 1)
- execl(shellp, shellname, "-c", &saveline[1], 0);
+ execl(shellp, shellname, "-c", &saveline[1], (char *)0);
else
- execl(shellp, shellname, 0);
+ execl(shellp, shellname, (char *)0);
perror("Execl");
_exit(1);
}
(void)wait((int *)0); /* Wait for the shell to complete */
if (TerminalWindowSize(&newrows, &newcols) && connected &&
- (err || ((oldrows != newrows) || (oldcols != newcols)))) {
+ (err_ || ((oldrows != newrows) || (oldcols != newcols)))) {
sendnaws();
}
break;
}
return 1;
}
-#else /* !defined(TN3270) */
-extern int shell();
-#endif /* !defined(TN3270) */
- /*VARARGS*/
- static
-bye(argc, argv)
- int argc; /* Number of arguments */
- char *argv[]; /* arguments */
+static int
+bye(int argc, char *argv[])
{
extern int resettermname;
(void) NetClose(net);
connected = 0;
resettermname = 1;
-#if defined(AUTHENTICATION) || defined(ENCRYPTION)
+#ifdef AUTHENTICATION
+#ifdef ENCRYPTION
auth_encrypt_connect(connected);
-#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */
+#endif
+#endif
/* reset options */
tninit();
-#if defined(TN3270)
- SetIn3270(); /* Get out of 3270 mode */
-#endif /* defined(TN3270) */
}
if ((argc != 2) || (strcmp(argv[1], "fromquit") != 0)) {
longjmp(toplevel, 1);
return 1; /* Keep lint, etc., happy */
}
-/*VARARGS*/
-quit()
+void
+quit(void)
{
(void) call(bye, "bye", "fromquit", 0);
Exit(0);
- /*NOTREACHED*/
}
-/*VARARGS*/
- int
-logout()
+static int
+logout(void)
{
send_do(TELOPT_LOGOUT, 1);
(void) netflush();
*/
struct slclist {
- char *name;
- char *help;
- void (*handler)();
+ const char *name;
+ const char *help;
+ void (*handler)(int);
int arg;
};
-static void slc_help();
+static void slc_help(void);
struct slclist SlcList[] = {
{ "export", "Use local special character definitions",
- slc_mode_export, 0 },
+ (void (*)(int))slc_mode_export, 0 },
{ "import", "Use remote special character definitions",
slc_mode_import, 1 },
{ "check", "Verify remote special character definitions",
slc_mode_import, 0 },
- { "help", 0, slc_help, 0 },
- { "?", "Print help information", slc_help, 0 },
- { 0 },
+ { "help", NULL, (void (*)(int))slc_help, 0 },
+ { "?", "Print help information", (void (*)(int))slc_help, 0 },
+ { NULL, NULL, NULL, 0 },
};
- static void
-slc_help()
+static void
+slc_help(void)
{
struct slclist *c;
}
}
- static struct slclist *
-getslc(name)
- char *name;
+static struct slclist *
+getslc(char *name)
{
return (struct slclist *)
genget(name, (char **) SlcList, sizeof(struct slclist));
}
- static
-slccmd(argc, argv)
- int argc;
- char *argv[];
+static int
+slccmd(int argc, char *argv[])
{
struct slclist *c;
argv[1]);
return 0;
}
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('slc ?' for help).\n",
argv[1]);
return 0;
*/
struct envlist {
- char *name;
- char *help;
- void (*handler)();
+ const char *name;
+ const char *help;
+ void (*handler)(unsigned char *, unsigned char *);
int narg;
};
extern struct env_lst *
- env_define P((unsigned char *, unsigned char *));
+ env_define(const unsigned char *, unsigned char *);
extern void
- env_undefine P((unsigned char *)),
- env_export P((unsigned char *)),
- env_unexport P((unsigned char *)),
- env_send P((unsigned char *)),
+ env_undefine(unsigned char *),
+ env_export(const unsigned char *),
+ env_unexport(const unsigned char *),
+ env_send(unsigned char *),
#if defined(OLD_ENVIRON) && defined(ENV_HACK)
- env_varval P((unsigned char *)),
+ env_varval(unsigned char *),
#endif
- env_list P((void));
+ env_list(void);
static void
- env_help P((void));
+ env_help(void);
struct envlist EnvList[] = {
{ "define", "Define an environment variable",
- (void (*)())env_define, 2 },
+ (void (*)(unsigned char *, unsigned char *))env_define, 2 },
{ "undefine", "Undefine an environment variable",
- env_undefine, 1 },
+ (void (*)(unsigned char *, unsigned char *))env_undefine, 1 },
{ "export", "Mark an environment variable for automatic export",
- env_export, 1 },
+ (void (*)(unsigned char *, unsigned char *))env_export, 1 },
{ "unexport", "Don't mark an environment variable for automatic export",
- env_unexport, 1 },
- { "send", "Send an environment variable", env_send, 1 },
+ (void (*)(unsigned char *, unsigned char *))env_unexport, 1 },
+ { "send", "Send an environment variable", (void (*)(unsigned char *, unsigned char *))env_send, 1 },
{ "list", "List the current environment variables",
- env_list, 0 },
+ (void (*)(unsigned char *, unsigned char *))env_list, 0 },
#if defined(OLD_ENVIRON) && defined(ENV_HACK)
{ "varval", "Reverse VAR and VALUE (auto, right, wrong, status)",
- env_varval, 1 },
+ (void (*)(unsigned char *, unsigned char *))env_varval, 1 },
#endif
- { "help", 0, env_help, 0 },
- { "?", "Print help information", env_help, 0 },
- { 0 },
+ { "help", NULL, (void (*)(unsigned char *, unsigned char *))env_help, 0 },
+ { "?", "Print help information", (void (*)(unsigned char *, unsigned char *))env_help, 0 },
+ { NULL, NULL, NULL, 0 },
};
- static void
-env_help()
+static void
+env_help(void)
{
struct envlist *c;
}
}
- static struct envlist *
-getenvcmd(name)
- char *name;
+static struct envlist *
+getenvcmd(char *name)
{
return (struct envlist *)
genget(name, (char **) EnvList, sizeof(struct envlist));
}
-env_cmd(argc, argv)
- int argc;
- char *argv[];
+static int
+env_cmd(int argc, char *argv[])
{
struct envlist *c;
argv[1]);
return 0;
}
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('environ ?' for help).\n",
argv[1]);
return 0;
struct env_lst envlisthead;
- struct env_lst *
-env_find(var)
- unsigned char *var;
+static struct env_lst *
+env_find(const unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
for (ep = envlisthead.next; ep; ep = ep->next) {
- if (strcmp((char *)ep->var, (char *)var) == 0)
+ if (strcmp(ep->var, var) == 0)
return(ep);
}
return(NULL);
}
- void
-env_init()
+void
+env_init(void)
{
extern char **environ;
- register char **epp, *cp;
- register struct env_lst *ep;
- extern char *strchr();
+ char **epp, *cp;
+ struct env_lst *ep;
for (epp = environ; *epp; epp++) {
- if (cp = strchr(*epp, '=')) {
+ if ((cp = strchr(*epp, '='))) {
*cp = '\0';
ep = env_define((unsigned char *)*epp,
(unsigned char *)cp+1);
* don't export the USER variable.
*/
if ((env_find("USER") == NULL) && (ep = env_find("LOGNAME"))) {
- env_define((unsigned char *)"USER", ep->value);
- env_unexport((unsigned char *)"USER");
+ env_define("USER", ep->value);
+ env_unexport("USER");
}
- env_export((unsigned char *)"DISPLAY");
- env_export((unsigned char *)"PRINTER");
+ env_export("DISPLAY");
+ env_export("PRINTER");
}
- struct env_lst *
-env_define(var, value)
- unsigned char *var, *value;
+struct env_lst *
+env_define(const unsigned char *var, unsigned char *value)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
- if (ep = env_find(var)) {
+ if ((ep = env_find(var))) {
if (ep->var)
free(ep->var);
if (ep->value)
}
ep->welldefined = opt_welldefined(var);
ep->export = 1;
- ep->var = (unsigned char *)strdup((char *)var);
- ep->value = (unsigned char *)strdup((char *)value);
+ ep->var = strdup(var);
+ ep->value = strdup(value);
return(ep);
}
- void
-env_undefine(var)
- unsigned char *var;
+void
+env_undefine(unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
- if (ep = env_find(var)) {
+ if ((ep = env_find(var))) {
ep->prev->next = ep->next;
if (ep->next)
ep->next->prev = ep->prev;
}
}
- void
-env_export(var)
- unsigned char *var;
+void
+env_export(const unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
- if (ep = env_find(var))
+ if ((ep = env_find(var)))
ep->export = 1;
}
- void
-env_unexport(var)
- unsigned char *var;
+void
+env_unexport(const unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
- if (ep = env_find(var))
+ if ((ep = env_find(var)))
ep->export = 0;
}
- void
-env_send(var)
- unsigned char *var;
+void
+env_send(unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
if (my_state_is_wont(TELOPT_NEW_ENVIRON)
#ifdef OLD_ENVIRON
env_opt_end(0);
}
- void
-env_list()
+void
+env_list(void)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
for (ep = envlisthead.next; ep; ep = ep->next) {
printf("%c %-20s %s\n", ep->export ? '*' : ' ',
}
}
- unsigned char *
-env_default(init, welldefined)
- int init;
+unsigned char *
+env_default(int init, int welldefined)
{
static struct env_lst *nep = NULL;
if (init) {
nep = &envlisthead;
- return;
+ return(NULL);
}
if (nep) {
- while (nep = nep->next) {
+ while ((nep = nep->next)) {
if (nep->export && (nep->welldefined == welldefined))
return(nep->var);
}
return(NULL);
}
- unsigned char *
-env_getvalue(var)
- unsigned char *var;
+unsigned char *
+env_getvalue(const unsigned char *var)
{
- register struct env_lst *ep;
+ struct env_lst *ep;
- if (ep = env_find(var))
+ if ((ep = env_find(var)))
return(ep->value);
return(NULL);
}
#if defined(OLD_ENVIRON) && defined(ENV_HACK)
- void
-env_varval(what)
- unsigned char *what;
+void
+env_varval(unsigned char *what)
{
extern int old_env_var, old_env_value, env_auto;
int len = strlen((char *)what);
}
#endif
-#if defined(AUTHENTICATION)
+#ifdef AUTHENTICATION
/*
* The AUTHENTICATE command.
*/
struct authlist {
- char *name;
- char *help;
- int (*handler)();
+ const char *name;
+ const char *help;
+ int (*handler)(char *);
int narg;
};
extern int
- auth_enable P((char *)),
- auth_disable P((char *)),
- auth_status P((void));
+ auth_enable(char *),
+ auth_disable(char *),
+ auth_status(void);
static int
- auth_help P((void));
+ auth_help(void);
struct authlist AuthList[] = {
{ "status", "Display current status of authentication information",
- auth_status, 0 },
+ (int (*)(char *))auth_status, 0 },
{ "disable", "Disable an authentication type ('auth disable ?' for more)",
auth_disable, 1 },
{ "enable", "Enable an authentication type ('auth enable ?' for more)",
auth_enable, 1 },
- { "help", 0, auth_help, 0 },
- { "?", "Print help information", auth_help, 0 },
- { 0 },
+ { "help", NULL, (int (*)(char *))auth_help, 0 },
+ { "?", "Print help information", (int (*)(char *))auth_help, 0 },
+ { NULL, NULL, NULL, 0 },
};
- static int
-auth_help()
+static int
+auth_help(void)
{
struct authlist *c;
return 0;
}
-auth_cmd(argc, argv)
- int argc;
- char *argv[];
+int
+auth_cmd(int argc, char *argv[])
{
struct authlist *c;
argv[1]);
return 0;
}
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('auth ?' for help).\n",
argv[1]);
return 0;
c->narg, c->narg == 1 ? "" : "s", c->name);
return 0;
}
- return((*c->handler)(argv[2], argv[3]));
+ return((*c->handler)(argv[2]));
}
#endif
*/
struct encryptlist {
- char *name;
- char *help;
- int (*handler)();
+ const char *name;
+ const char *help;
+ int (*handler)(char *, char *);
int needconnect;
int minarg;
int maxarg;
};
extern int
- EncryptEnable P((char *, char *)),
- EncryptDisable P((char *, char *)),
- EncryptType P((char *, char *)),
- EncryptStart P((char *)),
- EncryptStartInput P((void)),
- EncryptStartOutput P((void)),
- EncryptStop P((char *)),
- EncryptStopInput P((void)),
- EncryptStopOutput P((void)),
- EncryptStatus P((void));
+ EncryptEnable(char *, char *),
+ EncryptDisable(char *, char *),
+ EncryptType(char *, char *),
+ EncryptStart(char *),
+ EncryptStartInput(void),
+ EncryptStartOutput(void),
+ EncryptStop(char *),
+ EncryptStopInput(void),
+ EncryptStopOutput(void),
+ EncryptStatus(void);
static int
- EncryptHelp P((void));
+ EncryptHelp(void);
struct encryptlist EncryptList[] = {
{ "enable", "Enable encryption. ('encrypt enable ?' for more)",
{ "type", "Set encryption type. ('encrypt type ?' for more)",
EncryptType, 0, 1, 1 },
{ "start", "Start encryption. ('encrypt start ?' for more)",
- EncryptStart, 1, 0, 1 },
+ (int (*)(char *, char *))EncryptStart, 1, 0, 1 },
{ "stop", "Stop encryption. ('encrypt stop ?' for more)",
- EncryptStop, 1, 0, 1 },
+ (int (*)(char *, char *))EncryptStop, 1, 0, 1 },
{ "input", "Start encrypting the input stream",
- EncryptStartInput, 1, 0, 0 },
+ (int (*)(char *, char *))EncryptStartInput, 1, 0, 0 },
{ "-input", "Stop encrypting the input stream",
- EncryptStopInput, 1, 0, 0 },
+ (int (*)(char *, char *))EncryptStopInput, 1, 0, 0 },
{ "output", "Start encrypting the output stream",
- EncryptStartOutput, 1, 0, 0 },
+ (int (*)(char *, char *))EncryptStartOutput, 1, 0, 0 },
{ "-output", "Stop encrypting the output stream",
- EncryptStopOutput, 1, 0, 0 },
+ (int (*)(char *, char *))EncryptStopOutput, 1, 0, 0 },
{ "status", "Display current status of authentication information",
- EncryptStatus, 0, 0, 0 },
- { "help", 0, EncryptHelp, 0, 0, 0 },
- { "?", "Print help information", EncryptHelp, 0, 0, 0 },
- { 0 },
+ (int (*)(char *, char *))EncryptStatus, 0, 0, 0 },
+ { "help", NULL, (int (*)(char *, char *))EncryptHelp, 0, 0, 0 },
+ { "?", "Print help information", (int (*)(char *, char *))EncryptHelp, 0, 0, 0 },
+ { NULL, NULL, NULL, 0, 0, 0 },
};
- static int
-EncryptHelp()
+static int
+EncryptHelp(void)
{
struct encryptlist *c;
return 0;
}
-encrypt_cmd(argc, argv)
- int argc;
- char *argv[];
+static int
+encrypt_cmd(int argc, char *argv[])
{
struct encryptlist *c;
argv[1]);
return 0;
}
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
fprintf(stderr, "'%s': ambiguous argument ('encrypt ?' for help).\n",
argv[1]);
return 0;
}
}
return ((*c->handler)(argc > 0 ? argv[2] : 0,
- argc > 1 ? argv[3] : 0,
- argc > 2 ? argv[4] : 0));
+ argc > 1 ? argv[3] : 0));
}
#endif /* ENCRYPTION */
-#if (defined(unix) || defined(__APPLE__)) && defined(TN3270)
- static void
-filestuff(fd)
- int fd;
-{
- int res;
-
-#ifdef F_GETOWN
- setconnmode(0);
- res = fcntl(fd, F_GETOWN, 0);
- setcommandmode();
-
- if (res == -1) {
- perror("fcntl");
- return;
- }
- printf("\tOwner is %d.\n", res);
-#endif
-
- setconnmode(0);
- res = fcntl(fd, F_GETFL, 0);
- setcommandmode();
-
- if (res == -1) {
- perror("fcntl");
- return;
- }
-#ifdef notdef
- printf("\tFlags are 0x%x: %s\n", res, decodeflags(res));
-#endif
-}
-#endif /* (defined(unix) || defined(__APPLE__)) && defined(TN3270) */
-
/*
* Print status about the connection.
*/
- /*ARGSUSED*/
- static
-status(argc, argv)
- int argc;
- char *argv[];
+/*ARGSUSED*/
+static int
+status(int argc, char *argv[])
{
if (connected) {
printf("Connected to %s.\n", hostname);
} else {
printf("No connection.\n");
}
-# if !defined(TN3270)
printf("Escape character is '%s'.\n", control(escape));
(void) fflush(stdout);
-# else /* !defined(TN3270) */
- if ((!In3270) && ((argc < 2) || strcmp(argv[1], "notmuch"))) {
- printf("Escape character is '%s'.\n", control(escape));
- }
-# if defined(unix) || defined(__APPLE__)
- if ((argc >= 2) && !strcmp(argv[1], "everything")) {
- printf("SIGIO received %d time%s.\n",
- sigiocount, (sigiocount == 1)? "":"s");
- if (In3270) {
- printf("Process ID %d, process group %d.\n",
- getpid(), getpgrp(getpid()));
- printf("Terminal input:\n");
- filestuff(tin);
- printf("Terminal output:\n");
- filestuff(tout);
- printf("Network socket:\n");
- filestuff(net);
- }
- }
- if (In3270 && transcom) {
- printf("Transparent mode command is '%s'.\n", transcom);
- }
-# endif /* defined(unix) || defined(__APPLE__) */
- (void) fflush(stdout);
- if (In3270) {
- return 0;
- }
-# endif /* defined(TN3270) */
return 1;
}
/*
* Function that gets called when SIGINFO is received.
*/
-ayt_status()
+void
+ayt_status(void)
{
(void) call(status, "status", "notmuch", 0);
}
#endif
-unsigned long inet_addr();
-
- int
-tn(argc, argv)
- int argc;
- char *argv[];
-{
- register struct hostent *host = 0;
- struct sockaddr_in sin;
- struct servent *sp = 0;
- unsigned long temp;
- extern char *inet_ntoa();
-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
- char *srp = 0, *strrchr();
- unsigned long sourceroute(), srlen;
+static const char *
+sockaddr_ntop(struct sockaddr *sa)
+{
+ void *addr;
+ static char addrbuf[INET6_ADDRSTRLEN];
+
+ switch (sa->sa_family) {
+ case AF_INET:
+ addr = &((struct sockaddr_in *)sa)->sin_addr;
+ break;
+ case AF_UNIX:
+ addr = &((struct sockaddr_un *)sa)->sun_path;
+ break;
+#ifdef INET6
+ case AF_INET6:
+ addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
+ break;
+#endif
+ default:
+ return NULL;
+ }
+ inet_ntop(sa->sa_family, addr, addrbuf, sizeof(addrbuf));
+ return addrbuf;
+}
+
+#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
+static int
+setpolicy(int lnet, struct addrinfo *res, char *policy)
+{
+ char *buf;
+ int level;
+ int optname;
+
+ if (policy == NULL)
+ return 0;
+
+ buf = ipsec_set_policy(policy, strlen(policy));
+ if (buf == NULL) {
+ printf("%s\n", ipsec_strerror());
+ return -1;
+ }
+ level = res->ai_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6;
+ optname = res->ai_family == AF_INET ? IP_IPSEC_POLICY : IPV6_IPSEC_POLICY;
+ if (setsockopt(lnet, level, optname, buf, ipsec_get_policylen(buf)) < 0){
+ perror("setsockopt");
+ return -1;
+ }
+
+ free(buf);
+ return 0;
+}
+#endif
+
+#ifdef INET6
+/*
+ * When an Address Family related error happend, check if retry with
+ * another AF is possible or not.
+ * Return 1, if retry with another af is OK. Else, return 0.
+ */
+static int
+switch_af(struct addrinfo **aip)
+{
+ int nextaf;
+ struct addrinfo *ai;
+
+ ai = *aip;
+ nextaf = (ai->ai_family == AF_INET) ? AF_INET6 : AF_INET;
+ do
+ ai=ai->ai_next;
+ while (ai != NULL && ai->ai_family != nextaf);
+ *aip = ai;
+ if (*aip != NULL) {
+ return 1;
+ }
+ return 0;
+}
#endif
- char *cmd, *hostp = 0, *portp = 0, *user = 0;
- /* clear the socket address prior to use */
- memset((char *)&sin, 0, sizeof(sin));
+int
+tn(int argc, char *argv[])
+{
+ char *srp = 0;
+ int proto, opt;
+ int srlen;
+ int srcroute = 0, result;
+ char *cmd, *hostp = 0, *portp = 0, *user = 0;
+ char *src_addr = NULL;
+ struct addrinfo hints, *res, *res0 = NULL, *src_res, *src_res0 = NULL;
+ int error = 0, af_error = 0;
if (connected) {
printf("?Already connected to %s\n", hostname);
autologin = 1;
continue;
}
+ if (strcmp(*argv, "-s") == 0) {
+ --argc; ++argv;
+ if (argc == 0)
+ goto usage;
+ src_addr = *argv++;
+ --argc;
+ continue;
+ }
if (hostp == 0) {
hostp = *argv++;
--argc;
continue;
}
usage:
- printf("usage: %s [-l user] [-a] host-name [port]\n", cmd);
+ printf("usage: %s [-l user] [-a] [-s src_addr] host-name [port]\n", cmd);
setuid(getuid());
return 0;
}
if (hostp == 0)
goto usage;
-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
- if (hostp[0] == '@' || hostp[0] == '!') {
- if ((hostname = strrchr(hostp, ':')) == NULL)
- hostname = strrchr(hostp, '@');
- hostname++;
- srp = 0;
- temp = sourceroute(hostp, &srp, &srlen);
- if (temp == 0) {
- herror(srp);
- setuid(getuid());
- return 0;
- } else if (temp == -1) {
- printf("Bad source route option: %s\n", hostp);
- setuid(getuid());
- return 0;
- } else {
- sin.sin_addr.s_addr = temp;
- sin.sin_family = AF_INET;
- }
- } else {
-#endif
- temp = inet_addr(hostp);
- if (temp != (unsigned long) -1) {
- sin.sin_addr.s_addr = temp;
- sin.sin_family = AF_INET;
- (void) strcpy(_hostname, hostp);
- hostname = _hostname;
- } else {
- host = gethostbyname(hostp);
- if (host) {
- sin.sin_family = host->h_addrtype;
-#if defined(h_addr) /* In 4.3, this is a #define */
- memmove((caddr_t)&sin.sin_addr,
- host->h_addr_list[0], host->h_length);
-#else /* defined(h_addr) */
- memmove((caddr_t)&sin.sin_addr, host->h_addr, host->h_length);
-#endif /* defined(h_addr) */
- strncpy(_hostname, host->h_name, sizeof(_hostname));
- _hostname[sizeof(_hostname)-1] = '\0';
- hostname = _hostname;
- } else {
- herror(hostp);
+ if (src_addr != NULL) {
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_family = family;
+ hints.ai_socktype = SOCK_STREAM;
+ error = getaddrinfo(src_addr, 0, &hints, &src_res);
+ if (error == EAI_NODATA) {
+ hints.ai_flags = 0;
+ error = getaddrinfo(src_addr, 0, &hints, &src_res);
+ }
+ if (error != 0) {
+ fprintf(stderr, "%s: %s\n", src_addr, gai_strerror(error));
+ if (error == EAI_SYSTEM)
+ fprintf(stderr, "%s: %s\n", src_addr, strerror(errno));
setuid(getuid());
return 0;
- }
}
-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
- }
+ src_res0 = src_res;
+ }
+ if (hostp[0] == '/') {
+ struct sockaddr_un su;
+
+ if (strlen(hostp) >= sizeof(su.sun_path)) {
+ fprintf(stderr, "hostname too long for unix domain socket: %s",
+ hostp);
+ goto fail;
+ }
+ memset(&su, 0, sizeof su);
+ su.sun_family = AF_UNIX;
+ strncpy(su.sun_path, hostp, sizeof su.sun_path);
+ printf("Trying %s...\n", hostp);
+ net = socket(PF_UNIX, SOCK_STREAM, 0);
+ if ( net < 0) {
+ perror("socket");
+ goto fail;
+ }
+ if (connect(net, (struct sockaddr *)&su, sizeof su) == -1) {
+ perror(su.sun_path);
+ (void) NetClose(net);
+ goto fail;
+ }
+ goto af_unix;
+ } else if (hostp[0] == '@' || hostp[0] == '!') {
+ if (
+#ifdef INET6
+ family == AF_INET6 ||
#endif
- if (portp) {
- if (*portp == '-') {
- portp++;
- telnetport = 1;
- } else
- telnetport = 0;
- sin.sin_port = atoi(portp);
- if (sin.sin_port == 0) {
- sp = getservbyname(portp, "tcp");
- if (sp)
- sin.sin_port = sp->s_port;
- else {
- printf("%s: bad port number\n", portp);
- setuid(getuid());
- return 0;
- }
+ (hostname = strrchr(hostp, ':')) == NULL)
+ hostname = strrchr(hostp, '@');
+ if (hostname == NULL) {
+ hostname = hostp;
} else {
-#if !defined(htons)
- u_short htons P((unsigned short));
-#endif /* !defined(htons) */
- sin.sin_port = htons(sin.sin_port);
+ hostname++;
+ srcroute = 1;
}
+ } else
+ hostname = hostp;
+ if (!portp) {
+ telnetport = 1;
+ portp = strdup("telnet");
+ } else if (*portp == '-') {
+ portp++;
+ telnetport = 1;
+ } else
+ telnetport = 0;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_family = family;
+ hints.ai_socktype = SOCK_STREAM;
+ error = getaddrinfo(hostname, portp, &hints, &res);
+ if (error) {
+ hints.ai_flags = AI_CANONNAME;
+ error = getaddrinfo(hostname, portp, &hints, &res);
+ }
+ if (error != 0) {
+ fprintf(stderr, "%s: %s\n", hostname, gai_strerror(error));
+ if (error == EAI_SYSTEM)
+ fprintf(stderr, "%s: %s\n", hostname, strerror(errno));
+ setuid(getuid());
+ goto fail;
+ }
+ if (hints.ai_flags == AI_NUMERICHOST) {
+ /* hostname has numeric */
+ int gni_err = 1;
+
+ if (doaddrlookup)
+ gni_err = getnameinfo(res->ai_addr, res->ai_addr->sa_len,
+ _hostname, sizeof(_hostname) - 1, NULL, 0,
+ NI_NAMEREQD);
+ if (gni_err != 0)
+ (void) strncpy(_hostname, hostp, sizeof(_hostname) - 1);
+ _hostname[sizeof(_hostname)-1] = '\0';
+ hostname = _hostname;
} else {
- if (sp == 0) {
- sp = getservbyname("telnet", "tcp");
- if (sp == 0) {
- fprintf(stderr, "telnet: tcp/telnet: unknown service\n");
- setuid(getuid());
- return 0;
+ /* hostname has FQDN */
+ if (srcroute != 0)
+ (void) strncpy(_hostname, hostname, sizeof(_hostname) - 1);
+ else if (res->ai_canonname != NULL)
+ strcpy(_hostname, res->ai_canonname);
+ else
+ (void) strncpy(_hostname, hostp, sizeof(_hostname) - 1);
+ _hostname[sizeof(_hostname)-1] = '\0';
+ hostname = _hostname;
+ }
+ res0 = res;
+ #ifdef INET6
+ af_again:
+ #endif
+ if (srcroute != 0) {
+ static char hostbuf[BUFSIZ];
+
+ if (af_error == 0) { /* save intermediate hostnames for retry */
+ strncpy(hostbuf, hostp, BUFSIZ - 1);
+ hostbuf[BUFSIZ - 1] = '\0';
+ } else
+ hostp = hostbuf;
+ srp = 0;
+ result = sourceroute(res, hostp, &srp, &srlen, &proto, &opt);
+ if (result == 0) {
+#ifdef INET6
+ if (family == AF_UNSPEC && af_error == 0 &&
+ switch_af(&res) == 1) {
+ af_error = 1;
+ goto af_again;
}
- sin.sin_port = sp->s_port;
+#endif
+ setuid(getuid());
+ goto fail;
+ } else if (result == -1) {
+ printf("Bad source route option: %s\n", hostp);
+ setuid(getuid());
+ goto fail;
}
- telnetport = 1;
}
- printf("Trying %s...\n", inet_ntoa(sin.sin_addr));
do {
- net = socket(AF_INET, SOCK_STREAM, 0);
+ printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
+ net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
setuid(getuid());
if (net < 0) {
+#ifdef INET6
+ if (family == AF_UNSPEC && af_error == 0 &&
+ switch_af(&res) == 1) {
+ af_error = 1;
+ goto af_again;
+ }
+#endif
perror("telnet: socket");
- return 0;
+ goto fail;
}
-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
- if (srp && setsockopt(net, IPPROTO_IP, IP_OPTIONS, (char *)srp, srlen) < 0)
- perror("setsockopt (IP_OPTIONS)");
-#endif
+ if (srp && setsockopt(net, proto, opt, (char *)srp, srlen) < 0)
+ perror("setsockopt (source route)");
#if defined(IPPROTO_IP) && defined(IP_TOS)
- {
+ if (res->ai_family == PF_INET) {
# if defined(HAS_GETTOS)
struct tosent *tp;
if (tos < 0 && (tp = gettosbyname("telnet", "tcp")))
tos = tp->t_tos;
# endif
if (tos < 0)
- tos = 020; /* Low Delay bit */
+ tos = IPTOS_LOWDELAY;
if (tos
&& (setsockopt(net, IPPROTO_IP, IP_TOS,
(char *)&tos, sizeof(int)) < 0)
perror("setsockopt (SO_DEBUG)");
}
- if (connect(net, (struct sockaddr *)&sin, sizeof (sin)) < 0) {
-#if defined(h_addr) /* In 4.3, this is a #define */
- if (host && host->h_addr_list[1]) {
- int oerrno = errno;
+ if (src_addr != NULL) {
+ for (src_res = src_res0; src_res != 0; src_res = src_res->ai_next)
+ if (src_res->ai_family == res->ai_family)
+ break;
+ if (src_res == NULL)
+ src_res = src_res0;
+ if (bind(net, src_res->ai_addr, src_res->ai_addrlen) == -1) {
+#ifdef INET6
+ if (family == AF_UNSPEC && af_error == 0 &&
+ switch_af(&res) == 1) {
+ af_error = 1;
+ (void) NetClose(net);
+ goto af_again;
+ }
+#endif
+ perror("bind");
+ (void) NetClose(net);
+ goto fail;
+ }
+ }
+#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
+ if (setpolicy(net, res, ipsec_policy_in) < 0) {
+ (void) NetClose(net);
+ goto fail;
+ }
+ if (setpolicy(net, res, ipsec_policy_out) < 0) {
+ (void) NetClose(net);
+ goto fail;
+ }
+#endif
- fprintf(stderr, "telnet: connect to address %s: ",
- inet_ntoa(sin.sin_addr));
- errno = oerrno;
- perror((char *)0);
- host->h_addr_list++;
- memmove((caddr_t)&sin.sin_addr,
- host->h_addr_list[0], host->h_length);
+ if (connect(net, res->ai_addr, res->ai_addrlen) < 0) {
+ struct addrinfo *next;
+
+ next = res->ai_next;
+ /* If already an af failed, only try same af. */
+ if (af_error != 0)
+ while (next != NULL && next->ai_family != res->ai_family)
+ next = next->ai_next;
+ warn("connect to address %s", sockaddr_ntop(res->ai_addr));
+ if (next != NULL) {
+ res = next;
(void) NetClose(net);
continue;
}
-#endif /* defined(h_addr) */
- perror("telnet: Unable to connect to remote host");
- return 0;
+ warnx("Unable to connect to remote host");
+ (void) NetClose(net);
+ goto fail;
}
connected++;
-#if defined(AUTHENTICATION) || defined(ENCRYPTION)
+#ifdef AUTHENTICATION
+#ifdef ENCRYPTION
auth_encrypt_connect(connected);
-#endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */
+#endif
+#endif
} while (connected == 0);
+ freeaddrinfo(res0);
+ if (src_res0 != NULL)
+ freeaddrinfo(src_res0);
cmdrc(hostp, hostname);
+ af_unix:
if (autologin && user == NULL) {
struct passwd *pw;
user = getenv("USER");
if (user == NULL ||
- (pw = getpwnam(user)) && pw->pw_uid != getuid()) {
- if (pw = getpwuid(getuid()))
+ ((pw = getpwnam(user)) && pw->pw_uid != getuid())) {
+ if ((pw = getpwuid(getuid())))
user = pw->pw_name;
else
user = NULL;
}
}
if (user) {
- env_define((unsigned char *)"USER", (unsigned char *)user);
- env_export((unsigned char *)"USER");
+ env_define("USER", user);
+ env_export("USER");
}
(void) call(status, "status", "notmuch", 0);
if (setjmp(peerdied) == 0)
(void) NetClose(net);
ExitString("Connection closed by foreign host.\n",1);
/*NOTREACHED*/
+ fail:
+ if (res0 != NULL)
+ freeaddrinfo(res0);
+ if (src_res0 != NULL)
+ freeaddrinfo(src_res0);
+ return 0;
}
#define HELPINDENT (sizeof ("connect"))
togglestring[] ="toggle operating parameters ('toggle ?' for more)",
slchelp[] = "change state of special charaters ('slc ?' for more)",
displayhelp[] = "display operating parameters",
-#if defined(TN3270) && (defined(unix) || defined(__APPLE__))
- transcomhelp[] = "specify Unix command for transparent mode pipe",
-#endif /* defined(TN3270) && (defined(unix) || defined(__APPLE__)) */
-#if defined(AUTHENTICATION)
+#ifdef AUTHENTICATION
authhelp[] = "turn on (off) authentication ('auth ?' for more)",
#endif
#ifdef ENCRYPTION
encrypthelp[] = "turn on (off) encryption ('encrypt ?' for more)",
#endif /* ENCRYPTION */
-#if defined(unix) || defined(__APPLE__)
zhelp[] = "suspend telnet",
-#endif /* defined(unix) || defined(__APPLE__) */
+#ifdef OPIE
+ opiehelp[] = "compute response to OPIE challenge",
+#endif
shellhelp[] = "invoke a subshell",
envhelp[] = "change environment variables ('environ ?' for more)",
modestring[] = "try to enter line or character mode ('mode ?' for more)";
-static int help();
-
static Command cmdtab[] = {
{ "close", closehelp, bye, 1 },
- { "logout", logouthelp, logout, 1 },
+ { "logout", logouthelp, (int (*)(int, char **))logout, 1 },
{ "display", displayhelp, display, 0 },
{ "mode", modestring, modecmd, 0 },
+ { "telnet", openhelp, tn, 0 },
{ "open", openhelp, tn, 0 },
- { "quit", quithelp, quit, 0 },
+ { "quit", quithelp, (int (*)(int, char **))quit, 0 },
{ "send", sendhelp, sendcmd, 0 },
{ "set", sethelp, setcmd, 0 },
{ "unset", unsethelp, unsetcmd, 0 },
{ "status", statushelp, status, 0 },
{ "toggle", togglestring, toggle, 0 },
{ "slc", slchelp, slccmd, 0 },
-#if defined(TN3270) && (defined(unix) || defined(__APPLE__))
- { "transcom", transcomhelp, settranscom, 0 },
-#endif /* defined(TN3270) && (defined(unix) || defined(__APPLE__)) */
-#if defined(AUTHENTICATION)
+#ifdef AUTHENTICATION
{ "auth", authhelp, auth_cmd, 0 },
#endif
#ifdef ENCRYPTION
{ "encrypt", encrypthelp, encrypt_cmd, 0 },
#endif /* ENCRYPTION */
-#if defined(unix) || defined(__APPLE__)
- { "z", zhelp, suspend, 0 },
-#endif /* defined(unix) || defined(__APPLE__) */
-#if defined(TN3270)
+ { "z", zhelp, (int (*)(int, char **))suspend, 0 },
{ "!", shellhelp, shell, 1 },
-#else
- { "!", shellhelp, shell, 0 },
-#endif
{ "environ", envhelp, env_cmd, 0 },
{ "?", helphelp, help, 0 },
- { 0 }
+#ifdef OPIE
+ { "opie", opiehelp, opie_calc, 0 },
+#endif
+ { NULL, NULL, NULL, 0 }
};
static char crmodhelp[] = "deprecated command -- use 'toggle crmod' instead";
static Command cmdtab2[] = {
{ "help", 0, help, 0 },
{ "escape", escapehelp, setescape, 0 },
- { "crmod", crmodhelp, togcrmod, 0 },
- { 0 }
+ { "crmod", crmodhelp, (int (*)(int, char **))togcrmod, 0 },
+ { NULL, NULL, NULL, 0 }
};
* Call routine with argc, argv set from args (terminated by 0).
*/
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-
- /*VARARGS1*/
- static
-#if __STDC__
+static int
call(intrtn_t routine, ...)
{
-#else
-call(va_alist)
- va_dcl
-{
- intrtn_t routine;
-#endif
va_list ap;
char *args[100];
int argno = 0;
-#if __STDC__
va_start(ap, routine);
-#else
- va_start(ap);
- routine = (va_arg(ap, intrtn_t));
-#endif
- while ((args[argno++] = va_arg(ap, char *)) != 0) {
- ;
- }
+ while ((args[argno++] = va_arg(ap, char *)) != 0);
va_end(ap);
return (*routine)(argno-1, args);
}
- static Command *
-getcmd(name)
- char *name;
+static Command *
+getcmd(char *name)
{
Command *cm;
- if (cm = (Command *) genget(name, (char **) cmdtab, sizeof(Command)))
+ if ((cm = (Command *) genget(name, (char **) cmdtab, sizeof(Command))))
return cm;
return (Command *) genget(name, (char **) cmdtab2, sizeof(Command));
}
- void
-command(top, tbuf, cnt)
- int top;
- char *tbuf;
- int cnt;
+void
+command(int top, const char *tbuf, int cnt)
{
- register Command *c;
+ Command *c;
setcommandmode();
if (!top) {
putchar('\n');
-#if defined(unix) || defined(__APPLE__)
} else {
(void) signal(SIGINT, SIG_DFL);
(void) signal(SIGQUIT, SIG_DFL);
-#endif /* defined(unix) || defined(__APPLE__) */
}
for (;;) {
if (rlogin == _POSIX_VDISABLE)
printf("%s> ", prompt);
if (tbuf) {
- register char *cp;
+ char *cp;
cp = line;
while (cnt > 0 && (*cp++ = *tbuf++) != '\n')
cnt--;
break;
}
c = getcmd(margv[0]);
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
printf("?Ambiguous command\n");
continue;
}
longjmp(toplevel, 1);
/*NOTREACHED*/
}
-#if defined(TN3270)
- if (shell_active == 0) {
- setconnmode(0);
- }
-#else /* defined(TN3270) */
setconnmode(0);
-#endif /* defined(TN3270) */
}
}
\f
/*
* Help command.
*/
- static
-help(argc, argv)
- int argc;
- char *argv[];
+static int
+help(int argc, char *argv[])
{
- register Command *c;
+ Command *c;
if (argc == 1) {
printf("Commands may be abbreviated. Commands are:\n\n");
for (c = cmdtab; c->name; c++)
if (c->help) {
- printf("%-*s\t%s\n", HELPINDENT, c->name,
+ printf("%-*s\t%s\n", (int)HELPINDENT, c->name,
c->help);
}
return 0;
}
- while (--argc > 0) {
- register char *arg;
+ else while (--argc > 0) {
+ char *arg;
arg = *++argv;
c = getcmd(arg);
- if (Ambiguous(c))
+ if (Ambiguous((void *)c))
printf("?Ambiguous help command %s\n", arg);
else if (c == (Command *)0)
printf("?Invalid help command %s\n", arg);
static char *rcname = 0;
static char rcbuf[128];
-cmdrc(m1, m2)
- char *m1, *m2;
+void
+cmdrc(char *m1, char *m2)
{
- register Command *c;
+ Command *c;
FILE *rcfile;
int gotmachine = 0;
int l1 = strlen(m1);
int l2 = strlen(m2);
- char m1save[64];
+ char m1save[MAXHOSTNAMELEN];
if (skiprc)
return;
- strcpy(m1save, m1);
+ strlcpy(m1save, m1, sizeof(m1save));
m1 = m1save;
if (rcname == 0) {
rcname = getenv("HOME");
- if (rcname)
+ if (rcname && (strlen(rcname) + 10) < sizeof(rcbuf))
strcpy(rcbuf, rcname);
else
rcbuf[0] = '\0';
if (margv[0] == 0)
continue;
c = getcmd(margv[0]);
- if (Ambiguous(c)) {
+ if (Ambiguous((void *)c)) {
printf("?Ambiguous command: %s\n", margv[0]);
continue;
}
fclose(rcfile);
}
-#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
-
/*
* Source route is handed in as
* [!]@hop1@hop2...[@|:]dst
* be the address to connect() to.
*
* Arguments:
+ *
+ * res: ponter to addrinfo structure which contains sockaddr to
+ * the host to connect to.
+ *
* arg: pointer to route list to decipher
*
* cpp: If *cpp is not equal to NULL, this is a
* lenp: pointer to an integer that contains the
* length of *cpp if *cpp != NULL.
*
+ * protop: pointer to an integer that should be filled in with
+ * appropriate protocol for setsockopt, as socket
+ * protocol family.
+ *
+ * optp: pointer to an integer that should be filled in with
+ * appropriate option for setsockopt, as socket protocol
+ * family.
+ *
* Return values:
*
- * Returns the address of the host to connect to. If the
+ * If the return value is 1, then all operations are
+ * successful. If the
* return value is -1, there was a syntax error in the
* option, either unknown characters, or too many hosts.
* If the return value is 0, one of the hostnames in the
* *lenp: This will be filled in with how long the option
* pointed to by *cpp is.
*
+ * *protop: This will be filled in with appropriate protocol for
+ * setsockopt, as socket protocol family.
+ *
+ * *optp: This will be filled in with appropriate option for
+ * setsockopt, as socket protocol family.
*/
- unsigned long
-sourceroute(arg, cpp, lenp)
- char *arg;
- char **cpp;
- int *lenp;
-{
- static char lsr[44];
-#ifdef sysV88
- static IOPTN ipopt;
+static int
+sourceroute(struct addrinfo *ai, char *arg, char **cpp, int *lenp, int *protop, int *optp)
+{
+ static char buf[1024 + ALIGNBYTES]; /*XXX*/
+ char *cp, *cp2, *lsrp, *ep;
+ struct sockaddr_in *_sin;
+#ifdef INET6
+ struct sockaddr_in6 *sin6;
+ struct cmsghdr *cmsg;
#endif
- char *cp, *cp2, *lsrp, *lsrep;
- register int tmp;
- struct in_addr sin_addr;
- register struct hostent *host = 0;
- register char c;
+ struct addrinfo hints, *res;
+ int error;
+ char c;
/*
* Verify the arguments, and make sure we have
* at least 7 bytes for the option.
*/
if (cpp == NULL || lenp == NULL)
- return((unsigned long)-1);
- if (*cpp != NULL && *lenp < 7)
- return((unsigned long)-1);
+ return -1;
+ if (*cpp != NULL) {
+ switch (res->ai_family) {
+ case AF_INET:
+ if (*lenp < 7)
+ return -1;
+ break;
+#ifdef INET6
+ case AF_INET6:
+ if (*lenp < (int)CMSG_SPACE(sizeof(struct ip6_rthdr) +
+ sizeof(struct in6_addr)))
+ return -1;
+ break;
+#endif
+ }
+ }
/*
* Decide whether we have a buffer passed to us,
* or if we need to use our own static buffer.
*/
if (*cpp) {
lsrp = *cpp;
- lsrep = lsrp + *lenp;
+ ep = lsrp + *lenp;
} else {
- *cpp = lsrp = lsr;
- lsrep = lsrp + 44;
+ *cpp = lsrp = (char *)ALIGN(buf);
+ ep = lsrp + 1024;
}
cp = arg;
+#ifdef INET6
+ if (ai->ai_family == AF_INET6) {
+ cmsg = inet6_rthdr_init(*cpp, IPV6_RTHDR_TYPE_0);
+ if (*cp != '@')
+ return -1;
+ *protop = IPPROTO_IPV6;
+ *optp = IPV6_PKTOPTIONS;
+ } else
+#endif
+ {
/*
* Next, decide whether we have a loose source
* route or a strict source route, and fill in
* the begining of the option.
*/
-#ifndef sysV88
if (*cp == '!') {
cp++;
*lsrp++ = IPOPT_SSRR;
} else
*lsrp++ = IPOPT_LSRR;
-#else
- if (*cp == '!') {
- cp++;
- ipopt.io_type = IPOPT_SSRR;
- } else
- ipopt.io_type = IPOPT_LSRR;
-#endif
if (*cp != '@')
- return((unsigned long)-1);
+ return -1;
-#ifndef sysV88
lsrp++; /* skip over length, we'll fill it in later */
*lsrp++ = 4;
-#endif
+ *protop = IPPROTO_IP;
+ *optp = IP_OPTIONS;
+ }
cp++;
-
- sin_addr.s_addr = 0;
-
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = ai->ai_family;
+ hints.ai_socktype = SOCK_STREAM;
for (c = 0;;) {
- if (c == ':')
+ if (
+#ifdef INET6
+ ai->ai_family != AF_INET6 &&
+#endif
+ c == ':')
cp2 = 0;
- else for (cp2 = cp; c = *cp2; cp2++) {
+ else for (cp2 = cp; (c = *cp2); cp2++) {
if (c == ',') {
*cp2++ = '\0';
if (*cp2 == '@')
cp2++;
} else if (c == '@') {
*cp2++ = '\0';
- } else if (c == ':') {
+ } else if (
+#ifdef INET6
+ ai->ai_family != AF_INET6 &&
+#endif
+ c == ':') {
*cp2++ = '\0';
} else
continue;
if (!c)
cp2 = 0;
- if ((tmp = inet_addr(cp)) != -1) {
- sin_addr.s_addr = tmp;
- } else if (host = gethostbyname(cp)) {
-#if defined(h_addr)
- memmove((caddr_t)&sin_addr,
- host->h_addr_list[0], host->h_length);
-#else
- memmove((caddr_t)&sin_addr, host->h_addr, host->h_length);
-#endif
- } else {
+ hints.ai_flags = AI_NUMERICHOST;
+ error = getaddrinfo(cp, NULL, &hints, &res);
+ if (error == EAI_NODATA) {
+ hints.ai_flags = 0;
+ error = getaddrinfo(cp, NULL, &hints, &res);
+ }
+ if (error != 0) {
+ fprintf(stderr, "%s: %s\n", cp, gai_strerror(error));
+ if (error == EAI_SYSTEM)
+ fprintf(stderr, "%s: %s\n", cp,
+ strerror(errno));
*cpp = cp;
return(0);
}
- memmove(lsrp, (char *)&sin_addr, 4);
+#ifdef INET6
+ if (res->ai_family == AF_INET6) {
+ sin6 = (struct sockaddr_in6 *)res->ai_addr;
+ inet6_rthdr_add(cmsg, &sin6->sin6_addr,
+ IPV6_RTHDR_LOOSE);
+ } else
+#endif
+ {
+ _sin = (struct sockaddr_in *)res->ai_addr;
+ memcpy(lsrp, (char *)&_sin->sin_addr, 4);
lsrp += 4;
+ }
if (cp2)
cp = cp2;
else
/*
* Check to make sure there is space for next address
*/
- if (lsrp + 4 > lsrep)
- return((unsigned long)-1);
- }
-#ifndef sysV88
+#ifdef INET6
+ if (res->ai_family == AF_INET6) {
+ if (((char *)CMSG_DATA(cmsg) +
+ sizeof(struct ip6_rthdr) +
+ ((inet6_rthdr_segments(cmsg) + 1) *
+ sizeof(struct in6_addr))) > ep)
+ return -1;
+ } else
+#endif
+ if (lsrp + 4 > ep)
+ return -1;
+ freeaddrinfo(res);
+ }
+#ifdef INET6
+ if (res->ai_family == AF_INET6) {
+ inet6_rthdr_lasthop(cmsg, IPV6_RTHDR_LOOSE);
+ *lenp = cmsg->cmsg_len;
+ } else
+#endif
+ {
if ((*(*cpp+IPOPT_OLEN) = lsrp - *cpp) <= 7) {
*cpp = 0;
*lenp = 0;
- return((unsigned long)-1);
+ return -1;
}
*lsrp++ = IPOPT_NOP; /* 32 bit word align it */
*lenp = lsrp - *cpp;
-#else
- ipopt.io_len = lsrp - *cpp;
- if (ipopt.io_len <= 5) { /* Is 3 better ? */
- *cpp = 0;
- *lenp = 0;
- return((unsigned long)-1);
- }
- *lenp = sizeof(ipopt);
- *cpp = (char *) &ipopt;
-#endif
- return(sin_addr.s_addr);
+ }
+ freeaddrinfo(res);
+ return 1;
}
-#endif
projects / apple / network_cmds.git / blobdiff