[src/netbsd-1-5]: src/usr.sbin/dhcp/common Pull up revision 1.7 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a29701aaaad
branches:  netbsd-1-5
changeset: 490307:4a29701aaaad
user:      he <he%NetBSD.org@localhost>
date:      Wed Dec 13 22:47:20 2000 +0000

description:
Pull up revision 1.7 (requested by mycroft):
  Fix multiple problems that caused dhcpd to either spin or not
  respond to queries in a timely fashion.

diffstat:

 usr.sbin/dhcp/common/bpf.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 95e864f9e100 -r 4a29701aaaad usr.sbin/dhcp/common/bpf.c
--- a/usr.sbin/dhcp/common/bpf.c        Wed Dec 13 22:47:04 2000 +0000
+++ b/usr.sbin/dhcp/common/bpf.c        Wed Dec 13 22:47:20 2000 +0000
@@ -47,7 +47,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bpf.c,v 1.3.2.1 2000/10/18 04:11:01 tv Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bpf.c,v 1.3.2.2 2000/12/13 22:47:20 he Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -436,6 +436,10 @@
                        continue;
                }
 
+               /* Adjust for any padding BPF inserted between the packets. */
+               interface -> rbuf_offset =
+                   BPF_WORDALIGN (interface -> rbuf_offset);
+
                /* Copy out a bpf header... */
                memcpy (&hdr, &interface -> rbuf [interface -> rbuf_offset],
                        sizeof hdr);