Attachment 163023 Details for Bug 204438 – Patch of the diff in the URL section. Changes behavior of setsockopt

[patch] Patch of the diff in the URL section. Changes behavior of setsockopt

sockbuf-patch (text/plain), 1.16 KB, created by Cameron Sparr on 2015-11-11 20:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Sparr

Created: 2015-11-11 20:38:39 UTC

Size: 1.16 KB

patch

obsolete

>--- sys/kern/uipc_sockbuf.c	2015-11-11 13:34:32.000000000 -0700
>+++ /tmp/uipc_sockbuf.c	2015-11-11 13:34:27.000000000 -0700
>@@ -397,7 +397,7 @@
> 	sb_max_adj = (u_quad_t)sb_max * MCLBYTES / (MSIZE + MCLBYTES);
> 	return (0);
> }
>-	
>+
> /*
>  * Allot mbufs to a sockbuf.  Attempt to scale mbmax so that mbcnt doesn't
>  * become limiting if buffering efficiency is near the normal case.
>@@ -417,8 +417,12 @@
> 	 * appropriate thread resource limits are available.  In that case,
> 	 * we don't apply a process limit.
> 	 */
>-	if (cc > sb_max_adj)
>-		return (0);
>+    if (cc > sb_max)
>+        return (0);
>+
>+    if (cc > sb_max_adj)
>+        cc = sb_max_adj;
>+
> 	if (td != NULL) {
> 		sbsize_limit = lim_cur(td, RLIMIT_SBSIZE);
> 	} else
>@@ -433,7 +437,7 @@
> }
> 
> int
>-sbreserve(struct sockbuf *sb, u_long cc, struct socket *so, 
>+sbreserve(struct sockbuf *sb, u_long cc, struct socket *so,
>     struct thread *td)
> {
> 	int error;
>@@ -1297,7 +1301,7 @@
> 	xsb->sb_cc = sb->sb_ccc;
> 	xsb->sb_hiwat = sb->sb_hiwat;
> 	xsb->sb_mbcnt = sb->sb_mbcnt;
>-	xsb->sb_mcnt = sb->sb_mcnt;	
>+	xsb->sb_mcnt = sb->sb_mcnt;
> 	xsb->sb_ccnt = sb->sb_ccnt;
> 	xsb->sb_mbmax = sb->sb_mbmax;
> 	xsb->sb_lowat = sb->sb_lowat;

Actions: View | Diff

Attachments on bug 204438: 163023