From owner-svn-src-head@FreeBSD.ORG  Sat Nov  8 06:25:57 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6618C1065676;
	Sat,  8 Nov 2008 06:25:57 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 566E88FC19;
	Sat,  8 Nov 2008 06:25:57 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA86PvQg003487;
	Sat, 8 Nov 2008 06:25:57 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA86Pvhw003486;
	Sat, 8 Nov 2008 06:25:57 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200811080625.mA86Pvhw003486@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 8 Nov 2008 06:25:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184762 - head/sys/netgraph
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2008 06:25:57 -0000

Author: mav
Date: Sat Nov  8 06:25:57 2008
New Revision: 184762
URL: http://svn.freebsd.org/changeset/base/184762

Log:
  Don't use curthread to resolve file descriptor. Request may be queued, so
  thread will be different. Instead require sender to send process ID
  together with file descriptor.

Modified:
  head/sys/netgraph/ng_tty.c

Modified: head/sys/netgraph/ng_tty.c
==============================================================================
--- head/sys/netgraph/ng_tty.c	Sat Nov  8 04:43:24 2008	(r184761)
+++ head/sys/netgraph/ng_tty.c	Sat Nov  8 06:25:57 2008	(r184762)
@@ -73,6 +73,7 @@
 #include <sys/syslog.h>
 #include <sys/tty.h>
 #include <sys/ttycom.h>
+#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -250,7 +251,8 @@ ngt_shutdown(node_p node)
 static int
 ngt_rcvmsg(node_p node, item_p item, hook_p lasthook)
 {
-	struct thread *td = curthread;	/* XXX */
+	struct proc *p;
+	struct thread *td;
 	const sc_p sc = NG_NODE_PRIVATE(node);
 	struct ng_mesg *msg, *resp = NULL;
 	int error = 0;
@@ -262,8 +264,14 @@ ngt_rcvmsg(node_p node, item_p item, hoo
 		case NGM_TTY_SET_TTY:
 			if (sc->tp != NULL)
 				return (EBUSY);
-			error = ttyhook_register(&sc->tp, td, *(int *)msg->data,
+			
+			p = pfind(((int *)msg->data)[0]);
+			if (p == NULL)
+				return (ESRCH);
+			td = FIRST_THREAD_IN_PROC(p);
+			error = ttyhook_register(&sc->tp, td, ((int *)msg->data)[1],
 			    &ngt_hook, sc);
+			PROC_UNLOCK(p);
 			if (error != 0)
 				return (error);
 			break;