diff options
| author | darrenr <darrenr@FreeBSD.org> | 2002-03-19 11:44:16 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2002-03-19 11:44:16 +0000 |
| commit | 369d6395e751e640146687047af62ff1032a6745 (patch) | |
| tree | 1ec0538070dafba5c1b3fe17fe5318effec89c3a /sys/contrib/ipfilter/netinet/ip_proxy.h | |
| parent | d1bcf456b621a038a56b4d5754e66a66f85400c1 (diff) | |
| download | FreeBSD-src-369d6395e751e640146687047af62ff1032a6745.zip FreeBSD-src-369d6395e751e640146687047af62ff1032a6745.tar.gz | |
fix conflicts (mostly damn rcs id's) generated by import
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_proxy.h')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_proxy.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/contrib/ipfilter/netinet/ip_proxy.h index 9a601d7..f38974e 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.h +++ b/sys/contrib/ipfilter/netinet/ip_proxy.h @@ -75,10 +75,12 @@ typedef struct aproxy { void (* apr_fini) __P((void)); int (* apr_new) __P((fr_info_t *, ip_t *, ap_session_t *, struct nat *)); + void (* apr_del) __P((ap_session_t *)); int (* apr_inpkt) __P((fr_info_t *, ip_t *, ap_session_t *, struct nat *)); int (* apr_outpkt) __P((fr_info_t *, ip_t *, ap_session_t *, struct nat *)); + int (* apr_match) __P((fr_info_t *, ap_session_t *, struct nat *)); } aproxy_t; #define APR_DELETE 1 @@ -97,6 +99,7 @@ typedef struct ftpside { u_32_t ftps_seq; u_32_t ftps_len; int ftps_junk; + int ftps_cmds; char ftps_buf[FTP_BUFSZ]; } ftpside_t; @@ -109,7 +112,7 @@ typedef struct ftpinfo { /* * Real audio proxy structure and #defines */ -typedef struct { +typedef struct raudio_s { int rap_seenpna; int rap_seenver; int rap_version; @@ -137,6 +140,19 @@ typedef struct { #define RAP_M_TCP 4 #define RAP_M_UDP_ROBUST (RAP_M_UDP|RAP_M_ROBUST) +/* + * IPSec proxy + */ +typedef u_32_t ipsec_cookie_t[2]; + +typedef struct ipsec_pxy { + ipsec_cookie_t ipsc_icookie; + ipsec_cookie_t ipsc_rcookie; + int ipsc_rckset; + ipnat_t ipsc_rule; + nat_t *ipsc_nat; + ipstate_t *ipsc_state; +} ipsec_pxy_t; extern ap_session_t *ap_sess_tab[AP_SESS_SIZE]; extern ap_session_t *ap_sess_list; @@ -148,9 +164,11 @@ extern int appr_del __P((aproxy_t *)); extern int appr_init __P((void)); extern void appr_unload __P((void)); extern int appr_ok __P((ip_t *, tcphdr_t *, struct ipnat *)); +extern int appr_match __P((fr_info_t *, struct nat *)); extern void appr_free __P((aproxy_t *)); extern void aps_free __P((ap_session_t *)); extern int appr_check __P((ip_t *, fr_info_t *, struct nat *)); -extern aproxy_t *appr_match __P((u_int, char *)); +extern aproxy_t *appr_lookup __P((u_int, char *)); +extern int appr_new __P((fr_info_t *, ip_t *, struct nat *)); #endif /* __IP_PROXY_H__ */ |
