Module Name: src
Committed By: maxv
Date: Mon Feb 5 08:38:06 UTC 2018
Modified Files:
src/sys/netinet: in_proto.c ip_icmp.c
Log Message:
Declare icmperrppslim in ip_icmp.c, it shouldn't be used elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.166 -r1.167 src/sys/netinet/ip_icmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.125 src/sys/netinet/in_proto.c:1.126
--- src/sys/netinet/in_proto.c:1.125 Wed Sep 27 10:05:04 2017
+++ src/sys/netinet/in_proto.c Mon Feb 5 08:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.c,v 1.125 2017/09/27 10:05:04 ozaki-r Exp $ */
+/* $NetBSD: in_proto.c,v 1.126 2018/02/05 08:38:06 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.125 2017/09/27 10:05:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.126 2018/02/05 08:38:06 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -526,8 +526,6 @@ struct domain inetdomain = {
u_char ip_protox[IPPROTO_MAX];
-int icmperrppslim = 100; /* 100pps */
-
static void
sockaddr_in_addrlen(const struct sockaddr *sa, socklen_t *slenp)
{
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.166 src/sys/netinet/ip_icmp.c:1.167
--- src/sys/netinet/ip_icmp.c:1.166 Tue Jan 23 07:33:49 2018
+++ src/sys/netinet/ip_icmp.c Mon Feb 5 08:38:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.166 2018/01/23 07:33:49 maxv Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.167 2018/02/05 08:38:06 maxv Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.166 2018/01/23 07:33:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.167 2018/02/05 08:38:06 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -161,7 +161,7 @@ LIST_HEAD(, icmp_mtudisc_callback) icmp_
/* unused... */
u_int ip_next_mtu(u_int, int);
-extern int icmperrppslim;
+static int icmperrppslim = 100; /* 100pps */
static int icmperrpps_count = 0;
static struct timeval icmperrppslim_last;
static int icmp_rediraccept = 1;
