13,15d12
< #define MAXINTERFACES 512
< #define MAXFILENAME 128 /* maximum length of a file name */
<
24,25d20
< #else
< #define closesocket close
33c28
< extern int ctlclrtrap P((struct sockaddr_in *, struct interface *, int));
---
> extern int ctlclrtrap P((struct sockaddr_storage *, struct interface *, int));
35c30
< extern int ctlsettrap P((struct sockaddr_in *, struct interface *, int, int));
---
> extern int ctlsettrap P((struct sockaddr_storage *, struct interface *, int, int));
68c63
< extern char * add_var P((struct ctl_var **, unsigned long, int));
---
> extern char * add_var P((struct ctl_var **, u_long, u_short));
70,71c65,66
< extern void set_var P((struct ctl_var **, const char *, unsigned long, int));
< extern void set_sys_var P((char *, unsigned long, int));
---
> extern void set_var P((struct ctl_var **, const char *, u_long, u_short));
> extern void set_sys_var P((char *, u_long, u_short));
74c69
< extern void ntp_res_name P((u_int32, u_short));
---
> extern void ntp_res_name P((struct sockaddr_storage, u_short));
79,80c74,75
< extern struct interface *findinterface P((struct sockaddr_in *));
< extern struct interface *findbcastinter P((struct sockaddr_in *));
---
> extern struct interface *findinterface P((struct sockaddr_storage *));
> extern struct interface *findbcastinter P((struct sockaddr_storage *));
87,89c82,84
< extern void io_multicast_add P((u_int32));
< extern void io_multicast_del P((u_int32));
< extern void kill_asyncio P((void));
---
> extern void io_multicast_add P((struct sockaddr_storage));
> extern void io_multicast_del P((struct sockaddr_storage));
> extern void kill_asyncio P((int));
91c86
< extern void sendpkt P((struct sockaddr_in *, struct interface *, int, struct pkt *, int));
---
> extern void sendpkt P((struct sockaddr_storage *, struct interface *, int, struct pkt *, int));
125,126c120,121
< extern struct peer *findexistingpeer P((struct sockaddr_in *, struct peer *, int));
< extern struct peer *findpeer P((struct sockaddr_in *, struct interface *, int, int, int *));
---
> extern struct peer *findexistingpeer P((struct sockaddr_storage *, struct peer *, int));
> extern struct peer *findpeer P((struct sockaddr_storage *, struct interface *, int, int, int *));
128c123
< extern struct peer *newpeer P((struct sockaddr_in *, struct interface *, int, int, int, int, u_int, u_int, int, keyid_t));
---
> extern struct peer *newpeer P((struct sockaddr_storage *, struct interface *, int, int, int, int, u_int, u_char, int, keyid_t));
131c126
< extern struct peer *peer_config P((struct sockaddr_in *, struct interface *, int, int, int, int, u_int, int, keyid_t, u_char *));
---
> extern struct peer *peer_config P((struct sockaddr_storage *, struct interface *, int, int, int, int, u_int, int, keyid_t, u_char *));
133c128
< extern int peer_unconfig P((struct sockaddr_in *, struct interface *, int));
---
> extern int peer_unconfig P((struct sockaddr_storage *, struct interface *, int));
136c131
< #ifdef AUTOKEY
---
> #ifdef OPENSSL
138c133
< #endif /* AUTOKEY */
---
> #endif /* OPENSSL */
141a137,152
> /* ntp_crypto.c */
> #ifdef OPENSSL
> extern int crypto_recv P((struct peer *, struct recvbuf *));
> extern int crypto_xmit P((struct pkt *, struct sockaddr_storage *, int, struct exten *, keyid_t));
> extern keyid_t session_key P((struct sockaddr_storage *, struct sockaddr_storage *, keyid_t, keyid_t, u_long));
> extern void make_keylist P((struct peer *, struct interface *));
> extern void key_expire P((struct peer *));
> extern void crypto_update P((void));
> extern void crypto_config P((int, char *));
> extern void crypto_setup P((void));
> extern u_int crypto_ident P((struct peer *));
> extern struct exten *crypto_args P((struct peer *, u_int, char *));
> extern int crypto_public P((struct peer *, u_char *, u_int));
> extern void value_free P((struct value *));
> #endif /* OPENSSL */
>
145c156
< extern void peer_clear P((struct peer *));
---
> extern void peer_clear P((struct peer *, char *));
147a159
> extern void kod_proto P((void));
160c172
< extern void proto_config P((int, u_long, double));
---
> extern void proto_config P((int, u_long, double, struct sockaddr_storage*));
178,179c190,191
< extern int restrictions P((struct sockaddr_in *));
< extern void hack_restrict P((int, struct sockaddr_in *, struct sockaddr_in *, int, int));
---
> extern int restrictions P((struct sockaddr_storage *));
> extern void hack_restrict P((int, struct sockaddr_storage *, struct sockaddr_storage *, int, int));
182a195
> extern void reinit_timer P((void));
185c198
< #ifdef AUTOKEY
---
> #ifdef OPENSSL
188c201
< #endif /* AUTOKEY */
---
> #endif /* OPENSSL */
194c207
< extern void record_peer_stats P((struct sockaddr_in *, int, double, double, double, double));
---
> extern void record_peer_stats P((struct sockaddr_storage *, int, double, double, double, double));
196,197c209,213
< extern void record_clock_stats P((struct sockaddr_in *, const char *));
< extern void record_raw_stats P((struct sockaddr_in *, struct sockaddr_in *, l_fp *, l_fp *, l_fp *, l_fp *));
---
> extern void record_clock_stats P((struct sockaddr_storage *, const char *));
> extern void record_raw_stats P((struct sockaddr_storage *, struct sockaddr_storage *, l_fp *, l_fp *, l_fp *, l_fp *));
> extern void record_sys_stats P((void));
> extern void record_crypto_stats P((struct sockaddr_storage *, const char *));
> extern int sock_hash P((struct sockaddr_storage *));
257c273,274
< extern struct interface *any_interface; /* default interface */
---
> extern struct interface *any_interface; /* default ipv4 interface */
> extern struct interface *any6_interface;/* default ipv6 interface */
287d303
< extern int allow_step; /* allow step correction */
290a307
> extern int forground_process; /* run the process in the forground */
296d312
< extern u_char sys_minpoll; /* min system poll interval (log2 s) */
301c317
< extern u_char allan_xpt; /* Allan intercept (s) */
---
> extern double allan_xpt; /* Allan intercept (s) */
352c368,374
< extern int sys_manycastserver; /* 1 => respond to manycast client pkts */
---
> extern int sys_manycastserver; /* respond to manycast client pkts */
> extern int sys_minclock; /* minimum survivors */
> extern int sys_minsane; /* minimum candidates */
> extern int sys_floor; /* cluster stratum floor */
> extern int sys_ceiling; /* cluster stratum ceiling */
> extern u_char sys_ttl[]; /* ttl mapping vector */
> extern int sys_ttlmax; /* max ttl mapping vector index */
358,360c380,382
< extern u_long sys_badstratum; /* packets with invalid stratum */
< extern u_long sys_oldversionpkt; /* old version packets received */
< extern u_long sys_newversionpkt; /* new version packets received */
---
> extern u_long sys_restricted; /* restricted packets */
> extern u_long sys_oldversionpkt; /* old version packets */
> extern u_long sys_newversionpkt; /* new version packets */
362c384
< extern u_long sys_badlength; /* packets with bad length */
---
> extern u_long sys_badlength; /* bad length or format */
364,365c386,388
< extern u_long sys_badauth; /* packets dropped because of auth */
< extern u_long sys_limitrejected; /* pkts rejected due to client count per net */
---
> extern u_long sys_badauth; /* bad authentication */
> extern u_long sys_limitrejected; /* rate limit exceeded */
> extern u_long sys_received; /* packets received */
378,380c401,405
< extern struct restrictlist *restrictlist; /* the restriction list */
< extern u_long client_limit;
< extern u_long client_limit_period;
---
> extern struct restrictlist *restrictlist; /* the ipv4 restriction list */
> extern struct restrictlist6 *restrictlist6; /* the ipv6 restriction list */
> extern u_long res_min_interval;
> extern u_long res_avg_interval;
> extern u_long mon_age; /* monitor preempt age */
384c409
< extern u_long sys_revoke; /* keys revoke timeout */
---
> extern u_char sys_revoke; /* keys revoke timeout (log2 s) */
397a423,427
> #ifdef HAVE_CLOCKCTL
> extern char *user; /* user to switch to */
> extern char *group; /* group to switch to */
> extern char *chrootdir; /* directory to chroot to */
> #endif