svn commit: r310783 - head/sys/netinet
Andrey V. Elsukov
ae at FreeBSD.org
Thu Dec 29 19:57:47 UTC 2016
Author: ae
Date: Thu Dec 29 19:57:46 2016
New Revision: 310783
URL: https://svnweb.freebsd.org/changeset/base/310783
Log:
When we are sending IP fragments, update ip pointers in IP_PROBE() for
each fragment.
MFC after: 1 week
Modified:
head/sys/netinet/ip_fastfwd.c
head/sys/netinet/ip_output.c
Modified: head/sys/netinet/ip_fastfwd.c
==============================================================================
--- head/sys/netinet/ip_fastfwd.c Thu Dec 29 18:08:04 2016 (r310782)
+++ head/sys/netinet/ip_fastfwd.c Thu Dec 29 19:57:46 2016 (r310783)
@@ -400,8 +400,9 @@ passout:
*/
m_clrprotoflags(m);
- IP_PROBE(send, NULL, NULL, ip, nh.nh_ifp,
- ip, NULL);
+ IP_PROBE(send, NULL, NULL,
+ mtod(m, struct ip *), nh.nh_ifp,
+ mtod(m, struct ip *), NULL);
/* XXX: we can use cached route here */
error = (*nh.nh_ifp->if_output)(nh.nh_ifp, m,
(struct sockaddr *)&dst, NULL);
Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c Thu Dec 29 18:08:04 2016 (r310782)
+++ head/sys/netinet/ip_output.c Thu Dec 29 19:57:46 2016 (r310783)
@@ -696,7 +696,8 @@ sendit:
*/
m_clrprotoflags(m);
- IP_PROBE(send, NULL, NULL, ip, ifp, ip, NULL);
+ IP_PROBE(send, NULL, NULL, mtod(m, struct ip *), ifp,
+ mtod(m, struct ip *), NULL);
error = (*ifp->if_output)(ifp, m,
(const struct sockaddr *)gw, ro);
} else
More information about the svn-src-all
mailing list