diff options
| author | delphij <delphij@FreeBSD.org> | 2016-04-27 07:46:38 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-04-27 07:46:38 +0000 |
| commit | a3a54e251a8cfd2f3e18bfc988584e4deaef9e56 (patch) | |
| tree | 89c803d8ff6ef95cafc2a4cb08de66848195099a /contrib/ntp/include/ntp.h | |
| parent | bfb191f240107e9d6573c5106848927ba7b82ec6 (diff) | |
| parent | 759809282c676f97898ae19584803d31e41910ce (diff) | |
| download | FreeBSD-src-a3a54e251a8cfd2f3e18bfc988584e4deaef9e56.zip FreeBSD-src-a3a54e251a8cfd2f3e18bfc988584e4deaef9e56.tar.gz | |
MFV r298691:
ntp 4.2.8p7.
Security: CVE-2016-1547, CVE-2016-1548, CVE-2016-1549, CVE-2016-1550
Security: CVE-2016-1551, CVE-2016-2516, CVE-2016-2517, CVE-2016-2518
Security: CVE-2016-2519
Security: FreeBSD-SA-16:16.ntp
With hat: so
Diffstat (limited to 'contrib/ntp/include/ntp.h')
| -rw-r--r-- | contrib/ntp/include/ntp.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/ntp/include/ntp.h b/contrib/ntp/include/ntp.h index 6a4e9aa..cad3003 100644 --- a/contrib/ntp/include/ntp.h +++ b/contrib/ntp/include/ntp.h @@ -175,6 +175,7 @@ typedef struct interface endpt; struct interface { endpt * elink; /* endpt list link */ endpt * mclink; /* per-AF_* multicast list */ + void * ioreg_ctx; /* IO registration context */ SOCKET fd; /* socket descriptor */ SOCKET bfd; /* for receiving broadcasts */ u_int32 ifnum; /* endpt instance count */ @@ -242,6 +243,13 @@ struct interface { #define PEER_TEST_MASK (TEST10 | TEST11 | TEST12 | TEST13) /* + * Unused flags + */ +#define TEST14 0x2000 +#define TEST15 0x4000 +#define TEST16 0x8000 + +/* * The peer structure. Holds state information relating to the guys * we are peering with. Most of this stuff is from section 3.2 of the * spec. @@ -391,6 +399,7 @@ struct peer { u_long received; /* packets received */ u_long processed; /* packets processed */ u_long badauth; /* bad authentication (TEST5) */ + u_long badNAK; /* invalid crypto-NAK */ u_long bogusorg; /* bogus origin (TEST2, TEST3) */ u_long oldpkt; /* old duplicate (TEST1) */ u_long seldisptoolarge; /* bad header (TEST6, TEST7) */ @@ -545,6 +554,7 @@ struct pkt { l_fp rec; /* receive time stamp */ l_fp xmt; /* transmit time stamp */ +#define MIN_V4_PKT_LEN (12 * sizeof(u_int32)) /* min header length */ #define LEN_PKT_NOMAC (12 * sizeof(u_int32)) /* min header length */ #define MIN_MAC_LEN (1 * sizeof(u_int32)) /* crypto_NAK */ #define MAX_MD5_LEN (5 * sizeof(u_int32)) /* MD5 */ |
