diff options
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_proxy.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_proxy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index 96eb172..eb84cd1 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -1,3 +1,5 @@ +/* $FreeBSD$ */ + /* * Copyright (C) 1997-2003 by Darren Reed. * @@ -94,7 +96,6 @@ struct file; #if defined(_KERNEL) # include "netinet/ip_irc_pxy.c" # include "netinet/ip_raudio_pxy.c" -# include "netinet/ip_h323_pxy.c" # include "netinet/ip_netbios_pxy.c" #endif #include "netinet/ip_ipsec_pxy.c" @@ -103,7 +104,7 @@ struct file; /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.62.2.20 2007/05/31 12:27:36 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.62.2.16 2006/03/29 11:19:56 darrenr Exp $"; #endif static int appr_fixseqack __P((fr_info_t *, ip_t *, ap_session_t *, int )); @@ -121,7 +122,7 @@ aproxy_t *ap_proxylist = NULL; aproxy_t ap_proxies[] = { #ifdef IPF_FTP_PROXY { NULL, "ftp", (char)IPPROTO_TCP, 0, 0, ippr_ftp_init, ippr_ftp_fini, - ippr_ftp_new, NULL, ippr_ftp_in, ippr_ftp_out, NULL, NULL }, + ippr_ftp_new, NULL, ippr_ftp_in, ippr_ftp_out, NULL }, #endif #ifdef IPF_IRC_PROXY { NULL, "irc", (char)IPPROTO_TCP, 0, 0, ippr_irc_init, ippr_irc_fini, @@ -155,9 +156,9 @@ aproxy_t ap_proxies[] = { #endif #ifdef IPF_H323_PROXY { NULL, "h323", (char)IPPROTO_TCP, 0, 0, ippr_h323_init, ippr_h323_fini, - ippr_h323_new, ippr_h323_del, ippr_h323_in, NULL, NULL, NULL }, + ippr_h323_new, ippr_h323_del, ippr_h323_in, NULL, NULL }, { NULL, "h245", (char)IPPROTO_TCP, 0, 0, NULL, NULL, - ippr_h245_new, NULL, NULL, ippr_h245_out, NULL, NULL }, + ippr_h245_new, NULL, NULL, ippr_h245_out, NULL }, #endif #ifdef IPF_RPCB_PROXY # if 0 @@ -169,7 +170,7 @@ aproxy_t ap_proxies[] = { ippr_rpcb_init, ippr_rpcb_fini, ippr_rpcb_new, ippr_rpcb_del, ippr_rpcb_in, ippr_rpcb_out, NULL, NULL }, #endif - { NULL, "", '\0', 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + { NULL, "", '\0', 0, 0, NULL, NULL, NULL, NULL } }; /* @@ -191,7 +192,7 @@ aproxy_t *ap; return -1; } - for (a = ap_proxylist; (a != NULL); a = a->apr_next) + for (a = ap_proxylist; a->apr_p; a = a->apr_next) if ((a->apr_p == ap->apr_p) && !strncmp(a->apr_label, ap->apr_label, sizeof(ap->apr_label))) { @@ -288,11 +289,10 @@ ipnat_t *nat; } -int appr_ioctl(data, cmd, mode, ctx) +int appr_ioctl(data, cmd, mode) caddr_t data; ioctlcmd_t cmd; int mode; -void *ctx; { ap_ctl_t ctl; caddr_t ptr; @@ -814,7 +814,7 @@ int inc; if (ipf_proxy_debug > 8) printf("appr_fixseqack: seq %x ack %x\n", - (u_32_t)ntohl(tcp->th_seq), (u_32_t)ntohl(tcp->th_ack)); + ntohl(tcp->th_seq), ntohl(tcp->th_ack)); return ch ? 2 : 0; } |
