Attachment 293780 Details for Bug 431284 – A patch to fix this problem

[patch] A patch to fix this problem

fix-IP_MIB_OUTNOROUTES-dont-increase.patch (text/plain), 1.77 KB, created by Gui Jianfeng on 2008-02-02 02:51:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gui Jianfeng

Created: 2008-02-02 02:51:04 UTC

Size: 1.77 KB

patch

obsolete

>---
> net/ipv4/datagram.c |    6 +++++-
> net/ipv4/tcp_ipv4.c |    5 ++++-
> net/ipv4/udp.c      |    5 ++++-
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c
>index 5836e1e..9105aeb 100644
>--- a/net/ipv4/datagram.c
>+++ b/net/ipv4/datagram.c
>@@ -50,8 +50,12 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
> 			       RT_CONN_FLAGS(sk), oif,
> 			       sk->sk_protocol,
> 			       inet->sport, usin->sin_port, sk, 1);
>-	if (err)
>+	if (err) {
>+		if (err == -ENETUNREACH)
>+			IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
> 		return err;
>+	}
>+
> 	if ((rt->rt_flags & RTCF_BROADCAST) && !sock_flag(sk, SOCK_BROADCAST)) {
> 		ip_rt_put(rt);
> 		return -EACCES;
>diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
>index 35a6e26..4f58a8d 100644
>--- a/net/ipv4/tcp_ipv4.c
>+++ b/net/ipv4/tcp_ipv4.c
>@@ -180,8 +180,11 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
> 			       RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
> 			       IPPROTO_TCP,
> 			       inet->sport, usin->sin_port, sk, 1);
>-	if (tmp < 0)
>+	if (tmp < 0) {
>+		if (tmp == -ENETUNREACH)
>+			IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
> 		return tmp;
>+	}
> 
> 	if (rt->rt_flags & (RTCF_MULTICAST | RTCF_BROADCAST)) {
> 		ip_rt_put(rt);
>diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
>index d90c67e..bb6eeef 100644
>--- a/net/ipv4/udp.c
>+++ b/net/ipv4/udp.c
>@@ -605,8 +605,11 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> 						 .dport = dport } } };
> 		security_sk_classify_flow(sk, &fl);
> 		err = ip_route_output_flow(&rt, &fl, sk, 1);
>-		if (err)
>+		if (err) {
>+			if (err == -ENETUNREACH)
>+				IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
> 			goto out;
>+		}
> 
> 		err = -EACCES;
> 		if ((rt->rt_flags & RTCF_BROADCAST) &&
>-- 
>1.5.3
>

Actions: View | Diff

Attachments on bug 431284: 293780