[src/netbsd-1-4]: src/usr.sbin/rarpd Pull up revision 1.36 (requested by abs):

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

details:   https://anonhg.NetBSD.org/src/rev/526054e17411
branches:  netbsd-1-4
changeset: 470347:526054e17411
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 12 16:49:20 2000 +0000

description:
Pull up revision 1.36 (requested by abs):
  Stop rarpd from hanging if too many routing updates come in
  between requests, also improve debug output slightly.  Fixes
  PR#7508.

diffstat:

 usr.sbin/rarpd/rarpd.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r c3f5712e1575 -r 526054e17411 usr.sbin/rarpd/rarpd.c
--- a/usr.sbin/rarpd/rarpd.c    Fri Feb 11 00:38:13 2000 +0000
+++ b/usr.sbin/rarpd/rarpd.c    Sat Feb 12 16:49:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rarpd.c,v 1.32 1999/02/13 19:58:29 thorpej Exp $       */
+/*     $NetBSD: rarpd.c,v 1.32.2.1 2000/02/12 16:49:20 he Exp $        */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -28,7 +28,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: rarpd.c,v 1.32 1999/02/13 19:58:29 thorpej Exp $");
+__RCSID("$NetBSD: rarpd.c,v 1.32.2.1 2000/02/12 16:49:20 he Exp $");
 #endif
 
 
@@ -404,9 +404,6 @@
        struct ether_arp *ap = (struct ether_arp *) (p + sizeof(*ep));
 #endif
 
-       if (dflag)
-               fprintf(stderr, "got a packet\n");
-
        if (len < sizeof(*ep) + sizeof(*ap)) {
                rarperr(NONFATAL, "truncated request");
                return 0;
@@ -531,6 +528,8 @@
 
                                caplen = bhp->bh_caplen;
                                hdrlen = bhp->bh_hdrlen;
+                               debug("received packet on %s", ii->ii_name);
+
                                if (rarp_check(bp + hdrlen, caplen))
                                        rarp_process(ii, bp + hdrlen);
                                bp += BPF_WORDALIGN(hdrlen + caplen);