patch-2.1.9 linux/net/ipv6/ipv6_output.c

• Lines: 47
• Date: Sat Nov 9 19:50:27 1996
• Orig file: v2.1.8/linux/net/ipv6/ipv6_output.c
• Orig date: Sun Nov 10 20:12:30 1996

diff -u --recursive --new-file v2.1.8/linux/net/ipv6/ipv6_output.c linux/net/ipv6/ipv6_output.c
@@ -430,6 +430,7 @@
 		    int noblock)
 {
 	rt6_output_method_t output_method = default_output_method;
+	int	hlimit;
 	struct ipv6_pinfo *np = &sk->net_pinfo.af_inet6;
 	struct dest_entry *dc = NULL;
 	struct in6_addr *daddr = dest;
@@ -448,11 +449,17 @@
 	}
 
 	addr_type = ipv6_addr_type(daddr);
-	if (addr_type & IPV6_ADDR_MULTICAST && dev == NULL)
+	if (addr_type & IPV6_ADDR_MULTICAST)
 	{
-		dev = np->mc_if;
+		hlimit = np->mcast_hops;
+		if (dev == NULL)
+		{
+			dev = np->mc_if;
+		}
 	}
-
+	else
+		hlimit = np->hop_limit;
+	
 	if (addr_type & (IPV6_ADDR_LINKLOCAL | IPV6_ADDR_SITELOCAL |
 			 IPV6_ADDR_MULTICAST))
 	{
@@ -601,7 +608,7 @@
 			hdr->payload_len = htons(pktlength - 
 						 sizeof(struct ipv6hdr));
 			
-			hdr->hop_limit = np->hop_limit;
+			hdr->hop_limit = hlimit;
 
 			memcpy(&hdr->saddr, saddr, sizeof(struct in6_addr));
 			memcpy(&hdr->daddr, daddr, sizeof(struct in6_addr));
@@ -732,7 +739,7 @@
 		hdr->payload_len = htons(unfrag_len + frag_len - 
 					 sizeof(struct ipv6hdr));
 		
-		hdr->hop_limit = np->hop_limit;
+		hdr->hop_limit = hlimit;
 
 		hdr->nexthdr = NEXTHDR_FRAGMENT;