aboutsummaryrefslogtreecommitdiffstats
path: root/sys/netinet/ip_proxy.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet/ip_proxy.h')
-rw-r--r--sys/netinet/ip_proxy.h35
1 files changed, 19 insertions, 16 deletions
diff --git a/sys/netinet/ip_proxy.h b/sys/netinet/ip_proxy.h
index 2d7175491b39..2f71316a6800 100644
--- a/sys/netinet/ip_proxy.h
+++ b/sys/netinet/ip_proxy.h
@@ -1,11 +1,11 @@
/*
- * (C)opyright 1997 by Darren Reed.
+ * Copyright (C) 1997 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
* to the original author and the contributors.
*
- * $Id: ip_proxy.h,v 2.0.2.2 1997/05/24 07:36:44 darrenr Exp $
+ * $Id: ip_proxy.h,v 2.0.2.10 1997/10/19 15:39:23 darrenr Exp $
*/
#ifndef __IP_PROXY_H__
@@ -15,18 +15,21 @@
#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
#endif
+#ifndef APR_LABELLEN
#define APR_LABELLEN 16
+#endif
#define AP_SESS_SIZE 53
struct nat;
+struct ipnat;
typedef struct ap_tcp {
u_short apt_sport; /* source port */
u_short apt_dport; /* destination port */
- short apt_seqoff; /* sequence # difference */
- short apt_ackoff; /* ack # difference */
- tcp_seq apt_after; /* don't change seq-off until after this */
- char apt_state[2]; /* connection state */
+ short apt_sel; /* seqoff/after set selector */
+ short apt_seqoff[2]; /* sequence # difference */
+ tcp_seq apt_after[2]; /* don't change seq-off until after this */
+ u_char apt_state[2]; /* connection state */
} ap_tcp_t;
typedef struct ap_udp {
@@ -46,7 +49,7 @@ typedef struct ap_session {
u_int aps_flags;
QUAD_T aps_bytes; /* bytes sent */
QUAD_T aps_pkts; /* packets sent */
- time_t aps_tout; /* time left before expiring */
+ u_long aps_tout; /* time left before expiring */
void *aps_data; /* private data */
int aps_psiz; /* size of private data */
struct ap_session *aps_next;
@@ -54,16 +57,15 @@ typedef struct ap_session {
#define aps_sport aps_un.apu_tcp.apt_sport
#define aps_dport aps_un.apu_tcp.apt_dport
+#define aps_sel aps_un.apu_tcp.apt_sel
#define aps_seqoff aps_un.apu_tcp.apt_seqoff
-#define aps_ackoff aps_un.apu_tcp.apt_ackoff
-#define aps_sumoff aps_un.apu_tcp.apt_sumoff
-#define aps_state aps_un.apu_tcp.apt_state
#define aps_after aps_un.apu_tcp.apt_after
+#define aps_state aps_un.apu_tcp.apt_state
typedef struct aproxy {
char apr_label[APR_LABELLEN]; /* Proxy label # */
- char apr_p; /* protocol */
+ u_char apr_p; /* protocol */
int apr_ref; /* +1 per rule referencing it */
int apr_flags;
int (* apr_init) __P((fr_info_t *, ip_t *, tcphdr_t *,
@@ -80,10 +82,11 @@ typedef struct aproxy {
extern ap_session_t *ap_sess_tab[AP_SESS_SIZE];
extern aproxy_t ap_proxies[];
-extern void ap_unload __P((void));
-extern void ap_free __P((aproxy_t *));
-extern void aps_free __P((ap_session_t *));
-extern int ap_check __P((ip_t *, tcphdr_t *, fr_info_t *, struct nat *));
-extern aproxy_t *ap_match __P((char, char *));
+extern int ap_ok __P((ip_t *, tcphdr_t *, struct ipnat *));
+extern void ap_unload __P((void));
+extern void ap_free __P((aproxy_t *));
+extern void aps_free __P((ap_session_t *));
+extern int ap_check __P((ip_t *, tcphdr_t *, fr_info_t *, struct nat *));
+extern aproxy_t *ap_match __P((u_char, char *));
#endif /* __IP_PROXY_H__ */