51c51
< __FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 253571 2013-07-23 14:14:24Z ae $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 254889 2013-08-25 21:54:41Z markj $");
56a57
> #include "opt_kdtrace.h"
65a67
> #include <sys/sdt.h>
84a87
> #include <netinet/in_kdtrace.h>
690a694,695
> /* Reset length for SDT probes. */
> ip->ip_len = htons(tlen + off0);
691a697
>
1386a1393,1394
> TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
>
1396a1405,1406
> TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
>
1417a1428,1430
> if (m != NULL)
> TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
>
1913c1926,1928
< if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST))
---
> if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) {
> TCP_PROBE5(connect_refused, NULL, tp, m->m_data, tp,
> th);
1914a1930
> }
1959c1975
< tp->t_state = TCPS_FIN_WAIT_1;
---
> tcp_state_change(tp, TCPS_FIN_WAIT_1);
1963c1979,1981
< tp->t_state = TCPS_ESTABLISHED;
---
> tcp_state_change(tp, TCPS_ESTABLISHED);
> TCP_PROBE5(connect_established, NULL, tp,
> m->m_data, tp, th);
1981c1999
< tp->t_state = TCPS_SYN_RECEIVED;
---
> tcp_state_change(tp, TCPS_SYN_RECEIVED);
2119c2137
< tp->t_state = TCPS_CLOSED;
---
> tcp_state_change(tp, TCPS_CLOSED);
2364c2382
< tp->t_state = TCPS_FIN_WAIT_1;
---
> tcp_state_change(tp, TCPS_FIN_WAIT_1);
2367c2385,2387
< tp->t_state = TCPS_ESTABLISHED;
---
> tcp_state_change(tp, TCPS_ESTABLISHED);
> TCP_PROBE5(accept_established, NULL, tp, m->m_data, tp,
> th);
2755c2775
< tp->t_state = TCPS_FIN_WAIT_2;
---
> tcp_state_change(tp, TCPS_FIN_WAIT_2);
2981c3001
< tp->t_state = TCPS_CLOSE_WAIT;
---
> tcp_state_change(tp, TCPS_CLOSE_WAIT);
2989c3009
< tp->t_state = TCPS_CLOSING;
---
> tcp_state_change(tp, TCPS_CLOSING);