2000-02-03 Roland McGrath <roland@baalperazim.frob.com>

	Complete overhaul of pfinet based on the IPv4 networking code from the
	Linux 2.2.12 kernel sources.  This page describes a single unified set
	of interdependent changes, but there are so many changes that I have
	broken up the log entry into paragraphs based on rough topical
	divisions of the work involved.

	Subset of verbatim Linux 2.2.12 sources imported on a vendor branch.
	* linux-src: New directory, see README for details.
	* README: New file, describes linux-src layout and procedures for
	tracking Linux source updates.

	Light modifications to linux-src files to avoid really bending over
	backwards with the glue macros.  All modifications to files in
	linux-src are conditionalized by #ifdef _HURD_.
	* linux-src/include/linux/net.h [_HURD_] (struct socket): New members
	refcnt and identity; elide members fasync_list, file.
	* linux-src/include/linux/rtnetlink.h [! CONFIG_RTNETLINK]
	(rtnl_shlock, rtnl_shunlock) [! _HURD_]: Conditionalize contents on
	this, making these no-ops #ifdef _HURD_.
	* linux-src/net/core/dev.c [_HURD_] (dev_ioctl): Don't define the
	function, instead #define it to 0.
	* linux-src/net/ipv4/af_inet.c [_HURD_] (inet_ioctl): Likewise.
	* linux-src/net/ipv4/arp.c [_HURD_] (arp_ioctl): Likewise.
	* linux-src/net/ipv4/udp.c [_HURD_] (udp_ioctl): Likewise.
	* linux-src/net/ipv4/tcp.c [_HURD_] (tcp_ioctl): Likewise.
	[_HURD_] (tcp_tiocinq): New function, TIOCINQ code from tcp_ioctl.
	* linux-src/net/ipv4/devinet.c [_HURD_] (devinet_ioctl): Don't define
	the function, instead #define it to 0.
	[_HURD_] (configure_device): New function, cobbled from SIOCSIFADDR
	and SIOCSIFNETMASK code from devinet_ioctl.

	* glue-include/asm, glue-include/linux: New directories.
	These contain glue kludge headers that replace all of the
	Linux <asm/*.h> headers except checksum.h, and several of
	the Linux <linux/*.h> headers (the remainder come from
	linux-src/include/linux and are mostly unmodified).
	* glue-include/asm/atomic.h: New file, glue replacement header.
	* glue-include/asm/bitops.h: New file, glue replacement header.
	* glue-include/asm/byteorder.h: New file, glue replacement header.
	* glue-include/asm/checksum.h: New file, glue replacement header.
	* glue-include/asm/errno.h: New file, glue replacement header.
	* glue-include/asm/hardirq.h: New file, glue replacement header.
	* glue-include/asm/init.h: New file, glue replacement header.
	* glue-include/asm/segment.h: New file, glue replacement header.
	* glue-include/asm/spinlock.h: New file, glue replacement header.
	* glue-include/asm/system.h: New file, glue replacement header.
	* glue-include/asm/types.h: New file, glue replacement header.
	* glue-include/asm/uaccess.h: New file, glue replacement header.
	* glue-include/linux/autoconf.h: New file, glue replacement header.
	* glue-include/linux/binfmts.h: New file, glue replacement header.
	* glue-include/linux/config.h: New file, glue replacement header.
	* glue-include/linux/errno.h: New file, glue replacement header.
	* glue-include/linux/fcntl.h: New file, glue replacement header.
	* glue-include/linux/fs.h: New file, glue replacement header.
	* glue-include/linux/in.h: New file, glue replacement header.
	* glue-include/linux/in6.h: New file, glue replacement header.
	* glue-include/linux/interrupt.h: New file, glue replacement header.
	* glue-include/linux/ioctl.h: New file, glue replacement header.
	* glue-include/linux/ipv6.h: New file, glue replacement header.
	* glue-include/linux/kernel.h: New file, glue replacement header.
	* glue-include/linux/limits.h: New file, glue replacement header.
	* glue-include/linux/major.h: New file, glue replacement header.
	* glue-include/linux/malloc.h: New file, glue replacement header.
	* glue-include/linux/mm.h: New file, glue replacement header.
	* glue-include/linux/param.h: New file, glue replacement header.
	* glue-include/linux/personality.h: New file, glue replacement header.
	* glue-include/linux/poll.h: New file, glue replacement header.
	* glue-include/linux/proc_fs.h: New file, glue replacement header.
	* glue-include/linux/sched.h: New file, glue replacement header.
	* glue-include/linux/slab.h: New file, glue replacement header.
	* glue-include/linux/socket.h: New file, glue replacement header.
	* glue-include/linux/sockios.h: New file, glue replacement header.
	* glue-include/linux/stat.h: New file, glue replacement header.
	* glue-include/linux/string.h: New file, glue replacement header.
	* glue-include/linux/termios.h: New file, glue replacement header.
	* glue-include/linux/time.h: New file, glue replacement header.
	* glue-include/linux/timer.h: New file, glue replacement header.
	* glue-include/linux/timex.h: New file, glue replacement header.
	* glue-include/linux/types.h: New file, glue replacement header.
	* glue-include/linux/un.h: New file, glue replacement header.
	* glue-include/linux/version.h: New file, glue replacement header.
	* glue-include/linux/wait.h: New file, glue replacement header.

	* kmem_cache.c: New file.  Glue code replaces Linux kmem_cache_t et al.
	* stubs.c: New file.  No-op functions and stub variables for a few
	things the Linux networking code needs to link.

	* Makefile (core-srcs, arch-lib-srcs, ethernet-srcs, ipv4-srcs): New
	variables, listing sources used from linux-src subdirectories.
	(LINUXSRCS): Define using those.
	(SRCS): Remove devices.c; add kmem_cache.c, stubs.c.
	(UNUSEDSRC): Variable removed.
	(vpath %.c): Remove vpath for $(srcdir)/linux-inet directory.
	Add vpaths for $(srcdir)/linux-src subdirectories.
	(CPPFLAGS): Add -D_HURD_SYSTYPE defining it to $(asm_syntax) as a
	double-quoted string.  Add -I's for glue-include and linux-src/include.

	* pfinet.h: Include <sys/socket.h>, and not <linux/netdevice.h>.
	(master_device): Remove decl.
	(global_lock, packet_queue_lock): Remove common defns.
	(global_lock, net_bh_lock): Declare them as externs.
	(struct sockaddr): Remove len member, make address member just a
	struct sockaddr rather than a 0-length array.
	(setup_loopback_device, become_task_protid, become_task): Remove decls.
	(ethernet_initialize): Declare it.
	(input_work_thread): Remove decl.
	(net_bh_thread): Declare it.
	(tcp_readable): Remove decl.
	(tcp_tiocinq): Declare it.

	* config.h: Rewritten based on Linux 2.2.12 set of CONFIG_* options.
	(CONFIG_NET, CONFIG_INET, CONFIG_SKB_LARGE): These are the only
	Linux config options we set.
	(CONFIG_IP_NOSIOCRT): New macro (not a proper config option, but
	used conveniently in the code).
	* ethernet.c (ethernet_set_multi): Take only one parameter.
	Remove assert, since we always get passed IGMP_ALL_HOSTS.
	(ethernet_thread): Make static.
	(ethernet_demuxer): Use __mutex_lock in place of mutex_lock, so as to
	get cthreads instead of linux/spinlock.h glue macros.  Lock
	net_bh_lock instead of global_lock.  Set SKB->protocol with
	eth_type_trans before calling netif_rx.
	(ethernet_initialize): New function, one-time initialization broken
	out of ethernet_open.
	(ethernet_open): Ports setup moved to ethernet_initialize.
	Don't use `errno' to avoid glue conflicts.
	Use get_privileged_ports here to get the master device port, and
	deallocate it after calling device_open.
	(ethernet_xmit): Use assert_perror.  Only one arg to dev_kfree_skb now.
	(setup_ethernet_device): Change initializations for structure changes.
	Call dev_init_buffers and register_netdevice on the device.
	* timer-emul.c (all functions): Use __mutex_lock instead of mutex_lock.
	Adjust for renaming of `prevp' member to `prev' in struct timer_list.
	(mod_timer): New function.
	* socket.c (proto_ops): Variable removed.
	(net_families): New variable replaces it.
	(sock_register): Rewritten for new calling convention, set
	net_families rather than proto_ops.
	(make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved here from misc.c.
	* sched.c (packet_queue_lock): Variable removed.
	(net_bh_lock, net_bh_wakeup): New variables.
	(current): Variable removed (now a macro in the glue headers).
	(interruptible_sleep_on, wake_up_interruptible): Functions removed.
	They are replaced by inlines in the glue headers.
	(become_task, become_task_protid): Functions removed; they are
	replaced by macros in glue-include/linux/sched.h.
	(net_bh_worker): New function.
	* loopback.c: Completely rewritten, mostly copied from linux-2.2.12's
	drivers/net/loopback.c source file.

	* io-ops.c (all functions): Use __mutex_lock in place of mutex_lock.
	(S_io_write): Call ops->sendmsg instead of ops->write,
	which no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in
	msg_flags.
	(S_io_read): Call ops->recvmsg instead of ops->read,
	which no longer exists  If O_NONBLOCK is set, pass MSG_DONTWAIT.
	(S_io_readable): Use USER->sock->data in place of USER->sock->sk.
	For SOCK_STREAM and SOCK_SEQPACKET types, call tcp_tiocinq.
	(S_io_set_all_openmodes, S_io_get_openmodes, S_io_set_some_openmodes,
	S_io_clear_some_openmodes): Member USER->sock->userflags is now
	renamed USER->sock->flags.
	(S_io_select): Completely rewritten using ops->poll.
	(select_wait): Function removed.
	(S_io_stat): Set st_mode to reflect S_IFSOCK.
	* socket-ops.c (all functions): Use __mutex_lock instead of mutex_lock.
	(S_socket_create): Don't set SOCK->ops or call SOCK->ops->create.
	Instead, call net_families[PF_INET]->create.
	(S_socket_listen): Remove extra checks; just call ops->listen.
	(S_socket_accept): Remove extra checks before ops->accept call.
	Avoid use of goto.
	(S_socket_connect): Remove extra checks; just call ops->connect.
	(S_socket_bind): Adjust for struct sock_addr changes.
	(S_socket_create_address): Likewise.
	(S_socket_whatis_address): Likewise.
	(S_socket_connect2): Don't diddle data structures after
	ops->socketpair call.
	(S_socket_getopt): Use sock_getsockopt if LEVEL is SOL_SOCKET.
	Accept any data size, not just sizeof (int).
	(S_socket_setopt): Use sock_setsockopt if LEVEL is SOL_SOCKET.
	(S_socket_send): Always use ops->sendmsg instead of ops->send or
	ops->sendto, which no longer exist.  If O_NONBLOCK is set, set
	MSG_DONTWAIT in msg_flags.
	(S_socket_recv): Always use ops->recvmsg instead of ops->recv, which
	no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in flags.
	Check for error from S_socket_create_address.

	* main.c (find_device): Don't try to set ether_dev.pa_mask (it's gone).
	(main): Don't call init_devices.  Call ethernet_initialize.
	Start net_bh_worker instead of input_work_thread.  Don't call
	setup_loopback_device.  Instead, take global_lock, do prepare_current,
	and then call sk_init, skb_init, inet_proto_init, and net_dev_init.
	Keep global_lock held while calling argp_parse.
	Call arrange_shutdown_notification only after all that.
	Fix error call for "contacting parent" to pass ERR instead of errno.
	* options.c (ADDR): #undef before defining macro.
	(parse_opt): #if 0 out EDESTADDRREQ check (I don't understand it).
	To apply settings, call configure_devices.
	(ADD_ADDR_OPT): #if 0 --address and --netmask options.  Needs fixed.
	* misc.c (make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved to socket.c.
	(sock_release_peer): Function removed.
	(make_sockaddr_port): Use struct sockaddr_storage to size buffer.
	Fix size calculation for new struct sock_addr layout.
	Initialize sa_family and sa_len of new struct sock_addr.

	Remove the old Linux (2.0.??) network stack and the glue code for it.
	* linux-inet, asm, linux: Directories and all files removed.
	Some of the new files in glue-include came from the old glue headers
	in the asm and linux directories, but most were substantially modified.
	* devices.c: File removed.  The equivalent glue is now elsewhere.

1 files changed, 0 insertions, 774 deletions

diff --git a/pfinet/linux-inet/icmp.c b/pfinet/linux-inet/icmp.c
deleted file mode 100644
index c023eab2..00000000
--- a/pfinet/linux-inet/icmp.c
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Internet Control Message Protocol (ICMP)
- *
- * Version:	@(#)icmp.c	1.0.11	06/02/93
- *
- * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Mark Evans, <evansmp@uhura.aston.ac.uk>
- *		Alan Cox, <gw4pts@gw4pts.ampr.org>
- *		Stefan Becker, <stefanb@yello.ping.de>
- *
- * Fixes:	
- *		Alan Cox	:	Generic queue usage.
- *		Gerhard Koerting:	ICMP addressing corrected
- *		Alan Cox	:	Use tos/ttl settings
- *		Alan Cox	:	Protocol violations
- *		Alan Cox	:	SNMP Statistics		
- *		Alan Cox	:	Routing errors
- *		Alan Cox	:	Changes for newer routing code
- *		Alan Cox	:	Removed old debugging junk
- *		Alan Cox	:	Fixed the ICMP error status of net/host unreachable
- *	Gerhard Koerting	:	Fixed broadcast ping properly
- *		Ulrich Kunitz	:	Fixed ICMP timestamp reply
- *		A.N.Kuznetsov	:	Multihoming fixes.
- *		Laco Rusnak	:	Multihoming fixes.
- *		Alan Cox	:	Tightened up icmp_send().
- *		Alan Cox	:	Multicasts.
- *		Stefan Becker   :       ICMP redirects in icmp_send().
- *
- * 
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/fcntl.h>
-#include <linux/socket.h>
-#include <linux/in.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/string.h>
-#include "snmp.h"
-#include "ip.h"
-#include "route.h"
-#include "protocol.h"
-#include "icmp.h"
-#include "tcp.h"
-#include "snmp.h"
-#include <linux/skbuff.h>
-#include "sock.h"
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <asm/system.h>
-#include <asm/segment.h>
-
-
-#define min(a,b)	((a)<(b)?(a):(b))
-
-
-/*
- *	Statistics
- */
- 
-struct icmp_mib	icmp_statistics={0,};
-
-
-/* An array of errno for error messages from dest unreach. */
-struct icmp_err icmp_err_convert[] = {
-  { ENETUNREACH,	0 },	/*	ICMP_NET_UNREACH	*/
-  { EHOSTUNREACH,	0 },	/*	ICMP_HOST_UNREACH	*/
-  { ENOPROTOOPT,	1 },	/*	ICMP_PROT_UNREACH	*/
-  { ECONNREFUSED,	1 },	/*	ICMP_PORT_UNREACH	*/
-  { EOPNOTSUPP,		0 },	/*	ICMP_FRAG_NEEDED	*/
-  { EOPNOTSUPP,		0 },	/*	ICMP_SR_FAILED		*/
-  { ENETUNREACH,	1 },	/* 	ICMP_NET_UNKNOWN	*/
-  { EHOSTDOWN,		1 },	/*	ICMP_HOST_UNKNOWN	*/
-  { ENONET,		1 },	/*	ICMP_HOST_ISOLATED	*/
-  { ENETUNREACH,	1 },	/*	ICMP_NET_ANO		*/
-  { EHOSTUNREACH,	1 },	/*	ICMP_HOST_ANO		*/
-  { EOPNOTSUPP,		0 },	/*	ICMP_NET_UNR_TOS	*/
-  { EOPNOTSUPP,		0 }	/*	ICMP_HOST_UNR_TOS	*/
-};
-
-
-/*
- *	Send an ICMP message in response to a situation
- *
- *	Fixme: Fragment handling is wrong really.
- */
- 
-void icmp_send(struct sk_buff *skb_in, int type, int code, unsigned long info, struct device *dev)
-{
-	struct sk_buff *skb;
-	struct iphdr *iph;
-	int offset;
-	struct icmphdr *icmph;
-	int len;
-	struct device *ndev=NULL;	/* Make this =dev to force replies on the same interface */
-	unsigned long our_addr;
-	int atype;
-	
-	/*
-	 *	Find the original IP header.
-	 */
-	 
-	iph = (struct iphdr *) (skb_in->data + dev->hard_header_len);
-	
-	/*
-	 *	No replies to MAC multicast
-	 */
-	 
-	if(skb_in->pkt_type!=PACKET_HOST)
-		return;
-		
-	/*
-	 *	No replies to IP multicasting
-	 */
-	 
-	atype=ip_chk_addr(iph->daddr);
-	if(atype==IS_BROADCAST || IN_MULTICAST(iph->daddr))
-		return;
-
-	/*
-	 *	Only reply to first fragment.
-	 */
-	 
-	if(ntohs(iph->frag_off)&IP_OFFSET)
-		return;
-	 		
-	/*
-	 *	We must NEVER NEVER send an ICMP error to an ICMP error message
-	 */
-	 
-	if(type==ICMP_DEST_UNREACH||type==ICMP_REDIRECT||type==ICMP_SOURCE_QUENCH||type==ICMP_TIME_EXCEEDED)
-	{
-
-		/*
-		 *	Is the original packet an ICMP packet?
-		 */
-
-		if(iph->protocol==IPPROTO_ICMP)
-		{
-			icmph = (struct icmphdr *) ((char *) iph +
-                                                    4 * iph->ihl);
-			/*
-			 *	Check for ICMP error packets (Must never reply to
-			 *	an ICMP error).
-			 */
-	
-			if (icmph->type == ICMP_DEST_UNREACH ||
-				icmph->type == ICMP_SOURCE_QUENCH ||
-				icmph->type == ICMP_REDIRECT ||
-				icmph->type == ICMP_TIME_EXCEEDED ||
-				icmph->type == ICMP_PARAMETERPROB)
-				return;
-		}
-	}
-	icmp_statistics.IcmpOutMsgs++;
-	
-	/*
-	 *	This needs a tidy.	
-	 */
-		
-	switch(type)
-	{
-		case ICMP_DEST_UNREACH:
-			icmp_statistics.IcmpOutDestUnreachs++;
-			break;
-		case ICMP_SOURCE_QUENCH:
-			icmp_statistics.IcmpOutSrcQuenchs++;
-			break;
-		case ICMP_REDIRECT:
-			icmp_statistics.IcmpOutRedirects++;
-			break;
-		case ICMP_ECHO:
-			icmp_statistics.IcmpOutEchos++;
-			break;
-		case ICMP_ECHOREPLY:
-			icmp_statistics.IcmpOutEchoReps++;
-			break;
-		case ICMP_TIME_EXCEEDED:
-			icmp_statistics.IcmpOutTimeExcds++;
-			break;
-		case ICMP_PARAMETERPROB:
-			icmp_statistics.IcmpOutParmProbs++;
-			break;
-		case ICMP_TIMESTAMP:
-			icmp_statistics.IcmpOutTimestamps++;
-			break;
-		case ICMP_TIMESTAMPREPLY:
-			icmp_statistics.IcmpOutTimestampReps++;
-			break;
-		case ICMP_ADDRESS:
-			icmp_statistics.IcmpOutAddrMasks++;
-			break;
-		case ICMP_ADDRESSREPLY:
-			icmp_statistics.IcmpOutAddrMaskReps++;
-			break;
-	}		
-	/*
-	 *	Get some memory for the reply. 
-	 */
-	 
-	len = dev->hard_header_len + sizeof(struct iphdr) + sizeof(struct icmphdr) +
-		sizeof(struct iphdr) + 32;	/* amount of header to return */
-	   
-	skb = (struct sk_buff *) alloc_skb(len, GFP_ATOMIC);
-	if (skb == NULL) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		return;
-	}
-	skb->free = 1;
-
-	/*
-	 *	Build Layer 2-3 headers for message back to source. 
-	 */
-
-	our_addr = dev->pa_addr;
-	if (iph->daddr != our_addr && ip_chk_addr(iph->daddr) == IS_MYADDR)
-		our_addr = iph->daddr;
-	offset = ip_build_header(skb, our_addr, iph->saddr,
-			   &ndev, IPPROTO_ICMP, NULL, len,
-			   skb_in->ip_hdr->tos,255);
-	if (offset < 0) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		skb->sk = NULL;
-		kfree_skb(skb, FREE_READ);
-		return;
-	}
-
-	/* 
-	 *	Re-adjust length according to actual IP header size. 
-	 */
-
-	skb->len = offset + sizeof(struct icmphdr) + sizeof(struct iphdr) + 8;
-	
-	/*
-	 *	Fill in the frame
-	 */
-	 
-	icmph = (struct icmphdr *) (skb->data + offset);
-	icmph->type = type;
-	icmph->code = code;
-	icmph->checksum = 0;
-	icmph->un.gateway = info;	/* This might not be meant for 
-					   this form of the union but it will
-					   be right anyway */
-	memcpy(icmph + 1, iph, sizeof(struct iphdr) + 8);
-
-	icmph->checksum = ip_compute_csum((unsigned char *)icmph,
-                         sizeof(struct icmphdr) + sizeof(struct iphdr) + 8);
-
-	/*
-	 *	Send it and free it once sent.
-	 */
-	ip_queue_xmit(NULL, ndev, skb, 1);
-}
-
-
-/* 
- *	Handle ICMP_UNREACH and ICMP_QUENCH. 
- */
- 
-static void icmp_unreach(struct icmphdr *icmph, struct sk_buff *skb)
-{
-	struct inet_protocol *ipprot;
-	struct iphdr *iph;
-	unsigned char hash;
-	int err;
-
-	err = (icmph->type << 8) | icmph->code;
-	iph = (struct iphdr *) (icmph + 1);
-	
-	switch(icmph->code & 7) 
-	{
-		case ICMP_NET_UNREACH:
-			break;
-		case ICMP_HOST_UNREACH:
-			break;
-		case ICMP_PROT_UNREACH:
-			printk("ICMP: %s:%d: protocol unreachable.\n",
-				in_ntoa(iph->daddr), ntohs(iph->protocol));
-			break;
-		case ICMP_PORT_UNREACH:
-			break;
-		case ICMP_FRAG_NEEDED:
-			printk("ICMP: %s: fragmentation needed and DF set.\n",
-								in_ntoa(iph->daddr));
-			break;
-		case ICMP_SR_FAILED:
-			printk("ICMP: %s: Source Route Failed.\n", in_ntoa(iph->daddr));
-			break;
-		default:
-			break;
-	}
-
-	/*
-	 *	Get the protocol(s). 
-	 */
-	 
-	hash = iph->protocol & (MAX_INET_PROTOS -1);
-
-	/*
-	 *	This can't change while we are doing it. 
-	 */
-	 
-	ipprot = (struct inet_protocol *) inet_protos[hash];
-	while(ipprot != NULL) 
-	{
-		struct inet_protocol *nextip;
-
-		nextip = (struct inet_protocol *) ipprot->next;
-	
-		/* 
-		 *	Pass it off to everyone who wants it. 
-		 */
-		if (iph->protocol == ipprot->protocol && ipprot->err_handler) 
-		{
-			ipprot->err_handler(err, (unsigned char *)(icmph + 1),
-					    iph->daddr, iph->saddr, ipprot);
-		}
-
-		ipprot = nextip;
-  	}
-	kfree_skb(skb, FREE_READ);
-}
-
-
-/*
- *	Handle ICMP_REDIRECT. 
- */
-
-static void icmp_redirect(struct icmphdr *icmph, struct sk_buff *skb,
-	struct device *dev, unsigned long source)
-{
-	struct rtable *rt;
-	struct iphdr *iph;
-	unsigned long ip;
-
-	/*
-	 *	Get the copied header of the packet that caused the redirect
-	 */
-	 
-	iph = (struct iphdr *) (icmph + 1);
-	ip = iph->daddr;
-
-	switch(icmph->code & 7) 
-	{
-		case ICMP_REDIR_NET:
-			/*
-			 *	This causes a problem with subnetted networks. What we should do
-			 *	is use ICMP_ADDRESS to get the subnet mask of the problem route
-			 *	and set both. But we don't..
-			 */
-#ifdef not_a_good_idea
-			ip_rt_add((RTF_DYNAMIC | RTF_MODIFIED | RTF_GATEWAY),
-				ip, 0, icmph->un.gateway, dev,0, 0);
-			break;
-#endif
-		case ICMP_REDIR_HOST:
-			/*
-			 *	Add better route to host.
-			 *	But first check that the redirect
-			 *	comes from the old gateway..
-			 *	And make sure it's an ok host address
-			 *	(not some confused thing sending our
-			 *	address)
-			 */
-			rt = ip_rt_route(ip, NULL, NULL);
-			if (!rt)
-				break;
-			if (rt->rt_gateway != source || ip_chk_addr(icmph->un.gateway))
-				break;
-			printk("redirect from %s\n", in_ntoa(source));
-			ip_rt_add((RTF_DYNAMIC | RTF_MODIFIED | RTF_HOST | RTF_GATEWAY),
-				ip, 0, icmph->un.gateway, dev,0, 0);
-			break;
-		case ICMP_REDIR_NETTOS:
-		case ICMP_REDIR_HOSTTOS:
-			printk("ICMP: cannot handle TOS redirects yet!\n");
-			break;
-		default:
-			break;
-  	}
-  	
-  	/*
-  	 *	Discard the original packet
-  	 */
-  	 
-  	kfree_skb(skb, FREE_READ);
-}
-
-
-/*
- *	Handle ICMP_ECHO ("ping") requests. 
- */
- 
-static void icmp_echo(struct icmphdr *icmph, struct sk_buff *skb, struct device *dev,
-	  unsigned long saddr, unsigned long daddr, int len,
-	  struct options *opt)
-{
-	struct icmphdr *icmphr;
-	struct sk_buff *skb2;
-	struct device *ndev=NULL;
-	int size, offset;
-
-	icmp_statistics.IcmpOutEchoReps++;
-	icmp_statistics.IcmpOutMsgs++;
-	
-	size = dev->hard_header_len + 64 + len;
-	skb2 = alloc_skb(size, GFP_ATOMIC);
-
-	if (skb2 == NULL) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		kfree_skb(skb, FREE_READ);
-		return;
-	}
-	skb2->free = 1;
-
-	/* Build Layer 2-3 headers for message back to source */
-	offset = ip_build_header(skb2, daddr, saddr, &ndev,
-	 	IPPROTO_ICMP, opt, len, skb->ip_hdr->tos,255);
-	if (offset < 0) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		printk("ICMP: Could not build IP Header for ICMP ECHO Response\n");
-		kfree_skb(skb2,FREE_WRITE);
-		kfree_skb(skb, FREE_READ);
-		return;
-	}
-
-	/*
-	 *	Re-adjust length according to actual IP header size. 
-	 */
-	 
-	skb2->len = offset + len;
-
-	/*
-	 *	Build ICMP_ECHO Response message. 
-	 */
-	icmphr = (struct icmphdr *) (skb2->data + offset);
-	memcpy((char *) icmphr, (char *) icmph, len);
-	icmphr->type = ICMP_ECHOREPLY;
-	icmphr->code = 0;
-	icmphr->checksum = 0;
-	icmphr->checksum = ip_compute_csum((unsigned char *)icmphr, len);
-
-	/*
-	 *	Ship it out - free it when done 
-	 */
-	ip_queue_xmit((struct sock *)NULL, ndev, skb2, 1);
-
-	/*
-	 *	Free the received frame
-	 */
-	 
-	kfree_skb(skb, FREE_READ);
-}
-
-/*
- *	Handle ICMP Timestamp requests. 
- */
- 
-static void icmp_timestamp(struct icmphdr *icmph, struct sk_buff *skb, struct device *dev,
-	  unsigned long saddr, unsigned long daddr, int len,
-	  struct options *opt)
-{
-	struct icmphdr *icmphr;
-	struct sk_buff *skb2;
-	int size, offset;
-	unsigned long *timeptr, midtime;
-	struct device *ndev=NULL;
-
-        if (len != 20)
-	{
-		printk(
-		  "ICMP: Size (%d) of ICMP_TIMESTAMP request should be 20!\n",
-		  len);
-		icmp_statistics.IcmpInErrors++;		
-#if 1
-                /* correct answers are possible for everything >= 12 */
-	  	if (len < 12)
-#endif
-			return;
-	}
-
-	size = dev->hard_header_len + 84;
-
-	if (! (skb2 = alloc_skb(size, GFP_ATOMIC))) 
-	{
-		skb->sk = NULL;
-		kfree_skb(skb, FREE_READ);
-		icmp_statistics.IcmpOutErrors++;		
-		return;
-	}
-	skb2->free = 1;
- 
-/*
- *	Build Layer 2-3 headers for message back to source 
- */
- 
-	offset = ip_build_header(skb2, daddr, saddr, &ndev, IPPROTO_ICMP, opt, len, 
-				skb->ip_hdr->tos, 255);
-	if (offset < 0) 
-	{
-		printk("ICMP: Could not build IP Header for ICMP TIMESTAMP Response\n");
-		kfree_skb(skb2, FREE_WRITE);
-		kfree_skb(skb, FREE_READ);
-		icmp_statistics.IcmpOutErrors++;
-		return;
-	}
- 
-	/*
-	 *	Re-adjust length according to actual IP header size. 
-	 */
-	skb2->len = offset + 20;
- 
-	/*
-	 *	Build ICMP_TIMESTAMP Response message. 
-	 */
-
-	icmphr = (struct icmphdr *) ((char *) (skb2 + 1) + offset);
-	memcpy((char *) icmphr, (char *) icmph, 12);
-	icmphr->type = ICMP_TIMESTAMPREPLY;
-	icmphr->code = icmphr->checksum = 0;
-
-	/* fill in the current time as ms since midnight UT: */
-	midtime = (xtime.tv_sec % 86400) * 1000 + xtime.tv_usec / 1000;
-	timeptr = (unsigned long *) (icmphr + 1);
-	/*
-	 *	the originate timestamp (timeptr [0]) is still in the copy: 
-	 */
-	timeptr [1] = timeptr [2] = htonl(midtime);
-
-	icmphr->checksum = ip_compute_csum((unsigned char *) icmphr, 20);
-
-	/*
-	 *	Ship it out - free it when done 
-	 */
-
-	ip_queue_xmit((struct sock *) NULL, ndev, skb2, 1);
-	icmp_statistics.IcmpOutTimestampReps++;
-	kfree_skb(skb, FREE_READ);
-}
- 
- 
-
-
-/*
- *	Handle the ICMP INFORMATION REQUEST. 
- */
- 
-static void icmp_info(struct icmphdr *icmph, struct sk_buff *skb, struct device *dev,
-	  unsigned long saddr, unsigned long daddr, int len,
-	  struct options *opt)
-{
-	/* Obsolete */
-	kfree_skb(skb, FREE_READ);
-}
-
-
-/* 
- *	Handle ICMP_ADDRESS_MASK requests. 
- */
- 
-static void icmp_address(struct icmphdr *icmph, struct sk_buff *skb, struct device *dev,
-	  unsigned long saddr, unsigned long daddr, int len,
-	  struct options *opt)
-{
-	struct icmphdr *icmphr;
-	struct sk_buff *skb2;
-	int size, offset;
-	struct device *ndev=NULL;
-
-	icmp_statistics.IcmpOutMsgs++;
-	icmp_statistics.IcmpOutAddrMaskReps++;
-	
-	size = dev->hard_header_len + 64 + len;
-	skb2 = alloc_skb(size, GFP_ATOMIC);
-	if (skb2 == NULL) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		kfree_skb(skb, FREE_READ);
-		return;
-  	}
-  	skb2->free = 1;
-	
-	/* 
-	 *	Build Layer 2-3 headers for message back to source 
-	 */
-
-	offset = ip_build_header(skb2, daddr, saddr, &ndev,
-		 	IPPROTO_ICMP, opt, len, skb->ip_hdr->tos,255);
-	if (offset < 0) 
-	{
-		icmp_statistics.IcmpOutErrors++;
-		printk("ICMP: Could not build IP Header for ICMP ADDRESS Response\n");
-		kfree_skb(skb2,FREE_WRITE);
-		kfree_skb(skb, FREE_READ);
-		return;
-	}
-
-	/*
-	 *	Re-adjust length according to actual IP header size. 
-	 */
-
-	skb2->len = offset + len;
-
-	/*
-	 *	Build ICMP ADDRESS MASK Response message. 
-	 */
-
-	icmphr = (struct icmphdr *) (skb2->data + offset);
-	icmphr->type = ICMP_ADDRESSREPLY;
-	icmphr->code = 0;
-	icmphr->checksum = 0;
-	icmphr->un.echo.id = icmph->un.echo.id;
-	icmphr->un.echo.sequence = icmph->un.echo.sequence;
-	memcpy((char *) (icmphr + 1), (char *) &dev->pa_mask, sizeof(dev->pa_mask));
-
-	icmphr->checksum = ip_compute_csum((unsigned char *)icmphr, len);
-
-	/* Ship it out - free it when done */
-	ip_queue_xmit((struct sock *)NULL, ndev, skb2, 1);
-
-	skb->sk = NULL;
-	kfree_skb(skb, FREE_READ);
-}
-
-
-/* 
- *	Deal with incoming ICMP packets. 
- */
- 
-int icmp_rcv(struct sk_buff *skb1, struct device *dev, struct options *opt,
-	 unsigned long daddr, unsigned short len,
-	 unsigned long saddr, int redo, struct inet_protocol *protocol)
-{
-	struct icmphdr *icmph;
-	unsigned char *buff;
-
-	/*
-	 *	Drop broadcast packets. IP has done a broadcast check and ought one day
-	 *	to pass on that information.
-	 */
-	
-	icmp_statistics.IcmpInMsgs++;
-	 
-  	
-  	/*
-  	 *	Grab the packet as an icmp object
-  	 */
-
-	buff = skb1->h.raw;
-	icmph = (struct icmphdr *) buff;
-
-	/*
-	 *	Validate the packet first 
-	 */
-
-	if (ip_compute_csum((unsigned char *) icmph, len)) 
-	{
-		/* Failed checksum! */
-		icmp_statistics.IcmpInErrors++;
-		printk("ICMP: failed checksum from %s!\n", in_ntoa(saddr));
-		kfree_skb(skb1, FREE_READ);
-		return(0);
-	}
-
-	/*
-	 *	Parse the ICMP message 
-	 */
-
-	if (ip_chk_addr(daddr) != IS_MYADDR)
-	{
-		if (icmph->type != ICMP_ECHO) 
-		{
-			icmp_statistics.IcmpInErrors++;
-			kfree_skb(skb1, FREE_READ);
-			return(0);
-  		}
-		daddr=dev->pa_addr;
-	}
-
-	switch(icmph->type) 
-	{
-		case ICMP_TIME_EXCEEDED:
-			icmp_statistics.IcmpInTimeExcds++;
-			icmp_unreach(icmph, skb1);
-			return 0;
-		case ICMP_DEST_UNREACH:
-			icmp_statistics.IcmpInDestUnreachs++;
-			icmp_unreach(icmph, skb1);
-			return 0;
-		case ICMP_SOURCE_QUENCH:
-			icmp_statistics.IcmpInSrcQuenchs++;
-			icmp_unreach(icmph, skb1);
-			return(0);
-		case ICMP_REDIRECT:
-			icmp_statistics.IcmpInRedirects++;
-			icmp_redirect(icmph, skb1, dev, saddr);
-			return(0);
-		case ICMP_ECHO: 
-			icmp_statistics.IcmpInEchos++;
-			icmp_echo(icmph, skb1, dev, saddr, daddr, len, opt);
-			return 0;
-		case ICMP_ECHOREPLY:
-			icmp_statistics.IcmpInEchoReps++;
-			kfree_skb(skb1, FREE_READ);
-			return(0);
-		case ICMP_TIMESTAMP:
-			icmp_statistics.IcmpInTimestamps++;
-			icmp_timestamp(icmph, skb1, dev, saddr, daddr, len, opt);
-			return 0;
-		case ICMP_TIMESTAMPREPLY:
-			icmp_statistics.IcmpInTimestampReps++;
-			kfree_skb(skb1,FREE_READ);
-			return 0;
-		/* INFO is obsolete and doesn't even feature in the SNMP stats */
-		case ICMP_INFO_REQUEST:
-			icmp_info(icmph, skb1, dev, saddr, daddr, len, opt);
-			return 0;
-		case ICMP_INFO_REPLY:
-			skb1->sk = NULL;
-			kfree_skb(skb1, FREE_READ);
-			return(0);
-		case ICMP_ADDRESS:
-			icmp_statistics.IcmpInAddrMasks++;
-			icmp_address(icmph, skb1, dev, saddr, daddr, len, opt);
-			return 0;
-		case ICMP_ADDRESSREPLY:
-			/*
-			 *	We ought to set our netmask on receiving this, but 
-			 *	experience shows it's a waste of effort.
-			 */
-			icmp_statistics.IcmpInAddrMaskReps++;
-			kfree_skb(skb1, FREE_READ);
-			return(0);
-		default:
-			icmp_statistics.IcmpInErrors++;
-			kfree_skb(skb1, FREE_READ);
-			return(0);
- 	}
-  /*NOTREACHED*/
-	kfree_skb(skb1, FREE_READ);
-	return(-1);
-}
-
-
-/*
- *	Perform any ICMP-related I/O control requests. 
- *	[to vanish soon]
- */
- 
-int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg)
-{
-  	switch(cmd) 
-  	{
-		default:
-			return(-EINVAL);
-  	}
- 	return(0);
-}