Page MenuHomeFreeBSD
Files F153125666

D10769.diff
No OneTemporary
Actions

D10769.diff
View Options

Index: stable/10/cddl/lib/libdtrace/ip.d
===================================================================
--- stable/10/cddl/lib/libdtrace/ip.d
+++ stable/10/cddl/lib/libdtrace/ip.d
@@ -240,24 +240,6 @@
#pragma D binding "1.0" IFF_LOOPBACK
inline int IFF_LOOPBACK = 0x8;
-#pragma D binding "1.13" translator
-translator ipinfo_t < struct mbuf *m > {
- ip_ver = m == NULL ? 0 : ((struct ip *)m->m_data)->ip_v;
- ip_plength = m == NULL ? 0 :
- ((struct ip *)m->m_data)->ip_v == 4 ?
- ntohs(((struct ip *)m->m_data)->ip_len) -
- (((struct ip *)m->m_data)->ip_hl << 2):
- ntohs(((struct ip6_hdr *)m->m_data)->ip6_ctlun.ip6_un1.ip6_un1_plen);
- ip_saddr = m == NULL ? 0 :
- ((struct ip *)m->m_data)->ip_v == 4 ?
- inet_ntoa(&((struct ip *)m->m_data)->ip_src.s_addr) :
- inet_ntoa6(&((struct ip6_hdr *)m->m_data)->ip6_src);
- ip_daddr = m == NULL ? 0 :
- ((struct ip *)m->m_data)->ip_v == 4 ?
- inet_ntoa(&((struct ip *)m->m_data)->ip_dst.s_addr) :
- inet_ntoa6(&((struct ip6_hdr *)m->m_data)->ip6_dst);
-};
-
#pragma D binding "1.0" translator
translator ifinfo_t < struct ifnet *p > {
if_name = p->if_xname;
Index: stable/10/sys/netinet/in_kdtrace.c
===================================================================
--- stable/10/sys/netinet/in_kdtrace.c
+++ stable/10/sys/netinet/in_kdtrace.c
@@ -58,28 +58,28 @@
SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__established,
"void *", "pktinfo_t *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfoh_t *");
SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__refused,
"void *", "pktinfo_t *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfo_t *");
SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__established,
"void *", "pktinfo_t *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfoh_t *");
SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__refused,
"void *", "pktinfo_t *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfoh_t *");
@@ -93,7 +93,7 @@
SDT_PROBE_DEFINE5_XLATE(tcp, , , receive,
"void *", "pktinfo_t *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfoh_t *");
@@ -115,7 +115,7 @@
SDT_PROBE_DEFINE6_XLATE(tcp, , , receive__autoresize,
"void *", "void *",
"struct tcpcb *", "csinfo_t *",
- "struct mbuf *", "ipinfo_t *",
+ "uint8_t *", "ipinfo_t *",
"struct tcpcb *", "tcpsinfo_t *" ,
"struct tcphdr *", "tcpinfoh_t *",
"int", "int");
Index: stable/10/sys/netinet/tcp_input.c
===================================================================
--- stable/10/sys/netinet/tcp_input.c
+++ stable/10/sys/netinet/tcp_input.c
@@ -1519,7 +1519,8 @@
newsize = min(so->so_rcv.sb_hiwat +
V_tcp_autorcvbuf_inc, V_tcp_autorcvbuf_max);
}
- TCP_PROBE6(receive__autoresize, NULL, tp, m, tp, th, newsize);
+ TCP_PROBE6(receive__autoresize, NULL, tp, mtod(m, const char *),
+ tp, th, newsize);
/* Start over with next RTT. */
tp->rfbuf_ts = 0;

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 8:24 AM (29 m, 30 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31731189
Default Alt Text
D10769.diff (3 KB)

Event Timeline