Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6-0]: src/sys/netinet6 Pull up following revision(s) (requested b...



details:   https://anonhg.NetBSD.org/src/rev/487873161a02
branches:  netbsd-6-0
changeset: 774786:487873161a02
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Mar 31 20:20:31 2013 +0000

description:
Pull up following revision(s) (requested by christos in ticket #853):
        sys/netinet6/udp6_output.c: revision 1.44
PR/47408: Anthony Mallet: sendto(2) issue with IPv6 UDP datagrams
- don't connect when the local port is 0, just set the local port number.
- remove redundant assignment
XXX: pullup-6

diffstat:

 sys/netinet6/udp6_output.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 61cc206b1588 -r 487873161a02 sys/netinet6/udp6_output.c
--- a/sys/netinet6/udp6_output.c        Sun Mar 31 17:30:52 2013 +0000
+++ b/sys/netinet6/udp6_output.c        Sun Mar 31 20:20:31 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp6_output.c,v 1.43 2011/09/24 17:22:14 christos Exp $        */
+/*     $NetBSD: udp6_output.c,v 1.43.14.1 2013/03/31 20:20:31 riz Exp $        */
 /*     $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $    */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.43 2011/09/24 17:22:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.43.14.1 2013/03/31 20:20:31 riz Exp $");
 
 #include "opt_inet.h"
 
@@ -177,8 +177,6 @@
 
 
        if (sin6) {
-               faddr = &sin6->sin6_addr;
-
                /*
                 * IPv4 version of udp_output calls in_pcbconnect in this case,
                 * which needs splnet and affects performance.
@@ -292,10 +290,12 @@
                        if (error)
                                goto release;
 
-                       error = in6_pcbconnect(in6p, addr6, l);
+                       error = in6_pcbsetport(&lsin6, in6p, l);
 
-                       if (error)
+                       if (error) {
+                               in6p->in6p_laddr = in6addr_any;
                                goto release;
+                       }
                }
        } else {
                if (IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) {



Home | Main Index | Thread Index | Old Index