Re: git: 6b3db5d7793f - main - libsysdecode: fix build after 3d0a736796a9

On 3/20/24 8:16 PM, Kyle Evans wrote:
> The branch main has been updated by kevans:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=6b3db5d7793f57fa0020a78d61aae7ec318557cc
> 
> commit 6b3db5d7793f57fa0020a78d61aae7ec318557cc
> Author:     Kyle Evans <kevans@FreeBSD.org>
> AuthorDate: 2024-03-21 03:14:49 +0000
> Commit:     Kyle Evans <kevans@FreeBSD.org>
> CommitDate: 2024-03-21 03:14:49 +0000
> 
>      libsysdecode: fix build after 3d0a736796a9
>      
>      TCP_USE_DDP is a kernel-only macro, so we must exclude it in
>      libsysdecode to avoid breaking the build.
>      
>      Fixes:  3d0a736796a9 ("tcp: Add a new kernel-only TCP_USE_DDP [...]")

Oops, thanks for fixing.

> ---
>   lib/libsysdecode/mktables | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables
> index beb18e97f898..8a990e0408d5 100644
> --- a/lib/libsysdecode/mktables
> +++ b/lib/libsysdecode/mktables
> @@ -141,7 +141,7 @@ gen_table "sockopt"         "SO_[A-Z_]+[[:space:]]+0x[0-9]+"               "sys/
>   gen_table "sockoptip"       "(IP_[[:alnum:]_]+|MCAST_[[:alnum:]_]+_GROUP)[[:space:]]+" "netinet/in.h" "IP_DEFAULT|IP_MIN|IP_MAX|IP_PORTRANGE"
>   gen_table "sockoptipv6"     "IPV6_[[:alnum:]_]+[[:space:]]+[0-9]+"         "netinet6/in6.h"     "IPV6_ADDR_|IPV6_TAG_DIRECT|IPV6_OPTIONS|IPV6_RECVOPTS|IPV6_RECVRETOPTS|IPV6_RECVDSTADDR|IPV6_RETOPTS|IPV6_2292|IPV6_RECVRTHDRDSTOPTS|IPV6_REACHCONF|IPV6_PKTOPTIONS"
>   gen_table "sockoptsctp"     "SCTP_[[:alnum:]_]+[[:space:]]+[0-9]+"         "netinet/sctp.h"
> -gen_table "sockopttcp"      "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+"          "netinet/tcp.h"      "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN"
> +gen_table "sockopttcp"      "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+"          "netinet/tcp.h"      "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN|TCP_USE_DDP"
>   gen_table "sockoptudp"      "UDP_[[:alnum:]]+[[:space:]]+[0-9]+"           "netinet/udp.h"      "UDP_ENCAP_"
>   gen_table "sockoptudplite"  "UDPLITE_[[:alnum:]_]+[[:space:]]+[0-9]+"      "netinet/udplite.h"
>   gen_table "socktype"        "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*"          "sys/socket.h"

-- 
John Baldwin