Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c2910a4 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by David S. Miller
Browse files

[IPV4]: Snmpv2 Mib IP counter ipInAddrErrors support 



I followed Thomas' proposal to see every martian destination as a case
where the ipInAddrErrors counter has to be incremented. There are
two advantages by doing so: (1) The relation between the ipInReceive
counter and all the other ipInXXX counters is more accurate in the
case the RTN_UNICAST code check fails and (2) it makes the code in
ip_route_input_slow easier.

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae9cda5d

net/ipv4/ip_input.c

+5 −1
Original line number Diff line number Diff line
@@ -283,15 +283,19 @@ static inline int ip_rcv_finish(struct sk_buff *skb) 
{

	struct net_device *dev = skb->dev;

	struct iphdr *iph = skb->nh.iph;

	int err;



	/*

	 *	Initialise the virtual path cache for the packet. It describes

	 *	how the packet travels inside Linux networking.

	 */ 

	if (skb->dst == NULL) {

		if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev))

		if ((err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev))) {

			if (err == -EHOSTUNREACH)

				IP_INC_STATS_BH(IPSTATS_MIB_INADDRERRORS);

			goto drop; 

		}

	}



#ifdef CONFIG_NET_CLS_ROUTE

	if (skb->dst->tclassid) {

net/ipv4/route.c

+7 −2
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr, 
	 */

	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;
@@ -1933,7 +1933,7 @@ static int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr, 
	}



	if (!IN_DEV_FORWARD(in_dev))

		goto e_inval;

		goto e_hostunreach;

	if (res.type != RTN_UNICAST)

		goto martian_destination;
@@ -2025,6 +2025,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;