From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 0A89C3858D35 for ; Tue, 16 Apr 2024 17:00:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0A89C3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=fastly.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0A89C3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::635 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713286802; cv=none; b=ev4nhJAhtgY192QULYx1tmkOSipyVQuLBWiYqMkyTKE3NBJ2eNbfTXkAT0wBA8SPNXIITgbKfHptRtYb43S/F0yNKDmioIn/onvf0jVE44dIkaXM/oufvvyCWL2vsVMnq74gYUNLtR7HvqTvIMDu9J2NzjFZyzuQ68GHp94a6xc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713286802; c=relaxed/simple; bh=XMk7oNjVd4OtAhkSi2t3tYrJIWnZmzl4FW1A2Jth4Fw=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=Nql1gunpIfkYgm+EWxbPrfZqGHAyozXqcNn2wKlNsIS7TAQZnCVLJnC9/YbAcGQAYNSfqGKLAJf10FEr2ofj/JDEFnya9Gnv7XgcfE8SVHzI4n0rKG9PmW9Eaj5TCWd9cP4eRFMMRlCIyvuUViR3pKuPqlswnHcvGCNYRsTPqNQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a4715991c32so601170966b.1 for ; Tue, 16 Apr 2024 09:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1713286798; x=1713891598; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=UGzU3YqjpuffDD/mpUnaLsz96ddTuRSJhhDDgGtCX4Q=; b=l/oPKY90cD3eNgF8/QoEmlxNkxHLpxk2qZV5+VLQyRM47gQ7jqbA6xpd6wZnP/0WW6 tr5OtjDc755TjzKswKAEKn/LzE2I5AWY3rTAPTqlA0o/+oeD2eeD69gkEzYmb2yrG+xj oBYnCSDMyM4CVnBifbbf0Sg4FT3XWkF/1bMmM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713286798; x=1713891598; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UGzU3YqjpuffDD/mpUnaLsz96ddTuRSJhhDDgGtCX4Q=; b=q/t+ls2r/WVlv3mCXfZYAPUJSAZzVTOWN/P4HHwvANXEIDqRCtxekq7yPysbN1roFp tXdB0Mhaub8THSm/t9BWgPLpaITXtMjJaHVroYyHYH6YE4p+IwOjGJ2Kr0qlOyApALSC T35lhao3U7KX8zwi23nrB02DQFHdVhHI6AddMTqE3y3iBX3VGf2IBbIoXoSJJUnJDluu hZssW369KnNXKNv060EMizV7LOIdY5Vh/Uv8fxAHm8eP/SU9RDdNgg8iMBqEcz4Cfltw HALqK+U6Tz7Y8F18yR5B8jGEItsfiegNNq3iPSbKTj6ksGV+qYkPTMzeZJd/bmv65Bsj Uhbw== X-Gm-Message-State: AOJu0YwLCl4dxGNqMxXCQq35sDFZWdRiHJj07txpJFDyoXcULJg4ERYu WRCs+t8qYLZ33yKJTo524xj0gk0MFEdbht7wYl5NtOxWRHS5/COzmmgrB/bmCEYQYDXVUolCJpl o/J3FAHbhoUTOnZuHhUyj0bFFfJwjGnddKVWiHZ6Dh+Xf0rmnnVf4NvBxdjv8fo7stvRBK4v/jJ 5lPw6ZmGT1XcLOVcmYEc93b+cDdiBCyamBXZB6 X-Google-Smtp-Source: AGHT+IFBefR/M1s9j2mgIHcC5pZrEWrkahcmw4VM87pA/su5Y7QJboIE7oZH+TjRu08XOHJykJYqwg== X-Received: by 2002:a17:906:33d9:b0:a52:3975:6e47 with SMTP id w25-20020a17090633d900b00a5239756e47mr6373896eja.34.1713286798153; Tue, 16 Apr 2024 09:59:58 -0700 (PDT) Received: from snel ([2a10:3781:276:3:16f6:d8ff:fe47:2eb7]) by smtp.gmail.com with ESMTPSA id x13-20020a170906b08d00b00a51d073da7esm7030062ejy.82.2024.04.16.09.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 09:59:57 -0700 (PDT) Date: Tue, 16 Apr 2024 18:59:56 +0200 From: Job Snijders To: libc-alpha@sourceware.org Subject: [PATCH v2] resolv: add IPv6 support to inet_net_pton() Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPAM_FROM,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Dear all, The below patch is a new revision to add IPv6 support to inet_net_pton(). The patch is based on the OpenBSD implementation. Kind regards, Job Signed-off: Job Snijders --- resolv/inet_net_pton.c | 69 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/resolv/inet_net_pton.c b/resolv/inet_net_pton.c index 63a47b7394..93753cb37f 100644 --- a/resolv/inet_net_pton.c +++ b/resolv/inet_net_pton.c @@ -1,4 +1,6 @@ /* + * Copyright (c) 2024 Job Snijders + * Copyright (c) 2012 by Gilles Chehade * Copyright (c) 1996,1999 by Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -19,6 +21,7 @@ #include #include #include +#include #include #include @@ -35,13 +38,16 @@ static int inet_net_pton_ipv4 (const char *src, u_char *dst, size_t size) __THROW; +static int inet_net_pton_ipv6 (const char *src, u_char *dst, + size_t size) __THROW; /* - * static int + * int * inet_net_pton(af, src, dst, size) - * convert network number from presentation to network format. - * accepts hex octets, hex strings, decimal octets, and /CIDR. - * "size" is in bytes and describes "dst". + * Convert network number from presentation format to network format. + * If "af" is set to AF_INET, accept various formats like hex octets, + * hex strings, or decimal octets. If "af" is set to AF_INET6, accept + * IPv6 addresses. "size" is in bytes and describes "dst". * return: * number of bits, either imputed classfully or specified with /CIDR, * or -1 if some failure occurred (check errno). ENOENT means it was @@ -55,6 +61,8 @@ inet_net_pton (int af, const char *src, void *dst, size_t size) switch (af) { case AF_INET: return (inet_net_pton_ipv4(src, dst, size)); + case AF_INET6: + return (inet_net_pton_ipv6(src, dst, size)); default: __set_errno (EAFNOSUPPORT); return (-1); @@ -196,3 +204,56 @@ inet_net_pton_ipv4 (const char *src, u_char *dst, size_t size) __set_errno (EMSGSIZE); return (-1); } + + +/* + * Convert an IPv6 prefix from presentation format to network format. + * Return the number of bits specified, or -1 as error (check errno). + */ +static int +inet_net_pton_ipv6 (const char *src, u_char *dst, size_t size) +{ + struct in6_addr in6; + int bits; + long lbits; + size_t bytes; + char *ep, *sep; + + sep = strchr(src, '/'); + + if (__inet_pton_length(AF_INET6, src, sep ? sep - src : strlen(src), + &in6) != 1) { + __set_errno (ENOENT); + return (-1); + } + + if (sep == NULL) { + bits = 128; + goto out; + } + + if (sep[0] == '\0' || !isascii(sep[0]) || !isdigit(sep[0])) { + __set_errno (ENOENT); + return (-1); + } + + lbits = strtol(sep, &ep, 10); + if (ep == sep || *ep != '\0') { + __set_errno (ENOENT); + return (-1); + } + if (lbits < 0 || lbits > 128) { + __set_errno (EMSGSIZE); + return (-1); + } + bits = lbits; + + out: + bytes = (bits + 7) / 8; + if (bytes > size) { + __set_errno (EMSGSIZE); + return (-1); + } + memcpy(dst, &in6.s6_addr, bytes); + return (bits); +}