Attachment 234851 Details for Bug 346421 – A patch to fix this problem

[patch] A patch to fix this problem

RHEL3U9_fix_unreachable_package_proc_increase.patch (text/plain), 1.51 KB, created by Gui Jianfeng on 2007-10-23 08:09:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gui Jianfeng

Created: 2007-10-23 08:09:14 UTC

Size: 1.51 KB

patch

obsolete

>diff -Narup linux-2.4.21/net/ipv4/ip_input.c linux-2.4.21-prep/net/ipv4/ip_input.c
>--- linux-2.4.21/net/ipv4/ip_input.c	2007-10-17 10:48:22.000000000 +0800
>+++ linux-2.4.21-prep/net/ipv4/ip_input.c	2007-10-17 10:53:20.000000000 +0800
>@@ -288,8 +288,12 @@ static inline int ip_rcv_finish(struct s
> 	 *	how the packet travels inside Linux networking.
> 	 */ 
> 	if (skb->dst == NULL) {
>-		if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev))
>+		int err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev);
>+		if (unlikely(err)) {
>+			if (err == -EHOSTUNREACH)
>+				IP_INC_STATS_BH(IpInAddrErrors);
> 			goto drop; 
>+		}
> 	}
> 
> #ifdef CONFIG_NET_CLS_ROUTE
>diff -Narup linux-2.4.21/net/ipv4/route.c linux-2.4.21-prep/net/ipv4/route.c
>--- linux-2.4.21/net/ipv4/route.c	2007-10-17 10:48:22.000000000 +0800
>+++ linux-2.4.21-prep/net/ipv4/route.c	2007-10-17 10:52:40.000000000 +0800
>@@ -1456,7 +1456,7 @@ int ip_route_input_slow(struct sk_buff *
> 	 */
> 	if ((err = fib_lookup(&fl, &res)) != 0) {
> 		if (!IN_DEV_FORWARD(in_dev))
>-			goto e_inval;
>+			goto e_hostunreach;
> 		goto no_route;
> 	}
> 	free_res = 1;
>@@ -1505,7 +1505,7 @@ int ip_route_input_slow(struct sk_buff *
> 	}
> 
> 	if (!IN_DEV_FORWARD(in_dev))
>-		goto e_inval;
>+		goto e_hostunreach;
> 	if (res.type != RTN_UNICAST)
> 		goto martian_destination;
> 
>@@ -1679,6 +1679,11 @@ martian_destination:
> 			"%u.%u.%u.%u, dev %s\n",
> 			NIPQUAD(daddr), NIPQUAD(saddr), dev->name);
> #endif
>+
>+e_hostunreach:
>+	err = -EHOSTUNREACH;
>+	goto done;
>+
> e_inval:
> 	err = -EINVAL;
> 	goto done;

Actions: View | Diff

Attachments on bug 346421: 234851