Re: git: dc04fa802dc1 - main - pf: make if_pflog.h self-contained

On 17 Dec 2021, at 21:01, John Baldwin wrote:
> On 12/17/21 3:39 AM, Kristof Provost wrote:
>> The branch main has been updated by kp:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=dc04fa802dc17ec663dffb3de99db2690b393ca1
>>
>> commit dc04fa802dc17ec663dffb3de99db2690b393ca1
>> Author:     Kristof Provost <kp@FreeBSD.org>
>> AuthorDate: 2021-12-15 19:54:19 +0000
>> Commit:     Kristof Provost <kp@FreeBSD.org>
>> CommitDate: 2021-12-17 11:38:35 +0000
>>
>>      pf: make if_pflog.h self-contained
>>          Reviewed by:    imp
>>      Sponsored by:   Rubicon Communications, LLC ("Netgate")
>>      Differential Revision:  https://reviews.freebsd.org/D33503
>> ---
>>   sys/net/if_pflog.h | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h
>> index 93a69a2bb3a5..0406f78474a8 100644
>> --- a/sys/net/if_pflog.h
>> +++ b/sys/net/if_pflog.h
>> @@ -31,7 +31,10 @@
>>   #ifndef _NET_IF_PFLOG_H_
>>   #define	_NET_IF_PFLOG_H_
>>  +#include <sys/types.h>
>> +
>>   #include <net/bpf.h>
>> +#include <net/if.h>
>>    #define	PFLOGIFS_MAX	16
>
> FYI, as a counter point, net/libcap doesn't build on main (thus meaning that
> qemu doesn't build on head) because it includes this header which by the nested
> include of <net/bpf.h> adds duplicate definitions of 'struct bpf*':
>
> https://lists.freebsd.org/archives/freebsd-pkg-fallout/2021-December/156851.html
>
> (It only started at the start of December, not sure why though, all I know is
> I can't build qemu in poudriere on my laptop anymore.)
>
Yes, that’s as a result of the addition of the net/bpf.h header in if_pflog.h.

The include situation in libpcap is a bit … complex let’s say, but I’ve already submitted a fix to that project: https://github.com/the-tcpdump-group/libpcap/pull/1074

Best regards,
Kristof