Module Name: src
Committed By: elad
Date: Tue Apr 14 21:25:20 UTC 2009
Modified Files:
src/sys/netinet: in_pcb.c
src/sys/netinet6: in6_pcb.c
Log Message:
Don't set sin->sin_port and sin6->sin6_port to 0 before calling
ifa_ifwithaddr(), as we no longer do a byte compare on the entire struct.
Reviewed by and okay from dyo...@.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.101 -r1.102 src/sys/netinet6/in6_pcb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.130 src/sys/netinet/in_pcb.c:1.131
--- src/sys/netinet/in_pcb.c:1.130 Wed Mar 18 16:00:22 2009
+++ src/sys/netinet/in_pcb.c Tue Apr 14 21:25:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.130 2009/03/18 16:00:22 cegger Exp $ */
+/* $NetBSD: in_pcb.c,v 1.131 2009/04/14 21:25:20 elad Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.130 2009/03/18 16:00:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.131 2009/04/14 21:25:20 elad Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -262,7 +262,6 @@
if (so->so_options & SO_REUSEADDR)
reuseport = SO_REUSEADDR|SO_REUSEPORT;
} else if (!in_nullhost(sin->sin_addr)) {
- sin->sin_port = 0; /* yech... */
INADDR_TO_IA(sin->sin_addr, ia);
/* check for broadcast addresses */
if (ia == NULL)
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.101 src/sys/netinet6/in6_pcb.c:1.102
--- src/sys/netinet6/in6_pcb.c:1.101 Wed Mar 18 17:06:52 2009
+++ src/sys/netinet6/in6_pcb.c Tue Apr 14 21:25:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.101 2009/03/18 17:06:52 cegger Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.102 2009/04/14 21:25:20 elad Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.101 2009/03/18 17:06:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.102 2009/04/14 21:25:20 elad Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -251,7 +251,6 @@
} else if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
struct ifaddr *ia = NULL;
- sin6->sin6_port = 0; /* yech... */
if ((in6p->in6p_flags & IN6P_FAITH) == 0 &&
(ia = ifa_ifwithaddr((struct sockaddr *)sin6)) == 0)
return (EADDRNOTAVAIL);
