CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: tnn Date: Fri Aug 18 12:53:04 UTC 2023 Added Files: src/external/bsd/tcpdump/dist: ntp.h Log Message: tcpdump: fix mismerge (revive ntp.h) To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/tcpdump/dist/ntp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: tnn Date: Fri Aug 18 12:53:04 UTC 2023 Added Files: src/external/bsd/tcpdump/dist: ntp.h Log Message: tcpdump: fix mismerge (revive ntp.h) To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/tcpdump/dist/ntp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/tcpdump/dist/ntp.h diff -u /dev/null src/external/bsd/tcpdump/dist/ntp.h:1.3 --- /dev/null Fri Aug 18 12:53:04 2023 +++ src/external/bsd/tcpdump/dist/ntp.h Fri Aug 18 12:53:03 2023 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that: (1) source code distributions + * retain the above copyright notice and this paragraph in its entirety, (2) + * distributions including binary code include the above copyright notice and + * this paragraph in its entirety in the documentation or other materials + * provided with the distribution, and (3) all advertising materials mentioning + * features or use of this software display the following acknowledgement: + * ``This product includes software developed by the University of California, + * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of + * the University nor the names of its contributors may be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#include "netdissect-stdinc.h" + +#include "netdissect.h" + +/* + * Structure definitions for NTP fixed point values + * + *0 1 2 3 + *0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + *0 1 2 3 + *0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +*/ +struct l_fixedpt { + nd_uint32_t int_part; + nd_uint32_t fraction; +}; + +struct s_fixedpt { + nd_uint16_t int_part; + nd_uint16_t fraction; +}; + +void p_ntp_time(netdissect_options *, const struct l_fixedpt *);
Re: CVS commit: src/external/bsd/tcpdump/dist
On 24.02.2020 17:44, Valery Ushakov wrote: > On Mon, Feb 24, 2020 at 16:19:35 +, Kamil Rytarowski wrote: > >> Module Name: src >> Committed By:kamil >> Date:Mon Feb 24 16:19:35 UTC 2020 >> >> Modified Files: >> src/external/bsd/tcpdump/dist: extract.h >> >> Log Message: >> Rearrange the code to make UNALIGNED_OK available for __NetBSD__ > > s/unsigned/undefined/ in the comment > > We have __GNUC_PREREQ__() for version tests > > -uwe > This is the original tcpdump code that used to be shadowed by our local __NetBSD__ code block. signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/external/bsd/tcpdump/dist
On Mon, Feb 24, 2020 at 16:19:35 +, Kamil Rytarowski wrote: > Module Name: src > Committed By: kamil > Date: Mon Feb 24 16:19:35 UTC 2020 > > Modified Files: > src/external/bsd/tcpdump/dist: extract.h > > Log Message: > Rearrange the code to make UNALIGNED_OK available for __NetBSD__ s/unsigned/undefined/ in the comment We have __GNUC_PREREQ__() for version tests -uwe
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: christos Date: Sat Nov 16 21:41:02 UTC 2019 Modified Files: src/external/bsd/tcpdump/dist: parsenfsfh.c Log Message: Fix always false test (typo). Note by joerg@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/dist/parsenfsfh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: christos Date: Sat Nov 16 21:41:02 UTC 2019 Modified Files: src/external/bsd/tcpdump/dist: parsenfsfh.c Log Message: Fix always false test (typo). Note by joerg@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/dist/parsenfsfh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/tcpdump/dist/parsenfsfh.c diff -u src/external/bsd/tcpdump/dist/parsenfsfh.c:1.8 src/external/bsd/tcpdump/dist/parsenfsfh.c:1.9 --- src/external/bsd/tcpdump/dist/parsenfsfh.c:1.8 Sat Feb 4 23:05:05 2017 +++ src/external/bsd/tcpdump/dist/parsenfsfh.c Sat Nov 16 16:41:02 2019 @@ -42,7 +42,7 @@ #include #ifndef lint -__RCSID("$NetBSD: parsenfsfh.c,v 1.8 2017/02/05 04:05:05 spz Exp $"); +__RCSID("$NetBSD: parsenfsfh.c,v 1.9 2019/11/16 21:41:02 christos Exp $"); #endif #ifdef HAVE_CONFIG_H @@ -211,7 +211,7 @@ Parse_fh(register const unsigned char *f if ((fhp[6] == 0) && (fhp[7] == 0)) { /* for ffs sizeof(ufid) == 16 bytes */ if ((fhp[8] == 0x10 && fhp[9] == 0x0) || - (fhp[9] == 0x0 && fhp[9] == 0x10)) + (fhp[8] == 0x0 && fhp[9] == 0x10)) fhtype = FHT_NETBSD; else fhtype = FHT_BSD44;