From nobody Tue Jun 17 15:54:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bMBJX5x26z5yTmM; Tue, 17 Jun 2025 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMBJX3qMHz3sbj; Tue, 17 Jun 2025 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyPiWnQFewtCZK9qSsbVs2wSupY01Uwe9mU2n7WV0qw=; b=PvbetbYWMVbWlC/HNsa8SlC88UKQTrnc0iFYiA+hojBlefd5NwRIbjKh6628CPafap5Hs7 dNBbCq6Se9pdl6IWTCfnpq0elJax2HUzE5INYkfcnIv4uVOMa+A204Z5kfMSQm4vs+cCwZ qKevIA6hogMwBDoLQa8zP0Q0SVC7yDvvX43dWAqpi6OBAk0/l578P0oUsmcBBpy3S/wjvn OFDxfyWeNlAb3uAqdc9aiYc+1/vqlPsvtntaDAaq6N0qyYqny3svYxiMhYpC8m7wDgCcdQ nPnSkd83mK6xt4PFcC+JsyAkeR+lZisI+YDVowzmFekgCw/3Ny4VRejxjt7Vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyPiWnQFewtCZK9qSsbVs2wSupY01Uwe9mU2n7WV0qw=; b=xvYusKRCRBYtMG+Jr5vgdFLQl+qwUqPX4prG9PCBINmvTBbvuFGtSMjITuyXs/PnrContK TOfKaSOQrvL4iWhpu5UNl2TwHIOsZ61jpmSmT67JmXzbJ5aBiOcWwuhp2wR9IM02Malamx Mrw9lTNtK32Oe09ovIGIDXIzZXeitH878PrRnyZ6eqHVR7M1+Cly9tPUzDCsXyJSdnji2W gt/7Vq5N1Gl6avgNpL9SBCDqcQp+mfpYQStwfiqdeXpN6PUQvIEwUFOHbteV+t5rcVjnsU 9ecZL/fJCZrg6XyXVyR8+x5Qwm20nJLu8pCMvT+NSNcxjISwQvMWabMnJznZTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175676; a=rsa-sha256; cv=none; b=xJ0HUoMK7qZcwlXHOEtvq3h/Cg3SBf4pHNBh4+9S+PNvjEuCVm6htbhUODMF4I1n4gmNi/ IPZBaoqgGNNGC/o5kdrifOvEdWhzbUm180JNpLXVNG45TJFnNb8iLOEHzINKRtDLI349in GudRUPTT+ZosT8U14fqXkmEZuFDVEHE3p8OFehMqih6rWnXmpJaSW8tzFrDf3c/6yGXr9w EXWWeH2m1TKdPdf2rF4j2UrODboHIXpbSDRKsyz8nFGsjbqmIoeBna7NC6YXjhuw149idu a+YGsnqiiDHAw/J+rVSVOYWbjIt8Bh5WYLLYVr9JP9yx8OTEGnkbhCv2PCLUlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bMBJX3BTczqmG; Tue, 17 Jun 2025 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55HFsaCv038431; Tue, 17 Jun 2025 15:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFsa5B038428; Tue, 17 Jun 2025 15:54:36 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:54:36 GMT Message-Id: <202506171554.55HFsa5B038428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: df4b9fa460ab - main - snmp_mibII: use sysctl(3) to read min/max TCP retransmission timeouts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df4b9fa460ab7f31d11b046d6f3335be101bc576 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=df4b9fa460ab7f31d11b046d6f3335be101bc576 commit df4b9fa460ab7f31d11b046d6f3335be101bc576 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:53:50 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:54:18 +0000 snmp_mibII: use sysctl(3) to read min/max TCP retransmission timeouts Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50892 --- contrib/bsnmp/snmp_mibII/mibII_tcp.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/contrib/bsnmp/snmp_mibII/mibII_tcp.c b/contrib/bsnmp/snmp_mibII/mibII_tcp.c index e6d5920d9f88..551db06e9f0f 100644 --- a/contrib/bsnmp/snmp_mibII/mibII_tcp.c +++ b/contrib/bsnmp/snmp_mibII/mibII_tcp.c @@ -36,7 +36,6 @@ #include #include #include -#include #include struct tcp_index { @@ -51,7 +50,8 @@ static uint64_t tcps_states[TCP_NSTATES]; static struct xinpgen *xinpgen; static size_t xinpgen_len; static u_int tcp_total; - +static int tcp_rexmit_min; +static int tcp_rexmit_max; static u_int oidnum; static struct tcp_index *tcpoids; @@ -90,6 +90,28 @@ fetch_tcp_stats(void) return (-1); } + len = sizeof(tcp_rexmit_min); + if (sysctlbyname("net.inet.tcp.rexmit_min", &tcp_rexmit_min, &len, + NULL, 0) == -1) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_min: %m"); + return (-1); + } + if (len != sizeof(tcp_rexmit_min)) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_min: wrong size"); + return (-1); + } + + len = sizeof(tcp_rexmit_max); + if (sysctlbyname("net.inet.tcp.rexmit_max", &tcp_rexmit_max, &len, + NULL, 0) == -1) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_max: %m"); + return (-1); + } + if (len != sizeof(tcp_rexmit_max)) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_max: wrong size"); + return (-1); + } + tcp_stats_tick = get_ticks(); return (0); @@ -211,16 +233,13 @@ op_tcp(struct snmp_context *ctx __unused, struct snmp_value *value, value->v.integer = 4; /* Van Jacobson */ break; -#define hz clockinfo.hz - case LEAF_tcpRtoMin: - value->v.integer = 1000 * TCPTV_MIN / hz; + value->v.integer = tcp_rexmit_min; break; case LEAF_tcpRtoMax: - value->v.integer = 1000 * TCPTV_REXMTMAX / hz; + value->v.integer = tcp_rexmit_max; break; -#undef hz case LEAF_tcpMaxConn: value->v.integer = -1;