[src/netbsd-1-4]: src/lib/libpcap Pull up revision 1.8 (requested by itojun):

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

details:   https://anonhg.NetBSD.org/src/rev/11867c95e936
branches:  netbsd-1-4
changeset: 470522:11867c95e936
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 30 11:39:07 2000 +0000

description:
Pull up revision 1.8 (requested by itojun):
  Fix pcap_dispatch() timeout handling.  This synchronizes with a
  more recent LBL libpcap.

diffstat:

 lib/libpcap/pcap.c |  25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 7c882e080c19 -r 11867c95e936 lib/libpcap/pcap.c
--- a/lib/libpcap/pcap.c        Sun Apr 30 11:34:46 2000 +0000
+++ b/lib/libpcap/pcap.c        Sun Apr 30 11:39:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcap.c,v 1.6 1998/07/26 14:49:36 mycroft Exp $ */
+/*     $NetBSD: pcap.c,v 1.6.2.1 2000/04/30 11:39:07 he Exp $  */
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -39,7 +39,7 @@
 static const char rcsid[] =
     "@(#) Header: pcap.c,v 1.27 96/11/27 18:43:25 leres Exp  (LBL)";
 #else
-__RCSID("$NetBSD: pcap.c,v 1.6 1998/07/26 14:49:36 mycroft Exp $");
+__RCSID("$NetBSD: pcap.c,v 1.6.2.1 2000/04/30 11:39:07 he Exp $");
 #endif
 #endif
 
@@ -60,22 +60,29 @@
 int
 pcap_dispatch(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
-       register int cc;
 
        if (p->sf.rfile != NULL)
                return (pcap_offline_read(p, cnt, callback, user));
-       /* XXX keep reading until we get something (or an error occurs) */
-       do {
-               cc = pcap_read(p, cnt, callback, user);
-       } while (cc == 0);
-       return (cc);
+       return (pcap_read(p, cnt, callback, user));
 }
 
 int
 pcap_loop(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
 {
+       int n;
+
        for (;;) {
-               int n = pcap_dispatch(p, cnt, callback, user);
+               if (p->sf.rfile != NULL)
+                       n = pcap_offline_read(p, cnt, callback, user);
+               else {
+                       /*
+                        * XXX keep reading until we get something
+                        * (or an error occurs)
+                        */
+                       do {
+                               n = pcap_read(p, cnt, callback, user);
+                       } while (n == 0);
+               }
                if (n <= 0)
                        return (n);
                if (cnt > 0) {