6d4baa0d01
There were two issues with the new pflog packet length.
The first is that the length is expected to be a multiple of
sizeof(long), but we'd assumed it had to be a multiple of
sizeof(uint32_t).
The second is that there's some broken software out there (such as
Wireshark) that makes incorrect assumptions about the amount of padding.
That is, Wireshark assumes there's always three bytes of padding, rather
than however much is needed to get to a multiple of sizeof(long).
Fix this by adding extra padding, and a fake field to maintain
Wireshark's assumption.
Reported by: Ozkan KIRIK <ozkan.kirik@gmail.com>
Tested by: Ozkan KIRIK <ozkan.kirik@gmail.com>
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D33236
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/* $OpenBSD: if_pflog.h,v 1.13 2006/10/23 12:46:09 henning Exp $ */
|
|
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*
|
|
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NET_IF_PFLOG_H_
|
|
#define _NET_IF_PFLOG_H_
|
|
|
|
#include <net/bpf.h>
|
|
|
|
#define PFLOGIFS_MAX 16
|
|
|
|
#define PFLOG_RULESET_NAME_SIZE 16
|
|
|
|
struct pfloghdr {
|
|
u_int8_t length;
|
|
sa_family_t af;
|
|
u_int8_t action;
|
|
u_int8_t reason;
|
|
char ifname[IFNAMSIZ];
|
|
char ruleset[PFLOG_RULESET_NAME_SIZE];
|
|
u_int32_t rulenr;
|
|
u_int32_t subrulenr;
|
|
uid_t uid;
|
|
pid_t pid;
|
|
uid_t rule_uid;
|
|
pid_t rule_pid;
|
|
u_int8_t dir;
|
|
u_int8_t pad[3];
|
|
u_int32_t ridentifier;
|
|
u_int8_t reserve; /* Appease broken software like Wireshark. */
|
|
u_int8_t pad2[3];
|
|
};
|
|
|
|
#define PFLOG_HDRLEN BPF_WORDALIGN(offsetof(struct pfloghdr, pad2))
|
|
/* minus pad, also used as a signature */
|
|
#define PFLOG_REAL_HDRLEN offsetof(struct pfloghdr, pad2)
|
|
|
|
#ifdef _KERNEL
|
|
struct pf_rule;
|
|
struct pf_ruleset;
|
|
struct pfi_kif;
|
|
struct pf_pdesc;
|
|
|
|
#define PFLOG_PACKET(i,a,b,c,d,e,f,g,h,di) do { \
|
|
if (pflog_packet_ptr != NULL) \
|
|
pflog_packet_ptr(i,a,b,c,d,e,f,g,h,di); \
|
|
} while (0)
|
|
#endif /* _KERNEL */
|
|
#endif /* _NET_IF_PFLOG_H_ */
|