Attachment 13040 Details for Bug 24959 – file.diff

[patch] file.diff

file.diff (text/plain), 6.23 KB, created by Tony Finch on 2001-02-08 22:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Finch

Created: 2001-02-08 22:30:01 UTC

Size: 6.23 KB

patch

obsolete

>Index: alpha/linux/linux.h
>===================================================================
>RCS file: /home/ncvs/src/sys/alpha/linux/linux.h,v
>retrieving revision 1.49
>diff -u -r1.49 linux.h
>--- alpha/linux/linux.h	2000/12/03 01:30:30	1.49
>+++ alpha/linux/linux.h	2001/02/08 21:59:43
>@@ -379,6 +379,10 @@
> #define	LINUX_IP_ADD_MEMBERSHIP		35
> #define	LINUX_IP_DROP_MEMBERSHIP	36
> 
>+#define LINUX_TCP_NODELAY	1
>+#define LINUX_TCP_MAXSEG	2
>+#define LINUX_TCP_CORK		3
>+
> struct linux_sockaddr {
> 	u_short	sa_family;
> 	char	sa_data[14];
>Index: compat/linux/linux_socket.c
>===================================================================
>RCS file: /home/ncvs/src/sys/compat/linux/linux_socket.c,v
>retrieving revision 1.25
>diff -u -r1.25 linux_socket.c
>--- compat/linux/linux_socket.c	2000/12/19 00:24:25	1.25
>+++ compat/linux/linux_socket.c	2001/02/08 21:58:19
>@@ -46,6 +46,7 @@
> #include <netinet/in.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
>+#include <netinet/tcp.h>
> 
> #include <machine/../linux/linux.h>
> #include <machine/../linux/linux_proto.h>
>@@ -86,6 +87,21 @@
> }
> 
> static int
>+linux_to_bsd_tcp_sockopt(int opt)
>+{
>+
>+	switch (opt) {
>+	case LINUX_TCP_NODELAY:
>+		return (TCP_NODELAY);
>+	case LINUX_TCP_MAXSEG:
>+		return (TCP_MAXSEG);
>+	case LINUX_TCP_CORK:
>+		return (TCP_CORK);
>+	}
>+	return (-1);
>+}
>+
>+static int
> linux_to_bsd_ip_sockopt(int opt)
> {
> 
>@@ -831,8 +847,7 @@
> 		name = linux_to_bsd_ip_sockopt(linux_args.optname);
> 		break;
> 	case IPPROTO_TCP:
>-		/* Linux TCP option values match BSD's */
>-		name = linux_args.optname;
>+		name = linux_to_bsd_tcp_sockopt(linux_args.optname);
> 		break;
> 	default:
> 		name = -1;
>Index: i386/linux/linux.h
>===================================================================
>RCS file: /home/ncvs/src/sys/i386/linux/linux.h,v
>retrieving revision 1.51
>diff -u -r1.51 linux.h
>--- i386/linux/linux.h	2000/11/30 05:23:47	1.51
>+++ i386/linux/linux.h	2001/02/08 22:00:07
>@@ -503,6 +503,10 @@
> #define	LINUX_IP_ADD_MEMBERSHIP		35
> #define	LINUX_IP_DROP_MEMBERSHIP	36
> 
>+#define LINUX_TCP_NODELAY	1
>+#define LINUX_TCP_MAXSEG	2
>+#define LINUX_TCP_CORK		3
>+
> struct linux_sockaddr {
> 	u_short	sa_family;
> 	char	sa_data[14];
>Index: netinet/tcp.h
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp.h,v
>retrieving revision 1.16
>diff -u -r1.16 tcp.h
>--- netinet/tcp.h	2001/01/09 18:26:17	1.16
>+++ netinet/tcp.h	2001/02/08 21:51:36
>@@ -131,7 +131,8 @@
>  */
> #define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
> #define	TCP_MAXSEG	0x02	/* set maximum segment size */
>-#define TCP_NOPUSH	0x04	/* don't push last block of write */
>+#define TCP_CORK	0x03	/* don't push last block of write */
>+#define TCP_NOPUSH	0x04	/* ditto and also allow TAO on listen */
> #define TCP_NOOPT	0x08	/* don't use TCP options */
> 
> #endif
>Index: netinet/tcp_input.c
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
>retrieving revision 1.122
>diff -u -r1.122 tcp_input.c
>--- netinet/tcp_input.c	2001/01/24 16:25:36	1.122
>+++ netinet/tcp_input.c	2001/02/08 21:56:24
>@@ -822,7 +822,7 @@
> #endif
> 			tp = intotcpcb(inp);
> 			tp->t_state = TCPS_LISTEN;
>-			tp->t_flags |= tp0->t_flags & (TF_NOPUSH|TF_NOOPT);
>+			tp->t_flags |= tp0->t_flags & (TF_CORK|TF_NOOPT);
> 
> 			/* Compute proper scaling value from buffer space */
> 			while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
>Index: netinet/tcp_output.c
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
>retrieving revision 1.48
>diff -u -r1.48 tcp_output.c
>--- netinet/tcp_output.c	2000/10/27 11:45:41	1.48
>+++ netinet/tcp_output.c	2001/02/08 21:56:04
>@@ -282,7 +282,7 @@
> 			goto send;
> 		if (!(tp->t_flags & TF_MORETOCOME) &&
> 		    (idle || tp->t_flags & TF_NODELAY) &&
>-		    (tp->t_flags & TF_NOPUSH) == 0 &&
>+		    (tp->t_flags & TF_CORK) == 0 &&
> 		    len + off >= so->so_snd.sb_cc)
> 			goto send;
> 		if (tp->t_force)
>Index: netinet/tcp_usrreq.c
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v
>retrieving revision 1.53
>diff -u -r1.53 tcp_usrreq.c
>--- netinet/tcp_usrreq.c	2001/02/02 18:48:25	1.53
>+++ netinet/tcp_usrreq.c	2001/02/08 21:54:54
>@@ -895,6 +895,8 @@
> 		switch (sopt->sopt_name) {
> 		case TCP_NODELAY:
> 		case TCP_NOOPT:
>+		case TCP_CORK:
>+		case TCP_NOPUSH:
> 			error = sooptcopyin(sopt, &optval, sizeof optval,
> 					    sizeof optval);
> 			if (error)
>@@ -907,6 +909,12 @@
> 			case TCP_NOOPT:
> 				opt = TF_NOOPT;
> 				break;
>+			case TCP_CORK:
>+				opt = TF_CORK;
>+				break;
>+			case TCP_NOPUSH:
>+				opt = TF_NOPUSH | TF_CORK;
>+				break;
> 			default:
> 				opt = 0; /* dead code to fool gcc */
> 				break;
>@@ -914,21 +922,10 @@
> 
> 			if (optval)
> 				tp->t_flags |= opt;
>-			else
>-				tp->t_flags &= ~opt;
>-			break;
>-
>-		case TCP_NOPUSH:
>-			error = sooptcopyin(sopt, &optval, sizeof optval,
>-					    sizeof optval);
>-			if (error)
>-				break;
>-
>-			if (optval)
>-				tp->t_flags |= TF_NOPUSH;
> 			else {
>-				tp->t_flags &= ~TF_NOPUSH;
>-				error = tcp_output(tp);
>+				tp->t_flags &= ~opt;
>+				if (opt & TF_CORK)
>+					error = tcp_output(tp);
> 			}
> 			break;
> 
>Index: netinet/tcp_var.h
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp_var.h,v
>retrieving revision 1.63
>diff -u -r1.63 tcp_var.h
>--- netinet/tcp_var.h	2000/12/24 10:57:21	1.63
>+++ netinet/tcp_var.h	2001/02/08 21:54:10
>@@ -89,12 +89,13 @@
> #define	TF_SACK_PERMIT	0x00200		/* other side said I could SACK */
> #define	TF_NEEDSYN	0x00400		/* send SYN (implicit state) */
> #define	TF_NEEDFIN	0x00800		/* send FIN (implicit state) */
>-#define	TF_NOPUSH	0x01000		/* don't push */
>+#define	TF_NOPUSH	0x01000		/* enable TAO on listen */
> #define	TF_REQ_CC	0x02000		/* have/will request CC */
> #define	TF_RCVD_CC	0x04000		/* a CC was received in SYN */
> #define	TF_SENDCCNEW	0x08000		/* send CCnew instead of CC in SYN */
> #define	TF_MORETOCOME	0x10000		/* More data to be appended to sock */
> #define	TF_LQ_OVERFLOW	0x20000		/* listen queue overflow */
>+#define	TF_CORK		0x40000		/* don't push */
> 	int	t_force;		/* 1 if forcing out a byte */
> 
> 	tcp_seq	snd_una;		/* send unacknowledged */
>--------------------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 24959: 13039 | 13040