Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src Pull up revision 1.13 (requested by darrenr):
details: https://anonhg.NetBSD.org/src/rev/c67e39b032d2
branches: netbsd-1-4
changeset: 469940:c67e39b032d2
user: he <he%NetBSD.org@localhost>
date: Mon Dec 20 21:07:01 1999 +0000
description:
Pull up revision 1.13 (requested by darrenr):
Update IPF to version 3.3.5.
diffstat:
sys/netinet/ip_frag.h | 16 +++++++----
sys/netinet/ip_proxy.h | 55 ++++++++++++++++++++++++++++++++---------
usr.sbin/ipf/ipresend/Makefile | 9 ++----
3 files changed, 56 insertions(+), 24 deletions(-)
diffs (173 lines):
diff -r 3252c6c7fc66 -r c67e39b032d2 sys/netinet/ip_frag.h
--- a/sys/netinet/ip_frag.h Mon Dec 20 21:06:55 1999 +0000
+++ b/sys/netinet/ip_frag.h Mon Dec 20 21:07:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.h,v 1.12 1998/11/22 15:17:19 mrg Exp $ */
+/* $NetBSD: ip_frag.h,v 1.12.4.1 1999/12/20 21:07:01 he Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
@@ -8,7 +8,7 @@
* to the original author and the contributors.
*
* @(#)ip_frag.h 1.5 3/24/96
- * Id: ip_frag.h,v 2.0.2.12.2.2 1998/11/22 01:50:25 darrenr Exp
+ * Id: ip_frag.h,v 2.2 1999/08/06 06:26:38 darrenr Exp
*/
#ifndef _NETINET_IP_FRAG_H_
@@ -26,7 +26,7 @@
u_char ipfr_tos;
u_short ipfr_off;
u_short ipfr_ttl;
- u_char ipfr_pass;
+ frentry_t *ipfr_rule;
} ipfr_t;
@@ -45,15 +45,19 @@
extern int fr_ipfrttl;
extern ipfrstat_t *ipfr_fragstats __P((void));
-extern int ipfr_newfrag __P((ip_t *, fr_info_t *, int));
-extern int ipfr_nat_newfrag __P((ip_t *, fr_info_t *, int, struct nat *));
+extern int ipfr_newfrag __P((ip_t *, fr_info_t *, u_int));
+extern int ipfr_nat_newfrag __P((ip_t *, fr_info_t *, u_int, struct nat *));
extern nat_t *ipfr_nat_knownfrag __P((ip_t *, fr_info_t *));
-extern int ipfr_knownfrag __P((ip_t *, fr_info_t *));
+extern frentry_t *ipfr_knownfrag __P((ip_t *, fr_info_t *));
extern void ipfr_forget __P((void *));
extern void ipfr_unload __P((void));
#if (BSD >= 199306) || SOLARIS || defined(__sgi)
+# if defined(SOLARIS2) && (SOLARIS2 < 7)
extern void ipfr_slowtimer __P((void));
+# else
+extern void ipfr_slowtimer __P((void *));
+# endif
#else
extern int ipfr_slowtimer __P((void));
#endif
diff -r 3252c6c7fc66 -r c67e39b032d2 sys/netinet/ip_proxy.h
--- a/sys/netinet/ip_proxy.h Mon Dec 20 21:06:55 1999 +0000
+++ b/sys/netinet/ip_proxy.h Mon Dec 20 21:07:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_proxy.h,v 1.12 1998/11/22 15:17:20 mrg Exp $ */
+/* $NetBSD: ip_proxy.h,v 1.12.4.1 1999/12/20 21:07:01 he Exp $ */
/*
* Copyright (C) 1997-1998 by Darren Reed.
@@ -7,7 +7,7 @@
* 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.10.2.4 1998/11/22 01:50:30 darrenr Exp
+ * Id: ip_proxy.h,v 2.1.2.1 1999/09/19 12:18:20 darrenr Exp
*/
#ifndef _NETINET_IP_PROXY_H_
@@ -43,19 +43,16 @@
typedef struct ap_session {
struct aproxy *aps_apr;
- struct in_addr aps_src; /* source IP# */
- struct in_addr aps_dst; /* destination IP# */
- u_char aps_p; /* protocol */
union {
struct ap_tcp apu_tcp;
struct ap_udp apu_udp;
} aps_un;
- u_int aps_hv;
u_int aps_flags;
U_QUAD_T aps_bytes; /* bytes sent */
U_QUAD_T aps_pkts; /* packets sent */
void *aps_nat; /* pointer back to nat struct */
void *aps_data; /* private data */
+ int aps_p; /* protocol */
int aps_psiz; /* size of private data */
struct ap_session *aps_hnext;
struct ap_session *aps_next;
@@ -76,8 +73,9 @@
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 *,
- ap_session_t *, struct nat *));
+ int (* apr_init) __P((void));
+ int (* apr_new) __P((fr_info_t *, ip_t *,
+ ap_session_t *, struct nat *));
int (* apr_inpkt) __P((fr_info_t *, ip_t *,
ap_session_t *, struct nat *));
int (* apr_outpkt) __P((fr_info_t *, ip_t *,
@@ -87,14 +85,47 @@
#define APR_DELETE 1
+/*
+ * Real audio proxy structure and #defines
+ */
+typedef struct {
+ int rap_seenpna;
+ int rap_seenver;
+ int rap_version;
+ int rap_eos; /* End Of Startup */
+ int rap_gotid;
+ int rap_gotlen;
+ int rap_mode;
+ int rap_sdone;
+ u_short rap_plport;
+ u_short rap_prport;
+ u_short rap_srport;
+ char rap_svr[19];
+ u_32_t rap_sbf; /* flag to indicate which of the 19 bytes have
+ * been filled
+ */
+ tcp_seq rap_sseq;
+} raudio_t;
+
+#define RA_ID_END 0
+#define RA_ID_UDP 1
+#define RA_ID_ROBUST 7
+
+#define RAP_M_UDP 1
+#define RAP_M_ROBUST 2
+#define RAP_M_TCP 4
+#define RAP_M_UDP_ROBUST (RAP_M_UDP|RAP_M_ROBUST)
+
+
extern ap_session_t *ap_sess_tab[AP_SESS_SIZE];
extern ap_session_t *ap_sess_list;
extern aproxy_t ap_proxies[];
-extern int ap_ok __P((ip_t *, tcphdr_t *, struct ipnat *));
-extern void ap_free __P((aproxy_t *));
+extern int appr_init __P((void));
+extern int appr_ok __P((ip_t *, tcphdr_t *, struct ipnat *));
+extern void appr_free __P((aproxy_t *));
extern void aps_free __P((ap_session_t *));
-extern int ap_check __P((ip_t *, fr_info_t *, struct nat *));
-extern aproxy_t *ap_match __P((u_char, char *));
+extern int appr_check __P((ip_t *, fr_info_t *, struct nat *));
+extern aproxy_t *appr_match __P((u_int, char *));
#endif /* _NETINET_IP_PROXY_H_ */
diff -r 3252c6c7fc66 -r c67e39b032d2 usr.sbin/ipf/ipresend/Makefile
--- a/usr.sbin/ipf/ipresend/Makefile Mon Dec 20 21:06:55 1999 +0000
+++ b/usr.sbin/ipf/ipresend/Makefile Mon Dec 20 21:07:01 1999 +0000
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.12 1997/11/23 23:06:32 veego Exp $
+# $NetBSD: Makefile,v 1.12.2.1 1999/12/20 21:07:01 he Exp $
PROG= ipresend
SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
MAN= ipresend.1
-CPPFLAGS+=-I${.CURDIR}/../ipf -I${.CURDIR}/../ipfstat
-CPPFLAGS+=-I${.CURDIR}/../ipsend -I${.CURDIR}/../ipftest
+CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf
-.PATH: ${.CURDIR}/../ipf ${.CURDIR}/../ipfstat
-.PATH: ${.CURDIR}/../ipsend ${.CURDIR}/../ipftest
-
+.PATH: ${.CURDIR}/../../../dist/ipf/ipsend
.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index