The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8bcb13b79b4aa6156b852a0da04ca9f52c63ac0
commit d8bcb13b79b4aa6156b852a0da04ca9f52c63ac0 Author: Mark Johnston <[email protected]> AuthorDate: 2026-07-29 18:22:06 +0000 Commit: Mark Johnston <[email protected]> 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 ? "<unknown>" : 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 ? "<unknown>" : 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 ? "<unknown>" : 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 ? "<unknown>" : 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 ? "<unknown>" : 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 ? "<unknown>" : 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); };
