diff options
author | Brian Somers <brian@FreeBSD.org> | 1998-04-23 23:50:40 +0000 |
---|---|---|
committer | Brian Somers <brian@FreeBSD.org> | 1998-04-23 23:50:40 +0000 |
commit | 086760227f4a61242f39a1773af00d9299b6ad34 (patch) | |
tree | bac890b69c2704bdc29303692ebab1c7a10272f6 /usr.sbin/ppp/arp.c | |
parent | 673903ec42f3019f33a1221bf37205d248f26f5b (diff) | |
download | src-086760227f4a61242f39a1773af00d9299b6ad34.tar.gz src-086760227f4a61242f39a1773af00d9299b6ad34.zip |
Create #defines for all endpoint discriptor classes,
and allow `set enddisc mac'.
Notes
Notes:
svn path=/cvs2svn/branches/MP/; revision=35412
Diffstat (limited to 'usr.sbin/ppp/arp.c')
-rw-r--r-- | usr.sbin/ppp/arp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index cc992aecfc34..286d71d2bade 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: arp.c,v 1.27.2.11 1998/04/06 09:12:22 brian Exp $ + * $Id: arp.c,v 1.27.2.12 1998/04/07 00:53:14 brian Exp $ * */ @@ -64,8 +64,6 @@ #include "bundle.h" #include "arp.h" -static int get_ether_addr(int, struct in_addr, struct sockaddr_dl *); - /* * SET_SA_FAMILY - set the sa_family field of a struct sockaddr, * if it exists. @@ -226,7 +224,7 @@ cifproxyarp(struct bundle *bundle, struct in_addr addr, int s) * the same subnet as ipaddr. */ -static int +int get_ether_addr(int s, struct in_addr ipaddr, struct sockaddr_dl *hwaddr) { int mib[6], sa_len, skip, b; @@ -315,8 +313,8 @@ get_ether_addr(int s, struct in_addr ipaddr, struct sockaddr_dl *hwaddr) if (ifa->sin_family == AF_INET && (ifa->sin_addr.s_addr & mask->sin_addr.s_addr) == (ipaddr.s_addr & mask->sin_addr.s_addr)) { - LogPrintf(LogPHASE, "Found interface %.*s for proxy arp\n", - dl->sdl_alen, dl->sdl_data); + LogPrintf(LogPHASE, "Found interface %.*s for %s\n", + dl->sdl_alen, dl->sdl_data, inet_ntoa(ipaddr)); memcpy(hwaddr, dl, dl->sdl_len); free(buf); return 1; |