From nobody Wed Jul 29 18:27:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h9LRk5JJCz6mdc0 for ; Wed, 29 Jul 2026 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9LRk4ShJz3JLq for ; Wed, 29 Jul 2026 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785349682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IlOdw3c8SQKgTsq3V3PX4QfeicNi/mAflqNEbnlPNU=; b=vD1xz+9o3KeT/jnjLpM3gG15Mx54EShIE/0kXMsmeXlqo+YzJRVJ4GKpZaU0dUXa8RT/8X jyNrG8+A8YDAlM8ErEdCMIiWSuY5hSQshpudwP0GPakNRftPm+Ttpaehjs8Teiw1lzUu2i hl3npKx5kcstN5XAPFnrXZiUBbYY64gaAxOfdt+JXgXMWc3fqti08JS5afn1jLHBT21t4L fTbAnjZjmLreRuvqVAYBWqny1j6MBdnnsNBJidmXc1uKKZ+QY06HYzUphFrIvbts9krdBr 1I7r13RxqvwrjejVl71qhHuYUI2/lIFdQRT9p2k+JFYKid/bAxftHn93VIyAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785349682; a=rsa-sha256; cv=none; b=JrTZNw93QN64pi9IDcTuZCDwzHbVc/iQCxvhRgsWvZy4cgmsYuzd4Yy7b4glPaHq8IdV6B ozakm2ptGDJdJD14mdbnA0m5zsrslpQiynh5Gpc2oKAQV7CF1pxJdeRf1wQzEVKDi3rgyF hW9joMugkSE50WwXYzhk4yTbdQr8+dpGgT6iWyKGyAdxvc8eb9pcjjEkby74lS0yQ8U/EW LIq6kZIAfMyPL7WPFOQt7g3uWEHwnQV+0Vrj0vpCKPK6bMcKAExHpbJx9bnQ9cprQUklHb je1TuHl26ZNNb1frhE3JNWC1+OpOWnAmSVtyEeE9Glu+IMr4ABF20hVwC8hSew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785349682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IlOdw3c8SQKgTsq3V3PX4QfeicNi/mAflqNEbnlPNU=; b=ALa6EB/CmBkPJTeK5x8cSkt2LwAkfzx8lFaEns+uEZRYQKG3IBg8hXHPgqtOLQ4lmeMhDp DV27r+Tqzdv132L+5hwizNEug1YKes3umeFCerF0lxoMscKkJf5jTO5hXhxujhhR9qfB3b la5cNW0vDHt5vxXcx7OIo6Fzvmsk59LF43A/F4SHZxXUyp+D81Ks6UIDp/k5JWPitoGHwv fzPPHhcNUjuqFRLDau+nvrMjH9w3xTp5Y466WAPHyJ/DaUf/oZ3cVqrpknHel/HQi8J44Q IOkVaYpC7AoKS0SxRVp0AlUjsTjN8LSsY1CWz74flUPU/vK/AqyCs+9DwDK/7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9LRk3RjkzdP5 for ; Wed, 29 Jul 2026 18:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 18:27:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8bcb13b79b4 - main - libdtrace: Fix up translators after struct in_conninfo changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8bcb13b79b4aa6156b852a0da04ca9f52c63ac0 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 18:27:57 +0000 Message-Id: <6a6a462d.3df49.2542bbc8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8bcb13b79b4aa6156b852a0da04ca9f52c63ac0 commit d8bcb13b79b4aa6156b852a0da04ca9f52c63ac0 Author: Mark Johnston AuthorDate: 2026-07-29 18:22:06 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 18:22:06 +0000 libdtrace: Fix up translators after struct in_conninfo changes Fixes: 698402f4f97c ("inpcb: declare struct in_conninfo as a single declaration") --- cddl/lib/libdtrace/tcp.d | 4 ++-- cddl/lib/libdtrace/udp.d | 4 ++-- cddl/lib/libdtrace/udplite.d | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/lib/libdtrace/tcp.d b/cddl/lib/libdtrace/tcp.d index 8f51675df305..e0ebae4a6bdf 100644 --- a/cddl/lib/libdtrace/tcp.d +++ b/cddl/lib/libdtrace/tcp.d @@ -218,11 +218,11 @@ translator tcpsinfo_t < struct tcpcb *p > { tcps_rport = p == NULL ? 0 : ntohs(p->t_inpcb.inp_inc.inc_ie.ie_fport); tcps_laddr = p == NULL ? "" : p->t_inpcb.inp_vflag == INP_IPV4 ? - inet_ntoa(&p->t_inpcb.inp_inc.inc_ie.ie_dependladdr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->t_inpcb.inp_inc.inc_ie.ie_dependladdr.id4_addr.s_addr) : inet_ntoa6(&p->t_inpcb.inp_inc.inc_ie.ie_dependladdr.id6_addr); tcps_raddr = p == NULL ? "" : p->t_inpcb.inp_vflag == INP_IPV4 ? - inet_ntoa(&p->t_inpcb.inp_inc.inc_ie.ie_dependfaddr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->t_inpcb.inp_inc.inc_ie.ie_dependfaddr.id4_addr.s_addr) : inet_ntoa6(&p->t_inpcb.inp_inc.inc_ie.ie_dependfaddr.id6_addr); tcps_state = p == NULL ? -1 : p->t_state; tcps_iss = p == NULL ? 0 : p->iss; diff --git a/cddl/lib/libdtrace/udp.d b/cddl/lib/libdtrace/udp.d index fd28f5e2e7e9..5ceede203a83 100644 --- a/cddl/lib/libdtrace/udp.d +++ b/cddl/lib/libdtrace/udp.d @@ -56,11 +56,11 @@ translator udpsinfo_t < struct inpcb *p > { udps_rport = p == NULL ? 0 : ntohs(p->inp_inc.inc_ie.ie_fport); udps_laddr = p == NULL ? "" : p->inp_vflag == INP_IPV4 ? - inet_ntoa(&p->inp_inc.inc_ie.ie_dependladdr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->inp_inc.inc_ie.ie_dependladdr.id4_addr.s_addr) : inet_ntoa6(&p->inp_inc.inc_ie.ie_dependladdr.id6_addr); udps_raddr = p == NULL ? "" : p->inp_vflag == INP_IPV4 ? - inet_ntoa(&p->inp_inc.inc_ie.ie_dependfaddr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->inp_inc.inc_ie.ie_dependfaddr.id4_addr.s_addr) : inet_ntoa6(&p->inp_inc.inc_ie.ie_dependfaddr.id6_addr); }; diff --git a/cddl/lib/libdtrace/udplite.d b/cddl/lib/libdtrace/udplite.d index 88c1c8553ce5..7bf444b510fe 100644 --- a/cddl/lib/libdtrace/udplite.d +++ b/cddl/lib/libdtrace/udplite.d @@ -57,11 +57,11 @@ translator udplitesinfo_t < struct inpcb *p > { udplites_rport = p == NULL ? 0 : ntohs(p->inp_inc.inc_ie.ie_fport); udplites_laddr = p == NULL ? "" : p->inp_vflag == INP_IPV4 ? - inet_ntoa(&p->inp_inc.inc_ie.ie_dependladdr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->inp_inc.inc_ie.ie_dependladdr.id4_addr.s_addr) : inet_ntoa6(&p->inp_inc.inc_ie.ie_dependladdr.id6_addr); udplites_raddr = p == NULL ? "" : p->inp_vflag == INP_IPV4 ? - inet_ntoa(&p->inp_inc.inc_ie.ie_dependfaddr.id46_addr.ia46_addr4.s_addr) : + inet_ntoa(&p->inp_inc.inc_ie.ie_dependfaddr.id4_addr.s_addr) : inet_ntoa6(&p->inp_inc.inc_ie.ie_dependfaddr.id6_addr); };