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

• Lines: 38
• Date: Sat Mar 16 13:52:12 1996
• Orig file: v1.3.74/linux/net/ipv4/route.c
• Orig date: Sat Mar 2 10:43:46 1996

diff -u --recursive --new-file v1.3.74/linux/net/ipv4/route.c linux/net/ipv4/route.c
@@ -40,6 +40,7 @@
  *		
  *		Olaf Erb	:	irtt wasnt being copied right.
  *		Bjorn Ekwall	:	Kerneld route support.
+ *		Alan Cox	:	Multicast fixed (I hope)
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
@@ -1556,6 +1557,11 @@
 
 	if (!(rth->rt_flags & RTF_GATEWAY))
 		rth->rt_gateway = rth->rt_dst;
+	/*
+	 *	Multicast is never gatewayed.
+	 */
+	if (MULTICAST(daddr))
+		rth->rt_gateway = rth->rt_dst;
 
 	if (ip_rt_lock == 1)
 		rt_cache_add(hash, rth);
@@ -1714,7 +1720,7 @@
  *	Remove a route, as requested by the user.
  */
 
-static int rt_kill(struct rtentry *r)
+int ip_rt_kill(struct rtentry *r)
 {
 	struct sockaddr_in *trg;
 	struct sockaddr_in *msk;
@@ -1764,7 +1770,7 @@
 			if (err)
 				return err;
 			memcpy_fromfs(&rt, arg, sizeof(struct rtentry));
-			return (cmd == SIOCDELRT) ? rt_kill(&rt) : ip_rt_new(&rt);
+			return (cmd == SIOCDELRT) ? ip_rt_kill(&rt) : ip_rt_new(&rt);
 	}
 
 	return -EINVAL;