PERFORCE change 117323 for review
Kip Macy
kmacy at FreeBSD.org
Wed Apr 4 06:02:36 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=117323
Change 117323 by kmacy at 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;
More information about the p4-projects
mailing list