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, 740 deletions

diff --git a/pfinet/linux-inet/udp.c b/pfinet/linux-inet/udp.c
deleted file mode 100644
index 420f24b3..00000000
--- a/pfinet/linux-inet/udp.c
+++ /dev/null
@@ -1,740 +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.
- *
- *		The User Datagram Protocol (UDP).
- *
- * Version:	@(#)udp.c	1.0.13	06/02/93
- *
- * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- * Fixes:
- *		Alan Cox	:	verify_area() calls
- *		Alan Cox	: 	stopped close while in use off icmp
- *					messages. Not a fix but a botch that
- *					for udp at least is 'valid'.
- *		Alan Cox	:	Fixed icmp handling properly
- *		Alan Cox	: 	Correct error for oversized datagrams
- *		Alan Cox	:	Tidied select() semantics. 
- *		Alan Cox	:	udp_err() fixed properly, also now 
- *					select and read wake correctly on errors
- *		Alan Cox	:	udp_send verify_area moved to avoid mem leak
- *		Alan Cox	:	UDP can count its memory
- *		Alan Cox	:	send to an unknown connection causes
- *					an ECONNREFUSED off the icmp, but
- *					does NOT close.
- *		Alan Cox	:	Switched to new sk_buff handlers. No more backlog!
- *		Alan Cox	:	Using generic datagram code. Even smaller and the PEEK
- *					bug no longer crashes it.
- *		Fred Van Kempen	: 	Net2e support for sk->broadcast.
- *		Alan Cox	:	Uses skb_free_datagram
- *		Alan Cox	:	Added get/set sockopt support.
- *		Alan Cox	:	Broadcasting without option set returns EACCES.
- *		Alan Cox	:	No wakeup calls. Instead we now use the callbacks.
- *		Alan Cox	:	Use ip_tos and ip_ttl
- *		Alan Cox	:	SNMP Mibs
- *		Alan Cox	:	MSG_DONTROUTE, and 0.0.0.0 support.
- *		Matt Dillon	:	UDP length checks.
- *		Alan Cox	:	Smarter af_inet used properly.
- *		Alan Cox	:	Use new kernel side addressing.
- *		Alan Cox	:	Incorrect return on truncated datagram receive.
- *
- *
- *		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 <asm/system.h>
-#include <asm/segment.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/fcntl.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/timer.h>
-#include <linux/termios.h>
-#include <linux/mm.h>
-#include <linux/config.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include "snmp.h"
-#include "ip.h"
-#include "protocol.h"
-#include "tcp.h"
-#include <linux/skbuff.h>
-#include "sock.h"
-#include "udp.h"
-#include "icmp.h"
-#include "route.h"
-
-/*
- *	SNMP MIB for the UDP layer
- */
-
-struct udp_mib		udp_statistics;
-
-
-static int udp_deliver(struct sock *sk, struct udphdr *uh, struct sk_buff *skb, struct device *dev, long saddr, long daddr, int len);
-
-#define min(a,b)	((a)<(b)?(a):(b))
-
-
-/*
- * This routine is called by the ICMP module when it gets some
- * sort of error condition.  If err < 0 then the socket should
- * be closed and the error returned to the user.  If err > 0
- * it's just the icmp type << 8 | icmp code.  
- * Header points to the ip header of the error packet. We move
- * on past this. Then (as it used to claim before adjustment)
- * header points to the first 8 bytes of the udp header.  We need
- * to find the appropriate port.
- */
-
-void udp_err(int err, unsigned char *header, unsigned long daddr,
-	unsigned long saddr, struct inet_protocol *protocol)
-{
-	struct udphdr *th;
-	struct sock *sk;
-	struct iphdr *ip=(struct iphdr *)header;
-  
-	header += 4*ip->ihl;
-
-	/*
-	 *	Find the 8 bytes of post IP header ICMP included for us
-	 */  
-	
-	th = (struct udphdr *)header;  
-   
-	sk = get_sock(&udp_prot, th->source, daddr, th->dest, saddr);
-
-	if (sk == NULL) 
-	  	return;	/* No socket for error */
-  	
-	if (err & 0xff00 ==(ICMP_SOURCE_QUENCH << 8)) 
-	{	/* Slow down! */
-		if (sk->cong_window > 1) 
-			sk->cong_window = sk->cong_window/2;
-		return;
-	}
-
-	/*
-	 *	Various people wanted BSD UDP semantics. Well they've come 
-	 *	back out because they slow down response to stuff like dead
-	 *	or unreachable name servers and they screw term users something
-	 *	chronic. Oh and it violates RFC1122. So basically fix your 
-	 *	client code people.
-	 */
-	 
-#ifdef CONFIG_I_AM_A_BROKEN_BSD_WEENIE
-	/*
-	 *	It's only fatal if we have connected to them. I'm not happy
-	 *	with this code. Some BSD comparisons need doing.
-	 */
-	 
-	if (icmp_err_convert[err & 0xff].fatal && sk->state == TCP_ESTABLISHED) 
-	{
-		sk->err = icmp_err_convert[err & 0xff].errno;
-		sk->error_report(sk);
- 	}
-#else
-	if (icmp_err_convert[err & 0xff].fatal)
-	{
-		sk->err = icmp_err_convert[err & 0xff].error;
-		sk->error_report(sk);
-	}
-#endif
-}
-
-
-
-/*
- *	Generate UDP checksums. These may be disabled, eg for fast NFS over ethernet
- *	We default them enabled.. if you turn them off you either know what you are
- *	doing or get burned...
- */
-
-static void udp_send_check(struct udphdr *uh, unsigned long saddr, 
-	       unsigned long daddr, int len, struct sock *sk)
-{
-	uh->check = 0;
-	if (sk && sk->no_check) 
-	  	return;
-	uh->check = udp_check(uh, len, saddr, daddr);
-	
-	/*
-	 *	FFFF and 0 are the same, pick the right one as 0 in the
-	 *	actual field means no checksum.
-	 */
-	 
-	if (uh->check == 0)
-		uh->check = 0xffff;
-}
-
-
-static int udp_send(struct sock *sk, struct sockaddr_in *sin,
-	 unsigned char *from, int len, int rt)
-{
-	struct sk_buff *skb;
-	struct device *dev;
-	struct udphdr *uh;
-	unsigned char *buff;
-	unsigned long saddr;
-	int size, tmp;
-	int ttl;
-  
-	/* 
-	 *	Allocate an sk_buff copy of the packet.
-	 */
-	 
-	size = sk->prot->max_header + len;
-	skb = sock_alloc_send_skb(sk, size, 0, &tmp);
-
-
-	if (skb == NULL) 
-		return tmp;
-
-	skb->sk       = NULL;	/* to avoid changing sk->saddr */
-	skb->free     = 1;
-	skb->localroute = sk->localroute|(rt&MSG_DONTROUTE);
-
-	/*
-	 *	Now build the IP and MAC header. 
-	 */
-	 
-	buff = skb->data;
-	saddr = sk->saddr;
-	dev = NULL;
-	ttl = sk->ip_ttl;
-#ifdef CONFIG_IP_MULTICAST
-	if (MULTICAST(sin->sin_addr.s_addr))
-		ttl = sk->ip_mc_ttl;
-#endif
-	tmp = sk->prot->build_header(skb, saddr, sin->sin_addr.s_addr,
-			&dev, IPPROTO_UDP, sk->opt, skb->mem_len,sk->ip_tos,ttl);
-
-	skb->sk=sk;	/* So memory is freed correctly */
-	
-	/*
-	 *	Unable to put a header on the packet.
-	 */
-	 		    
-	if (tmp < 0 ) 
-	{
-		sk->prot->wfree(sk, skb->mem_addr, skb->mem_len);
-		return(tmp);
-  	}
-  	
-	buff += tmp;
-	saddr = skb->saddr; /*dev->pa_addr;*/
-	skb->len = tmp + sizeof(struct udphdr) + len;	/* len + UDP + IP + MAC */
-	skb->dev = dev;
-	
-	/*
-	 *	Fill in the UDP header. 
-	 */
-	 
-	uh = (struct udphdr *) buff;
-	uh->len = htons(len + sizeof(struct udphdr));
-	uh->source = sk->dummy_th.source;
-	uh->dest = sin->sin_port;
-	buff = (unsigned char *) (uh + 1);
-
-	/*
-	 *	Copy the user data. 
-	 */
-	 
-	memcpy_fromfs(buff, from, len);
-
-  	/*
-  	 *	Set up the UDP checksum. 
-  	 */
-  	 
-	udp_send_check(uh, saddr, sin->sin_addr.s_addr, skb->len - tmp, sk);
-
-	/* 
-	 *	Send the datagram to the interface. 
-	 */
-	 
-	udp_statistics.UdpOutDatagrams++;
-	 
-	sk->prot->queue_xmit(sk, dev, skb, 1);
-	return(len);
-}
-
-
-static int udp_sendto(struct sock *sk, unsigned char *from, int len, int noblock,
-	   unsigned flags, struct sockaddr_in *usin, int addr_len)
-{
-	struct sockaddr_in sin;
-	int tmp;
-
-	/* 
-	 *	Check the flags. We support no flags for UDP sending
-	 */
-	if (flags&~MSG_DONTROUTE) 
-	  	return(-EINVAL);
-	/*
-	 *	Get and verify the address. 
-	 */
-	 
-	if (usin) 
-	{
-		if (addr_len < sizeof(sin)) 
-			return(-EINVAL);
-		memcpy(&sin,usin,sizeof(sin));
-		if (sin.sin_family && sin.sin_family != AF_INET) 
-			return(-EINVAL);
-		if (sin.sin_port == 0) 
-			return(-EINVAL);
-	} 
-	else 
-	{
-		if (sk->state != TCP_ESTABLISHED) 
-			return(-EINVAL);
-		sin.sin_family = AF_INET;
-		sin.sin_port = sk->dummy_th.dest;
-		sin.sin_addr.s_addr = sk->daddr;
-  	}
-  
-  	/*
-  	 *	BSD socket semantics. You must set SO_BROADCAST to permit
-  	 *	broadcasting of data.
-  	 */
-  	 
-  	if(sin.sin_addr.s_addr==INADDR_ANY)
-  		sin.sin_addr.s_addr=ip_my_addr();
-  		
-  	if(!sk->broadcast && ip_chk_addr(sin.sin_addr.s_addr)==IS_BROADCAST)
-	    	return -EACCES;			/* Must turn broadcast on first */
-
-	sk->inuse = 1;
-
-	/* Send the packet. */
-	tmp = udp_send(sk, &sin, from, len, flags);
-
-	/* The datagram has been sent off.  Release the socket. */
-	release_sock(sk);
-	return(tmp);
-}
-
-/*
- *	In BSD SOCK_DGRAM a write is just like a send.
- */
-
-static int udp_write(struct sock *sk, unsigned char *buff, int len, int noblock,
-	  unsigned flags)
-{
-	return(udp_sendto(sk, buff, len, noblock, flags, NULL, 0));
-}
-
-
-#ifndef _HURD_
-/*
- *	IOCTL requests applicable to the UDP protocol
- */
- 
-int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)
-{
-	int err;
-	switch(cmd) 
-	{
-		case TIOCOUTQ:
-		{
-			unsigned long amount;
-
-			if (sk->state == TCP_LISTEN) return(-EINVAL);
-			amount = sk->prot->wspace(sk)/*/2*/;
-			err=verify_area(VERIFY_WRITE,(void *)arg,
-					sizeof(unsigned long));
-			if(err)
-				return(err);
-			put_fs_long(amount,(unsigned long *)arg);
-			return(0);
-		}
-
-		case TIOCINQ:
-		{
-			struct sk_buff *skb;
-			unsigned long amount;
-
-			if (sk->state == TCP_LISTEN) return(-EINVAL);
-			amount = 0;
-			skb = skb_peek(&sk->receive_queue);
-			if (skb != NULL) {
-				/*
-				 * We will only return the amount
-				 * of this packet since that is all
-				 * that will be read.
-				 */
-				amount = skb->len;
-			}
-			err=verify_area(VERIFY_WRITE,(void *)arg,
-						sizeof(unsigned long));
-			if(err)
-				return(err);
-			put_fs_long(amount,(unsigned long *)arg);
-			return(0);
-		}
-
-		default:
-			return(-EINVAL);
-	}
-	return(0);
-}
-#endif
-
-/*
- * 	This should be easy, if there is something there we\
- * 	return it, otherwise we block.
- */
-
-int udp_recvfrom(struct sock *sk, unsigned char *to, int len,
-	     int noblock, unsigned flags, struct sockaddr_in *sin,
-	     int *addr_len)
-{
-  	int copied = 0;
-  	int truesize;
-  	struct sk_buff *skb;
-  	int er;
-
-	/*
-	 *	Check any passed addresses
-	 */
-	 
-  	if (addr_len) 
-  		*addr_len=sizeof(*sin);
-  
-	/*
-	 *	From here the generic datagram does a lot of the work. Come
-	 *	the finished NET3, it will do _ALL_ the work!
-	 */
-	 	
-	skb=skb_recv_datagram(sk,flags,noblock,&er);
-	if(skb==NULL)
-  		return er;
-  
-  	truesize = skb->len;
-  	copied = min(len, truesize);
-
-  	/*
-  	 *	FIXME : should use udp header size info value 
-  	 */
-  	 
-	skb_copy_datagram(skb,sizeof(struct udphdr),to,copied);
-	sk->stamp=skb->stamp;
-
-	/* Copy the address. */
-	if (sin) 
-	{
-		sin->sin_family = AF_INET;
-		sin->sin_port = skb->h.uh->source;
-		sin->sin_addr.s_addr = skb->daddr;
-  	}
-  
-  	skb_free_datagram(skb);
-  	release_sock(sk);
-  	return(truesize);
-}
-
-/*
- *	Read has the same semantics as recv in SOCK_DGRAM
- */
-
-int udp_read(struct sock *sk, unsigned char *buff, int len, int noblock,
-	 unsigned flags)
-{
-	return(udp_recvfrom(sk, buff, len, noblock, flags, NULL, NULL));
-}
-
-
-int udp_connect(struct sock *sk, struct sockaddr_in *usin, int addr_len)
-{
-	struct rtable *rt;
-	unsigned long sa;
-	if (addr_len < sizeof(*usin)) 
-	  	return(-EINVAL);
-
-	if (usin->sin_family && usin->sin_family != AF_INET) 
-	  	return(-EAFNOSUPPORT);
-	if (usin->sin_addr.s_addr==INADDR_ANY)
-		usin->sin_addr.s_addr=ip_my_addr();
-
-	if(!sk->broadcast && ip_chk_addr(usin->sin_addr.s_addr)==IS_BROADCAST)
-		return -EACCES;			/* Must turn broadcast on first */
-  	
-  	rt=ip_rt_route(usin->sin_addr.s_addr, NULL, &sa);
-  	if(rt==NULL)
-  		return -ENETUNREACH;
-  	sk->saddr = sa;		/* Update source address */
-	sk->daddr = usin->sin_addr.s_addr;
-	sk->dummy_th.dest = usin->sin_port;
-	sk->state = TCP_ESTABLISHED;
-	return(0);
-}
-
-
-static void udp_close(struct sock *sk, int timeout)
-{
-	sk->inuse = 1;
-	sk->state = TCP_CLOSE;
-	if (sk->dead) 
-		destroy_sock(sk);
-	else
-		release_sock(sk);
-}
-
-
-/*
- *	All we need to do is get the socket, and then do a checksum. 
- */
- 
-int udp_rcv(struct sk_buff *skb, struct device *dev, struct options *opt,
-	unsigned long daddr, unsigned short len,
-	unsigned long saddr, int redo, struct inet_protocol *protocol)
-{
-  	struct sock *sk;
-  	struct udphdr *uh;
-	unsigned short ulen;
-	int addr_type = IS_MYADDR;
-	
-	if(!dev || dev->pa_addr!=daddr)
-		addr_type=ip_chk_addr(daddr);
-		
-	/*
-	 *	Get the header.
-	 */
-  	uh = (struct udphdr *) skb->h.uh;
-  	
-  	ip_statistics.IpInDelivers++;
-
-	/*
-	 *	Validate the packet and the UDP length.
-	 */
-	 
-	ulen = ntohs(uh->len);
-
-	if (ulen > len || len < sizeof(*uh) || ulen < sizeof(*uh)) 
-	{
-		printk("UDP: short packet: %d/%d\n", ulen, len);
-		udp_statistics.UdpInErrors++;
-		kfree_skb(skb, FREE_WRITE);
-		return(0);
-	}
-
-	if (uh->check && udp_check(uh, len, saddr, daddr)) 
-	{
-		/* <mea@utu.fi> wants to know, who sent it, to
-		   go and stomp on the garbage sender... */
-		printk("UDP: bad checksum. From %08lX:%d to %08lX:%d ulen %d\n",
-		       ntohl(saddr),ntohs(uh->source),
-		       ntohl(daddr),ntohs(uh->dest),
-		       ulen);
-		udp_statistics.UdpInErrors++;
-		kfree_skb(skb, FREE_WRITE);
-		return(0);
-	}
-
-
-	len=ulen;
-
-#ifdef CONFIG_IP_MULTICAST
-	if (addr_type!=IS_MYADDR)
-	{
-		/*
-		 *	Multicasts and broadcasts go to each listener.
-		 */
-		struct sock *sknext=NULL;
-		sk=get_sock_mcast(udp_prot.sock_array[ntohs(uh->dest)&(SOCK_ARRAY_SIZE-1)], uh->dest,
-				saddr, uh->source, daddr);
-		if(sk)
-		{		
-			do
-			{
-				struct sk_buff *skb1;
-
-				sknext=get_sock_mcast(sk->next, uh->dest, saddr, uh->source, daddr);
-				if(sknext)
-					skb1=skb_clone(skb,GFP_ATOMIC);
-				else
-					skb1=skb;
-				if(skb1)
-					udp_deliver(sk, uh, skb1, dev,saddr,daddr,len);
-				sk=sknext;
-			}
-			while(sknext!=NULL);
-		}
-		else
-			kfree_skb(skb, FREE_READ);
-		return 0;
-	}	
-#endif
-  	sk = get_sock(&udp_prot, uh->dest, saddr, uh->source, daddr);
-	if (sk == NULL) 
-  	{
-  		udp_statistics.UdpNoPorts++;
-		if (addr_type == IS_MYADDR) 
-		{
-			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0, dev);
-		}
-		/*
-		 * Hmm.  We got an UDP broadcast to a port to which we
-		 * don't wanna listen.  Ignore it.
-		 */
-		skb->sk = NULL;
-		kfree_skb(skb, FREE_WRITE);
-		return(0);
-  	}
-
-	return udp_deliver(sk,uh,skb,dev, saddr, daddr, len);
-}
-
-static int udp_deliver(struct sock *sk, struct udphdr *uh, struct sk_buff *skb, struct device *dev, long saddr, long daddr, int len)
-{
-	skb->sk = sk;
-	skb->dev = dev;
-	skb->len = len;
-
-	/*
-	 *	These are supposed to be switched. 
-	 */
-	 
-	skb->daddr = saddr;
-	skb->saddr = daddr;
-
-
-	/*
-	 *	Charge it to the socket, dropping if the queue is full.
-	 */
-
-	skb->len = len - sizeof(*uh);  
-	 
-	if (sock_queue_rcv_skb(sk,skb)<0) 
-	{
-		udp_statistics.UdpInErrors++;
-		ip_statistics.IpInDiscards++;
-		ip_statistics.IpInDelivers--;
-		skb->sk = NULL;
-		kfree_skb(skb, FREE_WRITE);
-		release_sock(sk);
-		return(0);
-	}
-  	udp_statistics.UdpInDatagrams++;
-	release_sock(sk);
-	return(0);
-}
-
-
-struct proto udp_prot = {
-	sock_wmalloc,
-	sock_rmalloc,
-	sock_wfree,
-	sock_rfree,
-	sock_rspace,
-	sock_wspace,
-	udp_close,
-	udp_read,
-	udp_write,
-	udp_sendto,
-	udp_recvfrom,
-	ip_build_header,
-	udp_connect,
-	NULL,
-	ip_queue_xmit,
-	NULL,
-	NULL,
-	NULL,
-	udp_rcv,
-	datagram_select,
-#ifdef _HURD_
-	NULL,
-#else
-	udp_ioctl,
-#endif
-	NULL,
-	NULL,
-	ip_setsockopt,
-	ip_getsockopt,
-	128,
-	0,
-	{NULL,},
-	"UDP",
-	0, 0
-};
-
-static unsigned short udp_check(struct udphdr *uh, int len, unsigned long saddr, unsigned long daddr)
-{
-	unsigned long sum;
-
-	__asm__(  "\t addl %%ecx,%%ebx\n"
-		  "\t adcl %%edx,%%ebx\n"
-		  "\t adcl $0, %%ebx\n"
-		  : "=b"(sum)
-		  : "0"(daddr), "c"(saddr), "d"((ntohs(len) << 16) + IPPROTO_UDP*256)
-		  : "cx","bx","dx" );
-
-	if (len > 3) 
-	{
-		__asm__("\tclc\n"
-			"1:\n"
-			"\t lodsl\n"
-			"\t adcl %%eax, %%ebx\n"
-			"\t loop 1b\n"
-			"\t adcl $0, %%ebx\n"
-			: "=b"(sum) , "=S"(uh)
-			: "0"(sum), "c"(len/4) ,"1"(uh)
-			: "ax", "cx", "bx", "si" );
-	}
-
-	/*
-	 *	Convert from 32 bits to 16 bits. 
-	 */
-
-	__asm__("\t movl %%ebx, %%ecx\n"
-		"\t shrl $16,%%ecx\n"
-	  	"\t addw %%cx, %%bx\n"
-	  	"\t adcw $0, %%bx\n"
-	  	: "=b"(sum)
-	  	: "0"(sum)
-	  	: "bx", "cx");
-	
-	/* 
-	 *	Check for an extra word. 
-	 */
-	 
-	if ((len & 2) != 0) 
-	{
-		__asm__("\t lodsw\n"
-			"\t addw %%ax,%%bx\n"
-			"\t adcw $0, %%bx\n"
-			: "=b"(sum), "=S"(uh)
-			: "0"(sum) ,"1"(uh)
-			: "si", "ax", "bx");
-  	}
-
-  	/*
-  	 *	Now check for the extra byte. 
-  	 */
-  	 
-	if ((len & 1) != 0) 
-	{
-		__asm__("\t lodsb\n"
-			"\t movb $0,%%ah\n"
-			"\t addw %%ax,%%bx\n"
-			"\t adcw $0, %%bx\n"
-			: "=b"(sum)
-			: "0"(sum) ,"S"(uh)
-			: "si", "ax", "bx");
-  	}
-
-  	/* 
-  	 *	We only want the bottom 16 bits, but we never cleared the top 16. 
-  	 */
-
-	return((~sum) & 0xffff);
-}