Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use inet_aton(), not inet_addr().

Browse Source
This commit is contained in:
mycroft 1995-05-21 14:22:23 +00:00
parent 631261a801
commit 10f79d3be3
3 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/routed/query/query.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: query.c,v 1.8 1995/03/18 15:00:52 cgd Exp $ */
/* $NetBSD: query.c,v 1.9 1995/05/21 14:22:25 mycroft Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)query.c 8.1 (Berkeley) 6/5/93";
#else
static char rcsid[] = "$NetBSD: query.c,v 1.8 1995/03/18 15:00:52 cgd Exp $";
static char rcsid[] = "$NetBSD: query.c,v 1.9 1995/05/21 14:22:25 mycroft Exp $";
#endif
#endif /* not lint */
@ -155,8 +155,7 @@ query(host)
memset(&router, 0, sizeof (router));
router.sin_family = AF_INET;
router.sin_addr.s_addr = inet_addr(host);
if (router.sin_addr.s_addr == -1) {
if (inet_aton(host, &router.sin_addr) == 0) {
hp = gethostbyname(host);
if (hp == NULL) {
fprintf(stderr, "query: %s: ", host);

33
sbin/routed/startup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: startup.c,v 1.12 1995/04/24 13:24:32 cgd Exp $ */
/* $NetBSD: startup.c,v 1.13 1995/05/21 14:22:23 mycroft Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)startup.c 8.1 (Berkeley) 6/5/93";
#else
static char rcsid[] = "$NetBSD: startup.c,v 1.12 1995/04/24 13:24:32 cgd Exp $";
static char rcsid[] = "$NetBSD: startup.c,v 1.13 1995/05/21 14:22:23 mycroft Exp $";
#endif
#endif /* not lint */
@ -496,19 +496,8 @@ getnetorhostname(type, name, sin)
sin->sin_addr = inet_makeaddr(n, INADDR_ANY);
return (1);
}
if (strcmp(type, "host") == 0) {
struct hostent *hp = gethostbyname(name);
if (hp == 0)
sin->sin_addr.s_addr = inet_addr(name);
else {
if (hp->h_addrtype != AF_INET)
return (0);
memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
}
sin->sin_family = AF_INET;
return (1);
}
if (strcmp(type, "host") == 0)
return (gethostnameornumber(name, sin));
return (0);
}
@ -519,13 +508,13 @@ gethostnameornumber(name, sin)
{
struct hostent *hp;
hp = gethostbyname(name);
if (hp) {
if (inet_aton(name, &sin->sin_addr) == 0) {
hp = gethostbyname(name);
if (hp == 0)
return (0);
memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
sin->sin_family = hp->h_addrtype;
return (1);
}
sin->sin_addr.s_addr = inet_addr(name);
sin->sin_family = AF_INET;
return (sin->sin_addr.s_addr != -1);
} else
sin->sin_family = AF_INET;
return (1);
}

7
sbin/routed/trace/trace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trace.c,v 1.7 1995/03/18 15:00:57 cgd Exp $ */
/* $NetBSD: trace.c,v 1.8 1995/05/21 14:22:27 mycroft Exp $ */
/*-
* Copyright (c) 1983, 1988, 1993
@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)trace.c 8.1 (Berkeley) 6/5/93";
#else
static char rcsid[] = "$NetBSD: trace.c,v 1.7 1995/03/18 15:00:57 cgd Exp $";
static char rcsid[] = "$NetBSD: trace.c,v 1.8 1995/05/21 14:22:27 mycroft Exp $";
#endif
#endif /* not lint */
@ -113,8 +113,7 @@ usage:
router.sin_port = sp->s_port;
while (argc > 0) {
router.sin_family = AF_INET;
router.sin_addr.s_addr = inet_addr(*argv);
if (router.sin_addr.s_addr == -1) {
if (inet_aton(*argv, &router.sin_addr) == 0) {
hp = gethostbyname(*argv);
if (hp == NULL) {
fprintf(stderr, "trace: %s: ", *argv);