From: Harlan Stenn Date: Tue, 29 May 2007 05:56:04 +0000 (-0400) Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc7b83b2ed2beb49f1579f6c365271c583e0560f;p=thirdparty%2Fntp.git Merge whimsy.udel.edu:/deacon/backroom/ntp-stable into whimsy.udel.edu:/deacon/backroom/ntp-dev bk: 465bc074T-rCb7yR0GNmdZZtzUDo8w --- fc7b83b2ed2beb49f1579f6c365271c583e0560f diff --cc ChangeLog index f94bde49ac,802a4e4ddc..8e8d458eeb --- a/ChangeLog +++ b/ChangeLog @@@ -1,52 -1,5 +1,53 @@@ +* Cleanup FILE * usage after fclose() in ntp_filegen.c. +* [Bug 843] Windows Completion port code was incorrectly merged from -stable. +* [Bug 841] make deferred binding to local interface the default. + (allows peers/servers to be configured even when no route exists) +* [Bug 840] do fudge configuration AFTER peers (thus refclocks) have been + configured. +* [Bug 824] Added new parser modules to the Windows project file. +* [Bug 832] Add libisc/log.c headers to the distribution. +* [Bug 808] Only write the drift file if we are in state 4. +* Initial import of libisc/log.c and friends. +* [Bug 826] Fix redefinition of PI. +* [Bug 825] ntp_scanner.c needs to #include . +* [Bug 824] New parser code has some build problems with the SIM code. +* [Bug 817] Use longnames for setting ntp variables on the command-line; + Allowing '-v' with and without an arg to disambiguate usage + is error-prone. +* [Bug 822] set progname once, early. +* [Bug 819] remove erroneous #if 0 in Windows completion port code. +* The new config code missed an #ifdef for building without refclocks. +* Distribute some files needed by the new config parsing code. +* [Bug 819] Timeout for WaitForMultipleObjects was 500ms instead of INFINITE +* Use autogen 5.9.1. +* Fix clktest command-line arg processing.' +* Audio documentation updates from Dave Mills. +* New config file parsing code, from Sachin Kamboj. +* fuzz bit cleanup from Dave Mills. +* replay cleanup from Dave Mills. +* [Bug 542] Tolerate missing directory separator at EO statsdir. +* [Bug 812] ntpd should drop supplementary groups. +* [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6. +* [Bug 740] Fix kernel/daemon startup drift anomaly. +* refclock_wwv.c fixes from Dave Mills. +* [Bug 810] Fix ntp-keygen documentation. +* [Bug 787] Bug fixes for 64-bit time_t on Windows. +* [Bug 796] Clean up duplicate #defines in ntp_control.c. +* [Bug 569] Use the correct precision for the Leitch CSD-5300. +* [Bug 795] Moved declaration of variable to top of function. +* [Bug 798] ntpq [p typo crashes ntpq/ntpdc. +* [Bug 786] Fix refclock_bancomm.c on Solaris. +* [Bug 774] parsesolaris.c does not compile under the new Solaris. +* [Bug 782] Remove P() macros from Windows files. +* [Bug 778] ntpd fails to lock with drift=+500 when started with drift=-500. +* [Bug 592] Trimble Thunderbolt GPS support. +* IRIG, CHU, WWV, WWVB refclock improvements from Dave Mills. +* [Bug 757] Lose ULONG_CONST(). +* [Bug 756] Require ANSI C (function prototypes). +* codec (audio) and ICOM changes from Dave Mills. + - (4.2.4p2) Released by Harlan Stenn + * [Bug 829] reduce syslog noise, while there fix Enabled/Disable logging + to reflect the actual configuration. * [Bug 795] Moved declaration of variable to top of function. * [Bug 789] Fix multicast client crypto authentication and make sure arriving multicast packets do not disturb the autokey dance. diff --cc ntpd/ntp_io.c index c2b266df60,5ba08b88f2..eb7fc5749c --- a/ntpd/ntp_io.c +++ b/ntpd/ntp_io.c @@@ -256,19 -256,19 +256,19 @@@ ISC_LIST(struct interface) inter_li static struct interface *wildipv4 = NULL; static struct interface *wildipv6 = NULL; -static void add_fd_to_list P((SOCKET, enum desc_type)); -static void close_and_delete_fd_from_list P((SOCKET)); -static void add_addr_to_list P((struct sockaddr_storage *, struct interface *)); -static void delete_addr_from_list P((struct sockaddr_storage *)); -static struct interface *find_addr_in_list P((struct sockaddr_storage *)); -static struct interface *find_flagged_addr_in_list P((struct sockaddr_storage *, int)); -static void create_wildcards P((u_short)); -static isc_boolean_t address_okay P((struct interface *)); -static void convert_isc_if P((isc_interface_t *, struct interface *, u_short)); -static void delete_interface_from_list P((struct interface *)); -static struct interface *getinterface P((struct sockaddr_storage *, int)); -static struct interface *findlocalinterface P((struct sockaddr_storage *, int)); -static struct interface *findlocalcastinterface P((struct sockaddr_storage *, int)); +static void add_fd_to_list (SOCKET, enum desc_type); +static void close_and_delete_fd_from_list (SOCKET); +static void add_addr_to_list (struct sockaddr_storage *, struct interface *); +static void delete_addr_from_list (struct sockaddr_storage *); +static void delete_interface_from_list (struct interface *); +static struct interface *find_addr_in_list (struct sockaddr_storage *); +static struct interface *find_flagged_addr_in_list (struct sockaddr_storage *, int); +static void create_wildcards (u_short); - static isc_boolean_t address_okay (isc_interface_t *); ++static isc_boolean_t address_okay (struct interface *); +static void convert_isc_if (isc_interface_t *, struct interface *, u_short); +static struct interface *getinterface (struct sockaddr_storage *, int); +static struct interface *findlocalinterface (struct sockaddr_storage *, int); +static struct interface *findlocalcastinterface (struct sockaddr_storage *, int); /* * Routines to read the ntp packets