ethers(3) sunos-like support from Roland McGrath <roland@frob.com>
YP code fixed by myself (looked in wrong maps, didn't free things :-) used by rarpd & friends.
This commit is contained in:
deraadt
parent
4eef2bd5ca
commit
6a3865505c
|
|
@ -1,5 +1,5 @@
|
|||
# from: @(#)Makefile.inc 5.3 (Berkeley) 2/21/91
|
||||
# $Id: Makefile.inc,v 1.12 1993/12/08 13:31:22 pk Exp $
|
||||
# $Id: Makefile.inc,v 1.13 1993/12/16 05:17:35 deraadt Exp $
|
||||
|
||||
# net sources
|
||||
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/net ${.CURDIR}/net
|
||||
|
|
@ -11,7 +11,7 @@ SRCS+= gethostnamadr.c getnetbyaddr.c getnetbyname.c getnetent.c \
|
|||
iso_addr.c ns_addr.c ns_ntoa.c \
|
||||
iso_addr.c linkaddr.c ns_addr.c ns_ntoa.c rcmd.c recv.c res_comp.c \
|
||||
res_debug.c res_init.c res_mkquery.c res_query.c res_send.c \
|
||||
send.c sethostent.c
|
||||
send.c sethostent.c ethers.c
|
||||
|
||||
.if (${MACHINE_ARCH} == "m68k")
|
||||
SRCS+= htonl.S htons.S ntohl.S ntohs.S
|
||||
|
|
|
|||
|
|
@ -0,0 +1,184 @@
|
|||
/*
|
||||
* ethers(3N) a la Sun.
|
||||
*
|
||||
* Written by Roland McGrath <roland@frob.com> 10/14/93.
|
||||
* Public domain.
|
||||
*
|
||||
* $Id: ethers.c,v 1.1 1993/12/16 05:17:37 deraadt Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
#include <sys/param.h>
|
||||
#include <paths.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#ifndef _PATH_ETHERS
|
||||
#define _PATH_ETHERS "/etc/ethers"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Sun uses this structure in netinet/if_ether.h.
|
||||
* It looked like it would be harmless to change that file,
|
||||
* but I didn't want to bother and struct ether_addr and u_char[6]
|
||||
* are layed out identically in memory anyway.
|
||||
*/
|
||||
struct ether_addr {
|
||||
u_char ether_addr_octet[6];
|
||||
};
|
||||
|
||||
char *
|
||||
ether_ntoa(e)
|
||||
struct ether_addr *e;
|
||||
{
|
||||
static char a[] = "xx:xx:xx:xx:xx:xx";
|
||||
|
||||
sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
|
||||
e->ether_addr_octet[0], e->ether_addr_octet[1],
|
||||
e->ether_addr_octet[2], e->ether_addr_octet[3],
|
||||
e->ether_addr_octet[4], e->ether_addr_octet[5]);
|
||||
return a;
|
||||
}
|
||||
|
||||
struct ether_addr *
|
||||
ether_aton(s)
|
||||
char *s;
|
||||
{
|
||||
static struct ether_addr n;
|
||||
u_int i[6];
|
||||
|
||||
if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1],
|
||||
&i[2], &i[3], &i[4], &i[5]) == 6) {
|
||||
n.ether_addr_octet[0] = (u_char)i[0];
|
||||
n.ether_addr_octet[1] = (u_char)i[1];
|
||||
n.ether_addr_octet[2] = (u_char)i[2];
|
||||
n.ether_addr_octet[3] = (u_char)i[3];
|
||||
n.ether_addr_octet[4] = (u_char)i[4];
|
||||
n.ether_addr_octet[5] = (u_char)i[5];
|
||||
return &n;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ether_ntohost(hostname, e)
|
||||
char *hostname;
|
||||
struct ether_addr *e;
|
||||
{
|
||||
FILE *f;
|
||||
char buf[BUFSIZ];
|
||||
struct ether_addr try;
|
||||
|
||||
#ifdef YP
|
||||
char trybuf[sizeof "xx:xx:xx:xx:xx:xx"];
|
||||
int trylen;
|
||||
|
||||
sprintf(trybuf, "%x:%x:%x:%x:%x:%x",
|
||||
e->ether_addr_octet[0], e->ether_addr_octet[1],
|
||||
e->ether_addr_octet[2], e->ether_addr_octet[3],
|
||||
e->ether_addr_octet[4], e->ether_addr_octet[5]);
|
||||
trylen = strlen(trybuf);
|
||||
#endif
|
||||
|
||||
f = fopen(_PATH_ETHERS, "r");
|
||||
if (f==NULL)
|
||||
return -1;
|
||||
while (fgets(buf, sizeof buf, f)) {
|
||||
#ifdef YP
|
||||
/* A + in the file means try YP now. */
|
||||
if (!strncmp(buf, "+\n", sizeof buf)) {
|
||||
char *ypbuf, *ypdom;
|
||||
int ypbuflen;
|
||||
|
||||
if (yp_get_default_domain(&ypdom))
|
||||
continue;
|
||||
if (yp_match(ypdom, "ethers.byaddr", trybuf,
|
||||
trylen, &ypbuf, &ypbuflen))
|
||||
continue;
|
||||
if (ether_line(ypbuf, &try, hostname) == 0) {
|
||||
free(ypbuf);
|
||||
(void)fclose(f);
|
||||
return 0;
|
||||
}
|
||||
free(ypbuf);
|
||||
}
|
||||
#endif
|
||||
if (ether_line(buf, &try, hostname) == 0 &&
|
||||
bcmp((char *)&try, (char *)e, sizeof try) == 0) {
|
||||
(void)fclose(f);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
(void)fclose(f);
|
||||
errno = ENOENT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
ether_hostton(hostname, e)
|
||||
char *hostname;
|
||||
struct ether_addr *e;
|
||||
{
|
||||
FILE *f;
|
||||
char buf[BUFSIZ];
|
||||
char try[MAXHOSTNAMELEN];
|
||||
#ifdef YP
|
||||
int hostlen = strlen(hostname);
|
||||
#endif
|
||||
|
||||
f = fopen(_PATH_ETHERS, "r");
|
||||
if (f==NULL)
|
||||
return -1;
|
||||
|
||||
while (fgets(buf, sizeof buf, f)) {
|
||||
#ifdef YP
|
||||
/* A + in the file means try YP now. */
|
||||
if (!strncmp(buf, "+\n", sizeof buf)) {
|
||||
char *ypbuf, *ypdom;
|
||||
int ypbuflen;
|
||||
|
||||
if (yp_get_default_domain(&ypdom))
|
||||
continue;
|
||||
if (yp_match(ypdom, "ethers.byname", hostname, hostlen,
|
||||
&ypbuf, &ypbuflen))
|
||||
continue;
|
||||
if (ether_line(ypbuf, e, try) == 0) {
|
||||
free(ypbuf);
|
||||
(void)fclose(f);
|
||||
return 0;
|
||||
}
|
||||
free(ypbuf);
|
||||
}
|
||||
#endif
|
||||
if (ether_line(buf, e, try) == 0 && strcmp(hostname, try) == 0) {
|
||||
(void)fclose(f);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
(void)fclose(f);
|
||||
errno = ENOENT;
|
||||
return -1;
|
||||
}
|
||||
|
||||
ether_line(l, e, hostname)
|
||||
char *l;
|
||||
struct ether_addr *e;
|
||||
char *hostname;
|
||||
{
|
||||
u_int i[6];
|
||||
|
||||
if (sscanf(l, " %x:%x:%x:%x:%x:%x %s\n", &i[0], &i[1],
|
||||
&i[2], &i[3], &i[4], &i[5], hostname) == 7) {
|
||||
e->ether_addr_octet[0] = (u_char)i[0];
|
||||
e->ether_addr_octet[1] = (u_char)i[1];
|
||||
e->ether_addr_octet[2] = (u_char)i[2];
|
||||
e->ether_addr_octet[3] = (u_char)i[3];
|
||||
e->ether_addr_octet[4] = (u_char)i[4];
|
||||
e->ether_addr_octet[5] = (u_char)i[5];
|
||||
return 0;
|
||||
}
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
Loading…
Reference in New Issue