From owner-p4-projects@FreeBSD.ORG  Wed Apr  4 06:02:36 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 15E1B16A407; Wed,  4 Apr 2007 06:02:36 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C485916A412
	for <perforce@freebsd.org>; Wed,  4 Apr 2007 06:02:35 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B2F6913C468
	for <perforce@freebsd.org>; Wed,  4 Apr 2007 06:02:35 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3462ZRU042667
	for <perforce@freebsd.org>; Wed, 4 Apr 2007 06:02:35 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3462Zka042662
	for perforce@freebsd.org; Wed, 4 Apr 2007 06:02:35 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 4 Apr 2007 06:02:35 GMT
Message-Id: <200704040602.l3462Zka042662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 117323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 06:02:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=117323

Change 117323 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/04 06:01:36

	IFC

Affected files ...

.. //depot/projects/opentoe/sys/netinet/libalias/alias_ftp.c#2 integrate
.. //depot/projects/opentoe/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/opentoe/sys/netinet/libalias/alias_proxy.c#2 integrate

Differences ...

==== //depot/projects/opentoe/sys/netinet/libalias/alias_ftp.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.28 2006/09/26 23:26:53 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.29 2007/04/04 03:14:15 kan Exp $");
 
 /*
     Alias_ftp.c performs special processing for FTP sessions under
@@ -79,6 +79,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #endif
 
 #include <netinet/in_systm.h>

==== //depot/projects/opentoe/sys/netinet/libalias/alias_irc.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.22 2006/09/26 23:26:53 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.23 2007/04/04 03:16:59 kan Exp $");
 
 /* Alias_irc.c intercepts packages contain IRC CTCP commands, and
 	changes DCC commands to export a port on the aliasing host instead
@@ -59,6 +59,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <stdio.h>
+#include <string.h>
 #include <limits.h>
 #endif
 

==== //depot/projects/opentoe/sys/netinet/libalias/alias_proxy.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.28 2006/12/15 12:50:06 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.29 2007/04/04 03:10:42 kan Exp $");
 
 /* file: alias_proxy.c
 
@@ -431,7 +431,7 @@
 	{
 		int dlen;
 		int hlen;
-		u_char *p;
+		char *p;
 
 		hlen = (pip->ip_hl + tc->th_off) << 2;
 		dlen = ntohs(pip->ip_len) - hlen;