patch-1.3.75 linux/net/ipv4/packet.c

• Lines: 88
• Date: Sat Mar 16 13:52:11 1996
• Orig file: v1.3.74/linux/net/ipv4/packet.c
• Orig date: Wed Feb 28 11:50:17 1996

diff -u --recursive --new-file v1.3.74/linux/net/ipv4/packet.c linux/net/ipv4/packet.c
@@ -5,6 +5,9 @@
  *
  *		PACKET - implements raw packet sockets.
  *
+ *		Doesn't belong in IP but its currently too hooked into ip
+ *		to seperate.
+ *
  * Version:	@(#)packet.c	1.0.6	05/25/93
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
@@ -30,6 +33,7 @@
  *	Richard Kooijman	:	Timestamp fixes.
  *		Alan Cox	:	New buffers. Use sk->mac.raw.
  *		Alan Cox	:	sendmsg/recvmsg support.
+ *		Alan Cox	:	Protocol setting support
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
@@ -46,6 +50,7 @@
 #include <linux/in.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
+#include <linux/if_packet.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -124,7 +129,8 @@
 {
 	struct sk_buff *skb;
 	struct device *dev;
-	struct sockaddr *saddr=(struct sockaddr *)msg->msg_name;
+	struct sockaddr_pkt *saddr=(struct sockaddr_pkt *)msg->msg_name;
+	unsigned short proto=0;
 
 	/*
 	 *	Check the flags. 
@@ -139,8 +145,10 @@
 	 
 	if (saddr) 
 	{
-		if (msg->msg_namelen < sizeof(*saddr)) 
+		if (msg->msg_namelen < sizeof(struct sockaddr)) 
 			return(-EINVAL);
+		if (msg->msg_namelen==sizeof(struct sockaddr_pkt))
+			proto=saddr->spkt_protocol;
 	} 
 	else
 		return(-ENOTCONN);	/* SOCK_PACKET must be sent giving an address */
@@ -149,8 +157,8 @@
 	 *	Find the device first to size check it 
 	 */
 
-	saddr->sa_data[13] = 0;
-	dev = dev_get(saddr->sa_data);
+	saddr->spkt_device[13] = 0;
+	dev = dev_get(saddr->spkt_device);
 	if (dev == NULL) 
 	{
 		return(-ENODEV);
@@ -185,6 +193,7 @@
 	skb->free = 1;
 	memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
 	skb->arp = 1;		/* No ARP needs doing on this (complete) frame */
+	skb->protocol = proto;
 
 	/*
 	 *	Now send it
@@ -393,7 +402,7 @@
 {
 	int copied=0;
 	struct sk_buff *skb;
-	struct sockaddr *saddr=(struct sockaddr *)msg->msg_name;
+	struct sockaddr_pkt *saddr=(struct sockaddr_pkt *)msg->msg_name;
 	int err;
 
 	if (sk->shutdown & RCV_SHUTDOWN) 
@@ -447,8 +456,9 @@
 	 
 	if (saddr) 
 	{
-		saddr->sa_family = skb->dev->type;
-		strncpy(saddr->sa_data,skb->dev->name, 15);
+		saddr->spkt_family = skb->dev->type;
+		strncpy(saddr->spkt_device,skb->dev->name, 15);
+		saddr->spkt_protocol = skb->protocol;
 	}
 	
 	/*