From nobody Thu Nov 07 04:08:49 2024 X-Original-To: dev-commits-src-branches@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 4XkT8f5jpCz5cJL3; Thu, 07 Nov 2024 04:08:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkT8d5vTQz4wjt; Thu, 7 Nov 2024 04:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952529; 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=f6pl/P1IV055wkoTgzPB28/+/6mEZgJ3J3ilnLisFZw=; b=RzlSjL1CT3NRH2jd1yYHcQDdwyo24u/UK8cLjs6qGlC+t4cL73/15cNUeQ2XZ3vPJ3JWeQ 64u9/aFQcstarUvUyp/LefmrsAACaQCSR/30EwA3S8bguI++sVH3D3rzWVyPYpIsBkwzoi /Gcdlw5ViJUzMyzip7ZThwvbGKs3UA6z4sMbuP2Aee/lqhouR+GRbZYesmyBf3aaqG3s3p 5axo6+yQvL28eR+IBIvQ5gm8Wny+c4CftFWGXl73E4tBcXXnsKWL+02329WDYyi3Qq9jsG y5PK9LKSVyJGnbselQyL2YXj+5vbeh/lpHX6qhvKpbr4aqLIfzIauiTOFKDO2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952529; 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=f6pl/P1IV055wkoTgzPB28/+/6mEZgJ3J3ilnLisFZw=; b=OhaCiGhBAEGjMNBoTcfbEvC8XhoxnhdsUGubgXF2JhDL8BbmLmSlFWmDWsVWpoc+7hEHlJ l86N4Uuw8DmH4AAMRynxL0SHF1joXiXr/3VL/BBwlf/tNHqmZOXuREhRr+EIb64GifsKzg Tov0JRObBAOcv46a3aTWgL4yuldull461HSQt/Wk48Azhd+8pMBHj4jX7mRkbjx/HdVdmc evlriDKEjOXb9hifX26ZRFyHpFZWh1hPPhFUERLaL/BbSjG/XhttHygRUPxzhIb/4O0lQ/ XDbRx8JUfWXPTwsFqHJQt4tsd76g7mRNFlj37S1k8BqFHZF9b67z66kVjpENHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730952529; a=rsa-sha256; cv=none; b=x14KAWB2awdzsKRQl0z7m+Yt0466ds3iYwuoPpvg1UNPlUtH23ZCvO3KcjZ9Tm5V01hjsK gEvFMpKfZ6Ra5ds/H1CSy4mUoL94ZBRGxsBc8jrcQwYzarij4ODMP8jMCxIaMNfvKLlGLM sWrOWNGQbHeIi1RtdXffDp3r/11fffpnsyFWNl7h7pwnOvBpumMRlOzd2CxINay72bJAtN feEYB/aEjol54I9b8atrD9QRR3mtYDCKpaivC/jQVuYGf/75YXHWoxGi7YX7mSykOx96ZP TnE6ri4HZdCzCFRAYzxR//kKnz24I6G8woNAMXQHMEUagoYsSMoKEE5F9TYHpQ== 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 4XkT8d586xzVf5; Thu, 7 Nov 2024 04:08:49 +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 4A748nfA075727; Thu, 7 Nov 2024 04:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A748nHx075724; Thu, 7 Nov 2024 04:08:49 GMT (envelope-from git) Date: Thu, 7 Nov 2024 04:08:49 GMT Message-Id: <202411070408.4A748nHx075724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 54514cfa5a84 - stable/14 - ndp: Move the global variable repeat into struct ndp_opts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 commit 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 Author: Zhenlei Huang AuthorDate: 2024-10-31 16:32:13 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 04:08:09 +0000 ndp: Move the global variable repeat into struct ndp_opts An upcoming fix for the netlink based implementation requires this refactoring. No functional change intended. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47233 (cherry picked from commit 12c04071cf18d1b00ffcc7058fb01f4393163ede) --- usr.sbin/ndp/ndp.c | 9 ++++----- usr.sbin/ndp/ndp.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index e98e506ee482..89666f7eb633 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -125,7 +125,6 @@ static pid_t pid; static int32_t thiszone; /* time difference with gmt */ static int s = -1; -static int repeat = 0; static char host_buf[NI_MAXHOST]; /* getnameinfo() */ static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ @@ -252,8 +251,8 @@ main(int argc, char **argv) /*NOTREACHED*/ } mode = 'a'; - repeat = atoi(optarg); - if (repeat < 0) { + opts.repeat = atoi(optarg); + if (opts.repeat < 0) { usage(); /*NOTREACHED*/ } @@ -823,10 +822,10 @@ again: if (buf != NULL) free(buf); - if (repeat) { + if (opts.repeat) { xo_emit("\n"); xo_flush(); - sleep(repeat); + sleep(opts.repeat); goto again; } diff --git a/usr.sbin/ndp/ndp.h b/usr.sbin/ndp/ndp.h index 5b2558982e86..6e7aef2e416e 100644 --- a/usr.sbin/ndp/ndp.h +++ b/usr.sbin/ndp/ndp.h @@ -10,6 +10,7 @@ struct ndp_opts { bool tflag; int flags; time_t expire_time; + int repeat; }; extern struct ndp_opts opts;