patch-2.1.11 linux/net/ipv4/udp.c

• Lines: 61
• Date: Mon Nov 18 11:31:36 1996
• Orig file: v2.1.10/linux/net/ipv4/udp.c
• Orig date: Fri Nov 15 23:49:12 1996

diff -u --recursive --new-file v2.1.10/linux/net/ipv4/udp.c linux/net/ipv4/udp.c
@@ -151,7 +151,7 @@
  */
 
 void udp_err(int type, int code, unsigned char *header, __u32 info,
-	     __u32 daddr, __u32 saddr, struct inet_protocol *protocol)
+	     __u32 daddr, __u32 saddr, struct inet_protocol *protocol, int len)
 {
 	struct udphdr *uh;
 	struct sock *sk;
@@ -159,6 +159,9 @@
 	/*
 	 *	Find the 8 bytes of post IP header ICMP included for us
 	 */  
+	 
+	if(len<sizeof(struct udphdr))
+		return;
 	
 	uh = (struct udphdr *)header;  
    
@@ -550,7 +553,13 @@
   		return er;
   
   	truesize = skb->len - sizeof(struct udphdr);
-  	copied = min(len, truesize);
+  	copied = truesize;
+  	
+  	if(len<truesize)
+  	{
+  		copied=len;
+  		msg->msg_flags|=MSG_TRUNC;
+  	}
 
   	/*
   	 *	FIXME : should use udp header size info value 
@@ -590,10 +599,25 @@
   	return(copied);
 }
 
-int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
+int udp_connect(struct sock *sk, struct sockaddr *uaddr, size_t addr_len)
 {
 	struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
 	struct rtable *rt;
+	
+	/*
+	 *	1003.1g - break association.
+	 */
+	 
+	if (usin->sin_family==AF_UNSPEC)
+	{
+		sk->saddr=INADDR_ANY;
+		sk->rcv_saddr=INADDR_ANY;
+		sk->daddr=INADDR_ANY;
+		sk->state = TCP_CLOSE;
+		udp_cache_zap();
+		return 0;
+	}
+	
 	if (addr_len < sizeof(*usin)) 
 	  	return(-EINVAL);