Deleted Added
full compact
ip_fil.h (98004) ip_fil.h (110916)
1/*
2 * Copyright (C) 1993-2002 by Darren Reed.
3 *
4 * See the IPFILTER.LICENCE file for details on licencing.
5 *
6 * @(#)ip_fil.h 1.35 6/5/96
7 * $Id: ip_fil.h,v 2.29.2.4 2000/11/12 11:54:53 darrenr Exp $
1/*
2 * Copyright (C) 1993-2002 by Darren Reed.
3 *
4 * See the IPFILTER.LICENCE file for details on licencing.
5 *
6 * @(#)ip_fil.h 1.35 6/5/96
7 * $Id: ip_fil.h,v 2.29.2.4 2000/11/12 11:54:53 darrenr Exp $
8 * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_fil.h 98004 2002-06-07 08:56:30Z darrenr $
8 * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_fil.h 110916 2003-02-15 06:25:25Z darrenr $
9 */
10
11#ifndef __IP_FIL_H__
12#define __IP_FIL_H__
13
14/*
15 * Pathnames for various IP Filter control devices. Used by LKM
16 * and userland, so defined here.

--- 42 unchanged lines hidden (view full) ---

59# define SIOCAUTHW _IOWR('r', 76, struct frauth *)
60# define SIOCAUTHR _IOWR('r', 77, struct frauth *)
61# define SIOCATHST _IOWR('r', 78, struct fr_authstat *)
62# define SIOCSTLCK _IOWR('r', 79, u_int)
63# define SIOCSTPUT _IOWR('r', 80, struct ipstate_save *)
64# define SIOCSTGET _IOWR('r', 81, struct ipstate_save *)
65# define SIOCSTGSZ _IOWR('r', 82, struct natget)
66# define SIOCGFRST _IOWR('r', 83, struct ipfrstat *)
9 */
10
11#ifndef __IP_FIL_H__
12#define __IP_FIL_H__
13
14/*
15 * Pathnames for various IP Filter control devices. Used by LKM
16 * and userland, so defined here.

--- 42 unchanged lines hidden (view full) ---

59# define SIOCAUTHW _IOWR('r', 76, struct frauth *)
60# define SIOCAUTHR _IOWR('r', 77, struct frauth *)
61# define SIOCATHST _IOWR('r', 78, struct fr_authstat *)
62# define SIOCSTLCK _IOWR('r', 79, u_int)
63# define SIOCSTPUT _IOWR('r', 80, struct ipstate_save *)
64# define SIOCSTGET _IOWR('r', 81, struct ipstate_save *)
65# define SIOCSTGSZ _IOWR('r', 82, struct natget)
66# define SIOCGFRST _IOWR('r', 83, struct ipfrstat *)
67# define SIOCIPFL6 _IOWR('r', 84, int)
67#else
68# define SIOCADAFR _IOW(r, 60, struct frentry *)
69# define SIOCRMAFR _IOW(r, 61, struct frentry *)
70# define SIOCSETFF _IOW(r, 62, u_int)
71# define SIOCGETFF _IOR(r, 63, u_int)
72# define SIOCGETFS _IOWR(r, 64, struct friostat *)
73# define SIOCIPFFL _IOWR(r, 65, int)
74# define SIOCIPFFB _IOR(r, 66, int)

--- 9 unchanged lines hidden (view full) ---

84# define SIOCAUTHW _IOWR(r, 76, struct frauth *)
85# define SIOCAUTHR _IOWR(r, 77, struct frauth *)
86# define SIOCATHST _IOWR(r, 78, struct fr_authstat *)
87# define SIOCSTLCK _IOWR(r, 79, u_int)
88# define SIOCSTPUT _IOWR(r, 80, struct ipstate_save *)
89# define SIOCSTGET _IOWR(r, 81, struct ipstate_save *)
90# define SIOCSTGSZ _IOWR(r, 82, struct natget)
91# define SIOCGFRST _IOWR(r, 83, struct ipfrstat *)
68#else
69# define SIOCADAFR _IOW(r, 60, struct frentry *)
70# define SIOCRMAFR _IOW(r, 61, struct frentry *)
71# define SIOCSETFF _IOW(r, 62, u_int)
72# define SIOCGETFF _IOR(r, 63, u_int)
73# define SIOCGETFS _IOWR(r, 64, struct friostat *)
74# define SIOCIPFFL _IOWR(r, 65, int)
75# define SIOCIPFFB _IOR(r, 66, int)

--- 9 unchanged lines hidden (view full) ---

85# define SIOCAUTHW _IOWR(r, 76, struct frauth *)
86# define SIOCAUTHR _IOWR(r, 77, struct frauth *)
87# define SIOCATHST _IOWR(r, 78, struct fr_authstat *)
88# define SIOCSTLCK _IOWR(r, 79, u_int)
89# define SIOCSTPUT _IOWR(r, 80, struct ipstate_save *)
90# define SIOCSTGET _IOWR(r, 81, struct ipstate_save *)
91# define SIOCSTGSZ _IOWR(r, 82, struct natget)
92# define SIOCGFRST _IOWR(r, 83, struct ipfrstat *)
93# define SIOCIPFL6 _IOWR(r, 84, int)
92#endif
93#define SIOCADDFR SIOCADAFR
94#define SIOCDELFR SIOCRMAFR
95#define SIOCINSFR SIOCINAFR
96
97
98typedef struct fr_ip {
99 u_32_t fi_v:4; /* IP version */

