Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.174.2.2 retrieving revision 1.175 diff -u -p -r1.174.2.2 -r1.175 --- src/sys/netinet/udp_usrreq.c 2009/07/23 23:32:48 1.174.2.2 +++ src/sys/netinet/udp_usrreq.c 2009/03/18 16:00:22 1.175 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.174.2.2 2009/07/23 23:32:48 jym Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.175 2009/03/18 16:00:22 cegger Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.174.2.2 2009/07/23 23:32:48 jym Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.175 2009/03/18 16:00:22 cegger Exp $"); #include "opt_inet.h" #include "opt_compat_netbsd.h" @@ -417,14 +417,14 @@ udp_input(struct mbuf *m, ...) src6.sin6_family = AF_INET6; src6.sin6_len = sizeof(struct sockaddr_in6); src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff; - memcpy(&src6.sin6_addr.s6_addr[12], &ip->ip_src, + bcopy(&ip->ip_src, &src6.sin6_addr.s6_addr[12], sizeof(ip->ip_src)); src6.sin6_port = uh->uh_sport; memset(&dst6, 0, sizeof(dst6)); dst6.sin6_family = AF_INET6; dst6.sin6_len = sizeof(struct sockaddr_in6); dst6.sin6_addr.s6_addr[10] = dst6.sin6_addr.s6_addr[11] = 0xff; - memcpy(&dst6.sin6_addr.s6_addr[12], &ip->ip_dst, + bcopy(&ip->ip_dst, &dst6.sin6_addr.s6_addr[12], sizeof(ip->ip_dst)); dst6.sin6_port = uh->uh_dport; @@ -836,12 +836,6 @@ udp4_realinput(struct sockaddr_in *src, } #endif - /* - * Check the minimum TTL for socket. - */ - if (mtod(m, struct ip *)->ip_ttl < inp->inp_ip_minttl) - goto bad; - udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); rcvcnt++; }