diff options
Diffstat (limited to 'net/firewalk-gtk/patches')
-rw-r--r-- | net/firewalk-gtk/patches/patch-aa | 106 | ||||
-rw-r--r-- | net/firewalk-gtk/patches/patch-ab | 45 | ||||
-rw-r--r-- | net/firewalk-gtk/patches/patch-ac | 24 | ||||
-rw-r--r-- | net/firewalk-gtk/patches/patch-ad | 25 |
4 files changed, 200 insertions, 0 deletions
diff --git a/net/firewalk-gtk/patches/patch-aa b/net/firewalk-gtk/patches/patch-aa new file mode 100644 index 00000000000..657bc0acaff --- /dev/null +++ b/net/firewalk-gtk/patches/patch-aa @@ -0,0 +1,106 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/10/11 15:13:49 agc Exp $ + +--- packet.c.orig Sat Sep 8 22:43:44 2001 ++++ packet.c Sat Sep 8 22:44:45 2001 +@@ -42,24 +42,24 @@ + int + icmp_verify(u_char *packet, struct firepack *fp) + { +- struct ip *ip_hdr; +- struct icmphdr *icmp_hdr; +- struct ip *origip_hdr; +- struct udphdr *origudp_hdr; ++ struct libnet_ip_hdr *ip_hdr; ++ struct libnet_icmp_hdr *icmp_hdr; ++ struct libnet_ip_hdr *origip_hdr; ++ struct libnet_udp_hdr *origudp_hdr; + +- ip_hdr = (struct ip *)(packet + fp->packet_offset); +- icmp_hdr = (struct icmphdr *)(packet + fp->packet_offset + IP_H); ++ ip_hdr = (struct libnet_ip_hdr *)(packet + fp->packet_offset); ++ icmp_hdr = (struct libnet_icmp_hdr *)(packet + fp->packet_offset + IP_H); + +- switch (icmp_hdr->type) ++ switch (icmp_hdr->icmp_type) + { +- case ICMP_DEST_UNREACH: +- case ICMP_TIME_EXCEEDED: ++ case ICMP_UNREACH: ++ case ICMP_TIMXCEED: + /* + * The ICMP error message contains the IP header and first 8 + * bytes of data of datagram that caused the error. + */ + origip_hdr = +- (struct ip *)(packet + fp->packet_offset + IP_H + ICMP_H + 4); ++ (struct libnet_ip_hdr *)(packet + fp->packet_offset + IP_H + ICMP_H + 4); + + /* + * Was this a UDP or TCP packet that caused the problem? If not, +@@ -78,7 +78,7 @@ + * having a UDP header. + */ + origudp_hdr = +- (struct udphdr *) ++ (struct libnet_udp_hdr *) + (packet + fp->packet_offset + 2 * IP_H + ICMP_H + 4); + + /* +@@ -92,22 +92,22 @@ + */ + if (ip_hdr->ip_src.s_addr == fp->gateway) + { +- return (icmp_hdr->type == ICMP_DEST_UNREACH ? ++ return (icmp_hdr->icmp_type == ICMP_UNREACH ? + UNREACH_GW_REPLY : EXPIRED_GW_REPLY); + } + /* + * This is a response from the destination host. + */ +- if (icmp_hdr->type == ICMP_DEST_UNREACH && ++ if (icmp_hdr->icmp_type == ICMP_UNREACH && + ip_hdr->ip_src.s_addr == fp->destination) + { +- return (icmp_hdr->type == ICMP_DEST_UNREACH ? ++ return (icmp_hdr->icmp_type == ICMP_UNREACH ? + UNREACH_DEST_REPLY : EXPIRED_DEST_REPLY); + } + /* + * This is just a standard TTL expired reply. + */ +- return (icmp_hdr->type == ICMP_DEST_UNREACH ? UNREACH_REPLY : ++ return (icmp_hdr->icmp_type == ICMP_UNREACH ? UNREACH_REPLY : + EXPIRED_REPLY); + } + default: +@@ -249,9 +249,9 @@ + void + print_ip(u_char *packet) + { +- struct ip *ip_hdr; ++ struct libnet_ip_hdr *ip_hdr; + +- ip_hdr = (struct ip *)(packet + fp->packet_offset); ++ ip_hdr = (struct libnet_ip_hdr *)(packet + fp->packet_offset); + fire_write("[%s]", libnet_host_lookup(ip_hdr->ip_src.s_addr, fp->use_name)); + } + +@@ -259,14 +259,14 @@ + u_char * + print_unreach_code(u_char *packet) + { +- struct icmphdr *icmp_hdr; ++ struct libnet_icmp_hdr *icmp_hdr; + +- icmp_hdr = (struct icmphdr *)(packet + fp->packet_offset + IP_H); +- if (icmp_hdr->code > 15) ++ icmp_hdr = (struct libnet_icmp_hdr *)(packet + fp->packet_offset + IP_H); ++ if (icmp_hdr->icmp_code > 15) + { + return ("Unkown unreachable code"); + } +- return (unreachables[icmp_hdr->code]); ++ return (unreachables[icmp_hdr->icmp_code]); + } + + diff --git a/net/firewalk-gtk/patches/patch-ab b/net/firewalk-gtk/patches/patch-ab new file mode 100644 index 00000000000..72bf104757f --- /dev/null +++ b/net/firewalk-gtk/patches/patch-ab @@ -0,0 +1,45 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/10/11 15:13:49 agc Exp $ + +--- Makefile.in.orig Sat Feb 3 20:24:09 2001 ++++ Makefile.in Thu Oct 11 15:58:01 2001 +@@ -6,23 +6,23 @@ + # + # @configure_input@ + +-FIREWALK = firewalk +-FIREWALK_LOC= /usr/local ++FIREWALK = firewalk-gtk ++FIREWALK_LOC?= /usr/local + FIREWALK_MAN= $(FIREWALK).1 + INSTALL = ./install-sh + DEFINES += @DEFS@ `libnet-config --defines` + CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ +-LIBS = -lnet -lpcap @FW_GTK_CONFIG@ `libnet-config --libs` ++LIBS += -lnet -lpcap @FW_GTK_CONFIG@ `libnet-config --libs` + OBJECTS = main.o firewalk.o watcher.o p_cap.o signal.o \ + packet.o udptcpwalk.o port_list.o util.o @FW_GTK_OBJS@ + + .c.o: + $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@ + +-all: firewalk ++all: ${FIREWALK} + +-firewalk: version.h $(OBJECTS) ++${FIREWALK}: version.h $(OBJECTS) + $(CC) $(CFLAGS) $(OBJECTS) -o $(FIREWALK) $(LIBS) + + version.o: version.h +@@ -30,8 +30,9 @@ + @rm -f $@ + sed -e 's/.*/static char version[] = "&";/' ./VERSION > $@ + +-install: firewalk +- $(INSTALL) -c -m 0700 $(FIREWALK) $(FIREWALK_LOC)/bin ++install: ${FIREWALK} ++ $(INSTALL) -d -m 0755 $(FIREWALK_LOC)/bin $(FIREWALK_LOC)/man/man1 ++ $(INSTALL) -c -m 0700 $(FIREWALK) $(FIREWALK_LOC)/bin/ + $(INSTALL) -c -m 0644 $(FIREWALK_MAN) $(FIREWALK_LOC)/man/man1 + + clean: diff --git a/net/firewalk-gtk/patches/patch-ac b/net/firewalk-gtk/patches/patch-ac new file mode 100644 index 00000000000..67ed7f297b7 --- /dev/null +++ b/net/firewalk-gtk/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/10/11 15:13:49 agc Exp $ + +--- gtk_main.c.orig Tue Sep 11 19:34:13 2001 ++++ gtk_main.c Tue Sep 11 19:34:45 2001 +@@ -35,15 +35,15 @@ + #if (HAVE_CONFIG_H) + #include "./config.h" + #endif ++#include "./main.h" ++#include "./packet.h" ++#include "./firewalk.h" + #include "./gtk_main.h" + #include "./gtk_util.h" + #include "./gtk_cb.h" + #include "./gtk_pack.h" +-#include "./main.h" +-#include "./packet.h" +-#include "./gtk_itemfactory.h" +-#include "./firewalk.h" + #include "./version.h" ++#include "./gtk_itemfactory.h" + + /* + * This code is heavily commented for the benefit of the programmer who diff --git a/net/firewalk-gtk/patches/patch-ad b/net/firewalk-gtk/patches/patch-ad new file mode 100644 index 00000000000..b11bafb7f55 --- /dev/null +++ b/net/firewalk-gtk/patches/patch-ad @@ -0,0 +1,25 @@ +$NetBSD: patch-ad,v 1.1.1.1 2001/10/11 15:13:49 agc Exp $ + +--- gtk_cp.c.orig Tue Sep 11 19:50:58 2001 ++++ gtk_cp.c Tue Sep 11 19:51:48 2001 +@@ -35,16 +35,16 @@ + #if (HAVE_CONFIG_H) + #include "./config.h" + #endif ++#include "./main.h" ++#include "./packet.h" ++#include "./firewalk.h" ++#include "./version.h" + #include "./gtk_main.h" + #include "./gtk_util.h" + #include "./gtk_cb.h" + #include "./gtk_cp.h" + #include "./gtk_pack.h" +-#include "./main.h" +-#include "./packet.h" + #include "./gtk_itemfactory.h" +-#include "./firewalk.h" +-#include "./version.h" + + /* + * This code is heavily commented for the benefit of the programmer who |