Fix "ipOutNoRoutes" counter error for TCP and UDP
Subsystems (4)
Hi Mr. David
I have modified my patch according to you advice. I think -
EHOSTUNREACH
is only for "input path". In "output" path, we can just simply check -ENETUNREACH (^_^), the patch is shown in the end of this mail.
BTW: my E-mail has been changed to [email protected]
Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
Function need to fix:
tcp_v4_connect();ip4_datagram_connect();udp_sendmsg();I think we need to make these checks more carefully.
Route lookup can fail for several reasons other than no route being available. Two examples are:
Quoted 7 lines
Quoted 6 lines
1) Out of memory error while creating route
2) IPSEC disallows communication to that flow IDAs a result, we'll probably best limiting the counter increment when the error is either
-EHOSTUNREACHor-ENETUNREACH.
Signed-off-by Wei Dong <[email protected]>
net/ipv4/datagram.c +5 -1
@@ -50,8 +50,12 @@ int ip4_datagram_connect(struct sock *skRT_CONN_FLAGS (sk), oif, sk->sk_protocol, inet->sport, usin->sin_port, sk); -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 ;
net/ipv4/tcp_ipv4.c +4 -1
@@ -192,8 +192,11 @@ int tcp_v4_connect(struct sock *sk, struRT_CONN_FLAGS (sk), sk->sk_bound_dev_if,IPPROTO_TCP , inet->sport, usin->sin_port, sk); -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);
net/ipv4/udp.c +4 -1
@@ -630,8 +630,11 @@ int udp_sendmsg(struct kiocb *iocb, stru .dport = dport } } };security_sk_classify_flow (sk, &fl); err =ip_route_output_flow (&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT )); -if (err) +if (err) { +if (err == -ENETUNREACH ) +IP_INC_STATS_BH (IPSTATS_MIB_OUTNOROUTES ); goto out; + } err = -EACCES ; if ((rt->rt_flags & RTCF_BROADCAST) &&