diff options
| author | Ted Lemon <source@isc.org> | 2000-01-05 18:17:10 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-01-05 18:17:10 +0000 |
| commit | 9e9b2261b11db8aa7f73fafc4d6ed253db29fa3a (patch) | |
| tree | 849a69a0b94012b5fb01b4a6ef05416b4a4e5043 /relay | |
| parent | 2cbc0e484d1cb6f03ccc06e8876c7dd400c17c1d (diff) | |
| download | isc-dhcp-9e9b2261b11db8aa7f73fafc4d6ed253db29fa3a.tar.gz | |
Support new struct hardware.
Diffstat (limited to 'relay')
| -rw-r--r-- | relay/dhcrelay.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 80d9dd0d..9eeede99 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -22,7 +22,7 @@ #ifndef lint static char ocopyright[] = -"$Id: dhcrelay.c,v 1.36 1999/10/28 13:09:35 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcrelay.c,v 1.37 2000/01/05 18:11:53 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -336,11 +336,9 @@ void relay (ip, packet, length, from_port, from, hfrom) to.sin_len = sizeof to; #endif - memcpy (hto.haddr, packet -> chaddr, - (packet -> hlen > sizeof hto.haddr - ? sizeof hto.haddr - : packet -> hlen)); - hto.htype = packet -> htype; + memcpy (&hto.hbuf [1], packet -> chaddr, packet -> hlen); + hto.hbuf [0] = packet -> htype; + hto.hlen = packet -> hlen + 1; /* Wipe out the agent relay options and, if possible, figure out which interface to use based on the contents of the |