From nobody Thu Jun 8 01:59:22 2023 X-Original-To: dev-commits-src-all@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 4Qc6pL71TDz4ZfVk; Thu, 8 Jun 2023 01:59:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qc6pL6LRqz3qF0; Thu, 8 Jun 2023 01:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686189562; 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=mH+NjnC35uROMCHVY2nhoLNB+W63PDxEXckImepI2Qg=; b=pu+GgnwMvtjl0I6ulWGnxwSWBdpLB3pp48C9c02Gyz3vya9qeEtICGzz6inty+uj489pWX SizVxQeKdSGk8PPdX2EU1Hnxt6l+gCaFs0jtAsF6zrN+iJzrdwdtx4j1b9ofG+zp1UZkfk RYhQo5oy8oUCfnLUeXaQZwYWy6+me2ajMOEaHXEGaAAEtiqTDcfhPt8iyDLNvrz+7E89nB xKB9NUF22vs0Qb4voOldAFRYlm0CanaM2tGe3ph2iM/Dn0SEWsSwJ2KUKAoTKZruSNoI01 EXN1AUahEi+vCx7mkI5es9VIulfLgRZz8c1/0yXDhAHkKWgsxF/QG/wDy1irqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686189562; 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=mH+NjnC35uROMCHVY2nhoLNB+W63PDxEXckImepI2Qg=; b=h1Wd/rYxw9D+2i1iCGcWXcUkXVwi0w4wBnttNzrJ3uNiReF8mRpXpHbJ7aXXghVyGWBjD7 Z3bQX+5Fmx8b3ZgE6aYsQzdmh9G/F2TVKKTXLCDS5ckpbbgiENyJzUkh3avHvgE5UrC7d2 z2eoYeCUXOyuSVZHj/kcZzD7n3kkDkMLJ3S7mtLo1kPLoEcWzQJHD52dw16nap8FgQLW3D hWOvJ0jVuE7aNoUWMy4X0wcMidHgF/q0Mo6ZZujJTd5v2j+KIIXR3X4UlMU62taQJwxAja k1l3R03L6lIWPhXK6+WcM188qn+t6NcsbYNE8rUTJZvW2ogZM23sKdMm+bN2mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686189562; a=rsa-sha256; cv=none; b=ZHDZO4n2P74sLgZmEhuNFLJ0Fe2tbb4mZTJ4mLqzVgNgBK92sey5IolETLl/ZRIsM7siCo aEAjEoTnrEy/Fzr6gbe663HXSzMd6/LHQj4QmLqT7auQbGBl8WhRX5FEjUMumzOxzhpbqZ VsSPCq8rvSkL1pqCoqnA5sQnpIFkq/ENYXp0sLFUuEXuqoVWsyU8p89iVXmi67t6RaurIF dfNVOF1nVUWjfYqA0AG9T2bfES6wrLXdaqKeqcb8g/9vKLrv16MDeTFd1hkO7QVI8PC50M +K3Qc7DfnW3RTiX/42mEIbDkXPTQP5ITL/bAYNmkQmUTTLaIn72bYTTVTKYrqQ== 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 4Qc6pL566WzbJh; Thu, 8 Jun 2023 01:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3581xMCV012859; Thu, 8 Jun 2023 01:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3581xMYL012858; Thu, 8 Jun 2023 01:59:22 GMT (envelope-from git) Date: Thu, 8 Jun 2023 01:59:22 GMT Message-Id: <202306080159.3581xMYL012858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 1cdec2832d05 - main - ndp: Prepare for pending tcpdump update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cdec2832d051ddcb1417f3f2601e6212aff2613 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=1cdec2832d051ddcb1417f3f2601e6212aff2613 commit 1cdec2832d051ddcb1417f3f2601e6212aff2613 Author: Joseph Mingrone AuthorDate: 2023-06-07 02:21:27 +0000 Commit: Joseph Mingrone CommitDate: 2023-06-08 01:57:20 +0000 ndp: Prepare for pending tcpdump update ndp makes use of gmt2local, however that library has been removed from tcpdump. Add utc_offset() as a substitute. Reviewed by: emaste, jhb, melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40445 --- usr.sbin/ndp/Makefile | 6 ++---- usr.sbin/ndp/ndp.c | 20 ++++++++++++++++++-- usr.sbin/ndp/ndp_netlink.c | 1 - 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile index 1722f4a5a2ef..f66c4ec846a8 100644 --- a/usr.sbin/ndp/Makefile +++ b/usr.sbin/ndp/Makefile @@ -15,15 +15,13 @@ .include -.PATH: ${SRCTOP}/contrib/tcpdump - PROG= ndp MAN= ndp.8 -SRCS= ndp.c gmt2local.c +SRCS= ndp.c LIBADD= xo -CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump +CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -D_U_="" .if ${MK_EXPERIMENTAL} != "no" diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 23e186466c22..112fd099e3e0 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -98,6 +98,7 @@ #include +#include #include #include #include @@ -107,11 +108,12 @@ #include #include #include +#include #include #include #include #include -#include "gmt2local.h" +#include #include "ndp.h" @@ -181,6 +183,20 @@ valid_type(int if_type) return (false); } +static int32_t +utc_offset(void) +{ + time_t t; + struct tm *tm; + + t = time(NULL); + tm = localtime(&t); + + assert(tm->tm_gmtoff > INT32_MIN && tm->tm_gmtoff < INT32_MAX); + + return (tm->tm_gmtoff); +} + int main(int argc, char **argv) { @@ -188,7 +204,7 @@ main(int argc, char **argv) char *arg = NULL; pid = getpid(); - thiszone = gmt2local(0); + thiszone = utc_offset(); argc = xo_parse_args(argc, argv); if (argc < 0) diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index a34359a4343f..ace3e5e5fa11 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -33,7 +33,6 @@ #include #include #include -#include "gmt2local.h" #include