mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-23 02:17:31 +00:00
Code Issues Releases Wiki Activity

Fixups for haddr/htype->hbuf

Browse Source
This commit is contained in:
Ted Lemon 2000-01-25 01:17:01 +00:00
parent 4cbc378fc9
commit 218eee75e6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/upf.c
View File

@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: upf.c,v 1.14 1999/10/07 06:47:49 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: upf.c,v 1.15 2000/01/25 01:17:01 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -103,9 +103,9 @@ int if_register_upf (info)
log_fatal ("Invalid hardware address length on %s: %d", log_fatal ("Invalid hardware address length on %s: %d",
info -> name, param.end_addr_len); info -> name, param.end_addr_len);
info -> hw_address.hlen = 6; info -> hw_address.hlen = 7;
info -> hw_address.htype = ARPHRD_ETHER; info -> hw_address.hbuf [0] = ARPHRD_ETHER;
memcpy (&info -> hw_address.haddr [0], param.end_addr, 6); memcpy (&info -> hw_address.hbuf [1], param.end_addr, 6);
return sock; return sock;
} }
@ -125,9 +125,9 @@ void if_register_send (info)
if (!quiet_interface_discovery) if (!quiet_interface_discovery)
log_info ("Sending on UPF/%s/%s%s%s", log_info ("Sending on UPF/%s/%s%s%s",
info -> name, info -> name,
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.hbuf [0],
info -> hw_address.hlen, info -> hw_address.hlen - 1,
info -> hw_address.haddr), &info -> hw_address.hbuf [1]),
(info -> shared_network ? "/" : ""), (info -> shared_network ? "/" : ""),
(info -> shared_network ? (info -> shared_network ?
info -> shared_network -> name : "")); info -> shared_network -> name : ""));
@ -191,9 +191,9 @@ void if_register_receive (info)
if (!quiet_interface_discovery) if (!quiet_interface_discovery)
log_info ("Listening on UPF/%s/%s%s%s", log_info ("Listening on UPF/%s/%s%s%s",
info -> name, info -> name,
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.hbuf [0],
info -> hw_address.hlen, info -> hw_address.hlen - 1,
info -> hw_address.haddr), &info -> hw_address.hbuf [1]),
(info -> shared_network ? "/" : ""), (info -> shared_network ? "/" : ""),
(info -> shared_network ? (info -> shared_network ?
info -> shared_network -> name : "")); info -> shared_network -> name : ""));