From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by sourceware.org (Postfix) with ESMTPS id 1C48E385782C for ; Mon, 28 Jun 2021 12:50:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C48E385782C Received: by mail-io1-xd33.google.com with SMTP id b7so22048500ioq.12 for ; Mon, 28 Jun 2021 05:50:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cMJ/1aThKh0h2gNVnadog3YY0xa3DNuq8ySPNzW+hUM=; b=BIN7jf9FAE2LnJiVka4vFH9us2sfdSWJSkH1I8Wr87nTsv/LrRI5WT7VHZzVyYXMwJ hH9dY+pEUGQh0qAL11lb3LYuH7poC2/0M7CvFFx++Dc812QPe4sHddC8DxLnx40S8lUD HaGtPvj46Sj12R+ZskojXY+djIuGPTcdzU1+gvSs2DkrFXlSDgpfHbMSXH7+L1O23P+d W6Gb/ua+R8MT1KZigaCHyV5OhyyC12vIaT3DeSKdjO1ZNo+IASp/9Mjne8PKu+l71GOo nBH/4A1J/FGiIiPu7S2kKEHVUbY10KMuisl8lmm0ck7Fu/bOQcvEAEuWR6KPlZD/T4kL ROsQ== X-Gm-Message-State: AOAM532L0p5aMuwj+M2RnmfZP5JJb5H1SPq/qkkUQtA0uni3MUXlRg9r zt15Z/r2xbv6A2oYiTUoKZc= X-Google-Smtp-Source: ABdhPJy9ioDcBfHd0J+mPfBUVDeqPR7TaXgFIHNqDzB7Tkl0ekLm7KDORvn0H/UhPZgFINaVoYyhzg== X-Received: by 2002:a5e:a612:: with SMTP id q18mr7754871ioi.76.1624884657605; Mon, 28 Jun 2021 05:50:57 -0700 (PDT) Received: from ?IPv6:2601:448:c580:1890:d0af:6698:5f10:3caf? ([2601:448:c580:1890:d0af:6698:5f10:3caf]) by smtp.gmail.com with ESMTPSA id v19sm2118739iom.32.2021.06.28.05.50.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Jun 2021 05:50:57 -0700 (PDT) Subject: Re: [PATCH V4] Add RFC 8335 Definitions from Linux 5.13 From: Andreas Roeseler To: libc-alpha@sourceware.org Cc: fweimer@redhat.com References: <20210603142604.1658845-1-andreas.a.roeseler@gmail.com> Message-ID: <094f48ef-4a72-15a6-06ab-927e6d9f0538@gmail.com> Date: Mon, 28 Jun 2021 07:50:55 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 12:51:01 -0000 On 6/21/2021 8:00 AM, Andreas Roeseler wrote: > On 6/3/2021 9:26 AM, Andreas Roeseler wrote: >> RFC 8335 defines the network utility PROBE, which builds off of the >> capabilities of Ping to query more detailed interface information from >> networking nodes. >> >> The definitions included in this patchset have been accepted into the >> linux net-next branch and will be included in Linux 5.13. This >> patchset adds the same definitions to the glibc for use in the >> iputils package. >> >> The relevant commits for the Linux definitions can be found here: >> https://github.com/torvalds/linux/commit/e542d29ca81d005651680a0a697b72ca13ddc4cc >> https://github.com/torvalds/linux/commit/750f4fc2a12f6632b5aa04526bf57fa06bfe8467 >> >> These changes have been tested by running the glibc tests on x86_64 >> >> Signed-off-by: Andreas Roeseler >> --- >> Changes: >> v1 -> v2: >> - Add more specific prefixes to constants >> >> v2 -> v3: >> - Updated URLs >> - Corrected Linux version that will include the definitions (5.13) >> >> v3 -> v4: >> - Updated URLs to Linus branch >> - Added V to ICMPV6 definitions >> --- >>   inet/netinet/icmp6.h          |  2 ++ >>   sysdeps/gnu/netinet/ip_icmp.h | 18 ++++++++++++++++++ >>   2 files changed, 20 insertions(+) >> >> diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h >> index 22b82335ec..151347987f 100644 >> --- a/inet/netinet/icmp6.h >> +++ b/inet/netinet/icmp6.h >> @@ -69,6 +69,8 @@ struct icmp6_hdr >>   #define MLD_LISTENER_QUERY          130 >>   #define MLD_LISTENER_REPORT         131 >>   #define MLD_LISTENER_REDUCTION      132 >> +#define ICMPV6_EXT_ECHO_REQUEST        160 >> +#define ICMPV6_EXT_ECHO_REPLY        161 >>     #define ICMP6_DST_UNREACH_NOROUTE     0 /* no route to destination */ >>   #define ICMP6_DST_UNREACH_ADMIN       1 /* communication with destination */ >> diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h >> index 5db7ac7c37..ec7137253f 100644 >> --- a/sysdeps/gnu/netinet/ip_icmp.h >> +++ b/sysdeps/gnu/netinet/ip_icmp.h >> @@ -89,6 +89,24 @@ struct icmphdr >>   #define ICMP_EXC_TTL        0    /* TTL count exceeded        */ >>   #define ICMP_EXC_FRAGTIME    1    /* Fragment Reass time exceeded    */ >>   +/* Codes for ICMP_EXT_ECHO (PROBE) */ >> +#define ICMP_EXT_ECHO        42 >> +#define ICMP_EXT_ECHOREPLY    43 >> +#define ICMP_EXT_CODE_MAL_QUERY    1    /* Malformed Query */ >> +#define ICMP_EXT_CODE_NO_IF    2    /* No such Interface */ >> +#define ICMP_EXT_CODE_NO_TABLE_ENT    3    /* No table entry */ >> +#define ICMP_EXT_CODE_MULT_IFS    4    /* Multiple Interfaces Satisfy Query */ >> + >> +/* Constants for EXT_ECHO (PROBE) */ >> +#define ICMP_EXT_ECHOREPLY_ACTIVE    (1 << 2)/* active bit in reply */ >> +#define ICMP_EXT_ECHOREPLY_IPV4        (1 << 1)/* ipv4 bit in reply */ >> +#define ICMP_EXT_ECHOREPLY_IPV6        1    /* ipv6 bit in reply */ >> +#define ICMP_EXT_ECHO_CTYPE_NAME    1 >> +#define ICMP_EXT_ECHO_CTYPE_INDEX    2 >> +#define ICMP_EXT_ECHO_CTYPE_ADDR    3 >> +#define ICMP_AFI_IP            1    /* Address Family Identifier for IPV4 */ >> +#define ICMP_AFI_IP6            2    /* Address Family Identifier for IPV6 */ >> + >>     #ifdef __USE_MISC >>   /* >> > bump > > As a side note in case this was missed, the conflict with Trinity has been fixed in Linux net-next here. > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=e32ea44c7ae476f4c90e35ab0a29dc8ff082bc11 bump