add sockopts for buffer sizes, etc.

SCCS-vsn: sys/kern/uipc_socket.c 6.9
SCCS-vsn: sys/kern/uipc_socket2.c 6.6

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 366bf08..02af94f 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*     uipc_socket.c   6.8     84/09/04        */
+/*     uipc_socket.c   6.9     84/11/14        */

 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"

diff --git a/usr/src/sys/kern/uipc_socket2.c b/usr/src/sys/kern/uipc_socket2.c
index e6e90cd..850a3ca 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/*     uipc_socket2.c  6.5     84/11/02        */
+/*     uipc_socket2.c  6.6     84/11/14        */

 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"


@@ -350,10 +350,12 @@ sbreserve(sb, cc)
        struct sockbuf *sb;
 {
 
        struct sockbuf *sb;
 {
 

+       if ((unsigned) cc > SB_MAX)
+               return (0);

        /* someday maybe this routine will fail... */
        sb->sb_hiwat = cc;
        /* * 2 implies names can be no more than 1 mbuf each */
        /* someday maybe this routine will fail... */
        sb->sb_hiwat = cc;
        /* * 2 implies names can be no more than 1 mbuf each */

-       sb->sb_mbmax = cc<<1;
+       sb->sb_mbmax = MAX(cc * 2, SB_MAX);

        return (1);
 }
 
        return (1);
 }