bad4a365fe
ppp descriptor and signals the terminal thread when there's something to read on that descriptor. This means that the main loop doesn't have to alarm() itself into dropping out of el_gets() frequently to check the descriptor. This dropping out was disturbing syscons (via ioctl()s from libedit) enough to reset the screensaver timeout every .5 of a second. PR: 20345
634 lines
18 KiB
C
634 lines
18 KiB
C
/*-
|
|
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <sys/un.h>
|
|
#include <netdb.h>
|
|
|
|
#include <sys/time.h>
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <histedit.h>
|
|
#include <semaphore.h>
|
|
#include <pthread.h>
|
|
#include <setjmp.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#define LINELEN 2048
|
|
|
|
/* Data passed to the threads we create */
|
|
struct thread_data {
|
|
EditLine *edit; /* libedit stuff */
|
|
History *hist; /* libedit stuff */
|
|
pthread_t trm; /* Terminal thread (for pthread_kill()) */
|
|
int ppp; /* ppp descriptor */
|
|
};
|
|
|
|
/* Flags passed to Receive() */
|
|
#define REC_PASSWD (1) /* Handle a password request from ppp */
|
|
#define REC_SHOW (2) /* Show everything except prompts */
|
|
#define REC_VERBOSE (4) /* Show everything */
|
|
|
|
static char *passwd;
|
|
static char *prompt; /* Tell libedit what the current prompt is */
|
|
static int data = -1; /* setjmp() has been done when data != -1 */
|
|
static jmp_buf pppdead; /* Jump the Terminal thread out of el_gets() */
|
|
static int timetogo; /* Tell the Monitor thread to exit */
|
|
static sem_t sem_select; /* select() co-ordination between threads */
|
|
static int TimedOut; /* Set if our connect() timed out */
|
|
static int want_sem_post; /* Need to let the Monitor thread in ? */
|
|
|
|
/*
|
|
* How to use pppctl...
|
|
*/
|
|
static int
|
|
usage()
|
|
{
|
|
fprintf(stderr, "usage: pppctl [-v] [-t n] [-p passwd] "
|
|
"Port|LocalSock [command[;command]...]\n");
|
|
fprintf(stderr, " -v tells pppctl to output all"
|
|
" conversation\n");
|
|
fprintf(stderr, " -t n specifies a timeout of n"
|
|
" seconds when connecting (default 2)\n");
|
|
fprintf(stderr, " -p passwd specifies your password\n");
|
|
exit(1);
|
|
}
|
|
|
|
/*
|
|
* Handle the SIGALRM received due to a connect() timeout.
|
|
*/
|
|
static void
|
|
Timeout(int Sig)
|
|
{
|
|
TimedOut = 1;
|
|
}
|
|
|
|
/*
|
|
* A callback routine for libedit to find out what the current prompt is.
|
|
* All the work is done in Receive() below.
|
|
*/
|
|
static char *
|
|
GetPrompt(EditLine *e)
|
|
{
|
|
if (prompt == NULL)
|
|
prompt = "";
|
|
return prompt;
|
|
}
|
|
|
|
/*
|
|
* Receive data from the ppp descriptor.
|
|
* We also handle password prompts here (if asked via the `display' arg)
|
|
* and buffer what our prompt looks like (via the `prompt' global).
|
|
*/
|
|
static int
|
|
Receive(int fd, int display)
|
|
{
|
|
static char Buffer[LINELEN];
|
|
struct timeval t;
|
|
int Result;
|
|
char *last;
|
|
fd_set f;
|
|
int len;
|
|
|
|
FD_ZERO(&f);
|
|
FD_SET(fd, &f);
|
|
t.tv_sec = 0;
|
|
t.tv_usec = 100000;
|
|
prompt = Buffer;
|
|
len = 0;
|
|
|
|
while (Result = read(fd, Buffer+len, sizeof(Buffer)-len-1), Result != -1) {
|
|
if (Result == 0 && errno != EINTR) {
|
|
Result = -1;
|
|
break;
|
|
}
|
|
len += Result;
|
|
Buffer[len] = '\0';
|
|
if (len > 2 && !strcmp(Buffer+len-2, "> ")) {
|
|
prompt = strrchr(Buffer, '\n');
|
|
if (display & (REC_SHOW|REC_VERBOSE)) {
|
|
if (display & REC_VERBOSE)
|
|
last = Buffer+len-1;
|
|
else
|
|
last = prompt;
|
|
if (last) {
|
|
last++;
|
|
write(1, Buffer, last-Buffer);
|
|
}
|
|
}
|
|
prompt = prompt == NULL ? Buffer : prompt+1;
|
|
for (last = Buffer+len-2; last > Buffer && *last != ' '; last--)
|
|
;
|
|
if (last > Buffer+3 && !strncmp(last-3, " on", 3)) {
|
|
/* a password is required ! */
|
|
if (display & REC_PASSWD) {
|
|
/* password time */
|
|
if (!passwd)
|
|
passwd = getpass("Password: ");
|
|
sprintf(Buffer, "passwd %s\n", passwd);
|
|
memset(passwd, '\0', strlen(passwd));
|
|
if (display & REC_VERBOSE)
|
|
write(1, Buffer, strlen(Buffer));
|
|
write(fd, Buffer, strlen(Buffer));
|
|
memset(Buffer, '\0', strlen(Buffer));
|
|
return Receive(fd, display & ~REC_PASSWD);
|
|
}
|
|
Result = 1;
|
|
} else
|
|
Result = 0;
|
|
break;
|
|
} else
|
|
prompt = "";
|
|
if (len == sizeof Buffer - 1) {
|
|
int flush;
|
|
if ((last = strrchr(Buffer, '\n')) == NULL)
|
|
/* Yeuch - this is one mother of a line ! */
|
|
flush = sizeof Buffer / 2;
|
|
else
|
|
flush = last - Buffer + 1;
|
|
write(1, Buffer, flush);
|
|
strcpy(Buffer, Buffer + flush);
|
|
len -= flush;
|
|
}
|
|
if ((Result = select(fd + 1, &f, NULL, NULL, &t)) <= 0) {
|
|
if (len)
|
|
write(1, Buffer, len);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return Result;
|
|
}
|
|
|
|
/*
|
|
* Handle being told by the Monitor thread that there's data to be read
|
|
* on the ppp descriptor.
|
|
*
|
|
* Note, this is a signal handler - be careful of what we do !
|
|
*/
|
|
static void
|
|
InputHandler(int sig)
|
|
{
|
|
static char buf[LINELEN];
|
|
struct timeval t;
|
|
int len;
|
|
fd_set f;
|
|
|
|
if (data != -1) {
|
|
FD_ZERO(&f);
|
|
FD_SET(data, &f);
|
|
t.tv_sec = t.tv_usec = 0;
|
|
|
|
if (select(data + 1, &f, NULL, NULL, &t) > 0) {
|
|
len = read(data, buf, sizeof buf);
|
|
|
|
if (len > 0)
|
|
write(1, buf, len);
|
|
else if (data != -1)
|
|
longjmp(pppdead, -1);
|
|
}
|
|
|
|
sem_post(&sem_select);
|
|
} else
|
|
/* Don't let the Monitor thread in 'till we've set ``data'' up again */
|
|
want_sem_post = 1;
|
|
}
|
|
|
|
/*
|
|
* This is a simple wrapper for el_gets(), allowing our SIGUSR1 signal
|
|
* handler (above) to take effect only after we've done a setjmp().
|
|
*
|
|
* We don't want it to do anything outside of here as we're going to
|
|
* service the ppp descriptor anyway.
|
|
*/
|
|
static const char *
|
|
SmartGets(EditLine *e, int *count, int fd)
|
|
{
|
|
const char *result;
|
|
|
|
if (setjmp(pppdead))
|
|
result = NULL;
|
|
else {
|
|
data = fd;
|
|
if (want_sem_post)
|
|
/* Let the Monitor thread in again */
|
|
sem_post(&sem_select);
|
|
result = el_gets(e, count);
|
|
}
|
|
|
|
data = -1;
|
|
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* The Terminal thread entry point.
|
|
*
|
|
* The bulk of the interactive work is done here. We read the terminal,
|
|
* write the results to our ppp descriptor and read the results back.
|
|
*
|
|
* While reading the terminal (using el_gets()), it's possible to take
|
|
* a SIGUSR1 from the Monitor thread, telling us that the ppp descriptor
|
|
* has some data. The data is read and displayed by the signal handler
|
|
* itself.
|
|
*/
|
|
static void *
|
|
Terminal(void *v)
|
|
{
|
|
struct sigaction act, oact;
|
|
struct thread_data *td;
|
|
const char *l;
|
|
int len;
|
|
|
|
act.sa_handler = InputHandler;
|
|
sigemptyset(&act.sa_mask);
|
|
act.sa_flags = SA_RESTART;
|
|
sigaction(SIGUSR1, &act, &oact);
|
|
|
|
td = (struct thread_data *)v;
|
|
want_sem_post = 1;
|
|
|
|
while ((l = SmartGets(td->edit, &len, td->ppp))) {
|
|
if (len > 1)
|
|
#ifdef __NetBSD__
|
|
history(td->hist, NULL, H_ENTER, l);
|
|
#else
|
|
history(td->hist, H_ENTER, l);
|
|
#endif
|
|
write(td->ppp, l, len);
|
|
if (Receive(td->ppp, REC_SHOW) != 0)
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* The Monitor thread entry point.
|
|
*
|
|
* This thread simply monitors our ppp descriptor. When there's something
|
|
* to read, a SIGUSR1 is sent to the Terminal thread.
|
|
*
|
|
* sem_select() is used by the Terminal thread to keep us from sending
|
|
* flurries of SIGUSR1s, and is used from the main thread to wake us up
|
|
* when it's time to exit.
|
|
*/
|
|
static void *
|
|
Monitor(void *v)
|
|
{
|
|
struct thread_data *td;
|
|
fd_set f;
|
|
int ret;
|
|
|
|
td = (struct thread_data *)v;
|
|
FD_ZERO(&f);
|
|
FD_SET(td->ppp, &f);
|
|
|
|
sem_wait(&sem_select);
|
|
while (!timetogo)
|
|
if ((ret = select(td->ppp + 1, &f, NULL, NULL, NULL)) > 0) {
|
|
pthread_kill(td->trm, SIGUSR1);
|
|
sem_wait(&sem_select);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Connect to ppp using either a local domain socket or a tcp socket.
|
|
*
|
|
* If we're given arguments, process them and quit, otherwise create two
|
|
* threads to handle interactive mode.
|
|
*/
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
struct servent *s;
|
|
struct hostent *h;
|
|
struct sockaddr *sock;
|
|
struct sockaddr_in ifsin;
|
|
struct sockaddr_un ifsun;
|
|
int socksz, arg, fd, len, verbose, save_errno, hide1, hide1off, hide2;
|
|
unsigned TimeoutVal;
|
|
char *DoneWord = "x", *next, *start;
|
|
struct sigaction act, oact;
|
|
void *thread_ret;
|
|
pthread_t mon;
|
|
char Command[LINELEN];
|
|
char Buffer[LINELEN];
|
|
|
|
verbose = 0;
|
|
TimeoutVal = 2;
|
|
hide1 = hide1off = hide2 = 0;
|
|
|
|
for (arg = 1; arg < argc; arg++)
|
|
if (*argv[arg] == '-') {
|
|
for (start = argv[arg] + 1; *start; start++)
|
|
switch (*start) {
|
|
case 't':
|
|
TimeoutVal = (unsigned)atoi
|
|
(start[1] ? start + 1 : argv[++arg]);
|
|
start = DoneWord;
|
|
break;
|
|
|
|
case 'v':
|
|
verbose = REC_VERBOSE;
|
|
break;
|
|
|
|
case 'p':
|
|
if (start[1]) {
|
|
hide1 = arg;
|
|
hide1off = start - argv[arg];
|
|
passwd = start + 1;
|
|
} else {
|
|
hide1 = arg;
|
|
hide1off = start - argv[arg];
|
|
passwd = argv[++arg];
|
|
hide2 = arg;
|
|
}
|
|
start = DoneWord;
|
|
break;
|
|
|
|
default:
|
|
usage();
|
|
}
|
|
}
|
|
else
|
|
break;
|
|
|
|
|
|
if (argc < arg + 1)
|
|
usage();
|
|
|
|
if (hide1) {
|
|
char title[1024];
|
|
int pos, harg;
|
|
|
|
for (harg = pos = 0; harg < argc; harg++)
|
|
if (harg == 0 || harg != hide2) {
|
|
if (harg == 0 || harg != hide1)
|
|
pos += snprintf(title + pos, sizeof title - pos, "%s%s",
|
|
harg ? " " : "", argv[harg]);
|
|
else if (hide1off > 1)
|
|
pos += snprintf(title + pos, sizeof title - pos, " %.*s",
|
|
hide1off, argv[harg]);
|
|
}
|
|
#ifdef __FreeBSD__
|
|
setproctitle("-%s", title);
|
|
#else
|
|
setproctitle("%s", title);
|
|
#endif
|
|
}
|
|
|
|
if (*argv[arg] == '/') {
|
|
sock = (struct sockaddr *)&ifsun;
|
|
socksz = sizeof ifsun;
|
|
|
|
memset(&ifsun, '\0', sizeof ifsun);
|
|
ifsun.sun_len = strlen(argv[arg]);
|
|
if (ifsun.sun_len > sizeof ifsun.sun_path - 1) {
|
|
warnx("%s: path too long", argv[arg]);
|
|
return 1;
|
|
}
|
|
ifsun.sun_family = AF_LOCAL;
|
|
strcpy(ifsun.sun_path, argv[arg]);
|
|
|
|
if (fd = socket(AF_LOCAL, SOCK_STREAM, 0), fd < 0) {
|
|
warnx("cannot create local domain socket");
|
|
return 2;
|
|
}
|
|
} else {
|
|
char *port, *host, *colon;
|
|
int hlen;
|
|
|
|
colon = strchr(argv[arg], ':');
|
|
if (colon) {
|
|
port = colon + 1;
|
|
*colon = '\0';
|
|
host = argv[arg];
|
|
} else {
|
|
port = argv[arg];
|
|
host = "127.0.0.1";
|
|
}
|
|
sock = (struct sockaddr *)&ifsin;
|
|
socksz = sizeof ifsin;
|
|
hlen = strlen(host);
|
|
|
|
memset(&ifsin, '\0', sizeof ifsin);
|
|
if (strspn(host, "0123456789.") == hlen) {
|
|
if (!inet_aton(host, &ifsin.sin_addr)) {
|
|
warnx("cannot translate %s", host);
|
|
return 1;
|
|
}
|
|
} else if ((h = gethostbyname(host)) == 0) {
|
|
warnx("cannot resolve %s", host);
|
|
return 1;
|
|
}
|
|
else
|
|
ifsin.sin_addr.s_addr = *(u_long *)h->h_addr_list[0];
|
|
|
|
if (colon)
|
|
*colon = ':';
|
|
|
|
if (strspn(port, "0123456789") == strlen(port))
|
|
ifsin.sin_port = htons(atoi(port));
|
|
else if (s = getservbyname(port, "tcp"), !s) {
|
|
warnx("%s isn't a valid port or service!", port);
|
|
usage();
|
|
}
|
|
else
|
|
ifsin.sin_port = s->s_port;
|
|
|
|
ifsin.sin_len = sizeof(ifsin);
|
|
ifsin.sin_family = AF_INET;
|
|
|
|
if (fd = socket(AF_INET, SOCK_STREAM, 0), fd < 0) {
|
|
warnx("cannot create internet socket");
|
|
return 2;
|
|
}
|
|
}
|
|
|
|
TimedOut = 0;
|
|
if (TimeoutVal) {
|
|
act.sa_handler = Timeout;
|
|
sigemptyset(&act.sa_mask);
|
|
act.sa_flags = 0;
|
|
sigaction(SIGALRM, &act, &oact);
|
|
alarm(TimeoutVal);
|
|
}
|
|
|
|
if (connect(fd, sock, socksz) < 0) {
|
|
if (TimeoutVal) {
|
|
save_errno = errno;
|
|
alarm(0);
|
|
sigaction(SIGALRM, &oact, 0);
|
|
errno = save_errno;
|
|
}
|
|
if (TimedOut)
|
|
warnx("timeout: cannot connect to socket %s", argv[arg]);
|
|
else {
|
|
if (errno)
|
|
warn("cannot connect to socket %s", argv[arg]);
|
|
else
|
|
warnx("cannot connect to socket %s", argv[arg]);
|
|
}
|
|
close(fd);
|
|
return 3;
|
|
}
|
|
|
|
if (TimeoutVal) {
|
|
alarm(0);
|
|
sigaction(SIGALRM, &oact, 0);
|
|
}
|
|
|
|
len = 0;
|
|
Command[sizeof(Command)-1] = '\0';
|
|
for (arg++; arg < argc; arg++) {
|
|
if (len && len < sizeof(Command)-1)
|
|
strcpy(Command+len++, " ");
|
|
strncpy(Command+len, argv[arg], sizeof(Command)-len-1);
|
|
len += strlen(Command+len);
|
|
}
|
|
|
|
switch (Receive(fd, verbose | REC_PASSWD)) {
|
|
case 1:
|
|
fprintf(stderr, "Password incorrect\n");
|
|
break;
|
|
|
|
case 0:
|
|
passwd = NULL;
|
|
if (len == 0) {
|
|
struct thread_data td;
|
|
const char *env;
|
|
int size;
|
|
|
|
td.hist = history_init();
|
|
if ((env = getenv("EL_SIZE"))) {
|
|
size = atoi(env);
|
|
if (size < 0)
|
|
size = 20;
|
|
} else
|
|
size = 20;
|
|
#ifdef __NetBSD__
|
|
history(td.hist, NULL, H_SETSIZE, size);
|
|
td.edit = el_init("pppctl", stdin, stdout, stderr);
|
|
#else
|
|
history(td.hist, H_EVENT, size);
|
|
td.edit = el_init("pppctl", stdin, stdout);
|
|
#endif
|
|
el_source(td.edit, NULL);
|
|
el_set(td.edit, EL_PROMPT, GetPrompt);
|
|
if ((env = getenv("EL_EDITOR"))) {
|
|
if (!strcmp(env, "vi"))
|
|
el_set(td.edit, EL_EDITOR, "vi");
|
|
else if (!strcmp(env, "emacs"))
|
|
el_set(td.edit, EL_EDITOR, "emacs");
|
|
}
|
|
el_set(td.edit, EL_SIGNAL, 1);
|
|
el_set(td.edit, EL_HIST, history, (const char *)td.hist);
|
|
|
|
td.ppp = fd;
|
|
td.trm = NULL;
|
|
|
|
/*
|
|
* We create two threads. The Terminal thread does all the
|
|
* work while the Monitor thread simply tells the Terminal
|
|
* thread when ``fd'' becomes readable. The telling is done
|
|
* by sending a SIGUSR1 to the Terminal thread. The
|
|
* sem_select semaphore is used to prevent the monitor
|
|
* thread from firing excessive signals at the Terminal
|
|
* thread (it's abused for exit handling too - see below).
|
|
*
|
|
* The Terminal thread never uses td.trm !
|
|
*/
|
|
sem_init(&sem_select, 0, 0);
|
|
|
|
pthread_create(&td.trm, NULL, Terminal, &td);
|
|
pthread_create(&mon, NULL, Monitor, &td);
|
|
|
|
/* Wait for the terminal thread to finish */
|
|
pthread_join(td.trm, &thread_ret);
|
|
fprintf(stderr, "Connection closed\n");
|
|
|
|
/* Get rid of the monitor thread by abusing sem_select */
|
|
timetogo = 1;
|
|
close(fd);
|
|
fd = -1;
|
|
sem_post(&sem_select);
|
|
pthread_join(mon, &thread_ret);
|
|
|
|
/* Restore our terminal and release resources */
|
|
el_end(td.edit);
|
|
history_end(td.hist);
|
|
sem_destroy(&sem_select);
|
|
} else {
|
|
start = Command;
|
|
do {
|
|
next = strchr(start, ';');
|
|
while (*start == ' ' || *start == '\t')
|
|
start++;
|
|
if (next)
|
|
*next = '\0';
|
|
strcpy(Buffer, start);
|
|
Buffer[sizeof(Buffer)-2] = '\0';
|
|
strcat(Buffer, "\n");
|
|
if (verbose)
|
|
write(1, Buffer, strlen(Buffer));
|
|
write(fd, Buffer, strlen(Buffer));
|
|
if (Receive(fd, verbose | REC_SHOW) != 0) {
|
|
fprintf(stderr, "Connection closed\n");
|
|
break;
|
|
}
|
|
if (next)
|
|
start = ++next;
|
|
} while (next && *next);
|
|
if (verbose)
|
|
puts("");
|
|
}
|
|
break;
|
|
|
|
default:
|
|
warnx("ppp is not responding");
|
|
break;
|
|
}
|
|
|
|
if (fd != -1)
|
|
close(fd);
|
|
|
|
return 0;
|
|
}
|