Skip to content
GitLab
Commit bc1f1c05 authored by Eric S. Raymond's avatar Eric S. Raymond
Browse files

Eliminate u_int, u_short, u_long. u_char homebrew types. 

These caused too much turis around which compilers have them as builtins
and which do not.
parent cc9491c8
Pipeline #10825273 failed with stages
in 4 minutes and 41 seconds
Hide whitespace changes
Inline Side-by-side
devel/trace/ntpsec-ntp-proto.ini
View file @ bc1f1c05
......@@ -37,7 +37,7 @@ header = '#include "ntpd.h"'
[ntpsec-ntp-proto-signatures]
transmit = void, struct peer*
receive = void, struct recvbuf*
process_packet = void, struct peer*, struct pkt*, u_int
process_packet = void, struct peer*, struct pkt*, unsigned int
poll_update = void, struct peer*, uint8_t
peer_clear = void, struct peer*, const char*
clock_filter = void, struct peer*, double, double, double
......@@ -49,5 +49,5 @@ measure_precision = void, const bool
measure_tick_fuzz = double, void
set_sys_tick_precision = void, double
init_proto = void, const bool
proto_config = void, int, u_long, double, sockaddr_u*
proto_config = void, int, unsigned long, double, sockaddr_u*
proto_clr_stats = void, void
devel/trace/ntpsec-ntp-worker.ini
View file @ bc1f1c05
......@@ -26,7 +26,7 @@ header = '#include "ntp_worker.h"'
[ntpsec-ntp-worker-signatures]
close_all_except = void, int
close_all_beyond = void, int
available_blocking_child_slot = u_int, void
available_blocking_child_slot = unsigned int, void
queue_blocking_request = int, blocking_work_req, void*, size_t, blocking_work_callback, void*
queue_blocking_response = int, blocking_child*, blocking_pipe_header*, size_t, const blocking_pipe_header*
process_blocking_resp = void, blocking_child*
......
docs/generic_howto.txt
View file @ bc1f1c05
......@@ -103,12 +103,12 @@ doing the appropriate time stamping.
----------------------------------------------------------------------------------
struct clockformat
{
u_long (*input)();
unsigned long (*input)();
/* input routine - your routine - cvt_<yourclock> */
u_long (*convert)();
unsigned long (*convert)();
/* conversion routine - your routine - cvt_<yourclock> */
/* routine for handling RS232 sync events (time stamps) - usually sync_simple */
u_long (*syncpps)();
unsigned long (*syncpps)();
/* PPS input routine - usually pps_one */
void *data;
/* local parameters - any parameters/data/configuration info your conversion
......@@ -117,7 +117,7 @@ struct clockformat
/* clock format name - Name of the time code */
unsigned short length;
/* maximum length of data packet for your clock format */
u_long flags;
unsigned long flags;
/* information for the parser what to look for */
};
----------------------------------------------------------------------------------
......@@ -141,7 +141,7 @@ clocks for example)
-------------------------------------------------------------------------------------
struct clockinfo
{
u_long cl_flags; /* operation flags (io modes) */
unsigned long cl_flags; /* operation flags (io modes) */
PARSE_F_PPSPPS use loopfilter PPS code
PARSE_F_PPSONSECOND PPS pulses are on second
usually flags stay 0 as they are used only for special setups
......@@ -165,12 +165,12 @@ clocks for example)
u_fp cl_rootdelay; /* rootdelay */
NTP rootdelay estimate (usually 0)
u_long cl_basedelay; /* current offset - unsigned l_fp
unsigned long cl_basedelay; /* current offset - unsigned l_fp
fractional part (fraction) by
which the RS232 time code is
delayed from the actual time. */
u_long cl_ppsdelay; /* current PPS offset - unsigned l_fp fractional
unsigned long cl_ppsdelay; /* current PPS offset - unsigned l_fp fractional
time (fraction) by which the PPS time stamp is delayed (usually 0)
part */
......@@ -184,22 +184,22 @@ clocks for example)
If the data format cann not ne detected automatically this is the name
as in clk_*.c clockformat.
u_char cl_type; /* clock type (ntp control) */
unsigned char cl_type; /* clock type (ntp control) */
Type if clock as in clock status word (ntp control messages) - usually 0
u_long cl_maxunsync; /* time to trust oscillator after losing synch
unsigned long cl_maxunsync; /* time to trust oscillator after losing synch
*/
seconds a clock can be trusted after losing synchronisation.
u_long cl_speed; /* terminal input & output baudrate */
u_long cl_cflag; /* terminal io flags */
u_long cl_iflag; /* terminal io flags */
u_long cl_oflag; /* terminal io flags */
u_long cl_lflag; /* terminal io flags */
unsigned long cl_speed; /* terminal input & output baudrate */
unsigned long cl_cflag; /* terminal io flags */
unsigned long cl_iflag; /* terminal io flags */
unsigned long cl_oflag; /* terminal io flags */
unsigned long cl_lflag; /* terminal io flags */
termio*.h tty modes.
u_long cl_samples; /* samples for median filter */
u_long cl_keep; /* samples for median filter to keep */
unsigned long cl_samples; /* samples for median filter */
unsigned long cl_keep; /* samples for median filter to keep */
median filter parameters - smoothing and rejection of bad samples
} clockinfo[] = {
...,<other clocks>,...
......
docs/oncore-shmem.txt
View file @ bc1f1c05
......@@ -87,16 +87,16 @@ look like
----------------------------------------
struct message {
u_int length;
u_char sequence;
u_char message[length];
unsigned int length;
unsigned char sequence;
unsigned char message[length];
}
----------------------------------------
if something like that were legal. That is, there are two bytes
(caution, these may NOT be aligned with word boundaries, so the field
needs to be treated as a pair of u_char), that contains the length of
the next message. This is followed by a u_char sequence number, that is
needs to be treated as a pair of unsigned char), that contains the length of
the next message. This is followed by a unsigned char sequence number, that is
incremented whenever a new message of this type is received. This is
followed by \'length' characters of the actual message.
......@@ -104,7 +104,7 @@ The next structure starts immediately following the last char of the
previous message (no alignment). Thus, each structure starts a distance
of \'length+3' from the previous structure.
Following the last structure, is a u_int containing a zero length to
Following the last structure, is an unsigned int containing a zero length to
indicate the end of the data.
The messages are recognized by reading the headers in the data itself,
......
include/gpstolfp.h
View file @ bc1f1c05
......@@ -6,6 +6,6 @@
#define MAX_BUILD_GPSWEEK (6078) /* testcase limit */
extern void gpstolfp (int weeks, int days, unsigned long seconds, l_fp *);
extern void gpsweekadj (u_int * week, u_int build_week);
extern void gpstocal (u_int week, u_int TOW, int UTC_offset, struct calendar *);
extern void caltogps (const struct calendar *, int UTC_offset, u_int * week, u_int * TOW);
\ No newline at end of file
extern void gpsweekadj (unsigned int * week, unsigned int build_week);
extern void gpstocal (unsigned int week, unsigned int TOW, int UTC_offset, struct calendar *);
extern void caltogps (const struct calendar *, int UTC_offset, unsigned int * week, unsigned int * TOW);
include/ntp.h
View file @ bc1f1c05
......@@ -9,20 +9,6 @@
#include <stddef.h>
#include <math.h>
#if ( defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600)) \
|| (__STDC_VERSION__ >= 199901L)
/*
* Supply GCCisms that stop being visible if we tell it we need the
* prototype for strptime(3). Note that this conditionalization is
* not actually necessary with -std=gnu99; we're leaving it here as
* documentation. Ideally all these nonstandard types should go away
* to be replaced by POSIX typedefs.
*/
typedef unsigned long u_long;
typedef unsigned short u_short;
typedef unsigned int u_int;
#endif
#include "ntp_fp.h"
#include "ntp_types.h"
#include "ntp_lists.h"
......@@ -138,18 +124,18 @@ typedef struct __endpt {
sockaddr_u mask; /* subnet mask */
sockaddr_u bcast; /* broadcast address */
char name[32]; /* name of interface */
u_short family; /* AF_INET/AF_INET6 */
u_short phase; /* phase in update cycle */
unsigned short family; /* AF_INET/AF_INET6 */
unsigned short phase; /* phase in update cycle */
uint32_t flags; /* interface flags */
uint32_t addr_refid; /* IPv4 addr or IPv6 hash */
u_long starttime; /* current_time at creation */
unsigned long starttime; /* current_time at creation */
volatile long received; /* number of incoming packets */
long sent; /* number of outgoing packets */
long notsent; /* number of send failures */
u_int ifindex; /* for IPV6_MULTICAST_IF */
unsigned int ifindex; /* for IPV6_MULTICAST_IF */
bool ignore_packets; /* listen-read-drop this? */
struct peer * peers; /* list of peers using endpt */
u_int peercnt; /* count of same */
unsigned int peercnt; /* count of same */
} endpt;
/*
......@@ -229,7 +215,7 @@ struct peer {
uint8_t hpoll; /* local poll interval */
uint8_t minpoll; /* min poll interval */
uint8_t maxpoll; /* max poll interval */
u_int flags; /* association flags */
unsigned int flags; /* association flags */
uint8_t cast_flags; /* additional flags */
uint8_t last_event; /* last peer error code */
uint8_t num_events; /* number of error events */
......@@ -274,14 +260,14 @@ struct peer {
uint8_t new_status; /* under-construction status */
uint8_t reach; /* reachability register */
int flash; /* protocol error test tally bits */
u_long epoch; /* reference epoch */
unsigned long epoch; /* reference epoch */
int burst; /* packets remaining in burst */
int retry; /* retry counter */
int filter_nextpt; /* index into filter shift register */
double filter_delay[NTP_SHIFT]; /* delay shift register */
double filter_offset[NTP_SHIFT]; /* offset shift register */
double filter_disp[NTP_SHIFT]; /* dispersion shift register */
u_long filter_epoch[NTP_SHIFT]; /* epoch shift register */
unsigned long filter_epoch[NTP_SHIFT]; /* epoch shift register */
uint8_t filter_order[NTP_SHIFT]; /* filter sort index */
l_fp rec; /* receive time stamp */
l_fp xmt; /* transmit time stamp */
......@@ -307,29 +293,29 @@ struct peer {
/*
* End of clear-to-zero area
*/
u_int outcount; /* packets sent without reply */
u_long update; /* receive epoch */
unsigned int outcount; /* packets sent without reply */
unsigned long update; /* receive epoch */
#define end_clear_to_zero update
int unreach; /* watchdog counter */
int throttle; /* rate control */
u_long outdate; /* send time last packet */
u_long nextdate; /* send time next packet */
unsigned long outdate; /* send time last packet */
unsigned long nextdate; /* send time next packet */
/*
* Statistic counters
*/
u_long timereset; /* time stat counters were reset */
u_long timereceived; /* last packet received time */
u_long timereachable; /* last reachable/unreachable time */
u_long sent; /* packets sent */
u_long received; /* packets received */
u_long processed; /* packets processed */
u_long badauth; /* bad authentication (BOGON5) */
u_long bogusorg; /* bogus origin (BOGON2, BOGON3) */
u_long oldpkt; /* old duplicate (BOGON1) */
u_long seldisptoolarge; /* bad header (BOGON6, BOGON7) */
u_long selbroken; /* KoD received */
unsigned long timereset; /* time stat counters were reset */
unsigned long timereceived; /* last packet received time */
unsigned long timereachable; /* last reachable/unreachable time */
unsigned long sent; /* packets sent */
unsigned long received; /* packets received */
unsigned long processed; /* packets processed */
unsigned long badauth; /* bad authentication (BOGON5) */
unsigned long bogusorg; /* bogus origin (BOGON2, BOGON3) */
unsigned long oldpkt; /* old duplicate (BOGON1) */
unsigned long seldisptoolarge; /* bad header (BOGON6, BOGON7) */
unsigned long selbroken; /* KoD received */
};
/* pythonize-header: stop ignoring */
......@@ -380,7 +366,7 @@ struct peer {
#define STRATUM_UNSPEC ((uint8_t)16) /* unspecified */
/*
* Values for peer.flags (u_int)
* Values for peer.flags (unsigned int)
*/
#define FLAG_CONFIG 0x0001 /* association was configured */
#define FLAG_PREEMPT 0x0002 /* preemptable association */
......@@ -619,7 +605,7 @@ struct mon_data {
l_fp last; /* last time seen */
int leak; /* leaky bucket accumulator */
int count; /* total packet count */
u_short flags; /* restrict flags */
unsigned short flags; /* restrict flags */
uint8_t vn_mode; /* packet mode & version */
uint8_t cast_flags; /* flags MDF_?CAST */
sockaddr_u rmtadr; /* address of remote host */
......@@ -669,9 +655,9 @@ typedef struct restrict_u_tag restrict_u;
struct restrict_u_tag {
restrict_u * link; /* link to next entry */
uint32_t count; /* number of packets matched */
u_short flags; /* accesslist flags */
u_short mflags; /* match flags */
u_long expire; /* valid until time */
unsigned short flags; /* accesslist flags */
unsigned short mflags; /* match flags */
unsigned long expire; /* valid until time */
union { /* variant starting here */
res_addr4 v4;
res_addr6 v6;
......
include/ntp_calendar.h
View file @ bc1f1c05
......@@ -245,6 +245,6 @@ ntpcal_date_to_time(const struct calendar * /* jd */);
* 2208988800. This is larger than 32-bit INT_MAX, so unsigned
* type is forced.
*/
#define JAN_1970 ((u_int)NTP_TO_UNIX_DAYS * (u_int)SECSPERDAY)
#define JAN_1970 ((unsigned int)NTP_TO_UNIX_DAYS * (unsigned int)SECSPERDAY)
#endif
include/ntp_config.h
View file @ bc1f1c05
......@@ -47,7 +47,7 @@ struct attr_val_tag {
int type; /* T_String, T_Integer, ... */
union val {
int i;
u_int u;
unsigned int u;
int_range r;
double d;
char * s;
......@@ -61,7 +61,7 @@ typedef struct address_node_tag address_node;
struct address_node_tag {
address_node * link;
char * address;
u_short type; /* family, AF_UNSPEC (0), AF_INET[6] */
unsigned short type; /* family, AF_UNSPEC (0), AF_INET[6] */
};
typedef DECL_FIFO_ANCHOR(address_node) address_fifo;
......@@ -261,7 +261,7 @@ address_node *create_address_node(char *addr, int type);
void destroy_address_node(address_node *my_node);
attr_val *create_attr_dval(int attr, double value);
attr_val *create_attr_ival(int attr, int value);
attr_val *create_attr_uval(int attr, u_int value);
attr_val *create_attr_uval(int attr, unsigned int value);
attr_val *create_attr_rangeval(int attr, int first, int last);
attr_val *create_attr_sval(int attr, const char *s);
filegen_node *create_filegen_node(int filegen_token,
......
include/ntp_filegen.h
View file @ bc1f1c05
......@@ -43,7 +43,7 @@ typedef struct filegen_tag {
extern void filegen_setup (FILEGEN *, time_t);
extern void filegen_config (FILEGEN *, const char *, const char *,
u_int, u_int);
unsigned int, unsigned int);
extern void filegen_statsdir(void);
extern FILEGEN *filegen_get (const char *);
extern void filegen_register (const char *, const char *, FILEGEN *);
......
include/ntp_io.h
View file @ bc1f1c05
......@@ -36,7 +36,7 @@ typedef enum {
extern int qos;
extern bool is_ip_address(const char *, u_short, sockaddr_u *);
extern bool is_ip_address(const char *, unsigned short, sockaddr_u *);
extern void add_nic_rule(nic_rule_match match_type,
const char *if_name, int prefixlen,
nic_rule_action action);
......
include/ntp_refclock.h
View file @ bc1f1c05
......@@ -38,7 +38,7 @@
struct refclockstat {
uint8_t flags; /* clock flags */
uint8_t haveflags; /* bit array of valid flags */
u_short lencode; /* length of last timecode */
unsigned short lencode; /* length of last timecode */
const char *p_lastcode; /* last timecode received */
uint32_t polls; /* transmit polls */
uint32_t noresponse; /* no response to poll */
......@@ -71,7 +71,7 @@ struct refclockio {
struct peer *srcclock; /* refclock peer */
size_t datalen; /* length of data */
int fd; /* file descriptor */
u_long recvcount; /* count of receive completions */
unsigned long recvcount; /* count of receive completions */
bool active; /* true when in use */
};
......@@ -82,12 +82,12 @@ struct refclockio {
#define NCLKBUGTIMES 32
struct refclockbug {
uint8_t nvalues; /* values following */
uint8_t ntimes; /* times following */
u_short svalues; /* values format sign array */
uint8_t nvalues; /* values following */
uint8_t ntimes; /* times following */
unsigned short svalues; /* values format sign array */
uint32_t stimes; /* times format sign array */
uint32_t values[NCLKBUGVALUES]; /* real values */
l_fp times[NCLKBUGTIMES]; /* real times */
l_fp times[NCLKBUGTIMES]; /* real times */
};
/*
......@@ -109,7 +109,7 @@ struct refclockproc {
uint8_t lastevent; /* last exception event */
const char *clockname; /* clock name (tag for logging) */
const char *clockdesc; /* clock description */
u_long nextaction; /* local activity timeout */
unsigned long nextaction; /* local activity timeout */
void (*action)(struct peer *); /* timeout callback */
char a_lastcode[BMAX]; /* last timecode received */
......@@ -143,11 +143,11 @@ struct refclockproc {
/*
* Status tallies
*/
u_long timestarted; /* time we started this */
u_long polls; /* polls sent */
u_long noreply; /* no replies to polls */
u_long badformat; /* bad format reply */
u_long baddata; /* bad data reply */
unsigned long timestarted; /* time we started this */
unsigned long polls; /* polls sent */
unsigned long noreply; /* no replies to polls */
unsigned long badformat; /* bad format reply */
unsigned long baddata; /* bad data reply */
};
/*
......@@ -181,7 +181,7 @@ extern void init_refclock (void);
extern void refclock_control(sockaddr_u *,
const struct refclockstat *,
struct refclockstat *);
extern int refclock_open (char *, u_int, u_int);
extern int refclock_open (char *, unsigned int, unsigned int);
extern void refclock_timer (struct peer *);
extern void refclock_transmit(struct peer *);
extern bool refclock_process(struct refclockproc *);
......
include/ntpd.h
View file @ bc1f1c05
......@@ -40,7 +40,7 @@
extern const char *getconfig (const char *);
extern void readconfig(const char *);
extern void ctl_clr_stats (void);
extern u_short ctlpeerstatus (struct peer *);
extern unsigned short ctlpeerstatus (struct peer *);
extern void init_control (void);
extern void process_control (struct recvbuf *, int);
extern void report_event (int, struct peer *, const char *);
......@@ -53,8 +53,8 @@ extern int mprintf_event (int, struct peer *, const char *, ...)
* variable indices and text format.
*/
struct ctl_var {
u_short code;
u_short flags;
unsigned short code;
unsigned short flags;
const char *text;
};
/*
......@@ -70,10 +70,10 @@ struct ctl_var {
#define RO (CAN_READ)
#define RW (CAN_READ|CAN_WRITE)
extern char * add_var (struct ctl_var **, u_long, u_short);
extern char * add_var (struct ctl_var **, unsigned long, unsigned short);
extern void free_varlist (struct ctl_var *);
extern void set_var (struct ctl_var **, const char *, u_long, u_short);
extern void set_sys_var (const char *, u_long, u_short);
extern void set_var (struct ctl_var **, const char *, unsigned long, unsigned short);
extern void set_sys_var (const char *, unsigned long, unsigned short);
extern const char * get_ext_sys_var(const char *tag);
/* ntp_io.c */
......@@ -109,7 +109,7 @@ extern void adj_host_clock(void);
extern void loop_config(int, double);
extern void select_loop(int);
extern void huffpuff(void);
extern u_int sys_tai;
extern unsigned int sys_tai;
extern int freq_cnt;
/* ntp_monitor.c */
......@@ -119,7 +119,7 @@ extern int freq_cnt;
extern void init_mon (void);
extern void mon_start (int);
extern void mon_stop (int);
extern u_short ntp_monitor (struct recvbuf *, u_short);
extern unsigned short ntp_monitor (struct recvbuf *, unsigned short);
extern void mon_clearinterface(endpt *interface);
extern int mon_get_oldest_age(l_fp);
......@@ -132,7 +132,7 @@ extern struct peer *findpeerbyassoc(associd_t);
extern void set_peerdstadr (struct peer *, endpt *);
extern struct peer *newpeer (sockaddr_u *, const char *,
endpt *, uint8_t, uint8_t,
uint8_t, uint8_t, u_int, uint8_t, uint32_t,
uint8_t, uint8_t, unsigned int, uint8_t, uint32_t,
keyid_t, const bool);
extern void peer_update_hash (struct peer *);
extern void peer_all_reset (void);
......@@ -160,26 +160,26 @@ extern void poll_update (struct peer *, uint8_t);
extern void clock_filter (struct peer *, double, double, double);
extern void init_proto (const bool);
extern void set_sys_tick_precision(double);
extern void proto_config (int, u_long, double);
extern void proto_config (int, unsigned long, double);
extern void proto_clr_stats (void);
/* ntp_restrict.c */
extern void init_restrict (void);
extern u_short restrictions (sockaddr_u *);
extern unsigned short restrictions (sockaddr_u *);
extern void hack_restrict (int, sockaddr_u *, sockaddr_u *,
u_short, u_short, u_long);
extern void restrict_source (sockaddr_u *, bool, u_long);
unsigned short, unsigned short, unsigned long);
extern void restrict_source (sockaddr_u *, bool, unsigned long);
/* ntp_timer.c */
extern void init_timer (void);
extern void reinit_timer (void);
extern void timer (void);
extern void timer_clr_stats (void);
extern void timer_interfacetimeout (u_long);
extern void timer_interfacetimeout (unsigned long);
extern volatile int interface_interval;
extern u_long orphwait; /* orphan wait time */
extern unsigned long orphwait; /* orphan wait time */
/* ntp_util.c */
extern void init_util (void);
......@@ -195,7 +195,7 @@ extern void record_raw_stats (struct peer *,
int leap, int version, int mode, int stratum,
int ppoll, int precision, double root_delay,
double root_dispersion, uint32_t refid,
u_int outcount);
unsigned int outcount);
extern void check_leap_file (bool is_daily_check, time_t systime);
#ifdef ENABLE_DEBUG_TIMING
extern void record_timing_stats (const char *);
......@@ -233,19 +233,19 @@ extern void reset_auth_stats(void);
/*
* Other statistics of possible interest
*/
extern u_long packets_dropped; /* total number of packets dropped on reception */
extern u_long packets_ignored; /* received on wild card interface */
extern u_long packets_received; /* total number of packets received */
extern u_long packets_sent; /* total number of packets sent */
extern u_long packets_notsent; /* total number of packets which couldn't be sent */
extern unsigned long packets_dropped; /* # packets dropped on reception */
extern unsigned long packets_ignored; /* received on wild card interface */
extern unsigned long packets_received; /* total number of packets received */
extern unsigned long packets_sent; /* total number of packets sent */
extern unsigned long packets_notsent; /* total number of packets which couldn't be sent */
extern volatile u_long handler_calls; /* number of calls to interrupt handler */
extern volatile u_long handler_pkts; /* number of pkts received by handler */
extern u_long io_timereset; /* time counters were reset */
extern volatile unsigned long handler_calls; /* number of calls to interrupt handler */
extern volatile unsigned long handler_pkts; /* number of pkts received by handler */
extern unsigned long io_timereset; /* time counters were reset */
/* ntp_io.c */
extern bool disable_dynamic_updates;
extern u_int sys_ifnum; /* next .ifnum to assign */
extern unsigned int sys_ifnum; /* next .ifnum to assign */
extern endpt * any_interface; /* IPv4 wildcard */
extern endpt * any6_interface; /* IPv6 wildcard */
extern endpt * loopback_interface; /* IPv4 loopback for refclocks */
......@@ -286,20 +286,20 @@ extern double sys_jitter; /* system jitter (s) */
extern uint8_t mon_hash_bits; /* log2 size of hash table */
extern mon_entry ** mon_hash; /* MRU hash table */
extern mon_entry mon_mru_list; /* mru listhead */
extern u_int mon_enabled; /* MON_OFF (0) or other MON_* */
extern u_int mru_entries; /* mru list count */
extern u_int mru_peakentries; /* highest mru_entries */
extern u_int mru_initalloc; /* entries to preallocate */
extern u_int mru_incalloc; /* allocation batch factor */
extern u_int mru_mindepth; /* preempt above this */
extern unsigned int mon_enabled; /* MON_OFF (0) or other MON_* */
extern unsigned int mru_entries; /* mru list count */
extern unsigned int mru_peakentries; /* highest mru_entries */
extern unsigned int mru_initalloc; /* entries to preallocate */
extern unsigned int mru_incalloc; /* allocation batch factor */
extern unsigned int mru_mindepth; /* preempt above this */
extern int mru_maxage; /* recycle if older than this */
extern int mru_minage; /* recycle if older than this & full */
extern u_int mru_maxdepth; /* MRU size hard limit */
extern u_long mru_exists; /* slot already exists */
extern u_long mru_new; /* allocated new slot */
extern u_long mru_recycleold; /* recycle: age > maxage */
extern u_long mru_recyclefull; /* recycle: full and age > minage */
extern u_long mru_none; /* couldn't allocate slot */
extern unsigned int mru_maxdepth; /* MRU size hard limit */
extern unsigned long mru_exists; /* slot already exists */
extern unsigned long mru_new; /* allocated new slot */
extern unsigned long mru_recycleold; /* recycle: age > maxage */
extern unsigned long mru_recyclefull; /* recycle: full and age > minage */
extern unsigned long mru_none; /* couldn't allocate slot */
extern int mon_age; /* preemption limit */
/* ntp_peer.c */
......@@ -334,18 +334,18 @@ extern int sys_minsane; /* minimum candidates */
/*
* Statistics counters
*/
extern u_long sys_stattime; /* time since reset */
extern u_long sys_received; /* packets received */
extern u_long sys_processed; /* packets for this host */
extern u_long sys_restricted; /* restricted packets */
extern u_long sys_newversion; /* current version */
extern u_long sys_oldversion; /* old version */
extern u_long sys_badlength; /* bad length or format */
extern u_long sys_badauth; /* bad authentication */
extern u_long sys_declined; /* declined */
extern u_long sys_limitrejected; /* rate exceeded */
extern u_long sys_kodsent; /* KoD sent */
extern u_long use_stattime; /* time since reset */
extern unsigned long sys_stattime; /* time since reset */
extern unsigned long sys_received; /* packets received */
extern unsigned long sys_processed; /* packets for this host */
extern unsigned long sys_restricted; /* restricted packets */
extern unsigned long sys_newversion; /* current version */
extern unsigned long sys_oldversion; /* old version */
extern unsigned long sys_badlength; /* bad length or format */
extern unsigned long sys_badauth; /* bad authentication */
extern unsigned long sys_declined; /* declined */
extern unsigned long sys_limitrejected; /* rate exceeded */
extern unsigned long sys_kodsent; /* KoD sent */
extern unsigned long use_stattime; /* time since reset */
/* Signalling */
extern volatile bool sawALRM;
......@@ -368,14 +368,14 @@ extern void send_via_ntp_signd(struct recvbuf *, int, keyid_t, int,
#endif
/* ntp_timer.c */
extern volatile u_long alarm_overflow;
extern u_long current_time; /* seconds since startup */