system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-16 06:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add IPv6 support to pppctl by using getaddrinfo() and trying each address

Browse source 
it returns. This allows it to connect to the server side again, which
has been listening on IPv6 addresses exclusively for more than 2 years.

PR:		59369
This commit is contained in:
Tim J. Robbins 2003-12-07 08:39:29 +00:00
parent 172293effe
commit 8b45548804
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=123229
1 changed files with 114 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
usr.sbin/pppctl/pppctl.c
View file

@ -332,6 +332,29 @@ Monitor(void *v)
return NULL; return NULL;
} }
static const char *
sockaddr_ntop(const struct sockaddr *sa)
{
const void *addr;
static char addrbuf[INET6_ADDRSTRLEN];
switch (sa->sa_family) {
case AF_INET:
addr = &((const struct sockaddr_in *)sa)->sin_addr;
break;
case AF_UNIX:
addr = &((const struct sockaddr_un *)sa)->sun_path;
break;
case AF_INET6:
addr = &((const struct sockaddr_in6 *)sa)->sin6_addr;
break;
default:
return NULL;
}
inet_ntop(sa->sa_family, addr, addrbuf, sizeof(addrbuf));
return addrbuf;
}
/* /*
* Connect to ppp using either a local domain socket or a tcp socket. * Connect to ppp using either a local domain socket or a tcp socket.
* *
@ -341,12 +364,8 @@ Monitor(void *v)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
struct servent *s;
struct hostent *h;
struct sockaddr *sock;
struct sockaddr_in ifsin;
struct sockaddr_un ifsun; struct sockaddr_un ifsun;
int n, socksz, arg, fd, len, verbose, save_errno, hide1, hide1off, hide2; int n, arg, fd, len, verbose, save_errno, hide1, hide1off, hide2;
unsigned TimeoutVal; unsigned TimeoutVal;
char *DoneWord = "x", *next, *start; char *DoneWord = "x", *next, *start;
struct sigaction act, oact; struct sigaction act, oact;
@ -424,9 +443,6 @@ main(int argc, char **argv)
} }
if (*argv[arg] == '/') { if (*argv[arg] == '/') {
sock = (struct sockaddr *)&ifsun;
socksz = sizeof ifsun;
memset(&ifsun, '\0', sizeof ifsun); memset(&ifsun, '\0', sizeof ifsun);
ifsun.sun_len = strlen(argv[arg]); ifsun.sun_len = strlen(argv[arg]);
if (ifsun.sun_len > sizeof ifsun.sun_path - 1) { if (ifsun.sun_len > sizeof ifsun.sun_path - 1) {
@ -440,57 +456,62 @@ main(int argc, char **argv)
warnx("cannot create local domain socket"); warnx("cannot create local domain socket");
return 2; return 2;
} }
} else { if (connect(fd, (struct sockaddr *)&ifsun, sizeof(ifsun)) < 0) {
char *port, *host, *colon; if (errno)
int hlen; warn("cannot connect to socket %s", argv[arg]);
else
colon = strchr(argv[arg], ':'); warnx("cannot connect to socket %s", argv[arg]);
if (colon) { close(fd);
port = colon + 1; return 3;
*colon = '\0';
host = argv[arg];
} else {
port = argv[arg];
host = "127.0.0.1";
} }
sock = (struct sockaddr *)&ifsin; } else {
socksz = sizeof ifsin; char *addr, *p, *port;
hlen = strlen(host); const char *caddr;
struct addrinfo hints, *res, *pai;
int gai;
char local[] = "localhost";
memset(&ifsin, '\0', sizeof ifsin); addr = argv[arg];
if (strspn(host, "0123456789.") == hlen) { if (addr[strspn(addr, "0123456789")] == '\0') {
if (!inet_aton(host, &ifsin.sin_addr)) { /* port on local machine */
warnx("cannot translate %s", host); port = addr;
addr = local;
} else if (*addr == '[') {
/* [addr]:port */
if ((p = strchr(addr, ']')) == NULL) {
warnx("%s: mismatched '['", addr);
return 1; return 1;
} }
} else if ((h = gethostbyname(host)) == 0) { addr++;
warnx("cannot resolve %s", host); *p++ = '\0';
if (*p != ':') {
warnx("%s: missing port", addr);
return 1; return 1;
} }
else port = ++p;
ifsin.sin_addr.s_addr = *(u_long *)h->h_addr_list[0]; } else {
/* addr:port */
if (colon) p = addr + strcspn(addr, ":");
*colon = ':'; if (*p != ':') {
warnx("%s: missing port", addr);
if (strspn(port, "0123456789") == strlen(port)) return 1;
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 *p++ = '\0';
ifsin.sin_port = s->s_port; port = p;
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;
} }
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
gai = getaddrinfo(addr, port, &hints, &res);
if (gai != 0) {
warnx("%s: %s", addr, gai_strerror(gai));
return 1;
}
for (pai = res; pai != NULL; pai = pai->ai_next) {
if (fd = socket(pai->ai_family, pai->ai_socktype,
pai->ai_protocol), fd < 0) {
warnx("cannot create socket");
continue;
} }
TimedOut = 0; TimedOut = 0;
if (TimeoutVal) { if (TimeoutVal) {
act.sa_handler = Timeout; act.sa_handler = Timeout;
@ -499,30 +520,35 @@ main(int argc, char **argv)
sigaction(SIGALRM, &act, &oact); sigaction(SIGALRM, &act, &oact);
alarm(TimeoutVal); alarm(TimeoutVal);
} }
if (connect(fd, pai->ai_addr, pai->ai_addrlen) == 0)
if (connect(fd, sock, socksz) < 0) { break;
if (TimeoutVal) { if (TimeoutVal) {
save_errno = errno; save_errno = errno;
alarm(0); alarm(0);
sigaction(SIGALRM, &oact, 0); sigaction(SIGALRM, &oact, 0);
errno = save_errno; errno = save_errno;
} }
caddr = sockaddr_ntop(pai->ai_addr);
if (caddr == NULL)
caddr = argv[arg];
if (TimedOut) if (TimedOut)
warnx("timeout: cannot connect to socket %s", argv[arg]); warnx("timeout: cannot connect to %s", caddr);
else { else {
if (errno) if (errno)
warn("cannot connect to socket %s", argv[arg]); warn("cannot connect to %s", caddr);
else else
warnx("cannot connect to socket %s", argv[arg]); warnx("cannot connect to %s", caddr);
} }
close(fd); close(fd);
return 3;
} }
freeaddrinfo(res);
if (pai == NULL)
return 1;
if (TimeoutVal) { if (TimeoutVal) {
alarm(0); alarm(0);
sigaction(SIGALRM, &oact, 0); sigaction(SIGALRM, &oact, 0);
} }
}
len = 0; len = 0;
Command[sizeof(Command)-1] = '\0'; Command[sizeof(Command)-1] = '\0';