Index: /branches/rel_apv_10_7/usr/click/tools/sysv_click
===================================================================
--- /branches/rel_apv_10_7/usr/click/tools/sysv_click	(revision 39439)
+++ /branches/rel_apv_10_7/usr/click/tools/sysv_click	(working copy)
@@ -851,6 +851,10 @@
 	fi
 	/usr/sbin/ip6tables -t raw -D PREROUTING -m rpfilter --invert -j DROP
 
+	# TWSD-802
+	# Drop all ICMP Timestamp Reply packets
+	/usr/sbin/iptables -I OUTPUT -p icmp --icmp-type timestamp-reply -j DROP
+
 	#Drop all input packets on AF_PACKET driver nic
         afpacket_nics=(`cat /ca/conf/af_packet_nic.conf | awk '{print $1}'`)
         for i in ${afpacket_nics[@]}
Index: /branches/rel_apv_10_7/usr/src/sys/netinet/ip_icmp.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/netinet/ip_icmp.c	(revision 39439)
+++ /branches/rel_apv_10_7/usr/src/sys/netinet/ip_icmp.c	(working copy)
@@ -551,22 +551,26 @@
 			goto reflect;
 
 	case ICMP_TSTAMP:
-		if (!V_icmpbmcastecho
-		    && (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
-			ICMPSTAT_INC(icps_bmcasttstamp);
-			break;
-		}
-		if (icmplen < ICMP_TSLEN) {
-			ICMPSTAT_INC(icps_badlen);
-			break;
-		}
-		icp->icmp_type = ICMP_TSTAMPREPLY;
-		icp->icmp_rtime = iptime();
-		icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
-		if (badport_bandlim(BANDLIM_ICMP_TSTAMP) < 0)
-			goto freeit;
-		else
-			goto reflect;
+		/* TWSD-802 */
+		/* Disable ICMP timestamp reply */
+		/* Ignore the ICMP Timestamp Request*/
+		break;
+		// if (!V_icmpbmcastecho
+		//     && (m->m_flags & (M_MCAST | M_BCAST)) != 0) {
+		// 	ICMPSTAT_INC(icps_bmcasttstamp);
+		// 	break;
+		// }
+		// if (icmplen < ICMP_TSLEN) {
+		// 	ICMPSTAT_INC(icps_badlen);
+		// 	break;
+		// }
+		// icp->icmp_type = ICMP_TSTAMPREPLY;
+		// icp->icmp_rtime = iptime();
+		// icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
+		// if (badport_bandlim(BANDLIM_ICMP_TSTAMP) < 0)
+		// 	goto freeit;
+		// else
+		// 	goto reflect;
 
 	case ICMP_MASKREQ:
 		if (V_icmpmaskrepl == 0)