svn commit: r274266 - in stable/10/sys: netinet netinet6

[Bryan Venteicher]

Author: bryanv
Date: Sat Nov  8 02:53:55 2014
New Revision: 274266
URL: https://svnweb.freebsd.org/changeset/base/274266

Log:
  MFC r272844:
  
  Add missing UDP multicast receive dtrace probes

Modified:
  stable/10/sys/netinet/udp_usrreq.c
  stable/10/sys/netinet6/udp6_usrreq.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/udp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/udp_usrreq.c	Sat Nov  8 02:47:23 2014	(r274265)
+++ stable/10/sys/netinet/udp_usrreq.c	Sat Nov  8 02:53:55 2014	(r274266)
@@ -566,6 +566,8 @@ udp_input(struct mbuf *m, int off)
 				struct mbuf *n;
 
 				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
+					UDP_PROBE(receive, NULL, last, ip,
+					    last, uh);
 					udp_append(last, ip, n, iphlen,
 					    &udp_in);
 				}
@@ -597,6 +599,7 @@ udp_input(struct mbuf *m, int off)
 			INP_INFO_RUNLOCK(pcbinfo);
 			goto badunlocked;
 		}
+		UDP_PROBE(receive, NULL, last, ip, last, uh);
 		udp_append(last, ip, m, iphlen, &udp_in);
 		INP_RUNLOCK(last);
 		INP_INFO_RUNLOCK(pcbinfo);

Modified: stable/10/sys/netinet6/udp6_usrreq.c
==============================================================================
--- stable/10/sys/netinet6/udp6_usrreq.c	Sat Nov  8 02:47:23 2014	(r274265)
+++ stable/10/sys/netinet6/udp6_usrreq.c	Sat Nov  8 02:53:55 2014	(r274266)
@@ -368,6 +368,8 @@ udp6_input(struct mbuf **mp, int *offp, 
 
 				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
 					INP_RLOCK(last);
+					UDP_PROBE(receive, NULL, last, ip6,
+					    last, uh);
 					udp6_append(last, n, off, &fromsa);
 					INP_RUNLOCK(last);
 				}