diff options
Diffstat (limited to 'contrib/ntp/include')
| -rw-r--r-- | contrib/ntp/include/Makefile.in | 77 | ||||
| -rw-r--r-- | contrib/ntp/include/ntp.h | 4 | ||||
| -rw-r--r-- | contrib/ntp/include/ntp_machine.h | 42 | ||||
| -rw-r--r-- | contrib/ntp/include/ntp_request.h | 35 | ||||
| -rw-r--r-- | contrib/ntp/include/ntpd.h | 2 |
5 files changed, 111 insertions, 49 deletions
diff --git a/contrib/ntp/include/Makefile.in b/contrib/ntp/include/Makefile.in index e034ae1..136e6dd 100644 --- a/contrib/ntp/include/Makefile.in +++ b/contrib/ntp/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4e from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -11,6 +11,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies + SHELL = @SHELL@ srcdir = @srcdir@ @@ -31,11 +35,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ - -@SET_MAKE@ -AMDEP = @AMDEP@ AMTAR = @AMTAR@ AUTOKEY = @AUTOKEY@ AWK = @AWK@ @@ -78,13 +75,12 @@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ EF_LIBS = @EF_LIBS@ EF_PROGS = @EF_PROGS@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ LDFLAGS = @LDFLAGS@ LIBPARSE = @LIBPARSE@ LIBRSAREF = @LIBRSAREF@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ MAKE_ADJTIMED = @MAKE_ADJTIMED@ MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@ MAKE_LIBPARSE = @MAKE_LIBPARSE@ @@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ +OBJEXT = @OBJEXT@ OPENSSL = @OPENSSL@ OPENSSL_INC = @OPENSSL_INC@ OPENSSL_LIB = @OPENSSL_LIB@ @@ -107,20 +104,17 @@ RSADIR = @RSADIR@ RSAOBJS = @RSAOBJS@ RSAREF = @RSAREF@ RSASRCS = @RSASRCS@ -STRIP = @STRIP@ TESTDCF = @TESTDCF@ U = @U@ VERSION = @VERSION@ -_am_include = @_am_include@ +am__include = @am__include@ +am__quote = @am__quote@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr ETAGS_ARGS = $(srcdir)/Makefile.am -#EXTRA_DIST = TAGS +#EXTRA_DIST = TAGS noinst_HEADERS = \ adjtime.h \ audio.h \ @@ -168,8 +162,6 @@ noinst_HEADERS = \ recvbuff.h \ trimble.h -EXEEXT = -OBJEXT = o subdir = include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -178,19 +170,17 @@ DIST_SOURCES = HEADERS = $(noinst_HEADERS) DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in - all: all-am .SUFFIXES: - -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu include/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS @@ -203,7 +193,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) END { for (i in files) print i; }'`; \ mkid -fID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -219,10 +209,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -231,7 +221,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ cp -pR $$d/$$file $(distdir) \ || exit 1; \ @@ -256,23 +250,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-am clean-am: clean-generic mostlyclean-am @@ -281,11 +272,11 @@ distclean: distclean-am distclean-am: clean-am distclean-generic distclean-tags -dvi: +dvi: dvi-am dvi-am: -info: +info: info-am info-am: @@ -293,7 +284,7 @@ install-data-am: install-exec-am: -install-info: +install-info: install-info-am install-man: @@ -307,14 +298,16 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -.PHONY: all all-am check check-am clean clean-generic distclean \ +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \ distclean-generic distclean-tags distdir dvi dvi-am info \ info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic tags uninstall uninstall-am - + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/ntp/include/ntp.h b/contrib/ntp/include/ntp.h index f7ade0d..5881df1 100644 --- a/contrib/ntp/include/ntp.h +++ b/contrib/ntp/include/ntp.h @@ -457,7 +457,9 @@ struct peer { #define REFCLK_FG 37 /* Forum Graphic GPS */ #define REFCLK_HOPF_SERIAL 38 /* hopf DCF77/GPS serial line receiver */ #define REFCLK_HOPF_PCI 39 /* hopf DCF77/GPS PCI receiver */ -#define REFCLK_MAX 39 /* Grow as needed... */ +#define REFCLK_JJY 40 /* JJY receiver */ +#define REFCLK_ZYFER 41 /* Zyfer GPStarplus receiver */ +#define REFCLK_MAX 41 /* Grow as needed... */ /* * We tell reference clocks from real peers by giving the reference diff --git a/contrib/ntp/include/ntp_machine.h b/contrib/ntp/include/ntp_machine.h index d14f5c1..17026a7 100644 --- a/contrib/ntp/include/ntp_machine.h +++ b/contrib/ntp/include/ntp_machine.h @@ -434,6 +434,48 @@ struct servent *getservbyname P((char *name, char *type)); # endif #endif /* NTP_SYSCALLS_STD */ +#ifdef MPE +# include <sys/types.h> +# include <netinet/in.h> +# include <stdio.h> +# include <time.h> + +/* missing functions that are easily renamed */ + +# define _getch getchar + +/* special functions that require MPE-specific wrappers */ + +# define bind __ntp_mpe_bind +# define fcntl __ntp_mpe_fcntl + +/* standard macros missing from MPE include files */ + +# define IN_CLASSD(i) ((((long)(i))&0xf0000000)==0xe0000000) +# define IN_MULTICAST IN_CLASSD +# define ITIMER_REAL 0 +# define MAXHOSTNAMELEN 64 + +/* standard structures missing from MPE include files */ + +struct itimerval { + struct timeval it_interval; /* timer interval */ + struct timeval it_value; /* current value */ +}; + +/* various declarations to make gcc stop complaining */ + +extern int __filbuf(FILE *); +extern int __flsbuf(int, FILE *); +extern int gethostname(char *, int); +extern unsigned long inet_addr(char *); +extern char *strdup(const char *); + +/* miscellaneous NTP macros */ + +# define HAVE_NO_NICE +#endif /* MPE */ + #ifdef HAVE_RTPRIO # define HAVE_NO_NICE #else diff --git a/contrib/ntp/include/ntp_request.h b/contrib/ntp/include/ntp_request.h index a64094a..9e76df5 100644 --- a/contrib/ntp/include/ntp_request.h +++ b/contrib/ntp/include/ntp_request.h @@ -129,8 +129,19 @@ struct req_pkt { }; /* + * The req_pkt_tail structure is used by ntpd to adjust for different + * packet sizes that may arrive. + */ +struct req_pkt_tail { + l_fp tstamp; /* time stamp, for authentication */ + keyid_t keyid; /* encryption key */ + char mac[MAX_MAC_LEN-sizeof(u_int32)]; /* (optional) 8 byte auth code */ +}; + +/* * Input packet lengths. One with the mac, one without. */ +#define REQ_LEN_HDR 8 /* 4 * u_char + 2 * u_short */ #define REQ_LEN_MAC (sizeof(struct req_pkt)) #define REQ_LEN_NOMAC (sizeof(struct req_pkt) - MAX_MAC_LEN) @@ -285,7 +296,7 @@ struct resp_pkt { #define INFO_FLAG_KERNEL 0x8 #define INFO_FLAG_MONITOR 0x40 #define INFO_FLAG_FILEGEN 0x80 -#define INFO_FLAG_PLL_SYNC 0x10 +#define INFO_FLAG_CAL 0x10 #define INFO_FLAG_PPS_SYNC 0x20 /* @@ -521,6 +532,18 @@ struct info_timer_stats { /* * Structure for passing peer configuration information */ +struct old_conf_peer { + u_int32 peeraddr; /* address to poll */ + u_char hmode; /* mode, either broadcast, active or client */ + u_char version; /* version number to poll with */ + u_char minpoll; /* min host poll interval */ + u_char maxpoll; /* max host poll interval */ + u_char flags; /* flags for this request */ + u_char ttl; /* time to live (multicast) or refclock mode */ + u_short unused; /* unused */ + keyid_t keyid; /* key to use for this association */ +}; + struct conf_peer { u_int32 peeraddr; /* address to poll */ u_char hmode; /* mode, either broadcast, active or client */ @@ -560,12 +583,14 @@ struct conf_sys_flags { /* * System flags we can set/clear */ -#define SYS_FLAG_BCLIENT 0x1 -#define SYS_FLAG_PPS 0x2 -#define SYS_FLAG_NTP 0x4 -#define SYS_FLAG_KERNEL 0x8 +#define SYS_FLAG_BCLIENT 0x01 +#define SYS_FLAG_PPS 0x02 +#define SYS_FLAG_NTP 0x04 +#define SYS_FLAG_KERNEL 0x08 #define SYS_FLAG_MONITOR 0x10 #define SYS_FLAG_FILEGEN 0x20 +#define SYS_FLAG_AUTH 0x40 +#define SYS_FLAG_CAL 0x80 /* * Structure used for returning restrict entries diff --git a/contrib/ntp/include/ntpd.h b/contrib/ntp/include/ntpd.h index d3db2fb..2e030e6 100644 --- a/contrib/ntp/include/ntpd.h +++ b/contrib/ntp/include/ntpd.h @@ -298,7 +298,7 @@ extern int state; /* clock discipline state */ extern int tc_counter; /* poll-adjust counter */ extern u_long last_time; /* time of last clock update (s) */ extern double last_offset; /* last clock offset (s) */ -extern double allan_xpt; /* Allan intercept (s) */ +extern u_char allan_xpt; /* Allan intercept (s) */ extern double sys_error; /* system RMS error (s) */ extern double sys_jitter; /* system RMS jitter (s) */ |
