Date: Mon, 24 Jun 2013 09:25:39 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252151 - stable/9/lib/libnetgraph Message-ID: <201306240925.r5O9Pdab011865@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Jun 24 09:25:38 2013 New Revision: 252151 URL: http://svnweb.freebsd.org/changeset/base/252151 Log: Merge r248159: Fix for quite a special case when userland emulates a netgraph node, and userland can reply to a message with NGM_HASREPLY bit set. In this case we should not wait for a response to a responce. PR: 176771 Submitted by: Keith Reynolds <keith.reynolds tidalscale.com> Modified: stable/9/lib/libnetgraph/msg.c Directory Properties: stable/9/lib/libnetgraph/ (props changed) Modified: stable/9/lib/libnetgraph/msg.c ============================================================================== --- stable/9/lib/libnetgraph/msg.c Mon Jun 24 09:23:24 2013 (r252150) +++ stable/9/lib/libnetgraph/msg.c Mon Jun 24 09:25:38 2013 (r252151) @@ -234,7 +234,7 @@ NgDeliverMsg(int cs, const char *path, } /* Wait for reply if there should be one. */ - if (msg->header.cmd & NGM_HASREPLY) { + if (msg->header.cmd & NGM_HASREPLY && !(msg->header.flags & NGF_RESP)) { struct pollfd rfds; int n;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306240925.r5O9Pdab011865>