Page MenuHomeFreeBSD
Differential D40445

ndp: Prepare for pending tcpdump update
ClosedPublic
Actions

Authored by jrm on Jun 7 2023, 2:27 AM.
Tags
None
Referenced Files
F84425698: D40445.id122947.diff
Thu, May 23, 5:37 PM
F84425694: D40445.id122953.diff
Thu, May 23, 5:37 PM
F84425686: D40445.id122949.diff
Thu, May 23, 5:37 PM
Unknown Object (File)
Tue, May 21, 4:38 AM
Unknown Object (File)
Tue, May 21, 4:37 AM
Unknown Object (File)
Sun, May 19, 8:56 PM
Unknown Object (File)
Sun, May 19, 8:35 PM
Unknown Object (File)
Sun, May 19, 7:21 PM
View All 44 Files
Subscribers
imp

Details

Reviewers
emaste
jhb
melifaro
Commits
rG1cdec2832d05: ndp: Prepare for pending tcpdump update
Summary

npd makes use of gmt2local, however that library has been removed from
tcpdump. Add utc_offset() as a substitute.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 51962
Build 48853: arc lint + arc unit

Event Timeline

jrm created this revision.Jun 7 2023, 2:27 AM
Herald added a subscriber: imp. · View Herald TranscriptJun 7 2023, 2:27 AM
jrm requested review of this revision.Jun 7 2023, 2:27 AM
Harbormaster completed remote builds in B51938: Diff 122906.Jun 7 2023, 2:27 AM
jrm added a comment.Jun 7 2023, 2:29 AM

Should we be concerned that the long tm->tm_gmtoff will be implicitly cast as int32_t when it's returned?

jrm updated this revision to Diff 122947.Jun 7 2023, 4:20 PM

Make utc_offset() argument match gmt2local() and make it a static function.

Harbormaster completed remote builds in B51959: Diff 122947.Jun 7 2023, 4:20 PM
jrm added reviewers: jhb, melifaro.Jun 7 2023, 4:22 PM
melifaro accepted this revision.Jun 7 2023, 4:36 PM
This revision is now accepted and ready to land.Jun 7 2023, 4:36 PM
emaste accepted this revision.Jun 7 2023, 4:48 PM

This seems OK as a minimal change.

We may want to follow tcpdump's ts_print() more closely though, in a subsequent change.

jrm updated this revision to Diff 122949.Jun 7 2023, 6:07 PM

Assert that the value stored in tm->tm_gmtoff will fit in a int32_t.

This revision now requires review to proceed.Jun 7 2023, 6:07 PM
Harbormaster completed remote builds in B51960: Diff 122949.Jun 7 2023, 6:07 PM
jhb added a comment.Jun 7 2023, 6:56 PM

Nit: s/npd/ndp/ in commit log

usr.sbin/ndp/ndp.c
187

Given this is only used with a value of 0, I would maybe go ahead and assume that and remove the argument from here entirely, that is, have it start as:

static int32_t
utc_offset(void)
{
    struct tm *tm;
    time t;

    t = time(NULL);
    tm = localtime(&t);
...
197
jrm updated this revision to Diff 122953.Jun 7 2023, 8:53 PM

Revert back to function with no arguments. Fix typo and formatting.

Harbormaster completed remote builds in B51962: Diff 122953.Jun 7 2023, 8:53 PM
jrm marked 2 inline comments as done.Jun 7 2023, 8:54 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2023, 2:00 AM
Closed by commit rG1cdec2832d05: ndp: Prepare for pending tcpdump update (authored by jrm). · Explain Why
This revision was automatically updated to reflect the committed changes.
jrm added a commit: rG1cdec2832d05: ndp: Prepare for pending tcpdump update.

Revision Contents
Changeset List

PathSize
usr.sbin/
ndp/
6 lines
20 lines
1 line

Diff 122953

View Options

usr.sbin/ndp/Makefile

Loading...
View Options

usr.sbin/ndp/ndp.c

Loading...
View Options

usr.sbin/ndp/ndp_netlink.c

Loading...