From owner-svn-src-all@freebsd.org Wed May 25 13:48:27 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A896AB4903F; Wed, 25 May 2016 13:48:27 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A1E81750; Wed, 25 May 2016 13:48:27 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4PDmQTm040105; Wed, 25 May 2016 13:48:26 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PDmQdA040104; Wed, 25 May 2016 13:48:26 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201605251348.u4PDmQdA040104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 25 May 2016 13:48:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300679 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2016 13:48:27 -0000 Author: tuexen Date: Wed May 25 13:48:26 2016 New Revision: 300679 URL: https://svnweb.freebsd.org/changeset/base/300679 Log: Count packets as not being delivered only if they are neither processed by a kernel handler nor by a raw socket. MFC after: 1 week Modified: head/sys/netinet/raw_ip.c Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Wed May 25 13:09:06 2016 (r300678) +++ head/sys/netinet/raw_ip.c Wed May 25 13:48:26 2016 (r300679) @@ -132,6 +132,8 @@ int (*ip_rsvp_vif)(struct socket *, stru void (*ip_rsvp_force_done)(struct socket *); #endif /* INET */ +extern struct protosw inetsw[]; + u_long rip_sendspace = 9216; SYSCTL_ULONG(_net_inet_raw, OID_AUTO, maxdgram, CTLFLAG_RW, &rip_sendspace, 0, "Maximum outgoing raw IP datagram size"); @@ -411,9 +413,11 @@ rip_input(struct mbuf **mp, int *offp, i IPSTAT_INC(ips_delivered); INP_RUNLOCK(last); } else { + if (inetsw[ip_protox[ip->ip_p]].pr_input == rip_input) { + IPSTAT_INC(ips_noproto); + IPSTAT_DEC(ips_delivered); + } m_freem(m); - IPSTAT_INC(ips_noproto); - IPSTAT_DEC(ips_delivered); } return (IPPROTO_DONE); }