IPF 3.2.3

1 files changed, 49 insertions, 31 deletions

diff --git a/usr.sbin/ipsend/ipresend/resend.c b/usr.sbin/ipsend/ipresend/resend.c
index 6762ae6048c..4beec1ac887 100644
--- a/usr.sbin/ipsend/ipresend/resend.c
+++ b/usr.sbin/ipsend/ipresend/resend.c
@@ -1,46 +1,52 @@
+/*     $OpenBSD: resend.c,v 1.3 1998/01/26 04:16:59 dgregor Exp $      */
 /*
- * resend.c (C) 1995 Darren Reed
+ * resend.c (C) 1995-1997 Darren Reed
  *
  * This was written to test what size TCP fragments would get through
  * various TCP/IP packet filters, as used in IP firewalls.  In certain
  * conditions, enough of the TCP header is missing for unpredictable
  * results unless the filter is aware that this can happen.
  *
+ * 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.
  */
-#ifndef	lint
-static	char	sccsid[] = "@(#)resend.c	1.3 1/11/96 (C)1995 Darren Reed";
+#if !defined(lint)
+static const char sccsid[] = "@(#)resend.c	1.3 1/11/96 (C)1995 Darren Reed";
+static const char rcsid[] = "@(#)$Id: resend.c,v 1.3 1998/01/26 04:16:59 dgregor Exp $";
 #endif
 #include <stdio.h>
-#include <stdlib.h>
 #include <netdb.h>
 #include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <netinet/ip_icmp.h>
 #ifndef	linux
-#include <netinet/ip_var.h>
-#include <netinet/tcpip.h>
-#include <netinet/if_ether.h>
+# include <netinet/ip_var.h>
+# include <netinet/if_ether.h>
+# if __FreeBSD_version >= 300000
+#  include <net/if_var.h>
+# endif
 #endif
-#include "ip_compat.h"
-#ifdef	linux
-#include <linux/sockios.h>
-#include "tcpip.h"
-#endif
-#include "ipt.h"
+#include "ipsend.h"
 
+extern	int	opts;
 
 static	u_char	buf[65536];	/* 1 big packet */
+void	printpacket __P((ip_t *));
 
 
-printpacket(ip)
+void printpacket(ip)
 ip_t	*ip;
 {
 	tcphdr_t *t;
@@ -58,9 +64,10 @@ ip_t	*ip;
 		printf(",%d", t->th_sport);
 	printf(" dst %s", inet_ntoa(ip->ip_dst));
 	if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP)
-		printf(",%d", t->th_sport);
+		printf(",%d", t->th_dport);
 	if (ip->ip_p == IPPROTO_TCP) {
-		printf(" seq %u:%u flags ", t->th_seq, t->th_ack);
+		printf(" seq %lu:%lu flags ",
+			(u_long)t->th_seq, (u_long)t->th_ack);
 		for (j = 0, i = 1; i < 256; i *= 2, j++)
 			if (t->th_flags & i)
 				printf("%c", "FSRPAU--"[j]);
@@ -71,6 +78,7 @@ ip_t	*ip;
 
 int	ip_resend(dev, mtu, r, gwip, datain)
 char	*dev;
+int	mtu;
 struct	in_addr	gwip;
 struct	ipread	*r;
 char	*datain;
@@ -91,7 +99,7 @@ char	*datain;
 	ip = (struct ip *)buf;
 	eh = (ether_header_t *)malloc(sizeof(*eh));
 
-	bzero(&eh->ether_shost, sizeof(eh->ether_shost));
+	bzero((char *)A_A eh->ether_shost, sizeof(eh->ether_shost));
 	if (gwip.s_addr && (arp((char *)&gwip, dhost) == -1))
 	    {
 		perror("arp");
@@ -100,21 +108,31 @@ char	*datain;
 
 	while ((i = (*r->r_readip)(buf, sizeof(buf), NULL, NULL)) > 0)
 	    {
-		len = ntohs(ip->ip_len);
-		eh = (ether_header_t *)realloc((char *)eh, sizeof(*eh) + len);
-		eh->ether_type = htons((u_short)ETHERTYPE_IP);
-		if (!gwip.s_addr) {
-			if (arp((char *)&gwip,
-				(char *)&eh->ether_dhost) == -1) {
-				perror("arp");
-				continue;
-			}
-		} else
-			bcopy(dhost, (char *)&eh->ether_dhost, sizeof(dhost));
-		bcopy(ip, (char *)(eh + 1), len);
-		printpacket(ip);
+		if (!(opts & OPT_RAW)) {
+			len = ntohs(ip->ip_len);
+			eh = (ether_header_t *)realloc((char *)eh, sizeof(*eh) + len);
+			eh->ether_type = htons((u_short)ETHERTYPE_IP);
+			if (!gwip.s_addr) {
+				if (arp((char *)&gwip,
+					(char *)A_A eh->ether_dhost) == -1) {
+					perror("arp");
+					continue;
+				}
+			} else
+				bcopy(dhost, (char *)A_A eh->ether_dhost,
+				      sizeof(dhost));
+			if (!ip->ip_sum)
+				ip->ip_sum = chksum((u_short *)ip,
+						    ip->ip_hl << 2);
+			bcopy(ip, (char *)(eh + 1), len);
+			len += sizeof(*eh);
+			printpacket(ip);
+		} else {
+			eh = (ether_header_t *)buf;
+			len = i;
+		}
 
-		if (sendip(wfd, eh, sizeof(*eh) + len) == -1)
+		if (sendip(wfd, (char *)eh, len) == -1)
 		    {
 			perror("send_packet");
 			break;