Followup to mtod removal in main stack (r311225). Continued removal
of mtod() calls from TCP_PROBE macros. MFC after: 1 week Sponsored by: Limelight Networks
This commit is contained in:
parent
619898777b
commit
fad073dd44
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=311243
@ -312,7 +312,7 @@ tcp_do_fastack(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
(void *)tcp_saveipgen,
|
||||
&tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__input, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__input, tp, th, m);
|
||||
m_freem(m);
|
||||
if (tp->snd_una == tp->snd_max)
|
||||
tcp_timer_activate(tp, TT_REXMT, 0);
|
||||
@ -404,7 +404,7 @@ tcp_do_fastnewdata(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
tcp_trace(TA_INPUT, ostate, tp,
|
||||
(void *)tcp_saveipgen, &tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__input, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__input, tp, th, m);
|
||||
/*
|
||||
* Automatic sizing of receive socket buffer. Often the send
|
||||
* buffer size is not optimally adjusted to the actual network
|
||||
@ -579,8 +579,7 @@ tcp_do_slowpath(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,
|
||||
mtod(m, const char *), tp, th);
|
||||
TCP_PROBE5(connect__refused, NULL, tp, m, tp, th);
|
||||
tp = tcp_drop(tp, ECONNREFUSED);
|
||||
}
|
||||
if (thflags & TH_RST)
|
||||
@ -633,7 +632,7 @@ tcp_do_slowpath(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
} else {
|
||||
tcp_state_change(tp, TCPS_ESTABLISHED);
|
||||
TCP_PROBE5(connect__established, NULL, tp,
|
||||
mtod(m, const char *), tp, th);
|
||||
m, tp, th);
|
||||
cc_conn_init(tp);
|
||||
tcp_timer_activate(tp, TT_KEEP,
|
||||
TP_KEEPIDLE(tp));
|
||||
@ -1004,7 +1003,7 @@ tcp_do_slowpath(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
} else {
|
||||
tcp_state_change(tp, TCPS_ESTABLISHED);
|
||||
TCP_PROBE5(accept__established, NULL, tp,
|
||||
mtod(m, const char *), tp, th);
|
||||
m, tp, th);
|
||||
cc_conn_init(tp);
|
||||
tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp));
|
||||
}
|
||||
@ -1676,7 +1675,7 @@ tcp_do_slowpath(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
tcp_trace(TA_INPUT, ostate, tp, (void *)tcp_saveipgen,
|
||||
&tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__input, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__input, tp, th, m);
|
||||
|
||||
/*
|
||||
* Return any desired output.
|
||||
@ -1723,7 +1722,7 @@ tcp_do_slowpath(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
tcp_trace(TA_DROP, ostate, tp, (void *)tcp_saveipgen,
|
||||
&tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__drop, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__drop, tp, th, m);
|
||||
if (ti_locked == TI_RLOCKED) {
|
||||
INP_INFO_RUNLOCK(&V_tcbinfo);
|
||||
}
|
||||
@ -1766,7 +1765,7 @@ tcp_do_slowpath(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
tcp_trace(TA_DROP, ostate, tp, (void *)tcp_saveipgen,
|
||||
&tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__drop, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__drop, tp, th, m);
|
||||
if (tp != NULL)
|
||||
INP_WUNLOCK(tp->t_inpcb);
|
||||
m_freem(m);
|
||||
@ -2183,7 +2182,7 @@ tcp_fastack(struct mbuf *m, struct tcphdr *th, struct socket *so,
|
||||
(void *)tcp_saveipgen,
|
||||
&tcp_savetcp, 0);
|
||||
#endif
|
||||
TCP_PROBE3(debug__input, tp, th, mtod(m, const char *));
|
||||
TCP_PROBE3(debug__input, tp, th, m);
|
||||
m_freem(m);
|
||||
if (tp->snd_una == tp->snd_max)
|
||||
tcp_timer_activate(tp, TT_REXMT, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user