summaryrefslogtreecommitdiff
path: root/usr.sbin/ipftest
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ipftest')
-rw-r--r--usr.sbin/ipftest/ipft_ef.c6
-rw-r--r--usr.sbin/ipftest/ipft_hx.c6
-rw-r--r--usr.sbin/ipftest/ipft_pc.c6
-rw-r--r--usr.sbin/ipftest/ipft_sn.c6
-rw-r--r--usr.sbin/ipftest/ipft_td.c6
-rw-r--r--usr.sbin/ipftest/ipft_tx.c7
-rw-r--r--usr.sbin/ipftest/ipt.c6
-rw-r--r--usr.sbin/ipftest/ipt.h6
-rw-r--r--usr.sbin/ipftest/misc.c14
-rw-r--r--usr.sbin/ipftest/pcap.h6
-rw-r--r--usr.sbin/ipftest/snoop.h6
11 files changed, 38 insertions, 37 deletions
diff --git a/usr.sbin/ipftest/ipft_ef.c b/usr.sbin/ipftest/ipft_ef.c
index c961b38cb5b..7cb02ef6c38 100644
--- a/usr.sbin/ipftest/ipft_ef.c
+++ b/usr.sbin/ipftest/ipft_ef.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_ef.c,v 1.9 1998/09/15 10:05:50 pattonme Exp $ */
+/* $OpenBSD: ipft_ef.c,v 1.10 1999/02/05 05:58:45 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -56,7 +56,7 @@ etherfind -n -t
#if !defined(lint)
static const char sccsid[] = "@(#)ipft_ef.c 1.6 2/4/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 1.9 1998/09/15 10:05:50 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 1.10 1999/02/05 05:58:45 deraadt Exp $";
#endif
static int etherf_open __P((char *));
diff --git a/usr.sbin/ipftest/ipft_hx.c b/usr.sbin/ipftest/ipft_hx.c
index 50f7d7770c9..7f4410cbfd5 100644
--- a/usr.sbin/ipftest/ipft_hx.c
+++ b/usr.sbin/ipftest/ipft_hx.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_hx.c,v 1.7 1998/09/15 10:05:50 pattonme Exp $ */
+/* $OpenBSD: ipft_hx.c,v 1.8 1999/02/05 05:58:46 deraadt Exp $ */
/*
- * Copyright (C) 1995-1997 by Darren Reed.
+ * Copyright (C) 1995-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -47,7 +47,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 1.7 1998/09/15 10:05:50 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 1.8 1999/02/05 05:58:46 deraadt Exp $";
#endif
extern int opts;
diff --git a/usr.sbin/ipftest/ipft_pc.c b/usr.sbin/ipftest/ipft_pc.c
index 7cf6e934834..3fe1a198105 100644
--- a/usr.sbin/ipftest/ipft_pc.c
+++ b/usr.sbin/ipftest/ipft_pc.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_pc.c,v 1.11 1998/09/15 10:05:50 pattonme Exp $ */
+/* $OpenBSD: ipft_pc.c,v 1.12 1999/02/05 05:58:46 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -38,7 +38,7 @@
#include "pcap.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 1.11 1998/09/15 10:05:50 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 1.12 1999/02/05 05:58:46 deraadt Exp $";
#endif
struct llc {
diff --git a/usr.sbin/ipftest/ipft_sn.c b/usr.sbin/ipftest/ipft_sn.c
index 6d33620e40b..3da1b2d7f6b 100644
--- a/usr.sbin/ipftest/ipft_sn.c
+++ b/usr.sbin/ipftest/ipft_sn.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_sn.c,v 1.8 1998/09/15 10:05:50 pattonme Exp $ */
+/* $OpenBSD: ipft_sn.c,v 1.9 1999/02/05 05:58:46 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -42,7 +42,7 @@
#include "snoop.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 1.8 1998/09/15 10:05:50 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 1.9 1999/02/05 05:58:46 deraadt Exp $";
#endif
struct llc {
diff --git a/usr.sbin/ipftest/ipft_td.c b/usr.sbin/ipftest/ipft_td.c
index 7251150678a..a45a4285412 100644
--- a/usr.sbin/ipftest/ipft_td.c
+++ b/usr.sbin/ipftest/ipft_td.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_td.c,v 1.9 1998/09/15 10:05:51 pattonme Exp $ */
+/* $OpenBSD: ipft_td.c,v 1.10 1999/02/05 05:58:46 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -65,7 +65,7 @@ tcpdump -nqte
#if !defined(lint)
static const char sccsid[] = "@(#)ipft_td.c 1.8 2/4/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_td.c,v 1.9 1998/09/15 10:05:51 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_td.c,v 1.10 1999/02/05 05:58:46 deraadt Exp $";
#endif
static int tcpd_open __P((char *));
diff --git a/usr.sbin/ipftest/ipft_tx.c b/usr.sbin/ipftest/ipft_tx.c
index 343cb1dcee7..9f5c8395f25 100644
--- a/usr.sbin/ipftest/ipft_tx.c
+++ b/usr.sbin/ipftest/ipft_tx.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipft_tx.c,v 1.11 1998/09/15 10:05:51 pattonme Exp $ */
+/* $OpenBSD: ipft_tx.c,v 1.12 1999/02/05 05:58:46 deraadt Exp $ */
/*
- * Copyright (C) 1995-1997 by Darren Reed.
+ * Copyright (C) 1995-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -48,7 +48,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.11 1998/09/15 10:05:51 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.12 1999/02/05 05:58:46 deraadt Exp $";
#endif
extern int opts;
@@ -313,6 +313,7 @@ int *out;
if (tcp->th_flags)
cpp++;
assert(tcp->th_flags != 0);
+ tcp->th_win = htons(4096);
} else if (*cpp && ip->ip_p == IPPROTO_ICMP) {
extern char *tx_icmptypes[];
char **s, *t;
diff --git a/usr.sbin/ipftest/ipt.c b/usr.sbin/ipftest/ipt.c
index 9ed2c549103..e60bc8f954e 100644
--- a/usr.sbin/ipftest/ipt.c
+++ b/usr.sbin/ipftest/ipt.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: ipt.c,v 1.12 1998/09/15 10:05:51 pattonme Exp $ */
+/* $OpenBSD: ipt.c,v 1.13 1999/02/05 05:58:47 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -58,7 +58,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipt.c,v 1.12 1998/09/15 10:05:51 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: ipt.c,v 1.13 1999/02/05 05:58:47 deraadt Exp $";
#endif
extern char *optarg;
diff --git a/usr.sbin/ipftest/ipt.h b/usr.sbin/ipftest/ipt.h
index 65ab3a2be49..bba64f94f4a 100644
--- a/usr.sbin/ipftest/ipt.h
+++ b/usr.sbin/ipftest/ipt.h
@@ -1,11 +1,11 @@
-/* $OpenBSD: ipt.h,v 1.5 1998/01/26 04:16:41 dgregor Exp $ */
+/* $OpenBSD: ipt.h,v 1.6 1999/02/05 05:58:47 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 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: ipt.h,v 1.5 1998/01/26 04:16:41 dgregor Exp $
+ * $Id: ipt.h,v 1.6 1999/02/05 05:58:47 deraadt Exp $
*/
#ifndef __IPT_H__
diff --git a/usr.sbin/ipftest/misc.c b/usr.sbin/ipftest/misc.c
index 8aa045af839..7de936cd95a 100644
--- a/usr.sbin/ipftest/misc.c
+++ b/usr.sbin/ipftest/misc.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: misc.c,v 1.7 1998/09/15 10:05:52 pattonme Exp $ */
+/* $OpenBSD: misc.c,v 1.8 1999/02/05 05:58:47 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -48,7 +48,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: misc.c,v 1.7 1998/09/15 10:05:52 pattonme Exp $";
+static const char rcsid[] = "@(#)$Id: misc.c,v 1.8 1999/02/05 05:58:47 deraadt Exp $";
#endif
extern int opts;
@@ -57,19 +57,19 @@ extern int opts;
void printpacket(ip)
ip_t *ip;
{
- struct tcphdr *tcp;
+ tcphdr_t *tcp;
tcp = (struct tcphdr *)((char *)ip + (ip->ip_hl << 2));
printf("ip %d(%d) %d ", ip->ip_len, ip->ip_hl << 2, ip->ip_p);
- if (ip->ip_off & 0x1fff)
+ if (ip->ip_off & IP_OFFMASK)
printf("@%d", ip->ip_off << 3);
(void)printf(" %s", inet_ntoa(ip->ip_src));
- if (!(ip->ip_off & 0x1fff))
+ if (!(ip->ip_off & IP_OFFMASK))
if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP)
(void)printf(",%d", ntohs(tcp->th_sport));
(void)printf(" > ");
(void)printf("%s", inet_ntoa(ip->ip_dst));
- if (!(ip->ip_off & 0x1fff))
+ if (!(ip->ip_off & IP_OFFMASK))
if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP)
(void)printf(",%d", ntohs(tcp->th_dport));
putchar('\n');
diff --git a/usr.sbin/ipftest/pcap.h b/usr.sbin/ipftest/pcap.h
index a866093dfec..170d0288f22 100644
--- a/usr.sbin/ipftest/pcap.h
+++ b/usr.sbin/ipftest/pcap.h
@@ -1,11 +1,11 @@
-/* $OpenBSD: pcap.h,v 1.5 1998/01/26 04:16:43 dgregor Exp $ */
+/* $OpenBSD: pcap.h,v 1.6 1999/02/05 05:58:47 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 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: pcap.h,v 1.5 1998/01/26 04:16:43 dgregor Exp $
+ * $Id: pcap.h,v 1.6 1999/02/05 05:58:47 deraadt Exp $
*/
/*
* This header file is constructed to match the version described by
diff --git a/usr.sbin/ipftest/snoop.h b/usr.sbin/ipftest/snoop.h
index 60cc10da493..c715f6b232b 100644
--- a/usr.sbin/ipftest/snoop.h
+++ b/usr.sbin/ipftest/snoop.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: snoop.h,v 1.4 1998/01/26 04:16:44 dgregor Exp $ */
+/* $OpenBSD: snoop.h,v 1.5 1999/02/05 05:58:47 deraadt Exp $ */
/*
- * Copyright (C) 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1998 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@@ -12,7 +12,7 @@
/*
* written to comply with the RFC (1761) from Sun.
- * $Id: snoop.h,v 1.4 1998/01/26 04:16:44 dgregor Exp $
+ * $Id: snoop.h,v 1.5 1999/02/05 05:58:47 deraadt Exp $
*/
struct snoophdr {
char s_id[8];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 08:33:04 +0000