d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r258605: Convert over the TCP probes to use mtod()

Browse Source 
MFC slacker:	adrian
This commit is contained in:
avg 2014-01-17 10:48:44 +00:00
parent f481239dd3
commit c2040a08a9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netinet/tcp_input.c
View File

@ -1393,7 +1393,7 @@ tcp_input(struct mbuf *m, int off0)
}
#endif
TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
/*
* Segment belongs to a connection in SYN_SENT, ESTABLISHED or later
@ -1405,7 +1405,7 @@ tcp_input(struct mbuf *m, int off0)
return;
dropwithreset:
TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
if (ti_locked == TI_WLOCKED) {
INP_INFO_WUNLOCK(&V_tcbinfo);
@ -1429,7 +1429,7 @@ tcp_input(struct mbuf *m, int off0)
dropunlock:
if (m != NULL)
TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
if (ti_locked == TI_WLOCKED) {
INP_INFO_WUNLOCK(&V_tcbinfo);
@ -1928,8 +1928,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
goto dropwithreset;
}
if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) {
TCP_PROBE5(connect_refused, NULL, tp, m->m_data, tp,
th);
TCP_PROBE5(connect_refused, NULL, tp,
mtod(m, const char *), tp, th);
tp = tcp_drop(tp, ECONNREFUSED);
}
if (thflags & TH_RST)
@ -1982,7 +1982,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
} else {
tcp_state_change(tp, TCPS_ESTABLISHED);
TCP_PROBE5(connect_established, NULL, tp,
m->m_data, tp, th);
mtod(m, const char *), tp, th);
cc_conn_init(tp);
tcp_timer_activate(tp, TT_KEEP,
TP_KEEPIDLE(tp));
@ -2387,8 +2387,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
tp->t_flags &= ~TF_NEEDFIN;
} else {
tcp_state_change(tp, TCPS_ESTABLISHED);
TCP_PROBE5(accept_established, NULL, tp, m->m_data, tp,
th);
TCP_PROBE5(accept_established, NULL, tp,
mtod(m, const char *), tp, th);
cc_conn_init(tp);
tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp));
}

5
sys/netinet/tcp_subr.c
View File

@ -706,9 +706,10 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m,
tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0);
#endif
if (flags & TH_RST)
TCP_PROBE5(accept_refused, NULL, NULL, m->m_data, tp, nth);
TCP_PROBE5(accept_refused, NULL, NULL, mtod(m, const char *),
tp, nth);
TCP_PROBE5(send, NULL, tp, m->m_data, tp, nth);
TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth);
#ifdef INET6
if (isipv6)
(void) ip6_output(m, NULL, NULL, ipflags, NULL, NULL, inp);