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

Commit 2d8dbb04 authored by Vincent Bernat's avatar Vincent Bernat Committed by David S. Miller
Browse files

snmp: fix OutOctets counter to include forwarded datagrams 



RFC 4293 defines ipIfStatsOutOctets (similar definition for
ipSystemStatsOutOctets):

   The total number of octets in IP datagrams delivered to the lower
   layers for transmission.  Octets from datagrams counted in
   ipIfStatsOutTransmits MUST be counted here.

And ipIfStatsOutTransmits:

   The total number of IP datagrams that this entity supplied to the
   lower layers for transmission.  This includes datagrams generated
   locally and those forwarded by this entity.

Therefore, IPSTATS_MIB_OUTOCTETS must be incremented when incrementing
IPSTATS_MIB_OUTFORWDATAGRAMS.

IP_UPD_PO_STATS is not used since ipIfStatsOutRequests must not
include forwarded datagrams:

   The total number of IP datagrams that local IP user-protocols
   (including ICMP) supplied to IP in requests for transmission.  Note
   that this counter does not include any datagrams counted in
   ipIfStatsOutForwDatagrams.

Signed-off-by: default avatarVincent Bernat <bernat@luffy.cx>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 278f015e

net/ipv4/ip_forward.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static int ip_forward_finish(struct sk_buff *skb) 
	struct ip_options *opt	= &(IPCB(skb)->opt);



	IP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTOCTETS, skb->len);



	if (unlikely(opt->optlen))

		ip_forward_options(skb);

net/ipv4/ipmr.c

+1 −0
Original line number Diff line number Diff line
@@ -1574,6 +1574,7 @@ static inline int ipmr_forward_finish(struct sk_buff *skb) 
	struct ip_options *opt = &(IPCB(skb)->opt);



	IP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTOCTETS, skb->len);



	if (unlikely(opt->optlen))

		ip_forward_options(skb);

net/ipv6/ip6_output.c

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ int ip6_forward(struct sk_buff *skb) 
	hdr->hop_limit--;



	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP6_ADD_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb->len);

	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dst->dev,

		       ip6_forward_finish);

net/ipv6/ip6mr.c

+2 −0
Original line number Diff line number Diff line
@@ -1886,6 +1886,8 @@ static inline int ip6mr_forward2_finish(struct sk_buff *skb) 
{

	IP6_INC_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)),

			 IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP6_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)),

			 IPSTATS_MIB_OUTOCTETS, skb->len);

	return dst_output(skb);

}