diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c index 88fd2950e203..8685bb49d383 100644 --- a/usr.sbin/ppp/command.c +++ b/usr.sbin/ppp/command.c @@ -1,1206 +1,1206 @@ /* * PPP User command processing module * * Written by Toshiharu OHNO (tony-o@iij.ad.jp) * * Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd. * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are * duplicated in all such forms and that any documentation, * advertising materials, and other materials related to such * distribution and use acknowledge that the software was developed * by the Internet Initiative Japan, Inc. The name of the * IIJ may not be used to endorse or promote products derived * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: command.c,v 1.43 1997/05/10 01:22:08 brian Exp $ + * $Id: command.c,v 1.44 1997/05/10 03:39:51 brian Exp $ * */ #include #include #include #include #include #include "fsm.h" #include "phase.h" #include "lcp.h" #include "ipcp.h" #include "modem.h" #include "filter.h" #include "command.h" #include "hdlc.h" #include "vars.h" #include "systems.h" #include "chat.h" #include #include #include #include #include "os.h" #include #include "chat.h" extern void Cleanup(), TtyTermMode(), PacketMode(); extern int EnableCommand(), DisableCommand(), DisplayCommand(); extern int AcceptCommand(), DenyCommand(); extern int LocalAuthCommand(); extern int LoadCommand(), SaveCommand(); extern int ChangeParity(char *); extern int SelectSystem(); extern int ShowRoute(); extern void TtyOldMode(), TtyCommandMode(); extern struct pppvars pppVars; extern struct cmdtab const SetCommands[]; extern char *IfDevName; struct in_addr ifnetmask; int randinit; static int ShowCommand(), TerminalCommand(), QuitCommand(); static int CloseCommand(), DialCommand(), DownCommand(); static int SetCommand(), AddCommand(), DeleteCommand(); static int ShellCommand(); static int HelpCommand(list, argc, argv, plist) struct cmdtab *list; int argc; char **argv; struct cmdtab *plist; { struct cmdtab *cmd; int n; char c; if (argc > 0) { for (cmd = plist; cmd->name; cmd++) { if (strcasecmp(cmd->name, *argv) == 0 && (cmd->lauth & VarLocalAuth)) { if (plist == SetCommands) printf("set "); printf("%s %s\n", cmd->name, cmd->syntax); return(1); } } return(1); } n = 0; for (cmd = plist; cmd->func; cmd++) { if (cmd->name && (cmd->lauth & VarLocalAuth)) { c = (n & 1)? '\n' : '\t'; printf(" %-8s: %-20s%c", cmd->name, cmd->helpmes, c); n++; } } if (n & 1) printf("\n"); return(1); } int IsInteractive() { char *mes = NULL; if (mode & MODE_DDIAL) mes = "Working in dedicated dial mode."; else if (mode & MODE_AUTO) mes = "Working in auto mode."; else if (mode & MODE_DIRECT) mes = "Working in direct mode."; else if (mode & MODE_DEDICATED) mes = "Working in dedicated mode."; if (mes) { printf("%s\n", mes); return(0); } return(1); } static int DialCommand(cmdlist, argc, argv) struct cmdtab *cmdlist; int argc; char **argv; { int tries; if (LcpFsm.state > ST_CLOSED) { printf("LCP state is [%s]\n", StateNames[LcpFsm.state]); return(1); } if (!IsInteractive()) return(1); if (argc > 0) { if (SelectSystem(*argv, CONFFILE) < 0) { printf("%s: not found.\n", *argv); return(1); } } tries = 0; do { printf("Dial attempt %u\n", ++tries); modem = OpenModem(mode); if (modem < 0) { printf("failed to open modem.\n"); break; } if (DialModem()) { sleep(1); ModemTimeout(); PacketMode(); break; } } while (VarDialTries == 0 || tries < VarDialTries); return(1); } static int ShellCommand(cmdlist, argc, argv) struct cmdtab *cmdlist; int argc; char **argv; { const char *shell; pid_t shpid; if((shell = getenv("SHELL")) == 0) { shell = _PATH_BSHELL; } #ifdef SHELL_ONLY_INTERACTIVELY #ifndef HAVE_SHELL_CMD_WITH_ANY_MODE if( mode != MODE_INTER) { fprintf(stdout, "Can only start a shell in interactive mode\n"); return(1); } #else if(argc == 0 && !(mode & MODE_INTER)) { fprintf(stderr, "Can only start an interactive shell in interactive mode\n"); return(1); } #endif /* HAVE_SHELL_CMD_WITH_ANY_MODE */ #else if ((mode & (MODE_AUTO|MODE_INTER)) == (MODE_AUTO|MODE_INTER)) { fprintf(stdout, "Shell is not allowed interactively in auto mode\n"); return(1); } #endif /* SHELL_ONLY_INTERACTIVELY */ if((shpid = fork()) == 0) { int dtablesize, i ; for (dtablesize = getdtablesize(), i = 3; i < dtablesize; i++) (void)close(i); /* * We are running setuid, we should change to * real user for avoiding security problems. */ if (setgid(getgid()) < 0) { perror("setgid"); exit(1); } if (setuid(getuid()) < 0) { perror("setuid"); exit(1); } TtyOldMode(); if(argc > 0) { /* substitute pseudo args */ for (i=1; i 0? argv[0]: shell); exit(255); } if( shpid == (pid_t)-1 ) { fprintf(stdout, "Fork failed\n"); } else { int status; (void)waitpid(shpid, &status, 0); } TtyCommandMode(1); return(0); } static char StrOption[] = "option .."; static char StrRemote[] = "[remote]"; char StrNull[] = ""; struct cmdtab const Commands[] = { { "accept", NULL, AcceptCommand, LOCAL_AUTH, "accept option request", StrOption}, { "add", NULL, AddCommand, LOCAL_AUTH, "add route", "dest mask gateway"}, { "close", NULL, CloseCommand, LOCAL_AUTH, "Close connection", StrNull}, { "delete", NULL, DeleteCommand, LOCAL_AUTH, "delete route", "ALL | dest gateway [mask]"}, { "deny", NULL, DenyCommand, LOCAL_AUTH, "Deny option request", StrOption}, { "dial", "call", DialCommand, LOCAL_AUTH, "Dial and login", StrRemote}, { "disable", NULL, DisableCommand, LOCAL_AUTH, "Disable option", StrOption}, { "display", NULL, DisplayCommand, LOCAL_AUTH, "Display option configs", StrNull}, { "enable", NULL, EnableCommand, LOCAL_AUTH, "Enable option", StrOption}, { "passwd", NULL, LocalAuthCommand,LOCAL_NO_AUTH, "Password for manipulation", StrOption}, { "load", NULL, LoadCommand, LOCAL_AUTH, "Load settings", StrRemote}, { "save", NULL, SaveCommand, LOCAL_AUTH, "Save settings", StrNull}, { "set", "setup", SetCommand, LOCAL_AUTH, "Set parameters", "var value"}, { "shell", "!", ShellCommand, LOCAL_AUTH, "Run a subshell", "[sh command]"}, { "show", NULL, ShowCommand, LOCAL_AUTH, "Show status and statictics", "var"}, { "term", NULL, TerminalCommand,LOCAL_AUTH, "Enter to terminal mode", StrNull}, { "quit", "bye", QuitCommand, LOCAL_AUTH | LOCAL_NO_AUTH, "Quit PPP program", "[all]"}, { "help", "?", HelpCommand, LOCAL_AUTH | LOCAL_NO_AUTH, "Display this message", "[command]", (void *)Commands }, { NULL, "down", DownCommand, LOCAL_AUTH, "Generate down event", StrNull}, { NULL, NULL, NULL }, }; extern int ReportCcpStatus(); extern int ReportLcpStatus(); extern int ReportIpcpStatus(); extern int ReportProtStatus(); extern int ReportCompress(); extern int ShowModemStatus(); extern int ReportHdlcStatus(); extern int ShowMemMap(); static char *LogLevelName[] = { LM_PHASE, LM_CHAT, LM_LQM, LM_LCP, LM_TCPIP, LM_HDLC, LM_ASYNC, LM_LINK, LM_CONNECT, LM_CARRIER, }; static int ShowDebugLevel() { int i; printf("%02x: ", loglevel); for (i = LOG_PHASE; i < MAXLOGLEVEL; i++) { if (loglevel & (1 << i)) printf("%s ", LogLevelName[i]); } printf("\n"); return(1); } static int ShowEscape() { int code, bit; if (EscMap[32]) { for (code = 0; code < 32; code++) { if (EscMap[code]) { for (bit = 0; bit < 8; bit++) { if (EscMap[code] & (1<= 0) { printf(" %d seconds, ", VarRedialTimeout); } else { printf(" Random 0 - %d seconds, ", REDIAL_PERIOD); } printf(" Redial Next Timer: "); if (VarRedialNextTimeout >= 0) { printf(" %d seconds, ", VarRedialNextTimeout); } else { printf(" Random 0 - %d seconds, ", REDIAL_PERIOD); } if (VarDialTries) printf("%d dial tries", VarDialTries); printf("\n"); return(1); } #ifdef MSEXT static int ShowMSExt() { printf(" MS PPP extention values \n" ); printf(" Primary NS : %s\n", inet_ntoa( ns_entries[0] )); printf(" Secondary NS : %s\n", inet_ntoa( ns_entries[1] )); printf(" Primary NBNS : %s\n", inet_ntoa( nbns_entries[0] )); printf(" Secondary NBNS : %s\n", inet_ntoa( nbns_entries[1] )); return(1); } #endif /* MSEXT */ extern int ShowIfilter(), ShowOfilter(), ShowDfilter(), ShowAfilter(); struct cmdtab const ShowCommands[] = { { "afilter", NULL, ShowAfilter, LOCAL_AUTH, "Show keep Alive filters", StrOption}, { "auth", NULL, ShowAuthKey, LOCAL_AUTH, "Show auth name/key", StrNull}, { "ccp", NULL, ReportCcpStatus, LOCAL_AUTH, "Show CCP status", StrNull}, { "compress", NULL, ReportCompress, LOCAL_AUTH, "Show compression statictics", StrNull}, { "debug", NULL, ShowDebugLevel, LOCAL_AUTH, "Show current debug level", StrNull}, { "dfilter", NULL, ShowDfilter, LOCAL_AUTH, "Show Demand filters", StrOption}, { "escape", NULL, ShowEscape, LOCAL_AUTH, "Show escape characters", StrNull}, { "hdlc", NULL, ReportHdlcStatus, LOCAL_AUTH, "Show HDLC error summary", StrNull}, { "ifilter", NULL, ShowIfilter, LOCAL_AUTH, "Show Input filters", StrOption}, { "ipcp", NULL, ReportIpcpStatus, LOCAL_AUTH, "Show IPCP status", StrNull}, { "lcp", NULL, ReportLcpStatus, LOCAL_AUTH, "Show LCP status", StrNull}, { "log", NULL, ShowLogList, LOCAL_AUTH, "Show log records", StrNull}, { "mem", NULL, ShowMemMap, LOCAL_AUTH, "Show memory map", StrNull}, { "modem", NULL, ShowModemStatus, LOCAL_AUTH, "Show modem setups", StrNull}, { "ofilter", NULL, ShowOfilter, LOCAL_AUTH, "Show Output filters", StrOption}, { "proto", NULL, ReportProtStatus, LOCAL_AUTH, "Show protocol summary", StrNull}, { "reconnect",NULL, ShowReconnect, LOCAL_AUTH, - "Show Reconnect timer ntries", StrNull}, + "Show Reconnect timer,tries", StrNull}, { "redial", NULL, ShowRedial, LOCAL_AUTH, "Show Redial timeout value", StrNull}, { "route", NULL, ShowRoute, LOCAL_AUTH, "Show routing table", StrNull}, { "timeout", NULL, ShowTimeout, LOCAL_AUTH, "Show Idle timeout value", StrNull}, #ifdef MSEXT { "msext", NULL, ShowMSExt, LOCAL_AUTH, "Show MS PPP extentions", StrNull}, #endif /* MSEXT */ { "version", NULL, ShowVersion, LOCAL_NO_AUTH | LOCAL_AUTH, "Show version string", StrNull}, { "help", "?", HelpCommand, LOCAL_NO_AUTH | LOCAL_AUTH, "Display this message", StrNull, (void *)ShowCommands}, { NULL, NULL, NULL }, }; struct cmdtab * FindCommand(cmds, str, pmatch) struct cmdtab *cmds; char *str; int *pmatch; { int nmatch = 0; int len = strlen(str); struct cmdtab *found = NULL; while (cmds->func) { if (cmds->name && strncasecmp(str, cmds->name, len) == 0) { nmatch++; found = cmds; } else if (cmds->alias && strncasecmp(str, cmds->alias, len) == 0) { nmatch++; found = cmds; } cmds++; } *pmatch = nmatch; return(found); } int FindExec(cmdlist, argc, argv) struct cmdtab *cmdlist; int argc; char **argv; { struct cmdtab *cmd; int val = 1; int nmatch; cmd = FindCommand(cmdlist, *argv, &nmatch); if (nmatch > 1) printf("Ambiguous.\n"); else if (cmd && ( cmd->lauth & VarLocalAuth ) ) val = (cmd->func)(cmd, --argc, ++argv, cmd->args); else printf("what?\n"); return(val); } int aft_cmd = 1; void Prompt() { char *pconnect, *pauth; if (!(mode & MODE_INTER)) return; if (!aft_cmd) printf("\n"); else aft_cmd = 0; if ( VarLocalAuth == LOCAL_AUTH ) pauth = " ON "; else pauth = " on "; if (IpcpFsm.state == ST_OPENED && phase == PHASE_NETWORK) pconnect = "PPP"; else pconnect = "ppp"; printf("%s%s%s> ", pconnect, pauth, VarShortHost); fflush(stdout); } void DecodeCommand(buff, nb, prompt) char *buff; int nb; int prompt; { char *vector[20]; char **argv; int argc, val; char *cp; val = 1; if (nb > 0) { cp = buff + strcspn(buff, "\r\n"); if (cp) *cp = '\0'; { argc = MakeArgs(buff, vector, VECSIZE(vector)); argv = vector; if (argc > 0) val = FindExec(Commands, argc, argv); } } if (val && prompt) Prompt(); } static int ShowCommand(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int val = 1; if (argc > 0) val = FindExec(ShowCommands, argc, argv); else printf("Use ``show ?'' to get a list.\n"); return(val); } static int TerminalCommand() { if (LcpFsm.state > ST_CLOSED) { printf("LCP state is [%s]\n", StateNames[LcpFsm.state]); return(1); } if (!IsInteractive()) return(1); modem = OpenModem(mode); if (modem < 0) { printf("failed to open modem.\n"); return(1); } printf("Enter to terminal mode.\n"); printf("Type `~?' for help.\n"); TtyTermMode(); return(0); } static int QuitCommand(list, argc, argv) struct cmdtab *list; int argc; char **argv; { if (mode & (MODE_DIRECT|MODE_DEDICATED|MODE_AUTO)) { if (argc > 0 && (VarLocalAuth & LOCAL_AUTH)) { Cleanup(EX_NORMAL); mode &= ~MODE_INTER; } else { LogPrintf(LOG_PHASE_BIT, "client connection closed.\n"); VarLocalAuth = LOCAL_NO_AUTH; close(netfd); close(1); dup2(2, 1); /* Have to have something here or the modem will be 1 */ netfd = -1; mode &= ~MODE_INTER; } } else Cleanup(EX_NORMAL); return(1); } static int CloseCommand() { LcpClose(); lostCarrier = 0; return(1); } static int DownCommand() { LcpDown(); return(1); } static int SetModemSpeed(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int speed; if (argc > 0) { if (strcmp(*argv, "sync") == 0) { VarSpeed = 0; return(1); } speed = atoi(*argv); if (IntToSpeed(speed) != B0) { VarSpeed = speed; return(1); } printf("invalid speed.\n"); } return(1); } static int SetReconnect(list, argc, argv) struct cmdtab *list; int argc; char **argv; { if (argc == 2) { VarReconnectTimer = atoi(argv[0]); VarReconnectTries = atoi(argv[1]); } else printf("Usage: %s %s\n", list->name, list->syntax); return(1); } static int SetRedialTimeout(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int timeout; int tries; char *dot; if (argc == 1 || argc == 2 ) { if (strncasecmp(argv[0], "random", 6) == 0 && (argv[0][6] == '\0' || argv[0][6] == '.')) { VarRedialTimeout = -1; printf("Using random redial timeout.\n"); if (!randinit) { randinit = 1; if (srandomdev() < 0) srandom((unsigned long)(time(NULL) ^ getpid())); } } else { timeout = atoi(argv[0]); if (timeout >= 0) { VarRedialTimeout = timeout; } else { printf("invalid redial timeout\n"); printf("Usage: %s %s\n", list->name, list->syntax); } } dot = index(argv[0],'.'); if (dot) { if (strcasecmp(++dot, "random") == 0) { VarRedialNextTimeout = -1; printf("Using random next redial timeout.\n"); if (!randinit) { randinit = 1; if (srandomdev() < 0) srandom((unsigned long)(time(NULL) ^ getpid())); } } else { timeout = atoi(dot); if (timeout >= 0) { VarRedialNextTimeout = timeout; } else { printf("invalid next redial timeout\n"); printf("Usage: %s %s\n", list->name, list->syntax); } } } else VarRedialNextTimeout = NEXT_REDIAL_PERIOD; /* Default next timeout */ if (argc == 2) { tries = atoi(argv[1]); if (tries >= 0) { VarDialTries = tries; } else { printf("invalid retry value\n"); printf("Usage: %s %s\n", list->name, list->syntax); } } } else { printf("Usage: %s %s\n", list->name, list->syntax); } return(1); } static int SetModemParity(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int parity; if (argc > 0) { parity = ChangeParity(*argv); if (parity < 0) printf("Invalid parity.\n"); else VarParity = parity; } return(1); } static int SetDebugLevel(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int level, w; for (level = 0; argc-- > 0; argv++) { if (isdigit(**argv)) { w = atoi(*argv); if (w < 0 || w >= MAXLOGLEVEL) { printf("invalid log level.\n"); break; } else level |= (1 << w); } else { for (w = 0; w < MAXLOGLEVEL; w++) { if (strcasecmp(*argv, LogLevelName[w]) == 0) { level |= (1 << w); continue; } } } } loglevel = level; return(1); } static int SetEscape(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int code; for (code = 0; code < 33; code++) EscMap[code] = 0; while (argc-- > 0) { sscanf(*argv++, "%x", &code); code &= 0xff; EscMap[code >> 3] |= (1 << (code&7)); EscMap[32] = 1; } return(1); } static int SetInitialMRU(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int mru; if (argc > 0) { mru = atoi(*argv); if (mru < 100) printf("given value is too small.\n"); else if (mru > MAX_MRU) printf("given value is too big.\n"); else VarMRU = mru; } return(1); } static int SetIdleTimeout(list, argc, argv) struct cmdtab *list; int argc; char **argv; { if (argc-- > 0) { VarIdleTimeout = atoi(*argv++); if (argc-- > 0) { VarLqrTimeout = atoi(*argv++); if (VarLqrTimeout < 1) VarLqrTimeout = 30; if (argc > 0) { VarRetryTimeout = atoi(*argv); if (VarRetryTimeout < 1 || VarRetryTimeout > 10) VarRetryTimeout = 3; } } } return(1); } struct in_addr GetIpAddr(cp) char *cp; { struct hostent *hp; struct in_addr ipaddr; hp = gethostbyname(cp); if (hp && hp->h_addrtype == AF_INET) bcopy(hp->h_addr, &ipaddr, hp->h_length); else if (inet_aton(cp, &ipaddr) == 0) ipaddr.s_addr = 0; return(ipaddr); } static int SetInterfaceAddr(list, argc, argv) struct cmdtab *list; int argc; char **argv; { DefMyAddress.ipaddr.s_addr = DefHisAddress.ipaddr.s_addr = 0L; if (argc > 4) { printf("set ifaddr: too many arguments (%d > 4)\n", argc); return(0); } if (argc > 0) { if (ParseAddr(argc, argv++, &DefMyAddress.ipaddr, &DefMyAddress.mask, &DefMyAddress.width) == 0) return(0); if (--argc > 0) { if (ParseAddr(argc, argv++, &DefHisAddress.ipaddr, &DefHisAddress.mask, &DefHisAddress.width) == 0) return(0); if (--argc > 0) { ifnetmask = GetIpAddr(*argv); if (--argc > 0) { if (ParseAddr(argc, argv++, &DefTriggerAddress.ipaddr, &DefTriggerAddress.mask, &DefTriggerAddress.width) == 0) return(0); } } } } /* * For backwards compatibility, 0.0.0.0 means any address. */ if (DefMyAddress.ipaddr.s_addr == 0) { DefMyAddress.mask.s_addr = 0; DefMyAddress.width = 0; } if (DefHisAddress.ipaddr.s_addr == 0) { DefHisAddress.mask.s_addr = 0; DefHisAddress.width = 0; } if ((mode & MODE_AUTO) || ((mode & MODE_DEDICATED) && dstsystem)) { if (OsSetIpaddress(DefMyAddress.ipaddr, DefHisAddress.ipaddr, ifnetmask) < 0) return(0); } return(1); } #ifdef MSEXT void SetMSEXT(pri_addr, sec_addr, argc, argv) struct in_addr *pri_addr; struct in_addr *sec_addr; int argc; char **argv; { int dummyint; struct in_addr dummyaddr; pri_addr->s_addr = sec_addr->s_addr = 0L; if( argc > 0 ) { ParseAddr(argc, argv++, pri_addr, &dummyaddr, &dummyint); if( --argc > 0 ) ParseAddr(argc, argv++, sec_addr, &dummyaddr, &dummyint); else sec_addr->s_addr = pri_addr->s_addr; } /* * if the primary/secondary ns entries are 0.0.0.0 we should * set them to either the localhost's ip, or the values in * /etc/resolv.conf ?? * * up to you if you want to implement this... */ } static int SetNS(list, argc, argv) struct cmdtab *list; int argc; char **argv; { SetMSEXT(&ns_entries[0], &ns_entries[1], argc, argv); return(1); } static int SetNBNS(list, argc, argv) struct cmdtab *list; int argc; char **argv; { SetMSEXT(&nbns_entries[0], &nbns_entries[1], argc, argv); return(1); } #endif /* MS_EXT */ #define VAR_AUTHKEY 0 #define VAR_DIAL 1 #define VAR_LOGIN 2 #define VAR_AUTHNAME 3 #define VAR_DEVICE 4 #define VAR_ACCMAP 5 #define VAR_PHONE 6 static int SetVariable(list, argc, argv, param) struct cmdtab *list; int argc; char **argv; int param; { u_long map; if (argc > 0) { switch (param) { case VAR_AUTHKEY: strncpy(VarAuthKey, *argv, sizeof(VarAuthKey)-1); VarAuthKey[sizeof(VarAuthKey)-1] = '\0'; break; case VAR_AUTHNAME: strncpy(VarAuthName, *argv, sizeof(VarAuthName)-1); VarAuthName[sizeof(VarAuthName)-1] = '\0'; break; case VAR_DIAL: strncpy(VarDialScript, *argv, sizeof(VarDialScript)-1); VarDialScript[sizeof(VarDialScript)-1] = '\0'; break; case VAR_LOGIN: strncpy(VarLoginScript, *argv, sizeof(VarLoginScript)-1); VarLoginScript[sizeof(VarLoginScript)-1] = '\0'; break; case VAR_DEVICE: strncpy(VarDevice, *argv, sizeof(VarDevice)-1); VarDevice[sizeof(VarDevice)-1] = '\0'; VarBaseDevice = rindex(VarDevice, '/'); VarBaseDevice = VarBaseDevice ? VarBaseDevice + 1 : ""; break; case VAR_ACCMAP: sscanf(*argv, "%lx", &map); VarAccmap = map; break; case VAR_PHONE: strncpy(VarPhoneList, *argv, sizeof(VarPhoneList)-1); VarPhoneList[sizeof(VarPhoneList)-1] = '\0'; strcpy(VarPhoneCopy, VarPhoneList); VarNextPhone = VarPhoneCopy; break; } } return(1); } static int SetCtsRts(list, argc, argv) struct cmdtab *list; int argc; char **argv; { if (argc > 0) { if (strcmp(*argv, "on") == 0) VarCtsRts = TRUE; else if (strcmp(*argv, "off") == 0) VarCtsRts = FALSE; else printf("usage: set ctsrts [on|off].\n"); } return(1); } static int SetOpenMode(list, argc, argv) struct cmdtab *list; int argc; char **argv; { if (argc > 0) { if (strcmp(*argv, "active") == 0) VarOpenMode = OPEN_ACTIVE; else if (strcmp(*argv, "passive") == 0) VarOpenMode = OPEN_PASSIVE; else printf("Invalid mode.\n"); } return(1); } static char StrChatStr[] = "chat-script"; static char StrValue[] = "value"; extern int SetIfilter(), SetOfilter(), SetDfilter(), SetAfilter(); struct cmdtab const SetCommands[] = { { "accmap", NULL, SetVariable, LOCAL_AUTH, "Set accmap value", "hex-value", (void *)VAR_ACCMAP}, { "afilter", NULL, SetAfilter, LOCAL_AUTH, "Set keep Alive filter", "..."}, { "authkey", "key", SetVariable, LOCAL_AUTH, "Set authentication key", "key", (void *)VAR_AUTHKEY}, { "authname", NULL, SetVariable, LOCAL_AUTH, "Set authentication name", "name", (void *)VAR_AUTHNAME}, { "ctsrts", NULL, SetCtsRts, LOCAL_AUTH, "Use CTS/RTS modem signalling", "[on|off]"}, { "debug", NULL, SetDebugLevel, LOCAL_AUTH, "Set debug level", StrValue}, { "device", "line", SetVariable, LOCAL_AUTH, "Set modem device name", "device-name", (void *)VAR_DEVICE}, { "dfilter", NULL, SetDfilter, LOCAL_AUTH, "Set demand filter", "..."}, { "dial", NULL, SetVariable, LOCAL_AUTH, "Set dialing script", StrChatStr, (void *)VAR_DIAL}, { "escape", NULL, SetEscape, LOCAL_AUTH, "Set escape characters", "hex-digit ..."}, { "ifaddr", NULL, SetInterfaceAddr, LOCAL_AUTH, "Set destination address", "[src-addr [dst-addr [netmask [trg-addr]]]]"}, { "ifilter", NULL, SetIfilter, LOCAL_AUTH, "Set input filter", "..."}, { "login", NULL, SetVariable, LOCAL_AUTH, "Set login script", StrChatStr, (void *)VAR_LOGIN }, { "mru", "mtu", SetInitialMRU, LOCAL_AUTH, "Set Initial MRU value", StrValue }, { "ofilter", NULL, SetOfilter, LOCAL_AUTH, "Set output filter", "..." }, { "openmode", NULL, SetOpenMode, LOCAL_AUTH, "Set open mode", "[active|passive]"}, { "parity", NULL, SetModemParity, LOCAL_AUTH, "Set modem parity", "[odd|even|none]"}, { "phone", NULL, SetVariable, LOCAL_AUTH, "Set telephone number(s)", "phone1[:phone2[...]]", (void *)VAR_PHONE }, { "reconnect",NULL, SetReconnect, LOCAL_AUTH, "Set Reconnect timeout", "value ntries"}, { "redial", NULL, SetRedialTimeout, LOCAL_AUTH, "Set Redial timeout", "value|random[.value|random] [dial_attempts]"}, { "speed", NULL, SetModemSpeed, LOCAL_AUTH, "Set modem speed", "speed"}, { "timeout", NULL, SetIdleTimeout, LOCAL_AUTH, "Set Idle timeout", StrValue}, #ifdef MSEXT { "ns", NULL, SetNS, LOCAL_AUTH, "Set NameServer", "pri-addr [sec-addr]"}, { "nbns", NULL, SetNBNS, LOCAL_AUTH, "Set NetBIOS NameServer", "pri-addr [sec-addr]"}, #endif /* MSEXT */ { "help", "?", HelpCommand, LOCAL_AUTH | LOCAL_NO_AUTH, "Display this message", StrNull, (void *)SetCommands}, { NULL, NULL, NULL }, }; static int SetCommand(list, argc, argv) struct cmdtab *list; int argc; char **argv; { int val = 1; if (argc > 0) val = FindExec(SetCommands, argc, argv); else printf("Use `set ?' to get a list or `set ? ' for syntax help.\n"); return(val); } static int AddCommand(list, argc, argv) struct cmdtab *list; int argc; char **argv; { struct in_addr dest, gateway, netmask; if (argc == 3) { dest = GetIpAddr(argv[0]); netmask = GetIpAddr(argv[1]); if (strcasecmp(argv[2], "HISADDR") == 0) gateway = IpcpInfo.his_ipaddr; else gateway = GetIpAddr(argv[2]); OsSetRoute(RTM_ADD, dest, gateway, netmask); } else { printf("Usage: %s %s\n", list->name, list->syntax); } return(1); } static int DeleteCommand(list, argc, argv) struct cmdtab *list; int argc; char **argv; { struct in_addr dest, gateway, netmask; if (argc >= 2) { dest = GetIpAddr(argv[0]); if (strcasecmp(argv[1], "HISADDR") == 0) gateway = IpcpInfo.his_ipaddr; else gateway = GetIpAddr(argv[1]); netmask.s_addr = 0; if (argc == 3) { if (inet_aton(argv[1], &netmask) == 0) { printf("bad netmask value.\n"); return(1); } } OsSetRoute(RTM_DELETE, dest, gateway, netmask); } else if (argc == 1 && strcasecmp(argv[0], "ALL") == 0) { DeleteIfRoutes(0); } else { printf("Usage: %s %s\n", list->name, list->syntax); } return(1); } diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c index 1613fd982d47..a55a67ca5179 100644 --- a/usr.sbin/ppp/ipcp.c +++ b/usr.sbin/ppp/ipcp.c @@ -1,579 +1,579 @@ /* * PPP IP Control Protocol (IPCP) Module * * Written by Toshiharu OHNO (tony-o@iij.ad.jp) * * Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd. * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are * duplicated in all such forms and that any documentation, * advertising materials, and other materials related to such * distribution and use acknowledge that the software was developed * by the Internet Initiative Japan, Inc. The name of the * IIJ may not be used to endorse or promote products derived * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.c,v 1.14 1997/05/10 01:22:12 brian Exp $ + * $Id: ipcp.c,v 1.15 1997/05/10 15:37:40 brian Exp $ * * TODO: * o More RFC1772 backwoard compatibility */ #include "fsm.h" #include "lcpproto.h" #include "lcp.h" #include "ipcp.h" #include #include #include #include #include #include "slcompress.h" #include "os.h" #include "phase.h" #include "vars.h" #include "alias.h" extern void PutConfValue(); extern void Prompt(); extern struct in_addr ifnetmask; struct ipcpstate IpcpInfo; struct in_range DefMyAddress, DefHisAddress, DefTriggerAddress; #ifdef MSEXT struct in_addr ns_entries[2], nbns_entries[2]; #endif /* MSEXT */ static void IpcpSendConfigReq __P((struct fsm *)); static void IpcpSendTerminateAck __P((struct fsm *)); static void IpcpSendTerminateReq __P((struct fsm *)); static void IpcpDecodeConfig __P((u_char *, int, int)); static void IpcpLayerStart __P((struct fsm *)); static void IpcpLayerFinish __P((struct fsm *)); static void IpcpLayerUp __P((struct fsm *)); static void IpcpLayerDown __P((struct fsm *)); static void IpcpInitRestartCounter __P((struct fsm *)); struct pppTimer IpcpReportTimer; static int lastInOctets, lastOutOctets; #define REJECTED(p, x) (p->his_reject & (1<name, StateNames[fp->state]); printf(" his side: %s, %lx\n", inet_ntoa(icp->his_ipaddr), icp->his_compproto); printf(" my side: %s, %lx\n", inet_ntoa(icp->want_ipaddr), icp->want_compproto); printf("connected: %d secs, idle: %d secs\n\n", ipConnectSecs, ipIdleSecs); printf("Defaults:\n"); printf(" My Address: %s/%d\n", inet_ntoa(DefMyAddress.ipaddr), DefMyAddress.width); printf(" His Address: %s/%d\n", inet_ntoa(DefHisAddress.ipaddr), DefHisAddress.width); printf(" Negotiation: %s/%d\n", inet_ntoa(DefTriggerAddress.ipaddr), DefTriggerAddress.width); - return 0; + return 1; } void IpcpDefAddress() { struct hostent *hp; char name[200]; bzero(&DefMyAddress, sizeof(DefMyAddress)); bzero(&DefHisAddress, sizeof(DefHisAddress)); bzero(&DefTriggerAddress, sizeof(DefTriggerAddress)); if (gethostname(name, sizeof(name)) == 0) { hp = gethostbyname(name); if (hp && hp->h_addrtype == AF_INET) { bcopy(hp->h_addr, (char *)&DefMyAddress.ipaddr.s_addr, hp->h_length); } } } void IpcpInit() { struct ipcpstate *icp = &IpcpInfo; FsmInit(&IpcpFsm); bzero(icp, sizeof(struct ipcpstate)); if ((mode & MODE_DEDICATED) && !dstsystem) { icp->want_ipaddr.s_addr = icp->his_ipaddr.s_addr = 0; } else { icp->want_ipaddr.s_addr = DefMyAddress.ipaddr.s_addr; icp->his_ipaddr.s_addr = DefHisAddress.ipaddr.s_addr; } /* * Some implementation of PPP are: * Starting a negotiaion by require sending *special* value as my address, * even though standard of PPP is defined full negotiation based. * (e.g. "0.0.0.0" or Not "0.0.0.0") */ if ( icp->want_ipaddr.s_addr == 0 ) { icp->want_ipaddr.s_addr = DefTriggerAddress.ipaddr.s_addr; } if (Enabled(ConfVjcomp)) icp->want_compproto = (PROTO_VJCOMP << 16) | ((MAX_STATES - 1) << 8); else icp->want_compproto = 0; icp->heis1172 = 0; IpcpFsm.maxconfig = 10; } static void IpcpInitRestartCounter(fp) struct fsm *fp; { fp->FsmTimer.load = VarRetryTimeout * SECTICKS; fp->restart = 5; } static void IpcpSendConfigReq(fp) struct fsm *fp; { u_char *cp; struct ipcpstate *icp = &IpcpInfo; cp = ReqBuff; LogPrintf(LOG_LCP_BIT, "%s: SendConfigReq\n", fp->name); if (!DEV_IS_SYNC || !REJECTED(icp, TY_IPADDR)) PutConfValue(&cp, cftypes, TY_IPADDR, 6, ntohl(icp->want_ipaddr.s_addr)); if (icp->want_compproto && !REJECTED(icp, TY_COMPPROTO)) { if (icp->heis1172) PutConfValue(&cp, cftypes, TY_COMPPROTO, 4, icp->want_compproto >> 16); else PutConfValue(&cp, cftypes, TY_COMPPROTO, 6, icp->want_compproto); } FsmOutput(fp, CODE_CONFIGREQ, fp->reqid++, ReqBuff, cp - ReqBuff); } static void IpcpSendTerminateReq(fp) struct fsm *fp; { /* XXX: No code yet */ } static void IpcpSendTerminateAck(fp) struct fsm *fp; { LogPrintf(LOG_LCP_BIT, " %s: SendTerminateAck\n", fp->name); FsmOutput(fp, CODE_TERMACK, fp->reqid++, NULL, 0); } static void IpcpLayerStart(fp) struct fsm *fp; { LogPrintf(LOG_LCP_BIT, "%s: LayerStart.\n", fp->name); } static void IpcpLayerFinish(fp) struct fsm *fp; { LogPrintf(LOG_LCP_BIT, "%s: LayerFinish.\n", fp->name); LcpClose(); NewPhase(PHASE_TERMINATE); } static void IpcpLayerDown(fp) struct fsm *fp; { LogPrintf(LOG_LCP_BIT, "%s: LayerDown.\n", fp->name); StopTimer(&IpcpReportTimer); } /* * Called when IPCP has reached to OPEN state */ static void IpcpLayerUp(fp) struct fsm *fp; { char tbuff[100]; #ifdef VERBOSE fprintf(stderr, "%s: LayerUp(%d).\r\n", fp->name, fp->state); #endif Prompt(); LogPrintf(LOG_LCP_BIT, "%s: LayerUp.\n", fp->name); snprintf(tbuff, sizeof(tbuff), "myaddr = %s ", inet_ntoa(IpcpInfo.want_ipaddr)); LogPrintf(LOG_LCP_BIT|LOG_LINK_BIT, " %s hisaddr = %s\n", tbuff, inet_ntoa(IpcpInfo.his_ipaddr)); if (OsSetIpaddress(IpcpInfo.want_ipaddr, IpcpInfo.his_ipaddr, ifnetmask) < 0) { printf("unable to set ip address\n"); return; } OsLinkup(); IpcpStartReport(); StartIdleTimer(); if (mode & MODE_ALIAS) SetAliasAddress(IpcpInfo.want_ipaddr); } void IpcpUp() { FsmUp(&IpcpFsm); LogPrintf(LOG_LCP_BIT, "IPCP Up event!!\n"); } void IpcpOpen() { FsmOpen(&IpcpFsm); } static int AcceptableAddr(prange, ipaddr) struct in_range *prange; struct in_addr ipaddr; { #ifdef DEBUG logprintf("requested = %x ", htonl(ipaddr.s_addr)); logprintf("range = %x", htonl(prange->ipaddr.s_addr)); logprintf("/%x\n", htonl(prange->mask.s_addr)); logprintf("%x, %x\n", htonl(prange->ipaddr.s_addr & prange->mask.s_addr), htonl(ipaddr.s_addr & prange->mask.s_addr)); #endif return (prange->ipaddr.s_addr & prange->mask.s_addr) == (ipaddr.s_addr & prange->mask.s_addr) && ipaddr.s_addr; } static void IpcpDecodeConfig(cp, plen, mode) u_char *cp; int plen; int mode; { int type, length; u_long *lp, compproto; struct compreq *pcomp; struct in_addr ipaddr, dstipaddr, dnsstuff, ms_info_req; char tbuff[100]; char tbuff2[100]; ackp = AckBuff; nakp = NakBuff; rejp = RejBuff; while (plen >= sizeof(struct fsmconfig)) { if (plen < 0) break; type = *cp; length = cp[1]; if (type <= TY_IPADDR) snprintf(tbuff, sizeof(tbuff), " %s[%d] ", cftypes[type], length); else snprintf(tbuff, sizeof(tbuff), " "); switch (type) { case TY_IPADDR: /* RFC1332 */ lp = (u_long *)(cp + 2); ipaddr.s_addr = *lp; LogPrintf(LOG_LCP_BIT, "%s %s\n", tbuff, inet_ntoa(ipaddr)); switch (mode) { case MODE_REQ: if (!AcceptableAddr(&DefHisAddress, ipaddr)) { /* * If destination address is not acceptable, insist to use * what we want to use. */ bcopy(cp, nakp, 2); bcopy(&IpcpInfo.his_ipaddr.s_addr, nakp+2, length); nakp += length; break; } IpcpInfo.his_ipaddr = ipaddr; bcopy(cp, ackp, length); ackp += length; break; case MODE_NAK: if (AcceptableAddr(&DefMyAddress, ipaddr)) { /* * Use address suggested by peer. */ snprintf(tbuff2, sizeof(tbuff2), "%s changing address: %s ", tbuff, inet_ntoa(IpcpInfo.want_ipaddr)); LogPrintf(LOG_LCP_BIT, "%s --> %s\n", tbuff2, inet_ntoa(ipaddr)); IpcpInfo.want_ipaddr = ipaddr; } break; case MODE_REJ: IpcpInfo.his_reject |= (1 << type); break; } break; case TY_COMPPROTO: lp = (u_long *)(cp + 2); compproto = htonl(*lp); LogPrintf(LOG_LCP_BIT, "%s %08x\n", tbuff, compproto); switch (mode) { case MODE_REQ: if (!Acceptable(ConfVjcomp)) { bcopy(cp, rejp, length); rejp += length; } else { pcomp = (struct compreq *)(cp + 2); switch (length) { case 4: /* RFC1172 */ if (ntohs(pcomp->proto) == PROTO_VJCOMP) { logprintf("** Peer is speaking RFC1172 compression protocol **\n"); IpcpInfo.heis1172 = 1; IpcpInfo.his_compproto = compproto; bcopy(cp, ackp, length); ackp += length; } else { bcopy(cp, nakp, 2); pcomp->proto = htons(PROTO_VJCOMP); bcopy(&pcomp, nakp + 2, 2); nakp += length; } break; case 6: /* RFC1332 */ if (ntohs(pcomp->proto) == PROTO_VJCOMP && pcomp->slots < MAX_STATES && pcomp->slots > 2) { IpcpInfo.his_compproto = compproto; IpcpInfo.heis1172 = 0; bcopy(cp, ackp, length); ackp += length; } else { bcopy(cp, nakp, 2); pcomp->proto = htons(PROTO_VJCOMP); pcomp->slots = MAX_STATES - 1; pcomp->compcid = 0; bcopy(&pcomp, nakp + 2, sizeof(pcomp)); nakp += length; } break; default: bcopy(cp, rejp, length); rejp += length; break; } } break; case MODE_NAK: LogPrintf(LOG_LCP_BIT, "%s changing compproto: %08x --> %08x\n", tbuff, IpcpInfo.want_compproto, compproto); IpcpInfo.want_compproto = compproto; break; case MODE_REJ: IpcpInfo.his_reject |= (1 << type); break; } break; case TY_IPADDRS: /* RFC1172 */ lp = (u_long *)(cp + 2); ipaddr.s_addr = *lp; lp = (u_long *)(cp + 6); dstipaddr.s_addr = *lp; LogPrintf(LOG_LCP_BIT, "%s %s, ", tbuff, inet_ntoa(ipaddr)); LogPrintf(LOG_LCP_BIT, "%s\n", inet_ntoa(dstipaddr)); switch (mode) { case MODE_REQ: IpcpInfo.his_ipaddr = ipaddr; IpcpInfo.want_ipaddr = dstipaddr; bcopy(cp, ackp, length); ackp += length; break; case MODE_NAK: LogPrintf(LOG_LCP_BIT, "%s changing address: %s ", tbuff, inet_ntoa(IpcpInfo.want_ipaddr)); LogPrintf(LOG_LCP_BIT, "--> %s\n", inet_ntoa(ipaddr)); IpcpInfo.want_ipaddr = ipaddr; IpcpInfo.his_ipaddr = dstipaddr; break; case MODE_REJ: IpcpInfo.his_reject |= (1 << type); break; } break; /* * MS extensions for MS's PPP */ #ifdef MSEXT case TY_PRIMARY_DNS: /* MS PPP DNS negotiation hack */ case TY_SECONDARY_DNS: if( !Enabled( ConfMSExt ) ) { LogPrintf( LOG_LCP, "MS NS req - rejected - msext disabled\n" ); IpcpInfo.my_reject |= ( 1 << type ); bcopy(cp, rejp, length); rejp += length; break; } switch( mode ){ case MODE_REQ: lp = (u_long *)(cp + 2); dnsstuff.s_addr = *lp; ms_info_req.s_addr = ns_entries[((type - TY_PRIMARY_DNS)?1:0)].s_addr; if( dnsstuff.s_addr != ms_info_req.s_addr ) { /* So the client has got the DNS stuff wrong (first request) so well tell 'em how it is */ bcopy( cp, nakp, 2 ); /* copy first two (type/length) */ LogPrintf( LOG_LCP, "MS NS req %d:%s->%s - nak\n", type, inet_ntoa( dnsstuff ), inet_ntoa( ms_info_req )); bcopy( &ms_info_req, nakp+2, length ); nakp += length; break; } /* Otherwise they have it right (this time) so we send a ack packet back confirming it... end of story */ LogPrintf( LOG_LCP, "MS NS req %d:%s ok - ack\n", type, inet_ntoa( ms_info_req )); bcopy( cp, ackp, length ); ackp += length; break; case MODE_NAK: /* what does this mean?? */ LogPrintf(LOG_LCP, "MS NS req %d - NAK??\n", type ); break; case MODE_REJ: /* confused?? me to :) */ LogPrintf(LOG_LCP, "MS NS req %d - REJ??\n", type ); break; } break; case TY_PRIMARY_NBNS: /* MS PPP NetBIOS nameserver hack */ case TY_SECONDARY_NBNS: if( !Enabled( ConfMSExt ) ) { LogPrintf( LOG_LCP, "MS NBNS req - rejected - msext disabled\n" ); IpcpInfo.my_reject |= ( 1 << type ); bcopy( cp, rejp, length ); rejp += length; break; } switch( mode ){ case MODE_REQ: lp = (u_long *)(cp + 2); dnsstuff.s_addr = *lp; ms_info_req.s_addr = nbns_entries[((type - TY_PRIMARY_NBNS)?1:0)].s_addr; if( dnsstuff.s_addr != ms_info_req.s_addr ) { bcopy( cp, nakp, 2 ); bcopy( &ms_info_req.s_addr , nakp+2, length ); LogPrintf( LOG_LCP, "MS NBNS req %d:%s->%s - nak\n", type, inet_ntoa( dnsstuff ), inet_ntoa( ms_info_req )); nakp += length; break; } LogPrintf( LOG_LCP, "MS NBNS req %d:%s ok - ack\n", type, inet_ntoa( ms_info_req )); bcopy( cp, ackp, length ); ackp += length; break; case MODE_NAK: LogPrintf( LOG_LCP, "MS NBNS req %d - NAK??\n", type ); break; case MODE_REJ: LogPrintf( LOG_LCP, "MS NBNS req %d - REJ??\n", type ); break; } break; #endif /* MSEXT */ default: IpcpInfo.my_reject |= (1 << type); bcopy(cp, rejp, length); rejp += length; break; } plen -= length; cp += length; } } void IpcpInput(struct mbuf *bp) { FsmInput(&IpcpFsm, bp); }