--- 308 unchanged lines hidden (view full) ---

408
409
410/*
411 * Log structure. Each packet header logged is prepended by one of these.
412 * Following this in the log records read from the device will be an ipflog
413 * structure which is then followed by any packet data.
414 */
415typedef struct iplog {
94#endif
95#define SIOCADDFR SIOCADAFR
96#define SIOCDELFR SIOCRMAFR
97#define SIOCINSFR SIOCINAFR
98
99
100typedef struct fr_ip {
101 u_32_t fi_v:4; /* IP version */

--- 308 unchanged lines hidden (view full) ---

410
411
412/*
413 * Log structure. Each packet header logged is prepended by one of these.
414 * Following this in the log records read from the device will be an ipflog
415 * structure which is then followed by any packet data.
416 */
417typedef struct iplog {
416 u_32_t ipl_magic;
417 u_int ipl_count;
418 u_long ipl_sec;
419 u_long ipl_usec;
420 size_t ipl_dsize;
418 u_32_t ipl_magic;
419 u_int ipl_count;
420 struct timeval ipl_tv;
421 size_t ipl_dsize;
421 struct iplog *ipl_next;
422} iplog_t;
423
422 struct iplog *ipl_next;
423} iplog_t;
424
425#define ipl_sec ipl_tv.tv_sec
426#define ipl_usec ipl_tv.tv_usec
427
424#define IPL_MAGIC 0x49504c4d /* 'IPLM' */
425#define IPLOG_SIZE sizeof(iplog_t)
426
427typedef struct ipflog {
428#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
429 (defined(OpenBSD) && (OpenBSD >= 199603))
430 char fl_ifname[LIFNAMSIZ];
431#else

--- 177 unchanged lines hidden (view full) ---

609extern int iwcopyptr __P((void *, void *, size_t));
610
611extern void ipflog_init __P((void));
612extern int ipflog_clear __P((minor_t));
613extern int ipflog __P((u_int, ip_t *, fr_info_t *, mb_t *));
614extern int ipllog __P((int, fr_info_t *, void **, size_t *, int *, int));
615extern int ipflog_read __P((minor_t, struct uio *));
616
428#define IPL_MAGIC 0x49504c4d /* 'IPLM' */
429#define IPLOG_SIZE sizeof(iplog_t)
430
431typedef struct ipflog {
432#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
433 (defined(OpenBSD) && (OpenBSD >= 199603))
434 char fl_ifname[LIFNAMSIZ];
435#else

--- 177 unchanged lines hidden (view full) ---

613extern int iwcopyptr __P((void *, void *, size_t));
614
615extern void ipflog_init __P((void));
616extern int ipflog_clear __P((minor_t));
617extern int ipflog __P((u_int, ip_t *, fr_info_t *, mb_t *));
618extern int ipllog __P((int, fr_info_t *, void **, size_t *, int *, int));
619extern int ipflog_read __P((minor_t, struct uio *));
620
617extern int frflush __P((minor_t, int));
621extern int frflush __P((minor_t, int, int));
618extern void frsync __P((void));
619extern frgroup_t *fr_addgroup __P((u_32_t, frentry_t *, minor_t, int));
620extern void fr_delgroup __P((u_32_t, u_32_t, minor_t, int));
621extern frgroup_t *fr_findgroup __P((u_32_t, u_32_t, minor_t, int,
622 frgroup_t ***));
623
624extern int fr_copytolog __P((int, char *, int));
625extern void fr_forgetifp __P((void *));

--- 32 unchanged lines hidden ---
622extern void frsync __P((void));
623extern frgroup_t *fr_addgroup __P((u_32_t, frentry_t *, minor_t, int));
624extern void fr_delgroup __P((u_32_t, u_32_t, minor_t, int));
625extern frgroup_t *fr_findgroup __P((u_32_t, u_32_t, minor_t, int,
626 frgroup_t ***));
627
628extern int fr_copytolog __P((int, char *, int));
629extern void fr_forgetifp __P((void *));

--- 32 unchanged lines hidden ---