Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 May 2019 08:24:53 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r347652 - stable/11/sys/netinet
Message-ID:  <201905160824.x4G8OrO2012844@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Thu May 16 08:24:53 2019
New Revision: 347652
URL: https://svnweb.freebsd.org/changeset/base/347652

Log:
  MFC r339219:
  
  Ensure that the ips_localout counter is incremented for
  locally generated SCTP packets sent over IPv4. This make
  the behaviour consistent with IPv6.

Modified:
  stable/11/sys/netinet/ip_output.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/ip_output.c
==============================================================================
--- stable/11/sys/netinet/ip_output.c	Thu May 16 08:22:50 2019	(r347651)
+++ stable/11/sys/netinet/ip_output.c	Thu May 16 08:24:53 2019	(r347652)
@@ -262,11 +262,12 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct rou
 		ip->ip_v = IPVERSION;
 		ip->ip_hl = hlen >> 2;
 		ip_fillid(ip);
-		IPSTAT_INC(ips_localout);
 	} else {
 		/* Header already set, fetch hlen from there */
 		hlen = ip->ip_hl << 2;
 	}
+	if ((flags & IP_FORWARDING) == 0)
+		IPSTAT_INC(ips_localout);
 
 	/*
 	 * dst/gw handling:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905160824.x4G8OrO2012844>