d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that all cases that enqueue a netgraph item for delivery by a

Browse Source 
ngthread properly set the item's depth to 1.  In particular, prior to this
change if ng_snd_item failed to acquire a lock on a node, the item's depth
would not be set at all.  This fix ensures that the error code from rcvmsg/
rcvdata is properly passed back to the apply callback.  For example, this
fixes a bug where an error from rcvmsg/rcvdata would not previously
propagate back to a libnetgraph consumer when the message was queued.

Reviewed by:	mav
MFC after:	1 month
Sponsored by:	Sandvine Incorporated
This commit is contained in:
Ryan Stone 2012-09-27 20:12:51 +00:00
parent 827396ba31
commit 3fabe28bdc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netgraph/ng_base.c
View File

@ -2008,6 +2008,7 @@ ng_queue_rw(node_p node, item_p item, int rw)
NGI_SET_WRITER(item);
else
NGI_SET_READER(item);
item->depth = 1;
NG_QUEUE_LOCK(ngq);
/* Set OP_PENDING flag and enqueue the item. */
@ -2286,7 +2287,6 @@ ng_snd_item(item_p item, int flags)
}
if (queue) {
item->depth = 1;
/* Put it on the queue for that node*/
ng_queue_rw(node, item, rw);
return ((flags & NG_PROGRESS) ? EINPROGRESS : 0);