Attachment 13487 Details for Bug 25651 – file.diff

[patch] file.diff

file.diff (text/plain), 1.49 KB, created by alexs on 2001-03-10 14:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alexs

Created: 2001-03-10 14:30:01 UTC

Size: 1.49 KB

patch

obsolete

>--- tcp_usrreq.c.old	Sat Mar 10 16:25:29 2001
>+++ tcp_usrreq.c	Sat Mar 10 16:16:50 2001
>@@ -165,25 +165,25 @@
> 	TCPDEBUG1();
> 	tp = tcp_disconnect(tp);
> 
> 	TCPDEBUG2(PRU_DETACH);
> 	splx(s);
> 	return error;
> }
> 
>-#define	COMMON_START()	TCPDEBUG0; \
>-			do { \
>+#define	COMMON_START1()	do { \
> 				     if (inp == 0) { \
> 					     splx(s); \
> 					     return EINVAL; \
> 				     } \
> 				     tp = intotcpcb(inp); \
> 				     TCPDEBUG1(); \
> 		     } while(0)
>+#define	COMMON_START()	TCPDEBUG0; COMMON_START1()
> 			     
> #define COMMON_END(req)	out: TCPDEBUG2(req); splx(s); return error; goto out
> 
> 
> /*
>  * Give the socket an address.
>  */
> static int
>@@ -412,39 +412,43 @@
> static int
> tcp_usr_accept(struct socket *so, struct sockaddr **nam)
> {
> 	int s = splnet();
> 	int error = 0;
> 	struct inpcb *inp = sotoinpcb(so);
> 	struct tcpcb *tp;
> 
>+	TCPDEBUG0;
>+
> 	if (so->so_state & SS_ISDISCONNECTED) {
> 		error = ECONNABORTED;
> 		goto out;
> 	}
>-	COMMON_START();
>+	COMMON_START1();
> 	in_setpeeraddr(so, nam);
> 	COMMON_END(PRU_ACCEPT);
> }
> 
> #ifdef INET6
> static int
> tcp6_usr_accept(struct socket *so, struct sockaddr **nam)
> {
> 	int s = splnet();
> 	int error = 0;
> 	struct inpcb *inp = sotoinpcb(so);
> 	struct tcpcb *tp;
> 
>+	TCPDEBUG0;
>+
> 	if (so->so_state & SS_ISDISCONNECTED) {
> 		error = ECONNABORTED;
> 		goto out;
> 	}
>-	COMMON_START();
>+	COMMON_START1();
> 	in6_mapped_peeraddr(so, nam);
> 	COMMON_END(PRU_ACCEPT);
> }
> #endif /* INET6 */
> /*
>  * Mark the connection as being incapable of further output.
>  */
> static int

Actions: View | Diff

Attachments on bug 25651: 13487