From owner-svn-src-all@FreeBSD.ORG  Sun Sep 15 21:38:47 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5DCE7F80;
 Sun, 15 Sep 2013 21:38:47 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B26F2742;
 Sun, 15 Sep 2013 21:38:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FLclEu066018;
 Sun, 15 Sep 2013 21:38:47 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FLcliA066017;
 Sun, 15 Sep 2013 21:38:47 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201309152138.r8FLcliA066017@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 15 Sep 2013 21:38:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255604 - head/cddl/lib/libdtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 21:38:47 -0000

Author: markj
Date: Sun Sep 15 21:38:46 2013
New Revision: 255604
URL: http://svnweb.freebsd.org/changeset/base/255604

Log:
  Use the address of the inpcb rather than the tcpcb to identify TCP
  connections. This keeps the tcp provider consistent with the other network
  providers.
  
  Approved by:	re (delphij)

Modified:
  head/cddl/lib/libdtrace/tcp.d

Modified: head/cddl/lib/libdtrace/tcp.d
==============================================================================
--- head/cddl/lib/libdtrace/tcp.d	Sun Sep 15 21:18:50 2013	(r255603)
+++ head/cddl/lib/libdtrace/tcp.d	Sun Sep 15 21:38:46 2013	(r255604)
@@ -144,7 +144,7 @@ typedef struct tcpinfo {
 #pragma D binding "1.0" translator
 translator csinfo_t < struct tcpcb *p > {
 	cs_addr =	NULL;
-	cs_cid =	(uint64_t)p;
+	cs_cid =	(uint64_t)(p == NULL ? 0 : p->t_inpcb);
 	cs_pid =	0;
 	cs_zoneid =	0;
 };