Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/npf/npfd fix signed compare



details:   https://anonhg.NetBSD.org/src/rev/f39a73aa0d4f
branches:  trunk
changeset: 821101:f39a73aa0d4f
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 24 20:25:08 2017 +0000

description:
fix signed compare

diffstat:

 usr.sbin/npf/npfd/npfd_log.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r f7f2deaa8d6d -r f39a73aa0d4f usr.sbin/npf/npfd/npfd_log.c
--- a/usr.sbin/npf/npfd/npfd_log.c      Tue Jan 24 20:24:59 2017 +0000
+++ b/usr.sbin/npf/npfd/npfd_log.c      Tue Jan 24 20:25:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npfd_log.c,v 1.8 2017/01/07 16:48:03 christos Exp $    */
+/*     $NetBSD: npfd_log.c,v 1.9 2017/01/24 20:25:08 christos Exp $    */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: npfd_log.c,v 1.8 2017/01/07 16:48:03 christos Exp $");
+__RCSID("$NetBSD: npfd_log.c,v 1.9 2017/01/24 20:25:08 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -90,7 +90,9 @@
        case 1:
                if (hdr->magic != TCPDUMP_MAGIC ||
                    hdr->version_major != PCAP_VERSION_MAJOR ||
-                   hdr->version_minor != PCAP_VERSION_MINOR)
+                   hdr->version_minor != PCAP_VERSION_MINOR ||
+                   hdr->linktype != (u_int)pcap_datalink(ctx->pcap) ||
+                   hdr->sigfigs != (u_int)pcap_get_tstamp_precision(ctx->pcap))
                        goto out;
                break;
        default:



Home | Main Index | Thread Index | Old Index