Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2002 22:11:46 +0100 (CET)
From:      Paul Everlund <tdv94ped@cs.umu.se>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/45538: [Bento fix]: net/netdude
Message-ID:  <200211202111.gAKLBkwX004967@everlund.homeip.net>

next in thread | raw e-mail | index | archive | help

>Number:         45538
>Category:       ports
>Synopsis:       [Bento fix]: net/netdude
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 20 13:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Paul Everlund
>Release:        FreeBSD 4.7-RELEASE i386
>Organization:
>Environment:
	System: FreeBSD freebsd.everlund.homeip.net 4.7-RELEASE
	FreeBSD 4.7-RELEASE #1: Sun Oct 13 07:35:27 CEST 2002
	su_paul@freebsd.everlund.homeip.net:/usr/obj/usr/src/sys/I686_CPU_KERNEL i386

>Description:
	Bento fix of net/netdude.

	Remove all in net/netdude/files and commit the patches to net/netdude/files.

	This port now compiles ok, installs and deinstalls, but is otherwise 
	untested.

>How-To-Repeat:

>Fix:
--- netdude-files begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files
#	files/patch-src::nd.h
#	files/patch-Makfile.in
#	files/patch-configure
#	files/patch-protocols-ether::nd_ether.c
#	files/patch-protocols-ether::nd_ether_callbacks.c
#	files/patch-protocols-ip::nd_ip.c
#	files/patch-protocols-arp::nd_arp.h
#	files/patch-protocols-icmp::nd_icmp.h
#	files/patch-protocols-ip::nd_ip_callbacks.c
#	files/patch-src::nd_misc.h
#	files/patch-src::nd_protocol.c
#	files/patch-protocols-tcp::nd_tcb.c
#	files/patch-src::nd_misc.c
#	files/patch-src::Makefile.in
#	files/patch-protocols-snap::nd_snap.c
#	files/patch-protocols-icmp::nd_icmp.c
#	files/patch-protocols-icmp::nd_icmp_callbacks.c
#	files/patch-protocols-fddi::nd_fddi_callbacks.c
#	files/patch-protocols-udp::nd_udp.c
#	files/patch-protocols-arp::nd_arp.c
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-src::nd.h
sed 's/^X//' >files/patch-src::nd.h << 'END-of-files/patch-src::nd.h'
X--- src/nd.h.orig	Sat Oct 12 00:03:36 2002
X+++ src/nd.h	Sat Oct 12 00:03:59 2002
X@@ -31,6 +31,7 @@
X #ifdef LINUX
X #define __FAVOR_BSD
X #endif
X+#include <sys/types.h>
X #include <netinet/in_systm.h>
X #include <netinet/in.h>
X 
END-of-files/patch-src::nd.h
echo x - files/patch-Makfile.in
sed 's/^X//' >files/patch-Makfile.in << 'END-of-files/patch-Makfile.in'
X--- Makefile.in.orig	Fri Oct 11 23:49:30 2002
X+++ Makefile.in	Fri Oct 11 23:49:41 2002
X@@ -106,7 +106,7 @@
X install_sh = @install_sh@
X td = @td@
X 
X-SUBDIRS = libltdl src plugins protocols intl po pixmaps doc
X+SUBDIRS = src plugins protocols intl po pixmaps doc
X 
X MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
X                        config.h.in config.sub configure install-sh \
END-of-files/patch-Makfile.in
echo x - files/patch-configure
sed 's/^X//' >files/patch-configure << 'END-of-files/patch-configure'
X--- configure.orig	Fri Oct 11 23:43:36 2002
X+++ configure	Fri Oct 11 23:44:16 2002
X@@ -418,7 +418,7 @@
X PACKAGE_BUGREPORT=
X 
X ac_unique_file="src/nd.h"
X-ac_subdirs_all="$ac_subdirs_all libltdl"
X+ac_subdirs_all="$ac_subdirs_all"
X # Factoring default headers for most tests.
X ac_includes_default="\
X #include <stdio.h>
X@@ -2634,7 +2634,7 @@
X 
X 
X 
X-subdirs="$subdirs libltdl"
X+subdirs="$subdirs"
X 
X 
X 
END-of-files/patch-configure
echo x - files/patch-protocols-ether::nd_ether.c
sed 's/^X//' >files/patch-protocols-ether::nd_ether.c << 'END-of-files/patch-protocols-ether::nd_ether.c'
X--- protocols/ether/nd_ether.c.orig	Sat Oct 12 00:18:53 2002
X+++ protocols/ether/nd_ether.c	Sat Oct 12 00:19:07 2002
X@@ -23,6 +23,7 @@
X 
X */
X 
X+#include <sys/types.h>
X #include <net/ethernet.h>
X 
X #include <netdude/nd_debug.h>
END-of-files/patch-protocols-ether::nd_ether.c
echo x - files/patch-protocols-ether::nd_ether_callbacks.c
sed 's/^X//' >files/patch-protocols-ether::nd_ether_callbacks.c << 'END-of-files/patch-protocols-ether::nd_ether_callbacks.c'
X--- protocols/ether/nd_ether_callbacks.c.orig	Sat Oct 12 00:20:26 2002
X+++ protocols/ether/nd_ether_callbacks.c	Sat Oct 12 00:23:48 2002
X@@ -22,6 +22,7 @@
X CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
X 
X */
X+#include <sys/types.h>
X #include <net/ethernet.h>
X #include <netdude/nd.h>
X #include <netdude/nd_debug.h>
X@@ -54,7 +55,7 @@
X       if (!eh)
X 	continue;
X 
X-      memcpy(eh->ether_shost, address, ETH_ALEN);
X+      memcpy(eh->ether_shost, address, ETHER_ADDR_LEN);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X   
X@@ -84,7 +85,7 @@
X       if (!eh)
X 	continue;
X 
X-      memcpy(eh->ether_dhost, address, ETH_ALEN);
X+      memcpy(eh->ether_dhost, address, ETHER_ADDR_LEN);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X   
END-of-files/patch-protocols-ether::nd_ether_callbacks.c
echo x - files/patch-protocols-ip::nd_ip.c
sed 's/^X//' >files/patch-protocols-ip::nd_ip.c << 'END-of-files/patch-protocols-ip::nd_ip.c'
X--- protocols/ip/nd_ip.c.orig	Sun Oct 13 21:33:19 2002
X+++ protocols/ip/nd_ip.c	Sun Oct 13 21:34:05 2002
X@@ -102,7 +102,7 @@
X   { N_("Low delay"),         N_("Minimize delay"),       IPTOS_LOWDELAY,    nd_ip_tos_value_cb },
X   { N_("Throughput"),        N_("Maximize throughput"),  IPTOS_THROUGHPUT,  nd_ip_tos_value_cb },
X   { N_("Reliability"),       N_("Maximize reliability"), IPTOS_RELIABILITY, nd_ip_tos_value_cb },
X-  { N_("Low cost"),          N_("Minimize cost"),        IPTOS_LOWCOST,     nd_ip_tos_value_cb },
X+  { N_("Low cost"),          N_("Minimize cost"),        IPTOS_MINCOST,     nd_ip_tos_value_cb },
X   { N_("None"),              N_("Clear all bits"),       0,                 nd_ip_tos_value_cb },
X   { N_("Custom"),            N_("Custom ToS value"),     -1,                nd_ip_tos_custom_cb },
X   { NULL, NULL, 0, NULL}
END-of-files/patch-protocols-ip::nd_ip.c
echo x - files/patch-protocols-arp::nd_arp.h
sed 's/^X//' >files/patch-protocols-arp::nd_arp.h << 'END-of-files/patch-protocols-arp::nd_arp.h'
X--- protocols/arp/nd_arp.h.orig	Wed Nov 20 20:57:00 2002
X+++ protocols/arp/nd_arp.h	Wed Nov 20 20:57:26 2002
X@@ -26,6 +26,8 @@
X #ifndef __nd_arp_h
X #define __nd_arp_h
X 
X+#include <sys/types.h>
X+#include <sys/socket.h>
X #include <net/ethernet.h>
X #include <net/if_arp.h>
X 
END-of-files/patch-protocols-arp::nd_arp.h
echo x - files/patch-protocols-icmp::nd_icmp.h
sed 's/^X//' >files/patch-protocols-icmp::nd_icmp.h << 'END-of-files/patch-protocols-icmp::nd_icmp.h'
X--- protocols/icmp/nd_icmp.h.orig	Sun Oct 13 12:45:27 2002
X+++ protocols/icmp/nd_icmp.h	Sun Oct 13 12:45:40 2002
X@@ -30,8 +30,46 @@
X #include <netdude/nd_types.h>
X 
X #include <netinet/in.h>
X+#include <netinet/ip.h>
X #include <netinet/ip_icmp.h>
X 
X+#ifdef __FreeBSD__
X+#define	ICMP_DEST_UNREACH	ICMP_UNREACH
X+#define	ICMP_SOURCE_QUENCH	ICMP_SOURCEQUENCH
X+#define	ICMP_TIME_EXCEEDED	ICMP_TIMXCEED
X+#define	ICMP_PARAMETERPROB	ICMP_PARAMPROB
X+#define	ICMP_TIMESTAMP		ICMP_TSTAMP
X+#define	ICMP_TIMESTAMPREPLY	ICMP_TSTAMPREPLY
X+#define	ICMP_INFO_REQUEST	ICMP_IREQ
X+#define	ICMP_INFO_REPLY		ICMP_IREQREPLY
X+#define	ICMP_ADDRESS		ICMP_MASKREQ
X+#define	ICMP_ADDRESSREPLY	ICMP_MASKREPLY
X+
X+#define	ICMP_NET_UNREACH	ICMP_UNREACH_NET
X+#define	ICMP_HOST_UNREACH	ICMP_UNREACH_HOST
X+#define	ICMP_PROT_UNREACH	ICMP_UNREACH_PROTOCOL
X+#define	ICMP_PORT_UNREACH	ICMP_UNREACH_PORT
X+#define	ICMP_FRAG_NEEDED	ICMP_UNREACH_NEEDFRAG
X+#define	ICMP_SR_FAILED		ICMP_UNREACH_SRCFAIL
X+#define	ICMP_NET_UNKNOWN	ICMP_UNREACH_NET_UNKNOWN
X+#define	ICMP_HOST_UNKNOWN	ICMP_UNREACH_HOST_UNKNOWN
X+#define	ICMP_HOST_ISOLATED	ICMP_UNREACH_ISOLATED
X+#define	ICMP_NET_ANO		ICMP_UNREACH_NET_PROHIB
X+#define	ICMP_HOST_ANO		ICMP_UNREACH_HOST_PROHIB
X+#define	ICMP_NET_UNR_TOS	ICMP_UNREACH_TOSNET
X+#define	ICMP_HOST_UNR_TOS	ICMP_UNREACH_TOSHOST
X+#define	ICMP_PKT_FILTERED	ICMP_UNREACH_FILTER_PROHIB
X+#define	ICMP_PREC_VIOLATION	ICMP_UNREACH_HOST_PRECEDENCE
X+#define	ICMP_PREC_CUTOFF	ICMP_UNREACH_PRECEDENCE_CUTOFF
X+
X+#define	ICMP_REDIR_NET		ICMP_REDIRECT_NET
X+#define	ICMP_REDIR_HOST		ICMP_REDIRECT_HOST
X+#define	ICMP_REDIR_NETTOS	ICMP_REDIRECT_TOSNET
X+#define	ICMP_REDIR_HOSTTOS	ICMP_REDIRECT_TOSHOST
X+
X+#define	ICMP_EXC_TTL		ICMP_TIMXCEED_INTRANS
X+#define	ICMP_EXC_FRAGTIME	ICMP_TIMXCEED_REASS
X+#endif
X 
X /* ICMP packet structure -- using our own for the funky stuff ... */
X 
END-of-files/patch-protocols-icmp::nd_icmp.h
echo x - files/patch-protocols-ip::nd_ip_callbacks.c
sed 's/^X//' >files/patch-protocols-ip::nd_ip_callbacks.c << 'END-of-files/patch-protocols-ip::nd_ip_callbacks.c'
X--- protocols/ip/nd_ip_callbacks.c.orig	Sun Oct 13 21:35:01 2002
X+++ protocols/ip/nd_ip_callbacks.c	Sun Oct 13 21:35:31 2002
X@@ -26,6 +26,7 @@
X #ifdef LINUX
X #define __FAVOR_BSD
X #endif
X+#include <sys/types.h>
X #include <netinet/in_systm.h>
X #include <netinet/in.h>
X #include <netinet/ip.h>
END-of-files/patch-protocols-ip::nd_ip_callbacks.c
echo x - files/patch-src::nd_misc.h
sed 's/^X//' >files/patch-src::nd_misc.h << 'END-of-files/patch-src::nd_misc.h'
X--- src/nd_misc.h.orig	Fri Oct 11 23:55:05 2002
X+++ src/nd_misc.h	Fri Oct 11 23:55:41 2002
X@@ -27,6 +27,7 @@
X #define __nd_misc_h
X 
X #include <stdlib.h>
X+#include <sys/socket.h>
X #include <net/if.h>
X #include <gtk/gtk.h>
X #include <netdude/nd_protocol.h>
END-of-files/patch-src::nd_misc.h
echo x - files/patch-src::nd_protocol.c
sed 's/^X//' >files/patch-src::nd_protocol.c << 'END-of-files/patch-src::nd_protocol.c'
X--- src/nd_protocol.c.orig	Wed Nov 20 20:13:36 2002
X+++ src/nd_protocol.c	Wed Nov 20 20:14:20 2002
X@@ -26,6 +26,7 @@
X #  include <config.h>
X #endif
X 
X+#include <sys/types.h>
X #include <netinet/in.h>
X 
X #include <netdude/nd.h>
END-of-files/patch-src::nd_protocol.c
echo x - files/patch-protocols-tcp::nd_tcb.c
sed 's/^X//' >files/patch-protocols-tcp::nd_tcb.c << 'END-of-files/patch-protocols-tcp::nd_tcb.c'
X--- protocols/tcp/nd_tcb.c.orig	Sun Oct 13 21:42:08 2002
X+++ protocols/tcp/nd_tcb.c	Sun Oct 13 21:45:35 2002
X@@ -26,13 +26,15 @@
X #  include <config.h>
X #endif
X 
X+#include <sys/types.h>
X+#include <netinet/in_systm.h>
X+#include <netinet/in.h>
X #include <netinet/ip.h>
X 
X #include <string.h>
X #include <unistd.h>
X #include <stdlib.h>
X #include <stdio.h>
X-#include <sys/types.h>
X #include <glib.h>
X 
X #include <netdude/nd.h>
END-of-files/patch-protocols-tcp::nd_tcb.c
echo x - files/patch-src::nd_misc.c
sed 's/^X//' >files/patch-src::nd_misc.c << 'END-of-files/patch-src::nd_misc.c'
X--- src/nd_misc.c.orig	Sat Oct 12 00:00:02 2002
X+++ src/nd_misc.c	Sat Oct 12 00:00:19 2002
X@@ -37,6 +37,7 @@
X #include <sys/types.h>
X #include <sys/stat.h>
X #include <sys/ioctl.h>
X+#include <sys/socket.h>
X #include <net/if.h>
X 
X #include <netdude/nd.h>
END-of-files/patch-src::nd_misc.c
echo x - files/patch-src::Makefile.in
sed 's/^X//' >files/patch-src::Makefile.in << 'END-of-files/patch-src::Makefile.in'
X--- src/Makefile.in.orig	Sat Oct 12 00:09:46 2002
X+++ src/Makefile.in	Sat Oct 12 00:10:15 2002
X@@ -177,7 +177,7 @@
X 	gtkhex.c gtkhex.h
X 
X 
X-netdude_LDADD = $(top_builddir)/libltdl/libltdlc.la @gtk_libs@ @glib_libs@
X+netdude_LDADD = @gtk_libs@ @glib_libs@
X subdir = src
X mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
X CONFIG_HEADER = $(top_builddir)/config.h
X@@ -197,7 +197,6 @@
X 	nd_trace_registry.$(OBJEXT) callbacks.$(OBJEXT) \
X 	interface.$(OBJEXT) support.$(OBJEXT) gtkhex.$(OBJEXT)
X netdude_OBJECTS = $(am_netdude_OBJECTS)
X-netdude_DEPENDENCIES = $(top_builddir)/libltdl/libltdlc.la
X netdude_LDFLAGS =
X 
X DEFS = @DEFS@
END-of-files/patch-src::Makefile.in
echo x - files/patch-protocols-snap::nd_snap.c
sed 's/^X//' >files/patch-protocols-snap::nd_snap.c << 'END-of-files/patch-protocols-snap::nd_snap.c'
X--- protocols/snap/nd_snap.c.orig	Sun Oct 13 21:40:25 2002
X+++ protocols/snap/nd_snap.c	Sun Oct 13 21:41:10 2002
X@@ -26,6 +26,7 @@
X #  include <config.h>
X #endif
X 
X+#include <sys/types.h>
X #include <net/ethernet.h>
X 
X #include <netdude/nd_debug.h>
END-of-files/patch-protocols-snap::nd_snap.c
echo x - files/patch-protocols-icmp::nd_icmp.c
sed 's/^X//' >files/patch-protocols-icmp::nd_icmp.c << 'END-of-files/patch-protocols-icmp::nd_icmp.c'
X--- protocols/icmp/nd_icmp.c.orig	Fri Sep 20 02:41:19 2002
X+++ protocols/icmp/nd_icmp.c	Sun Oct 13 12:00:17 2002
X@@ -22,6 +22,7 @@
X CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
X 
X */
X+#include <sys/types.h>
X #include <sys/socket.h>
X #include <netinet/in.h>
X #include <arpa/inet.h>
END-of-files/patch-protocols-icmp::nd_icmp.c
echo x - files/patch-protocols-icmp::nd_icmp_callbacks.c
sed 's/^X//' >files/patch-protocols-icmp::nd_icmp_callbacks.c << 'END-of-files/patch-protocols-icmp::nd_icmp_callbacks.c'
X--- protocols/icmp/nd_icmp_callbacks.c.orig	Fri Sep 20 02:40:51 2002
X+++ protocols/icmp/nd_icmp_callbacks.c	Sun Oct 13 20:52:27 2002
X@@ -63,7 +63,7 @@
X 
X   struct icmphdr *icmphdr = (struct icmphdr *) header;
X   
X-  switch (icmphdr->type)
X+  switch (icmphdr->icmp_type)
X     {
X     case ICMP_DEST_UNREACH:
X       if (!unreach_menu)
X@@ -82,7 +82,7 @@
X   
X   nd_dialog_number(_("Enter ICMP code:"),
X 		   ND_BASE_DEC,
X-		   icmphdr->code,
X+		   icmphdr->icmp_code,
X 		   255,
X 		   (ND_NumberCallback) nd_icmp_code_value_cb,
X 		   NULL,
X@@ -107,7 +107,7 @@
X       if (!icmphdr)
X 	continue;
X   
X-      icmphdr->checksum = htons(value);
X+      icmphdr->icmp_cksum = htons(value);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X 
X@@ -125,7 +125,7 @@
X 
X   nd_dialog_number(_("Enter ICMP checksum:"),
X 		   ND_BASE_HEX,
X-		   ntohs(icmphdr->checksum), 65535,
X+		   ntohs(icmphdr->icmp_cksum), 65535,
X 		   icmp_sum_ok_cb,
X 		   NULL,
X 		   packet, data);
X@@ -145,7 +145,7 @@
X       if (!icmphdr)
X 	continue;
X   
X-      switch (icmphdr->type)
X+      switch (icmphdr->icmp_type)
X 	{
X 	case ICMP_ECHO:
X 	case ICMP_ECHOREPLY:
X@@ -161,7 +161,7 @@
X 	  continue;
X 	}
X 
X-      icmphdr->un.echo.id = htons(value);
X+      icmphdr->icmp_id = htons(value);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X 
X@@ -179,7 +179,7 @@
X 
X   nd_dialog_number(_("Enter ICMP identifier:"),
X 		   ND_BASE_DEC,
X-		   ntohs(icmphdr->un.echo.id),
X+		   ntohs(icmphdr->icmp_id),
X 		   65535,
X 		   (ND_NumberCallback) icmp_id_ok_cb,
X 		   NULL,
X@@ -202,7 +202,7 @@
X       if (!icmphdr)
X 	continue;
X 
X-      switch (icmphdr->type)
X+      switch (icmphdr->icmp_type)
X 	{
X 	case ICMP_ECHO:
X 	case ICMP_ECHOREPLY:
X@@ -218,7 +218,7 @@
X 	  continue;
X 	}
X   
X-      icmphdr->un.echo.sequence = htons(value);
X+      icmphdr->icmp_seq = htons(value);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X 
X@@ -236,7 +236,7 @@
X 
X   nd_dialog_number(_("Enter ICMP sequence number:"),
X 		   ND_BASE_DEC,
X-		   ntohs(icmphdr->un.echo.sequence),
X+		   ntohs(icmphdr->icmp_seq),
X 		   65535,
X 		   (ND_NumberCallback) icmp_seq_ok_cb,
X 		   NULL,
X@@ -425,7 +425,7 @@
X       if (!icmphdr)
X 	continue;
X   
X-      icmphdr->un.gateway = htonl(value);
X+      icmphdr->icmp_gwaddr.s_addr = htonl(value);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X 
X@@ -441,12 +441,12 @@
X {
X   struct icmphdr *icmphdr = (struct icmphdr *) header;
X 
X-  if (!nd_icmp_header_is_error(icmphdr) && icmphdr->type != 10)
X+  if (!nd_icmp_header_is_error(icmphdr) && icmphdr->icmp_type != 10)
X     return;
X 
X   nd_dialog_number(_("Enter 32-bit ICMP data:"),
X 		   ND_BASE_DEC,
X-		   ntohl(icmphdr->un.gateway), (guint) -1,
X+		   ntohl(icmphdr->icmp_gwaddr.s_addr), (guint) -1,
X 		   icmp_error_ok_cb,
X 		   NULL, packet, data);    
X }
X@@ -589,7 +589,7 @@
X 	continue;
X   
X       icmphdr = (struct icmphdr *) data;
X-      if (icmphdr->type != 9)
X+      if (icmphdr->icmp_type != 9)
X 	continue;
X 
X       memcpy(data + 8 + entry_num * 8, address, sizeof(guchar) * 4);
X@@ -634,7 +634,7 @@
X 	continue;
X   
X       icmphdr = (struct icmphdr *) data;
X-      if (icmphdr->type != 9)
X+      if (icmphdr->icmp_type != 9)
X 	continue;
X       
X       memcpy(data + 12 + entry_num * 8, &val, sizeof(guint32));
X@@ -684,7 +684,7 @@
X       if (!icmphdr)
X 	continue;
X   
X-      icmphdr->type = value;
X+      icmphdr->icmp_type = value;
X       nd_packet_init(packet);
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X@@ -703,7 +703,7 @@
X 
X   nd_dialog_number(_("Enter ICMP type:"),
X 		   ND_BASE_DEC,
X-		   icmphdr->type,
X+		   icmphdr->icmp_type,
X 		   255,
X 		   (ND_NumberCallback) nd_icmp_type_value_cb,
X 		   NULL,
X@@ -728,7 +728,7 @@
X       if (!icmphdr)
X 	continue;
X   
X-      icmphdr->code = value;
X+      icmphdr->icmp_code = value;
X       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X     }
X 
X@@ -746,7 +746,7 @@
X 
X   nd_dialog_number(_("Enter ICMP code:"),
X 		   ND_BASE_DEC,
X-		   icmphdr->code,
X+		   icmphdr->icmp_code,
X 		   255,
X 		   (ND_NumberCallback) nd_icmp_code_value_cb,
X 		   NULL,
X@@ -774,7 +774,7 @@
X       
X       if (!nd_icmp_csum_correct(nd_pit_get(&pit), &correct_sum))
X 	{
X-	  icmphdr->checksum = correct_sum;
X+	  icmphdr->icmp_cksum = correct_sum;
X 	  nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
X 	}
X     }
END-of-files/patch-protocols-icmp::nd_icmp_callbacks.c
echo x - files/patch-protocols-fddi::nd_fddi_callbacks.c
sed 's/^X//' >files/patch-protocols-fddi::nd_fddi_callbacks.c << 'END-of-files/patch-protocols-fddi::nd_fddi_callbacks.c'
X--- protocols/fddi/nd_fddi_callbacks.c.orig	Wed Nov 20 21:37:07 2002
X+++ protocols/fddi/nd_fddi_callbacks.c	Wed Nov 20 21:38:04 2002
X@@ -22,7 +22,9 @@
X CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
X 
X */
X+#include <sys/types.h>
X #include <netinet/if_fddi.h>
X+#define FDDI_K_ALEN	6
X 
X #include <netdude/nd_debug.h>
X #include <netdude/nd_macros.h>
END-of-files/patch-protocols-fddi::nd_fddi_callbacks.c
echo x - files/patch-protocols-udp::nd_udp.c
sed 's/^X//' >files/patch-protocols-udp::nd_udp.c << 'END-of-files/patch-protocols-udp::nd_udp.c'
X--- protocols/udp/nd_udp.c.orig	Sun Oct 13 21:47:40 2002
X+++ protocols/udp/nd_udp.c	Sun Oct 13 21:49:50 2002
X@@ -26,6 +26,10 @@
X #  include <config.h>
X #endif
X 
X+#include <sys/types.h>
X+#include <netinet/in_systm.h>
X+#include <netinet/in.h>
X+#include <netinet/ip_var.h>
X #include <netinet/ip.h>
X 
X #include <netdude/nd_debug.h>
END-of-files/patch-protocols-udp::nd_udp.c
echo x - files/patch-protocols-arp::nd_arp.c
sed 's/^X//' >files/patch-protocols-arp::nd_arp.c << 'END-of-files/patch-protocols-arp::nd_arp.c'
X--- protocols/arp/nd_arp.c.orig	Sat Oct 12 00:15:36 2002
X+++ protocols/arp/nd_arp.c	Sat Oct 12 00:15:47 2002
X@@ -23,6 +23,7 @@
X 
X */
X 
X+#include <sys/types.h>
X #include <sys/socket.h>
X #include <netinet/in.h>
X #include <arpa/inet.h>
END-of-files/patch-protocols-arp::nd_arp.c
exit
--- netdude-files ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211202111.gAKLBkwX004967>