git: 59b8f72a21b3 - releng/13.0 - libsysdecode: fix decoding of TCP_NOPUSH and TCP_MD5SIG

[Michael Tuexen]

The branch releng/13.0 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=59b8f72a21b3e81465dc4ecd96f64dbaa44a4a9f

commit 59b8f72a21b3e81465dc4ecd96f64dbaa44a4a9f
Author:     Michael Tuexen <tuexen at FreeBSD.org>
AuthorDate: 2021-02-09 22:35:55 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-03-02 14:55:22 +0000

    libsysdecode: fix decoding of TCP_NOPUSH and TCP_MD5SIG
    
    TCP_FASTOPEN_MIN_COOKIE_LEN was incorrectly registered as a name of
    a IPPROTO_TCP level socket option, which overwrote TCP_NOPUSH.
    TCP_FASTOPEN_PSK_LEN was incorrectly registered as a name of an
    IPPROTO_TCP level socket option, which overwrote TCP_MD5SIG.
    
    Approved by:    re (gjb)
    Sponsored by:   Netflix, Inc.
    
    (cherry picked from commit f25266bee7dafb10f03e06537c8127cc17335bed)
    (cherry picked from commit 2a9b68d5e1bba633c37cc829f52e79e1281e910b)
---
 lib/libsysdecode/mktables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables
index 3a0284a2deb4..3d152a3a2646 100644
--- a/lib/libsysdecode/mktables
+++ b/lib/libsysdecode/mktables
@@ -140,7 +140,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"
+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 "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"