[src/netbsd-1-5]: src/sys/netinet Pull up revision 1.16 (requested by darrenr):

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

details:   https://anonhg.NetBSD.org/src/rev/653f5f01e24e
branches:  netbsd-1-5
changeset: 491240:653f5f01e24e
user:      he <he%NetBSD.org@localhost>
date:      Sat Apr 14 20:56:42 2001 +0000

description:
Pull up revision 1.16 (requested by darrenr):
  Fix bug related to fragment cache handling.

diffstat:

 sys/netinet/ip_frag.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 1dc9893913c4 -r 653f5f01e24e sys/netinet/ip_frag.h
--- a/sys/netinet/ip_frag.h     Sat Apr 14 20:56:22 2001 +0000
+++ b/sys/netinet/ip_frag.h     Sat Apr 14 20:56:42 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_frag.h,v 1.14 2000/05/03 11:12:07 veego Exp $       */
+/*     $NetBSD: ip_frag.h,v 1.14.4.1 2001/04/14 20:56:42 he Exp $      */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -25,7 +25,8 @@
        u_char  ipfr_p;
        u_char  ipfr_tos;
        u_short ipfr_off;
-       u_short ipfr_ttl;
+       u_char  ipfr_ttl;
+       u_char  ipfr_seen0;
        frentry_t *ipfr_rule;
 } ipfr_t;
 
@@ -41,7 +42,8 @@
        struct  ipfr    **ifs_nattab;
 } ipfrstat_t;
 
-#define        IPFR_CMPSZ      (4 + 4 + 2 + 1 + 1)
+#define        IPFR_CMPSZ      (offsetof(ipfr_t, ipfr_off) - \
+                        offsetof(ipfr_t, ipfr_src))
 
 extern int     fr_ipfrttl;
 extern int     fr_frag_lock;