From owner-p4-projects@FreeBSD.ORG Thu Apr 21 14:17:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56DCC16A4D0; Thu, 21 Apr 2005 14:17:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1045A16A4CE for ; Thu, 21 Apr 2005 14:17:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4CFE43D41 for ; Thu, 21 Apr 2005 14:17:13 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3LEHD45017873 for ; Thu, 21 Apr 2005 14:17:13 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3LEHDOC017870 for perforce@freebsd.org; Thu, 21 Apr 2005 14:17:13 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 14:17:13 GMT Message-Id: <200504211417.j3LEHDOC017870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 14:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=75668 Change 75668 by davidxu@davidxu_alona on 2005/04/21 14:16:33 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/faith.4#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/faithd/ftp.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/lib/libc/amd64/sys/cerror.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.14 2005/04/21 12:47:08 kan Exp $"); #include "SYS.h" @@ -55,7 +55,7 @@ pushq %rax call PIC_PLT(CNAME(__error)) popq %rcx - movq %rcx,(%rax) + movl %ecx,(%rax) movq $-1,%rax movq $-1,%rdx ret ==== //depot/projects/davidxu_thread/src/share/man/man4/faith.4#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/faith.4,v 1.13 2005/02/09 18:07:16 ru Exp $ +.\" $FreeBSD: src/share/man/man4/faith.4,v 1.14 2005/04/21 13:27:13 suz Exp $ .\" .Dd April 10, 1999 .Dt FAITH 4 @@ -127,9 +127,7 @@ .%A Jun-ichiro itojun Hagino .%A Kazu Yamamoto .%T "An IPv6-to-IPv4 transport relay translator" -.%R internet draft -.%N draft-ietf-ngtrans-tcpudp-relay-04.txt -.%O work in progress material +.%O RFC3142 .Re .Sh HISTORY The FAITH IPv6-to-IPv4 TCP relay translator was first appeared in ==== //depot/projects/davidxu_thread/src/usr.sbin/faithd/ftp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $KAME: ftp.c,v 1.23 2003/08/19 21:20:33 itojun Exp $ */ +/* $KAME: ftp.c,v 1.24 2005/03/16 05:05:48 itojun Exp $ */ /* * Copyright (C) 1997 and 1998 WIDE Project. @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.10 2003/11/14 17:34:08 ume Exp $ + * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.11 2005/04/21 13:21:48 suz Exp $ */ #include @@ -967,9 +967,11 @@ n = 0; if (n) write(src, sbuf, n); + freeaddrinfo(res); return n; } + freeaddrinfo(res); memcpy(&data6, res->ai_addr, res->ai_addrlen); goto sendport;