From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202504 header.b=WEajusiD; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 9D9D85A0271 for ; Thu, 10 Apr 2025 09:16:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202504; t=1744269401; bh=YNCKkAP2JFKNL9vNMykVs4lxbJ6Xmcp++Or6C9Hagt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WEajusiDLWKhAc92rvAamLvluHJeNBY8GAieS7Rfc91RBF+E8l6ISLcjMFdKv/i1u +CodO2XnO1zoM9Y6cDxknxzI/8pIfBHgbubcXT/Vhz2AkKnzhNtQTz72gt0WEmQasa BfcPKH+eyKGXJ70FeORSZrCelu+/T8vF058EWG8ckt7OxRL+7wiJpl1rbRkrTgZu84 kkoi7PPDhFXcWAOg9+/G3z+6CKEQv2MeALUCAissGv2QZJjNZ70KyHVuNLIF5Azjfe AvhCfDgtEIkwhXStpN7cDrAVhbllD/3AczV9InjA1LaHPnnT+/tdQB2J4giUgey1jm hK3GfGb9tB2Wg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZYB2K4PxBz4xCp; Thu, 10 Apr 2025 17:16:41 +1000 (AEST) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH 2/3] inany: Improve ASSERT message for bad socket family Date: Thu, 10 Apr 2025 17:16:39 +1000 Message-ID: <20250410071640.2310091-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410071640.2310091-1-david@gibson.dropbear.id.au> References: <20250410071640.2310091-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TTJ3L6BPNHDT7VYQJFKNA45GVTE2I5SB X-Message-ID-Hash: TTJ3L6BPNHDT7VYQJFKNA45GVTE2I5SB X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: inany_from_sockaddr() can only handle sockaddrs of family AF_INET or AF_INET6 and asserts if given something else. I hit this assertion while debugging something else, and wanted to see what the bad sockaddr family was. Now that we have ASSERT_WITH_MSG() its easy to add this information. Signed-off-by: David Gibson --- inany.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inany.h b/inany.h index 6a12c292..1c247e1e 100644 --- a/inany.h +++ b/inany.h @@ -252,7 +252,8 @@ static inline void inany_from_sockaddr(union inany_addr *aa, in_port_t *port, *port = ntohs(sa->sa4.sin_port); } else { /* Not valid to call with other address families */ - ASSERT(0); + ASSERT_WITH_MSG(0, "Unexpected sockaddr family: %u", + sa->sa_family); } } -- 2.49.0