From ea66d79595ea38b5dd51f2a7f92eb38e5bc820a5 Mon Sep 17 00:00:00 2001 From: christos Date: Fri, 19 Dec 2014 20:43:14 +0000 Subject: [PATCH] Merge conflicts --- external/bsd/ntp/bin/ntpd/Makefile | 3 +- external/bsd/ntp/dist/adjtimed/adjtimed.c | 2 +- external/bsd/ntp/dist/clockstuff/chutest.c | 2 +- external/bsd/ntp/dist/clockstuff/propdelay.c | 2 +- external/bsd/ntp/dist/include/adjtime.h | 2 +- external/bsd/ntp/dist/include/ascii.h | 2 +- external/bsd/ntp/dist/include/audio.h | 2 +- external/bsd/ntp/dist/include/binio.h | 2 +- external/bsd/ntp/dist/include/declcond.h | 2 +- external/bsd/ntp/dist/include/gps.h | 2 +- external/bsd/ntp/dist/include/hopf6039.h | 2 +- external/bsd/ntp/dist/include/icom.h | 2 +- external/bsd/ntp/dist/include/ieee754io.h | 2 +- external/bsd/ntp/dist/include/intreswork.h | 2 +- external/bsd/ntp/dist/include/iosignal.h | 2 +- external/bsd/ntp/dist/include/isc/mem.h | 2 +- external/bsd/ntp/dist/include/l_stdlib.h | 2 +- external/bsd/ntp/dist/include/lib_strbuf.h | 2 +- external/bsd/ntp/dist/include/libntp.h | 2 +- external/bsd/ntp/dist/include/mbg_gps166.h | 2 +- external/bsd/ntp/dist/include/mx4200.h | 2 +- external/bsd/ntp/dist/include/ntif.h | 2 +- external/bsd/ntp/dist/include/ntp.h | 2 +- external/bsd/ntp/dist/include/ntp_assert.h | 2 +- external/bsd/ntp/dist/include/ntp_calendar.h | 2 +- external/bsd/ntp/dist/include/ntp_cmdargs.h | 2 +- external/bsd/ntp/dist/include/ntp_config.h | 2 +- external/bsd/ntp/dist/include/ntp_control.h | 2 +- external/bsd/ntp/dist/include/ntp_crypto.h | 2 +- external/bsd/ntp/dist/include/ntp_datum.h | 2 +- external/bsd/ntp/dist/include/ntp_debug.h | 2 +- external/bsd/ntp/dist/include/ntp_filegen.h | 2 +- external/bsd/ntp/dist/include/ntp_fp.h | 8 +- external/bsd/ntp/dist/include/ntp_if.h | 2 +- external/bsd/ntp/dist/include/ntp_intres.h | 2 +- external/bsd/ntp/dist/include/ntp_io.h | 2 +- external/bsd/ntp/dist/include/ntp_libopts.h | 2 +- external/bsd/ntp/dist/include/ntp_lineedit.h | 2 +- external/bsd/ntp/dist/include/ntp_lists.h | 2 +- external/bsd/ntp/dist/include/ntp_machine.h | 2 +- external/bsd/ntp/dist/include/ntp_malloc.h | 2 +- external/bsd/ntp/dist/include/ntp_md5.h | 2 +- external/bsd/ntp/dist/include/ntp_net.h | 2 +- external/bsd/ntp/dist/include/ntp_prio_q.h | 2 +- external/bsd/ntp/dist/include/ntp_proto.h | 2 +- external/bsd/ntp/dist/include/ntp_random.h | 2 +- external/bsd/ntp/dist/include/ntp_refclock.h | 2 +- external/bsd/ntp/dist/include/ntp_request.h | 2 +- external/bsd/ntp/dist/include/ntp_rfc2553.h | 2 +- external/bsd/ntp/dist/include/ntp_select.h | 2 +- external/bsd/ntp/dist/include/ntp_stdlib.h | 2 +- external/bsd/ntp/dist/include/ntp_string.h | 2 +- external/bsd/ntp/dist/include/ntp_syscall.h | 2 +- external/bsd/ntp/dist/include/ntp_syslog.h | 2 +- external/bsd/ntp/dist/include/ntp_tty.h | 2 +- external/bsd/ntp/dist/include/ntp_types.h | 2 +- external/bsd/ntp/dist/include/ntp_unixtime.h | 2 +- external/bsd/ntp/dist/include/ntp_worker.h | 2 +- external/bsd/ntp/dist/include/ntp_workimpl.h | 2 +- external/bsd/ntp/dist/include/ntpd.h | 6 +- external/bsd/ntp/dist/include/ntpsim.h | 2 +- external/bsd/ntp/dist/include/parse.h | 2 +- external/bsd/ntp/dist/include/parse_conf.h | 2 +- external/bsd/ntp/dist/include/recvbuff.h | 2 +- external/bsd/ntp/dist/include/refclock_atom.h | 2 +- external/bsd/ntp/dist/include/ssl_applink.c | 2 +- external/bsd/ntp/dist/include/timepps-SCO.h | 2 +- .../bsd/ntp/dist/include/timepps-Solaris.h | 2 +- external/bsd/ntp/dist/include/timepps-SunOS.h | 2 +- external/bsd/ntp/dist/include/timespecops.h | 2 +- external/bsd/ntp/dist/include/timetoa.h | 2 +- external/bsd/ntp/dist/include/timevalops.h | 2 +- external/bsd/ntp/dist/include/trimble.h | 2 +- external/bsd/ntp/dist/include/vint64ops.h | 2 +- .../bsd/ntp/dist/kernel/sys/bsd_audioirig.h | 2 +- external/bsd/ntp/dist/kernel/sys/i8253.h | 2 +- .../bsd/ntp/dist/kernel/sys/parsestreams.h | 2 +- external/bsd/ntp/dist/kernel/sys/pcl720.h | 2 +- external/bsd/ntp/dist/kernel/sys/ppsclock.h | 2 +- external/bsd/ntp/dist/kernel/sys/timex.h | 2 +- external/bsd/ntp/dist/kernel/sys/tpro.h | 2 +- external/bsd/ntp/dist/kernel/sys/tt560_api.h | 2 +- .../dist/lib/isc/alpha/include/isc/atomic.h | 2 +- external/bsd/ntp/dist/lib/isc/app_api.c | 2 +- external/bsd/ntp/dist/lib/isc/assertions.c | 2 +- .../bsd/ntp/dist/lib/isc/backtrace-emptytbl.c | 2 +- external/bsd/ntp/dist/lib/isc/backtrace.c | 2 +- external/bsd/ntp/dist/lib/isc/base32.c | 2 +- external/bsd/ntp/dist/lib/isc/base64.c | 2 +- external/bsd/ntp/dist/lib/isc/bitstring.c | 2 +- external/bsd/ntp/dist/lib/isc/buffer.c | 2 +- external/bsd/ntp/dist/lib/isc/bufferlist.c | 2 +- external/bsd/ntp/dist/lib/isc/commandline.c | 2 +- external/bsd/ntp/dist/lib/isc/entropy.c | 2 +- external/bsd/ntp/dist/lib/isc/error.c | 2 +- external/bsd/ntp/dist/lib/isc/event.c | 2 +- external/bsd/ntp/dist/lib/isc/fsaccess.c | 2 +- external/bsd/ntp/dist/lib/isc/hash.c | 2 +- external/bsd/ntp/dist/lib/isc/heap.c | 2 +- external/bsd/ntp/dist/lib/isc/hex.c | 2 +- external/bsd/ntp/dist/lib/isc/hmacmd5.c | 2 +- external/bsd/ntp/dist/lib/isc/hmacsha.c | 2 +- external/bsd/ntp/dist/lib/isc/httpd.c | 2 +- .../dist/lib/isc/ia64/include/isc/atomic.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/Makefile | 439 - .../bsd/ntp/dist/lib/isc/include/isc/app.h | 2 +- .../ntp/dist/lib/isc/include/isc/assertions.h | 2 +- .../ntp/dist/lib/isc/include/isc/backtrace.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/base32.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/base64.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/bind9.h | 2 +- .../ntp/dist/lib/isc/include/isc/bitstring.h | 2 +- .../ntp/dist/lib/isc/include/isc/boolean.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/buffer.h | 2 +- .../ntp/dist/lib/isc/include/isc/bufferlist.h | 2 +- .../dist/lib/isc/include/isc/commandline.h | 2 +- .../ntp/dist/lib/isc/include/isc/entropy.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/error.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/event.h | 2 +- .../ntp/dist/lib/isc/include/isc/eventclass.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/file.h | 2 +- .../dist/lib/isc/include/isc/formatcheck.h | 2 +- .../ntp/dist/lib/isc/include/isc/fsaccess.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/hash.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/heap.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/hex.h | 2 +- .../ntp/dist/lib/isc/include/isc/hmacmd5.h | 2 +- .../ntp/dist/lib/isc/include/isc/hmacsha.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/httpd.h | 2 +- .../dist/lib/isc/include/isc/interfaceiter.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/ipv6.h | 2 +- .../dist/lib/isc/include/isc/iterated_hash.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/lang.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/lex.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/lfsr.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/lib.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/list.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/log.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/magic.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/md5.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/mem.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/msgcat.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/msgs.h | 2 +- .../ntp/dist/lib/isc/include/isc/mutexblock.h | 2 +- .../ntp/dist/lib/isc/include/isc/namespace.h | 2 +- .../ntp/dist/lib/isc/include/isc/netaddr.h | 2 +- .../ntp/dist/lib/isc/include/isc/netscope.h | 2 +- .../ntp/dist/lib/isc/include/isc/ondestroy.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/os.h | 2 +- .../ntp/dist/lib/isc/include/isc/parseint.h | 2 +- .../ntp/dist/lib/isc/include/isc/platform.h | 2 +- .../ntp/dist/lib/isc/include/isc/portset.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/print.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/queue.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/quota.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/radix.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/random.h | 2 +- .../dist/lib/isc/include/isc/ratelimiter.h | 2 +- .../ntp/dist/lib/isc/include/isc/refcount.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/region.h | 2 +- .../ntp/dist/lib/isc/include/isc/resource.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/result.h | 2 +- .../dist/lib/isc/include/isc/resultclass.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/rwlock.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/serial.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/sha1.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/sha2.h | 2 +- .../ntp/dist/lib/isc/include/isc/sockaddr.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/socket.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/stats.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/stdio.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/stdlib.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/string.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/symtab.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/task.h | 2 +- .../ntp/dist/lib/isc/include/isc/taskpool.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/timer.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/types.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/util.h | 2 +- .../ntp/dist/lib/isc/include/isc/version.h | 2 +- .../bsd/ntp/dist/lib/isc/include/isc/xml.h | 2 +- external/bsd/ntp/dist/lib/isc/inet_aton.c | 2 +- external/bsd/ntp/dist/lib/isc/inet_ntop.c | 2 +- external/bsd/ntp/dist/lib/isc/inet_pton.c | 2 +- external/bsd/ntp/dist/lib/isc/iterated_hash.c | 2 +- external/bsd/ntp/dist/lib/isc/lex.c | 2 +- external/bsd/ntp/dist/lib/isc/lfsr.c | 2 +- external/bsd/ntp/dist/lib/isc/lib.c | 2 +- external/bsd/ntp/dist/lib/isc/log.c | 2 +- external/bsd/ntp/dist/lib/isc/md5.c | 2 +- external/bsd/ntp/dist/lib/isc/mem.c | 2 +- external/bsd/ntp/dist/lib/isc/mem_api.c | 2 +- .../dist/lib/isc/mips/include/isc/atomic.h | 2 +- external/bsd/ntp/dist/lib/isc/mutexblock.c | 2 +- external/bsd/ntp/dist/lib/isc/netaddr.c | 2 +- external/bsd/ntp/dist/lib/isc/netscope.c | 2 +- external/bsd/ntp/dist/lib/isc/nls/msgcat.c | 2 +- .../lib/isc/noatomic/include/isc/atomic.h | 2 +- .../ntp/dist/lib/isc/nothreads/condition.c | 2 +- .../lib/isc/nothreads/include/isc/condition.h | 2 +- .../lib/isc/nothreads/include/isc/mutex.h | 2 +- .../dist/lib/isc/nothreads/include/isc/once.h | 2 +- .../lib/isc/nothreads/include/isc/thread.h | 2 +- .../bsd/ntp/dist/lib/isc/nothreads/mutex.c | 2 +- .../bsd/ntp/dist/lib/isc/nothreads/thread.c | 2 +- external/bsd/ntp/dist/lib/isc/ondestroy.c | 2 +- external/bsd/ntp/dist/lib/isc/parseint.c | 2 +- external/bsd/ntp/dist/lib/isc/portset.c | 2 +- .../dist/lib/isc/powerpc/include/isc/atomic.h | 2 +- external/bsd/ntp/dist/lib/isc/print.c | 2 +- .../bsd/ntp/dist/lib/isc/pthreads/condition.c | 2 +- .../lib/isc/pthreads/include/isc/condition.h | 2 +- .../dist/lib/isc/pthreads/include/isc/mutex.h | 2 +- .../dist/lib/isc/pthreads/include/isc/once.h | 2 +- .../lib/isc/pthreads/include/isc/thread.h | 2 +- .../bsd/ntp/dist/lib/isc/pthreads/mutex.c | 2 +- .../bsd/ntp/dist/lib/isc/pthreads/thread.c | 2 +- external/bsd/ntp/dist/lib/isc/quota.c | 2 +- external/bsd/ntp/dist/lib/isc/radix.c | 2 +- external/bsd/ntp/dist/lib/isc/random.c | 2 +- external/bsd/ntp/dist/lib/isc/ratelimiter.c | 2 +- external/bsd/ntp/dist/lib/isc/refcount.c | 2 +- external/bsd/ntp/dist/lib/isc/region.c | 2 +- external/bsd/ntp/dist/lib/isc/result.c | 2 +- external/bsd/ntp/dist/lib/isc/rwlock.c | 2 +- external/bsd/ntp/dist/lib/isc/serial.c | 2 +- external/bsd/ntp/dist/lib/isc/sha1.c | 2 +- external/bsd/ntp/dist/lib/isc/sha2.c | 2 +- external/bsd/ntp/dist/lib/isc/sockaddr.c | 2 +- external/bsd/ntp/dist/lib/isc/socket_api.c | 2 +- .../dist/lib/isc/sparc64/include/isc/atomic.h | 2 +- external/bsd/ntp/dist/lib/isc/stats.c | 2 +- external/bsd/ntp/dist/lib/isc/string.c | 2 +- external/bsd/ntp/dist/lib/isc/strtoul.c | 2 +- external/bsd/ntp/dist/lib/isc/symtab.c | 2 +- external/bsd/ntp/dist/lib/isc/task.c | 2 +- external/bsd/ntp/dist/lib/isc/task_api.c | 2 +- external/bsd/ntp/dist/lib/isc/task_p.h | 2 +- external/bsd/ntp/dist/lib/isc/taskpool.c | 2 +- .../bsd/ntp/dist/lib/isc/tests/hash_test.c | 2 +- external/bsd/ntp/dist/lib/isc/tests/isctest.c | 2 +- external/bsd/ntp/dist/lib/isc/tests/isctest.h | 2 +- .../bsd/ntp/dist/lib/isc/tests/queue_test.c | 2 +- .../bsd/ntp/dist/lib/isc/tests/socket_test.c | 2 +- .../bsd/ntp/dist/lib/isc/tests/symtab_test.c | 2 +- .../bsd/ntp/dist/lib/isc/tests/task_test.c | 2 +- .../ntp/dist/lib/isc/tests/taskpool_test.c | 2 +- external/bsd/ntp/dist/lib/isc/timer.c | 2 +- external/bsd/ntp/dist/lib/isc/timer_api.c | 2 +- external/bsd/ntp/dist/lib/isc/timer_p.h | 2 +- external/bsd/ntp/dist/lib/isc/unix/app.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/dir.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/entropy.c | 2 +- .../bsd/ntp/dist/lib/isc/unix/errno2result.c | 2 +- .../bsd/ntp/dist/lib/isc/unix/errno2result.h | 2 +- external/bsd/ntp/dist/lib/isc/unix/file.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/fsaccess.c | 2 +- .../ntp/dist/lib/isc/unix/ifiter_getifaddrs.c | 14 +- .../bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c | 2 +- .../bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c | 2 +- .../dist/lib/isc/unix/include/isc/Makefile | 415 - .../ntp/dist/lib/isc/unix/include/isc/dir.h | 2 +- .../ntp/dist/lib/isc/unix/include/isc/int.h | 2 +- .../dist/lib/isc/unix/include/isc/keyboard.h | 2 +- .../ntp/dist/lib/isc/unix/include/isc/net.h | 2 +- .../ntp/dist/lib/isc/unix/include/isc/netdb.h | 2 +- .../dist/lib/isc/unix/include/isc/offset.h | 2 +- .../ntp/dist/lib/isc/unix/include/isc/stat.h | 2 +- .../dist/lib/isc/unix/include/isc/stdtime.h | 2 +- .../dist/lib/isc/unix/include/isc/strerror.h | 2 +- .../dist/lib/isc/unix/include/isc/syslog.h | 2 +- .../ntp/dist/lib/isc/unix/include/isc/time.h | 2 +- .../bsd/ntp/dist/lib/isc/unix/interfaceiter.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/ipv6.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/keyboard.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/net.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/os.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/resource.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/socket.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/socket_p.h | 2 +- external/bsd/ntp/dist/lib/isc/unix/stdio.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/stdtime.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/strerror.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/syslog.c | 2 +- external/bsd/ntp/dist/lib/isc/unix/time.c | 2 +- external/bsd/ntp/dist/lib/isc/version.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/DLLMain.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/app.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/condition.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/dir.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/entropy.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/errno2result.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/errno2result.h | 2 +- external/bsd/ntp/dist/lib/isc/win32/file.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/fsaccess.c | 2 +- .../lib/isc/win32/include/isc/bind_registry.h | 2 +- .../dist/lib/isc/win32/include/isc/bindevt.h | 2 +- .../lib/isc/win32/include/isc/condition.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/dir.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/int.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/ipv6.h | 2 +- .../dist/lib/isc/win32/include/isc/keyboard.h | 2 +- .../dist/lib/isc/win32/include/isc/mutex.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/net.h | 2 +- .../dist/lib/isc/win32/include/isc/netdb.h | 2 +- .../dist/lib/isc/win32/include/isc/ntgroups.h | 2 +- .../dist/lib/isc/win32/include/isc/ntpaths.h | 2 +- .../dist/lib/isc/win32/include/isc/offset.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/once.h | 2 +- .../dist/lib/isc/win32/include/isc/platform.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/stat.h | 2 +- .../dist/lib/isc/win32/include/isc/stdtime.h | 2 +- .../dist/lib/isc/win32/include/isc/strerror.h | 2 +- .../dist/lib/isc/win32/include/isc/syslog.h | 2 +- .../dist/lib/isc/win32/include/isc/thread.h | 2 +- .../ntp/dist/lib/isc/win32/include/isc/time.h | 2 +- .../dist/lib/isc/win32/include/isc/win32os.h | 2 +- .../ntp/dist/lib/isc/win32/interfaceiter.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/ipv6.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/keyboard.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/libgen.h | 2 +- external/bsd/ntp/dist/lib/isc/win32/net.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/netdb.h | 2 +- .../bsd/ntp/dist/lib/isc/win32/ntgroups.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/ntpaths.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/once.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/os.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/resource.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/socket.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/stdio.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/stdtime.c | 2 +- .../bsd/ntp/dist/lib/isc/win32/strerror.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/syslog.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/syslog.h | 2 +- external/bsd/ntp/dist/lib/isc/win32/thread.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/time.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/unistd.h | 2 +- external/bsd/ntp/dist/lib/isc/win32/version.c | 2 +- external/bsd/ntp/dist/lib/isc/win32/win32os.c | 2 +- .../dist/lib/isc/x86_32/include/isc/atomic.h | 2 +- .../dist/lib/isc/x86_64/include/isc/atomic.h | 2 +- external/bsd/ntp/dist/libjsmn/jsmn.c | 4 +- external/bsd/ntp/dist/libjsmn/jsmn.h | 2 +- external/bsd/ntp/dist/libjsmn/jsmn_test.c | 2 +- external/bsd/ntp/dist/libntp/a_md5encrypt.c | 2 +- external/bsd/ntp/dist/libntp/adjtime.c | 2 +- external/bsd/ntp/dist/libntp/adjtimex.c | 2 +- external/bsd/ntp/dist/libntp/atoint.c | 2 +- external/bsd/ntp/dist/libntp/atolfp.c | 2 +- external/bsd/ntp/dist/libntp/atouint.c | 2 +- external/bsd/ntp/dist/libntp/audio.c | 2 +- external/bsd/ntp/dist/libntp/authkeys.c | 2 +- external/bsd/ntp/dist/libntp/authreadkeys.c | 6 +- external/bsd/ntp/dist/libntp/authusekey.c | 2 +- external/bsd/ntp/dist/libntp/bsd_strerror.c | 2 +- external/bsd/ntp/dist/libntp/buftvtots.c | 2 +- external/bsd/ntp/dist/libntp/caljulian.c | 2 +- external/bsd/ntp/dist/libntp/caltontp.c | 2 +- external/bsd/ntp/dist/libntp/calyearstart.c | 2 +- external/bsd/ntp/dist/libntp/clocktime.c | 2 +- external/bsd/ntp/dist/libntp/clocktypes.c | 2 +- external/bsd/ntp/dist/libntp/decodenetnum.c | 2 +- external/bsd/ntp/dist/libntp/dofptoa.c | 2 +- external/bsd/ntp/dist/libntp/dolfptoa.c | 2 +- external/bsd/ntp/dist/libntp/emalloc.c | 2 +- external/bsd/ntp/dist/libntp/findconfig.c | 2 +- external/bsd/ntp/dist/libntp/getopt.c | 2 +- external/bsd/ntp/dist/libntp/hextoint.c | 2 +- external/bsd/ntp/dist/libntp/hextolfp.c | 2 +- external/bsd/ntp/dist/libntp/humandate.c | 2 +- external/bsd/ntp/dist/libntp/icom.c | 2 +- external/bsd/ntp/dist/libntp/iosignal.c | 2 +- external/bsd/ntp/dist/libntp/lib_strbuf.c | 2 +- external/bsd/ntp/dist/libntp/machines.c | 2 +- external/bsd/ntp/dist/libntp/mktime.c | 2 +- external/bsd/ntp/dist/libntp/modetoa.c | 2 +- external/bsd/ntp/dist/libntp/mstolfp.c | 2 +- external/bsd/ntp/dist/libntp/msyslog.c | 2 +- external/bsd/ntp/dist/libntp/netof.c | 2 +- external/bsd/ntp/dist/libntp/ntp_calendar.c | 110 +- external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c | 3 +- external/bsd/ntp/dist/libntp/ntp_intres.c | 2 +- external/bsd/ntp/dist/libntp/ntp_libopts.c | 2 +- external/bsd/ntp/dist/libntp/ntp_lineedit.c | 2 +- external/bsd/ntp/dist/libntp/ntp_random.c | 2 +- external/bsd/ntp/dist/libntp/ntp_rfc2553.c | 2 +- external/bsd/ntp/dist/libntp/ntp_worker.c | 2 +- external/bsd/ntp/dist/libntp/numtoa.c | 2 +- external/bsd/ntp/dist/libntp/numtohost.c | 2 +- external/bsd/ntp/dist/libntp/octtoint.c | 2 +- external/bsd/ntp/dist/libntp/prettydate.c | 2 +- external/bsd/ntp/dist/libntp/recvbuff.c | 2 +- external/bsd/ntp/dist/libntp/refnumtoa.c | 2 +- external/bsd/ntp/dist/libntp/snprintf.c | 2 +- external/bsd/ntp/dist/libntp/socket.c | 2 +- external/bsd/ntp/dist/libntp/socktoa.c | 2 +- external/bsd/ntp/dist/libntp/socktohost.c | 2 +- external/bsd/ntp/dist/libntp/ssl_init.c | 2 +- external/bsd/ntp/dist/libntp/statestr.c | 2 +- external/bsd/ntp/dist/libntp/strdup.c | 2 +- external/bsd/ntp/dist/libntp/strl_obsd.c | 2 +- external/bsd/ntp/dist/libntp/syssignal.c | 2 +- external/bsd/ntp/dist/libntp/systime.c | 2 +- external/bsd/ntp/dist/libntp/systime_s.c | 2 +- external/bsd/ntp/dist/libntp/timetoa.c | 2 +- external/bsd/ntp/dist/libntp/timevalops.c | 2 +- external/bsd/ntp/dist/libntp/uglydate.c | 2 +- external/bsd/ntp/dist/libntp/vint64ops.c | 2 +- external/bsd/ntp/dist/libntp/work_fork.c | 2 +- external/bsd/ntp/dist/libntp/work_thread.c | 2 +- external/bsd/ntp/dist/libntp/ymd2yd.c | 2 +- external/bsd/ntp/dist/libparse/binio.c | 2 +- .../bsd/ntp/dist/libparse/clk_computime.c | 2 +- external/bsd/ntp/dist/libparse/clk_dcf7000.c | 2 +- external/bsd/ntp/dist/libparse/clk_hopf6021.c | 2 +- external/bsd/ntp/dist/libparse/clk_meinberg.c | 2 +- external/bsd/ntp/dist/libparse/clk_rawdcf.c | 2 +- external/bsd/ntp/dist/libparse/clk_rcc8000.c | 2 +- external/bsd/ntp/dist/libparse/clk_schmid.c | 2 +- external/bsd/ntp/dist/libparse/clk_sel240x.c | 2 +- external/bsd/ntp/dist/libparse/clk_trimtaip.c | 2 +- external/bsd/ntp/dist/libparse/clk_trimtsip.c | 2 +- external/bsd/ntp/dist/libparse/clk_varitext.c | 2 +- external/bsd/ntp/dist/libparse/clk_wharton.c | 2 +- external/bsd/ntp/dist/libparse/data_mbg.c | 2 +- external/bsd/ntp/dist/libparse/gpstolfp.c | 2 +- external/bsd/ntp/dist/libparse/ieee754io.c | 2 +- external/bsd/ntp/dist/libparse/info_trimble.c | 6 +- external/bsd/ntp/dist/libparse/mfp_mul.c | 2 +- external/bsd/ntp/dist/libparse/parse.c | 2 +- external/bsd/ntp/dist/libparse/parse_conf.c | 2 +- external/bsd/ntp/dist/libparse/parsesolaris.c | 2 +- external/bsd/ntp/dist/libparse/parsestreams.c | 2 +- external/bsd/ntp/dist/libparse/trim_info.c | 2 +- external/bsd/ntp/dist/ntpd/check_y2k.c | 2 +- external/bsd/ntp/dist/ntpd/cmd_args.c | 2 +- external/bsd/ntp/dist/ntpd/declcond.h | 2 +- external/bsd/ntp/dist/ntpd/jupiter.h | 2 +- external/bsd/ntp/dist/ntpd/keyword-gen.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_config.c | 254 +- external/bsd/ntp/dist/ntpd/ntp_control.c | 50 +- external/bsd/ntp/dist/ntpd/ntp_crypto.c | 165 +- external/bsd/ntp/dist/ntpd/ntp_filegen.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_io.c | 80 +- external/bsd/ntp/dist/ntpd/ntp_leapsec.c | 4 +- external/bsd/ntp/dist/ntpd/ntp_leapsec.h | 2 +- external/bsd/ntp/dist/ntpd/ntp_loopfilter.c | 166 +- external/bsd/ntp/dist/ntpd/ntp_monitor.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_parser.c | 5525 +++-- external/bsd/ntp/dist/ntpd/ntp_parser.h | 444 +- external/bsd/ntp/dist/ntpd/ntp_parser.y | 38 +- external/bsd/ntp/dist/ntpd/ntp_peer.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_prio_q.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_proto.c | 19 +- external/bsd/ntp/dist/ntpd/ntp_refclock.c | 18 +- external/bsd/ntp/dist/ntpd/ntp_request.c | 4 +- external/bsd/ntp/dist/ntpd/ntp_restrict.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_scanner.c | 32 +- external/bsd/ntp/dist/ntpd/ntp_scanner.h | 2 +- external/bsd/ntp/dist/ntpd/ntp_signd.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_timer.c | 2 +- external/bsd/ntp/dist/ntpd/ntp_util.c | 143 +- external/bsd/ntp/dist/ntpd/ntpd-opts.c | 2 +- external/bsd/ntp/dist/ntpd/ntpd-opts.h | 25 +- external/bsd/ntp/dist/ntpd/ntpd.c | 125 +- external/bsd/ntp/dist/ntpd/ntpsim.c | 2 +- external/bsd/ntp/dist/ntpd/ppsapi_timepps.h | 2 +- external/bsd/ntp/dist/ntpd/refclock_acts.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_arbiter.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_arc.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_as2201.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_atom.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_bancomm.c | 2 +- .../bsd/ntp/dist/ntpd/refclock_chronolog.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_chu.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_conf.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_datum.c | 2 +- .../bsd/ntp/dist/ntpd/refclock_dumbclock.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_fg.c | 2 +- .../bsd/ntp/dist/ntpd/refclock_gpsdjson.c | 8 +- external/bsd/ntp/dist/ntpd/refclock_gpsvme.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_heath.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_hopfpci.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_hopfser.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_hpgps.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_irig.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_jjy.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_jupiter.c | 4 +- external/bsd/ntp/dist/ntpd/refclock_leitch.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_local.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_msfees.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_mx4200.c | 2 +- .../bsd/ntp/dist/ntpd/refclock_neoclock4x.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_nmea.c | 211 +- external/bsd/ntp/dist/ntpd/refclock_oncore.c | 7 +- .../bsd/ntp/dist/ntpd/refclock_palisade.c | 2 +- .../bsd/ntp/dist/ntpd/refclock_palisade.h | 2 +- external/bsd/ntp/dist/ntpd/refclock_parse.c | 6 +- external/bsd/ntp/dist/ntpd/refclock_pcf.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_pst.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_ripencc.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_shm.c | 374 +- external/bsd/ntp/dist/ntpd/refclock_tpro.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_true.c | 155 +- .../bsd/ntp/dist/ntpd/refclock_tsyncpci.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_tt560.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_ulink.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_wwv.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_wwvb.c | 2 +- external/bsd/ntp/dist/ntpd/refclock_zyfer.c | 2 +- external/bsd/ntp/dist/ntpdate/ntpdate.c | 2 +- external/bsd/ntp/dist/ntpdate/ntpdate.h | 2 +- external/bsd/ntp/dist/ntpdc/nl_in.c | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc-layout.c | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc-opts.c | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc-opts.h | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc.c | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc.h | 2 +- external/bsd/ntp/dist/ntpdc/ntpdc_ops.c | 2 +- external/bsd/ntp/dist/ntpq/libntpq.c | 2 +- external/bsd/ntp/dist/ntpq/libntpq.h | 2 +- external/bsd/ntp/dist/ntpq/libntpq_subs.c | 2 +- external/bsd/ntp/dist/ntpq/ntpq-opts.c | 2 +- external/bsd/ntp/dist/ntpq/ntpq-opts.h | 2 +- external/bsd/ntp/dist/ntpq/ntpq-subs.c | 20 +- external/bsd/ntp/dist/ntpq/ntpq.c | 22 +- external/bsd/ntp/dist/ntpq/ntpq.h | 2 +- .../bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c | 2 +- .../ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c | 2 +- .../ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h | 2 +- external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h | 2 +- .../bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c | 2 +- .../bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h | 2 +- external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c | 2 +- external/bsd/ntp/dist/parseutil/dcfd.c | 2 +- external/bsd/ntp/dist/parseutil/testdcf.c | 2 +- external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm | 515 - .../ntp/dist/sntp/ag-tpl/Old/agman-file.tpl | 86 - .../ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl | 73 - .../ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl | 884 - .../bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib | 1003 - .../bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man | 308 - .../bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl | 58 - .../bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl | 46 - .../bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib | 1079 - .../ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib | 92 - external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man | 181 - external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi | 150 - external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl | 176 - external/bsd/ntp/dist/sntp/crypto.c | 2 +- external/bsd/ntp/dist/sntp/crypto.h | 2 +- external/bsd/ntp/dist/sntp/data_formats.h | 2 +- external/bsd/ntp/dist/sntp/kod_management.c | 2 +- external/bsd/ntp/dist/sntp/kod_management.h | 2 +- external/bsd/ntp/dist/sntp/libevent/CommitLog | 18291 ---------------- .../libevent/WIN32-Code/evconfig-private.h | 8 - .../libevent/WIN32-Code/event2/event-config.h | 365 - .../WIN32-Code/nmake/evconfig-private.h | 2 +- .../WIN32-Code/nmake/event2/event-config.h | 2 +- .../ntp/dist/sntp/libevent/WIN32-Code/tree.h | 2 +- .../bsd/ntp/dist/sntp/libevent/arc4random.c | 2 +- external/bsd/ntp/dist/sntp/libevent/buffer.c | 2 +- .../bsd/ntp/dist/sntp/libevent/buffer_iocp.c | 2 +- .../dist/sntp/libevent/bufferevent-internal.h | 2 +- .../bsd/ntp/dist/sntp/libevent/bufferevent.c | 2 +- .../dist/sntp/libevent/bufferevent_async.c | 2 +- .../dist/sntp/libevent/bufferevent_filter.c | 2 +- .../dist/sntp/libevent/bufferevent_openssl.c | 2 +- .../ntp/dist/sntp/libevent/bufferevent_pair.c | 2 +- .../dist/sntp/libevent/bufferevent_ratelim.c | 2 +- .../ntp/dist/sntp/libevent/bufferevent_sock.c | 2 +- .../dist/sntp/libevent/changelist-internal.h | 2 +- .../ntp/dist/sntp/libevent/compat/sys/queue.h | 2 +- .../ntp/dist/sntp/libevent/defer-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/devpoll.c | 2 +- external/bsd/ntp/dist/sntp/libevent/epoll.c | 2 +- .../bsd/ntp/dist/sntp/libevent/epoll_sub.c | 2 +- .../dist/sntp/libevent/epolltable-internal.h | 2 +- .../dist/sntp/libevent/evbuffer-internal.h | 2 +- .../ntp/dist/sntp/libevent/evconfig-private.h | 2 +- external/bsd/ntp/dist/sntp/libevent/evdns.3 | 322 - external/bsd/ntp/dist/sntp/libevent/evdns.c | 2 +- .../ntp/dist/sntp/libevent/event-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/event.3 | 624 - external/bsd/ntp/dist/sntp/libevent/event.c | 2 +- .../bsd/ntp/dist/sntp/libevent/event_iocp.c | 2 +- .../ntp/dist/sntp/libevent/event_tagging.c | 2 +- .../ntp/dist/sntp/libevent/evmap-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/evmap.c | 2 +- external/bsd/ntp/dist/sntp/libevent/evport.c | 2 +- .../ntp/dist/sntp/libevent/evrpc-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/evrpc.c | 2 +- .../dist/sntp/libevent/evsignal-internal.h | 2 +- .../dist/sntp/libevent/evthread-internal.h | 2 +- .../bsd/ntp/dist/sntp/libevent/evthread.c | 2 +- .../ntp/dist/sntp/libevent/evthread_pthread.c | 2 +- .../ntp/dist/sntp/libevent/evthread_win32.c | 2 +- external/bsd/ntp/dist/sntp/libevent/evutil.c | 2 +- .../bsd/ntp/dist/sntp/libevent/evutil_rand.c | 2 +- .../bsd/ntp/dist/sntp/libevent/evutil_time.c | 2 +- .../bsd/ntp/dist/sntp/libevent/ht-internal.h | 2 +- .../ntp/dist/sntp/libevent/http-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/http.c | 2 +- .../dist/sntp/libevent/include/Makefile.in | 561 - .../ntp/dist/sntp/libevent/include/evdns.h | 2 +- .../ntp/dist/sntp/libevent/include/event.h | 2 +- .../sntp/libevent/include/event2/buffer.h | 2 +- .../libevent/include/event2/buffer_compat.h | 2 +- .../libevent/include/event2/bufferevent.h | 2 +- .../include/event2/bufferevent_compat.h | 2 +- .../libevent/include/event2/bufferevent_ssl.h | 2 +- .../include/event2/bufferevent_struct.h | 2 +- .../dist/sntp/libevent/include/event2/dns.h | 2 +- .../sntp/libevent/include/event2/dns_compat.h | 2 +- .../sntp/libevent/include/event2/dns_struct.h | 2 +- .../dist/sntp/libevent/include/event2/event.h | 2 +- .../libevent/include/event2/event_compat.h | 2 +- .../libevent/include/event2/event_struct.h | 2 +- .../dist/sntp/libevent/include/event2/http.h | 2 +- .../libevent/include/event2/http_compat.h | 2 +- .../libevent/include/event2/http_struct.h | 2 +- .../libevent/include/event2/keyvalq_struct.h | 2 +- .../sntp/libevent/include/event2/listener.h | 2 +- .../dist/sntp/libevent/include/event2/rpc.h | 2 +- .../sntp/libevent/include/event2/rpc_compat.h | 2 +- .../sntp/libevent/include/event2/rpc_struct.h | 2 +- .../dist/sntp/libevent/include/event2/tag.h | 2 +- .../sntp/libevent/include/event2/tag_compat.h | 2 +- .../sntp/libevent/include/event2/thread.h | 2 +- .../dist/sntp/libevent/include/event2/util.h | 2 +- .../sntp/libevent/include/event2/visibility.h | 2 +- .../ntp/dist/sntp/libevent/include/evhttp.h | 2 +- .../ntp/dist/sntp/libevent/include/evrpc.h | 2 +- .../ntp/dist/sntp/libevent/include/evutil.h | 2 +- .../ntp/dist/sntp/libevent/iocp-internal.h | 2 +- .../ntp/dist/sntp/libevent/ipv6-internal.h | 2 +- .../ntp/dist/sntp/libevent/kqueue-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/kqueue.c | 2 +- .../bsd/ntp/dist/sntp/libevent/listener.c | 2 +- .../bsd/ntp/dist/sntp/libevent/log-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/log.c | 2 +- .../dist/sntp/libevent/m4/LICENSE-OPENLDAP | 47 - .../dist/sntp/libevent/make_epoll_table.py | 57 - .../ntp/dist/sntp/libevent/minheap-internal.h | 2 +- .../bsd/ntp/dist/sntp/libevent/mm-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/poll.c | 2 +- .../ntp/dist/sntp/libevent/ratelim-internal.h | 2 +- .../ntp/dist/sntp/libevent/sample/Makefile.in | 566 - .../dist/sntp/libevent/sample/dns-example.c | 2 +- .../sntp/libevent/sample/event-read-fifo.c | 2 +- .../dist/sntp/libevent/sample/hello-world.c | 2 +- .../ntp/dist/sntp/libevent/sample/hostcheck.c | 2 +- .../ntp/dist/sntp/libevent/sample/hostcheck.h | 2 +- .../dist/sntp/libevent/sample/http-server.c | 2 +- .../dist/sntp/libevent/sample/https-client.c | 2 +- .../ntp/dist/sntp/libevent/sample/le-proxy.c | 2 +- .../sample/openssl_hostname_validation.c | 2 +- .../sample/openssl_hostname_validation.h | 2 +- .../dist/sntp/libevent/sample/signal-test.c | 2 +- .../ntp/dist/sntp/libevent/sample/time-test.c | 2 +- external/bsd/ntp/dist/sntp/libevent/select.c | 2 +- external/bsd/ntp/dist/sntp/libevent/signal.c | 2 +- .../ntp/dist/sntp/libevent/strlcpy-internal.h | 2 +- external/bsd/ntp/dist/sntp/libevent/strlcpy.c | 2 +- .../ntp/dist/sntp/libevent/test/Makefile.in | 1137 - .../bsd/ntp/dist/sntp/libevent/test/bench.c | 2 +- .../dist/sntp/libevent/test/bench_cascade.c | 2 +- .../ntp/dist/sntp/libevent/test/bench_http.c | 2 +- .../sntp/libevent/test/bench_httpclient.c | 2 +- .../sntp/libevent/test/print-winsock-errors.c | 86 - .../bsd/ntp/dist/sntp/libevent/test/regress.c | 2 +- .../ntp/dist/sntp/libevent/test/regress.gen.c | 2 +- .../ntp/dist/sntp/libevent/test/regress.gen.h | 2 +- .../bsd/ntp/dist/sntp/libevent/test/regress.h | 2 +- .../dist/sntp/libevent/test/regress_buffer.c | 2 +- .../sntp/libevent/test/regress_bufferevent.c | 2 +- .../ntp/dist/sntp/libevent/test/regress_dns.c | 2 +- .../ntp/dist/sntp/libevent/test/regress_et.c | 2 +- .../sntp/libevent/test/regress_finalize.c | 2 +- .../dist/sntp/libevent/test/regress_http.c | 2 +- .../dist/sntp/libevent/test/regress_iocp.c | 2 +- .../sntp/libevent/test/regress_listener.c | 2 +- .../dist/sntp/libevent/test/regress_main.c | 2 +- .../dist/sntp/libevent/test/regress_minheap.c | 2 +- .../ntp/dist/sntp/libevent/test/regress_rpc.c | 2 +- .../ntp/dist/sntp/libevent/test/regress_ssl.c | 2 +- .../sntp/libevent/test/regress_testutils.c | 2 +- .../sntp/libevent/test/regress_testutils.h | 2 +- .../dist/sntp/libevent/test/regress_thread.c | 2 +- .../dist/sntp/libevent/test/regress_thread.h | 2 +- .../dist/sntp/libevent/test/regress_util.c | 2 +- .../dist/sntp/libevent/test/regress_zlib.c | 2 +- .../dist/sntp/libevent/test/test-changelist.c | 2 +- .../ntp/dist/sntp/libevent/test/test-closed.c | 2 +- .../dist/sntp/libevent/test/test-dumpevents.c | 2 +- .../ntp/dist/sntp/libevent/test/test-eof.c | 2 +- .../ntp/dist/sntp/libevent/test/test-fdleak.c | 2 +- .../ntp/dist/sntp/libevent/test/test-init.c | 2 +- .../dist/sntp/libevent/test/test-ratelim.c | 2 +- .../dist/sntp/libevent/test/test-ratelim.sh | 88 - .../ntp/dist/sntp/libevent/test/test-time.c | 2 +- .../ntp/dist/sntp/libevent/test/test-weof.c | 2 +- .../ntp/dist/sntp/libevent/test/tinytest.c | 2 +- .../ntp/dist/sntp/libevent/test/tinytest.h | 2 +- .../dist/sntp/libevent/test/tinytest_demo.c | 259 - .../dist/sntp/libevent/test/tinytest_local.h | 2 +- .../dist/sntp/libevent/test/tinytest_macros.h | 2 +- .../ntp/dist/sntp/libevent/time-internal.h | 2 +- .../ntp/dist/sntp/libevent/util-internal.h | 2 +- .../bsd/ntp/dist/sntp/libevent/win32select.c | 2 +- .../bsd/ntp/dist/sntp/libopts/ag-char-map.h | 2 +- external/bsd/ntp/dist/sntp/libopts/alias.c | 2 +- external/bsd/ntp/dist/sntp/libopts/ao-strs.c | 2 +- external/bsd/ntp/dist/sntp/libopts/ao-strs.h | 2 +- external/bsd/ntp/dist/sntp/libopts/autoopts.c | 4 +- external/bsd/ntp/dist/sntp/libopts/autoopts.h | 15 +- .../ntp/dist/sntp/libopts/autoopts/options.h | 41 +- .../ntp/dist/sntp/libopts/autoopts/project.h | 2 +- .../dist/sntp/libopts/autoopts/usage-txt.h | 2 +- external/bsd/ntp/dist/sntp/libopts/boolean.c | 2 +- external/bsd/ntp/dist/sntp/libopts/check.c | 2 +- .../ntp/dist/sntp/libopts/compat/_Noreturn.h | 2 +- .../bsd/ntp/dist/sntp/libopts/compat/compat.h | 2 +- .../ntp/dist/sntp/libopts/compat/pathfind.c | 2 +- .../ntp/dist/sntp/libopts/compat/snprintf.c | 2 +- .../bsd/ntp/dist/sntp/libopts/compat/strchr.c | 2 +- .../bsd/ntp/dist/sntp/libopts/compat/strdup.c | 2 +- .../dist/sntp/libopts/compat/windows-config.h | 2 +- .../bsd/ntp/dist/sntp/libopts/configfile.c | 4 +- external/bsd/ntp/dist/sntp/libopts/cook.c | 2 +- external/bsd/ntp/dist/sntp/libopts/enum.c | 4 +- external/bsd/ntp/dist/sntp/libopts/env.c | 2 +- external/bsd/ntp/dist/sntp/libopts/file.c | 4 +- external/bsd/ntp/dist/sntp/libopts/find.c | 4 +- external/bsd/ntp/dist/sntp/libopts/genshell.c | 2 +- external/bsd/ntp/dist/sntp/libopts/genshell.h | 2 +- external/bsd/ntp/dist/sntp/libopts/gettext.h | 2 +- external/bsd/ntp/dist/sntp/libopts/init.c | 4 +- external/bsd/ntp/dist/sntp/libopts/intprops.h | 2 +- external/bsd/ntp/dist/sntp/libopts/libopts.c | 2 +- external/bsd/ntp/dist/sntp/libopts/load.c | 4 +- .../bsd/ntp/dist/sntp/libopts/makeshell.c | 10 +- external/bsd/ntp/dist/sntp/libopts/nested.c | 129 +- external/bsd/ntp/dist/sntp/libopts/numeric.c | 11 +- .../ntp/dist/sntp/libopts/option-value-type.c | 2 +- .../ntp/dist/sntp/libopts/option-value-type.h | 2 +- .../dist/sntp/libopts/option-xat-attribute.c | 2 +- .../dist/sntp/libopts/option-xat-attribute.h | 2 +- .../ntp/dist/sntp/libopts/parse-duration.c | 13 +- .../ntp/dist/sntp/libopts/parse-duration.h | 2 +- external/bsd/ntp/dist/sntp/libopts/pgusage.c | 4 +- external/bsd/ntp/dist/sntp/libopts/proto.h | 2 +- external/bsd/ntp/dist/sntp/libopts/putshell.c | 4 +- external/bsd/ntp/dist/sntp/libopts/reset.c | 4 +- external/bsd/ntp/dist/sntp/libopts/restore.c | 2 +- external/bsd/ntp/dist/sntp/libopts/save.c | 4 +- external/bsd/ntp/dist/sntp/libopts/sort.c | 2 +- external/bsd/ntp/dist/sntp/libopts/stack.c | 89 +- .../ntp/dist/sntp/libopts/stdnoreturn.in.h | 2 +- .../bsd/ntp/dist/sntp/libopts/streqvcmp.c | 4 +- .../bsd/ntp/dist/sntp/libopts/text_mmap.c | 2 +- external/bsd/ntp/dist/sntp/libopts/time.c | 2 +- external/bsd/ntp/dist/sntp/libopts/tokenize.c | 4 +- external/bsd/ntp/dist/sntp/libopts/usage.c | 4 +- external/bsd/ntp/dist/sntp/libopts/version.c | 2 +- external/bsd/ntp/dist/sntp/log.c | 2 +- external/bsd/ntp/dist/sntp/log.h | 2 +- external/bsd/ntp/dist/sntp/main.c | 4 +- external/bsd/ntp/dist/sntp/main.h | 2 +- external/bsd/ntp/dist/sntp/networking.c | 69 +- external/bsd/ntp/dist/sntp/networking.h | 2 +- external/bsd/ntp/dist/sntp/sntp-opts.c | 409 +- external/bsd/ntp/dist/sntp/sntp-opts.h | 2 +- external/bsd/ntp/dist/sntp/sntp.c | 2 +- .../ntp/dist/sntp/tests/fileHandlingTest.h | 2 +- external/bsd/ntp/dist/sntp/tests/sntptest.h | 2 +- external/bsd/ntp/dist/sntp/tests_main.h | 2 +- external/bsd/ntp/dist/sntp/utilities.c | 2 +- external/bsd/ntp/dist/sntp/utilities.h | 2 +- external/bsd/ntp/dist/tests/libntp/lfptest.h | 2 +- .../bsd/ntp/dist/tests/libntp/libntptest.h | 2 +- .../bsd/ntp/dist/tests/libntp/sockaddrtest.h | 2 +- .../bsd/ntp/dist/tests/libntp/timestructs.h | 2 +- external/bsd/ntp/dist/tests/ntpd/ntpdtest.h | 2 +- external/bsd/ntp/dist/util/audio-pcm.c | 2 +- external/bsd/ntp/dist/util/byteorder.c | 2 +- external/bsd/ntp/dist/util/hist.c | 2 +- external/bsd/ntp/dist/util/jitter.c | 2 +- external/bsd/ntp/dist/util/jitter.h | 2 +- external/bsd/ntp/dist/util/kern.c | 2 +- external/bsd/ntp/dist/util/longsize.c | 2 +- external/bsd/ntp/dist/util/ntp-keygen-opts.c | 499 +- external/bsd/ntp/dist/util/ntp-keygen-opts.h | 2 +- external/bsd/ntp/dist/util/ntp-keygen.c | 26 +- external/bsd/ntp/dist/util/ntptime.c | 2 +- external/bsd/ntp/dist/util/pps-api.c | 2 +- external/bsd/ntp/dist/util/precision.c | 2 +- external/bsd/ntp/dist/util/sht.c | 2 +- external/bsd/ntp/dist/util/testrs6000.c | 2 +- external/bsd/ntp/dist/util/tg.c | 2 +- external/bsd/ntp/dist/util/tg2.c | 2 +- external/bsd/ntp/dist/util/tickadj.c | 2 +- external/bsd/ntp/dist/util/timetrim.c | 2 +- external/bsd/ntp/include/config.h | 38 +- external/bsd/ntp/lib/libiscntp/Makefile | 3 +- external/bsd/ntp/lib/libntp/Makefile | 4 +- 806 files changed, 6687 insertions(+), 32134 deletions(-) delete mode 100644 external/bsd/ntp/dist/lib/isc/include/isc/Makefile delete mode 100644 external/bsd/ntp/dist/lib/isc/unix/include/isc/Makefile delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/Old/agman-file.tpl delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib delete mode 100755 external/bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib delete mode 100755 external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man delete mode 100755 external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi delete mode 100644 external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl delete mode 100644 external/bsd/ntp/dist/sntp/libevent/CommitLog delete mode 100644 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/evconfig-private.h delete mode 100644 external/bsd/ntp/dist/sntp/libevent/WIN32-Code/event2/event-config.h delete mode 100644 external/bsd/ntp/dist/sntp/libevent/evdns.3 delete mode 100644 external/bsd/ntp/dist/sntp/libevent/event.3 delete mode 100644 external/bsd/ntp/dist/sntp/libevent/include/Makefile.in delete mode 100644 external/bsd/ntp/dist/sntp/libevent/m4/LICENSE-OPENLDAP delete mode 100644 external/bsd/ntp/dist/sntp/libevent/make_epoll_table.py delete mode 100644 external/bsd/ntp/dist/sntp/libevent/sample/Makefile.in delete mode 100644 external/bsd/ntp/dist/sntp/libevent/test/Makefile.in delete mode 100644 external/bsd/ntp/dist/sntp/libevent/test/print-winsock-errors.c delete mode 100755 external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.sh delete mode 100644 external/bsd/ntp/dist/sntp/libevent/test/tinytest_demo.c diff --git a/external/bsd/ntp/bin/ntpd/Makefile b/external/bsd/ntp/bin/ntpd/Makefile index 3516ed8502ac..3c035ffc4779 100644 --- a/external/bsd/ntp/bin/ntpd/Makefile +++ b/external/bsd/ntp/bin/ntpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/20 01:52:54 christos Exp $ +# $NetBSD: Makefile,v 1.17 2014/12/19 20:43:14 christos Exp $ .include @@ -41,6 +41,7 @@ SRCS= cmd_args.c \ refclock_datum.c \ refclock_dumbclock.c \ refclock_fg.c \ + refclock_gpsdjson.c \ refclock_gpsvme.c \ refclock_heath.c \ refclock_hopfpci.c \ diff --git a/external/bsd/ntp/dist/adjtimed/adjtimed.c b/external/bsd/ntp/dist/adjtimed/adjtimed.c index c77d8037237d..64a9f659af91 100644 --- a/external/bsd/ntp/dist/adjtimed/adjtimed.c +++ b/external/bsd/ntp/dist/adjtimed/adjtimed.c @@ -1,4 +1,4 @@ -/* $NetBSD: adjtimed.c,v 1.1.1.1 2009/12/13 16:53:40 kardel Exp $ */ +/* $NetBSD: adjtimed.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*************************************************************************/ /* (c) Copyright Tai Jin, 1988. All Rights Reserved. */ diff --git a/external/bsd/ntp/dist/clockstuff/chutest.c b/external/bsd/ntp/dist/clockstuff/chutest.c index 702ef371946e..76d3b171c757 100644 --- a/external/bsd/ntp/dist/clockstuff/chutest.c +++ b/external/bsd/ntp/dist/clockstuff/chutest.c @@ -1,4 +1,4 @@ -/* $NetBSD: chutest.c,v 1.1.1.2 2013/12/27 23:30:33 christos Exp $ */ +/* $NetBSD: chutest.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* chutest.c,v 3.1 1993/07/06 01:05:21 jbj Exp * chutest - test the CHU clock diff --git a/external/bsd/ntp/dist/clockstuff/propdelay.c b/external/bsd/ntp/dist/clockstuff/propdelay.c index c8343ee180e0..0f109dbc00fc 100644 --- a/external/bsd/ntp/dist/clockstuff/propdelay.c +++ b/external/bsd/ntp/dist/clockstuff/propdelay.c @@ -1,4 +1,4 @@ -/* $NetBSD: propdelay.c,v 1.1.1.2 2013/12/27 23:30:33 christos Exp $ */ +/* $NetBSD: propdelay.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* propdelay.c,v 3.1 1993/07/06 01:05:24 jbj Exp * propdelay - compute propagation delays diff --git a/external/bsd/ntp/dist/include/adjtime.h b/external/bsd/ntp/dist/include/adjtime.h index a63ae0550ba9..47bf508ab1a9 100644 --- a/external/bsd/ntp/dist/include/adjtime.h +++ b/external/bsd/ntp/dist/include/adjtime.h @@ -1,4 +1,4 @@ -/* $NetBSD: adjtime.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $ */ +/* $NetBSD: adjtime.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*************************************************************************/ /* (c) Copyright Tai Jin, 1988. All Rights Reserved. */ diff --git a/external/bsd/ntp/dist/include/ascii.h b/external/bsd/ntp/dist/include/ascii.h index 5b1bca0a46fa..d8496cbcb003 100644 --- a/external/bsd/ntp/dist/include/ascii.h +++ b/external/bsd/ntp/dist/include/ascii.h @@ -1,4 +1,4 @@ -/* $NetBSD: ascii.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ascii.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/include/ascii.h,v 4.4 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/include/audio.h b/external/bsd/ntp/dist/include/audio.h index 5552578742c3..41f92538b7af 100644 --- a/external/bsd/ntp/dist/include/audio.h +++ b/external/bsd/ntp/dist/include/audio.h @@ -1,4 +1,4 @@ -/* $NetBSD: audio.h,v 1.2 2010/12/04 23:08:33 christos Exp $ */ +/* $NetBSD: audio.h,v 1.3 2014/12/19 20:43:14 christos Exp $ */ /* * Header file for audio drivers diff --git a/external/bsd/ntp/dist/include/binio.h b/external/bsd/ntp/dist/include/binio.h index f5786d627129..bae29e795212 100644 --- a/external/bsd/ntp/dist/include/binio.h +++ b/external/bsd/ntp/dist/include/binio.h @@ -1,4 +1,4 @@ -/* $NetBSD: binio.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: binio.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/include/binio.h,v 4.5 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/include/declcond.h b/external/bsd/ntp/dist/include/declcond.h index 8053cd9abaee..006d520d8c99 100644 --- a/external/bsd/ntp/dist/include/declcond.h +++ b/external/bsd/ntp/dist/include/declcond.h @@ -1,4 +1,4 @@ -/* $NetBSD: declcond.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: declcond.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * declcond.h - declarations conditionalized for ntpd diff --git a/external/bsd/ntp/dist/include/gps.h b/external/bsd/ntp/dist/include/gps.h index 09e68d4a9dbd..b0fd0ab6adc0 100644 --- a/external/bsd/ntp/dist/include/gps.h +++ b/external/bsd/ntp/dist/include/gps.h @@ -1,4 +1,4 @@ -/* $NetBSD: gps.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $ */ +/* $NetBSD: gps.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /****************************************************************************/ /* gps.h */ diff --git a/external/bsd/ntp/dist/include/hopf6039.h b/external/bsd/ntp/dist/include/hopf6039.h index cc7026d8b8aa..61d4a67253a0 100644 --- a/external/bsd/ntp/dist/include/hopf6039.h +++ b/external/bsd/ntp/dist/include/hopf6039.h @@ -1,4 +1,4 @@ -/* $NetBSD: hopf6039.h,v 1.1.1.1 2009/12/13 16:54:48 kardel Exp $ */ +/* $NetBSD: hopf6039.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /****************************************************************************/ /* hopf6039.h */ diff --git a/external/bsd/ntp/dist/include/icom.h b/external/bsd/ntp/dist/include/icom.h index 9ab280bb7078..a65aceca3060 100644 --- a/external/bsd/ntp/dist/include/icom.h +++ b/external/bsd/ntp/dist/include/icom.h @@ -1,4 +1,4 @@ -/* $NetBSD: icom.h,v 1.2 2010/12/04 23:08:33 christos Exp $ */ +/* $NetBSD: icom.h,v 1.3 2014/12/19 20:43:14 christos Exp $ */ /* * Header file for ICOM radios diff --git a/external/bsd/ntp/dist/include/ieee754io.h b/external/bsd/ntp/dist/include/ieee754io.h index a4d382c632b0..c02826600864 100644 --- a/external/bsd/ntp/dist/include/ieee754io.h +++ b/external/bsd/ntp/dist/include/ieee754io.h @@ -1,4 +1,4 @@ -/* $NetBSD: ieee754io.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ieee754io.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/include/ieee754io.h,v 4.3 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/include/intreswork.h b/external/bsd/ntp/dist/include/intreswork.h index 980036fb13bf..63ac7dc36824 100644 --- a/external/bsd/ntp/dist/include/intreswork.h +++ b/external/bsd/ntp/dist/include/intreswork.h @@ -1,4 +1,4 @@ -/* $NetBSD: intreswork.h,v 1.1.1.1 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: intreswork.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * intreswork.h -- declarations private to ntp_intres.c, ntp_worker.c. diff --git a/external/bsd/ntp/dist/include/iosignal.h b/external/bsd/ntp/dist/include/iosignal.h index 49706346596f..2e851114e409 100644 --- a/external/bsd/ntp/dist/include/iosignal.h +++ b/external/bsd/ntp/dist/include/iosignal.h @@ -1,4 +1,4 @@ -/* $NetBSD: iosignal.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: iosignal.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ #ifndef IOSIGNAL_H #define IOSIGNAL_H diff --git a/external/bsd/ntp/dist/include/isc/mem.h b/external/bsd/ntp/dist/include/isc/mem.h index 098889cca447..6e1f3c77e12b 100644 --- a/external/bsd/ntp/dist/include/isc/mem.h +++ b/external/bsd/ntp/dist/include/isc/mem.h @@ -1,4 +1,4 @@ -/* $NetBSD: mem.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: mem.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * libntp local override of isc/mem.h to stub it out. diff --git a/external/bsd/ntp/dist/include/l_stdlib.h b/external/bsd/ntp/dist/include/l_stdlib.h index 7f18ffc1a23c..bcbc3a613cce 100644 --- a/external/bsd/ntp/dist/include/l_stdlib.h +++ b/external/bsd/ntp/dist/include/l_stdlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: l_stdlib.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: l_stdlib.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Proto types for machines that are not ANSI and POSIX compliant. diff --git a/external/bsd/ntp/dist/include/lib_strbuf.h b/external/bsd/ntp/dist/include/lib_strbuf.h index a71ec6b254ee..bcca67db84e1 100644 --- a/external/bsd/ntp/dist/include/lib_strbuf.h +++ b/external/bsd/ntp/dist/include/lib_strbuf.h @@ -1,4 +1,4 @@ -/* $NetBSD: lib_strbuf.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: lib_strbuf.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * lib_strbuf.h - definitions for routines which use the common string buffers diff --git a/external/bsd/ntp/dist/include/libntp.h b/external/bsd/ntp/dist/include/libntp.h index d609d2dfa039..b0040b205e07 100644 --- a/external/bsd/ntp/dist/include/libntp.h +++ b/external/bsd/ntp/dist/include/libntp.h @@ -1,4 +1,4 @@ -/* $NetBSD: libntp.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: libntp.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* libntp.h */ diff --git a/external/bsd/ntp/dist/include/mbg_gps166.h b/external/bsd/ntp/dist/include/mbg_gps166.h index 81ec1b7298c9..425b3d1c924e 100644 --- a/external/bsd/ntp/dist/include/mbg_gps166.h +++ b/external/bsd/ntp/dist/include/mbg_gps166.h @@ -1,4 +1,4 @@ -/* $NetBSD: mbg_gps166.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: mbg_gps166.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/include/mbg_gps166.h,v 4.7 2006/06/22 18:41:43 kardel RELEASE_20060622_A diff --git a/external/bsd/ntp/dist/include/mx4200.h b/external/bsd/ntp/dist/include/mx4200.h index 844b2f6568aa..c0899f1680eb 100644 --- a/external/bsd/ntp/dist/include/mx4200.h +++ b/external/bsd/ntp/dist/include/mx4200.h @@ -1,4 +1,4 @@ -/* $NetBSD: mx4200.h,v 1.1.1.1 2009/12/13 16:54:49 kardel Exp $ */ +/* $NetBSD: mx4200.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* records transmitted from extern CDU to MX 4200 */ diff --git a/external/bsd/ntp/dist/include/ntif.h b/external/bsd/ntp/dist/include/ntif.h index 3750e232315d..b442ba07432c 100644 --- a/external/bsd/ntp/dist/include/ntif.h +++ b/external/bsd/ntp/dist/include/ntif.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntif.h,v 1.1.1.1 2009/12/13 16:54:49 kardel Exp $ */ +/* $NetBSD: ntif.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* this is a hacked version of if.h from unix to contain the stuff we need only to build named (bind) with the minimal amount of changes... by l. kahn */ diff --git a/external/bsd/ntp/dist/include/ntp.h b/external/bsd/ntp/dist/include/ntp.h index d9c49108e57a..1f13a59a0a3d 100644 --- a/external/bsd/ntp/dist/include/ntp.h +++ b/external/bsd/ntp/dist/include/ntp.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp.h,v 1.1.1.4 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: ntp.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp.h - NTP definitions for the masses diff --git a/external/bsd/ntp/dist/include/ntp_assert.h b/external/bsd/ntp/dist/include/ntp_assert.h index 7b0efc986cdc..242b6253ee9d 100644 --- a/external/bsd/ntp/dist/include/ntp_assert.h +++ b/external/bsd/ntp/dist/include/ntp_assert.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_assert.h,v 1.1.1.4 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: ntp_assert.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_assert.h - design by contract stuff diff --git a/external/bsd/ntp/dist/include/ntp_calendar.h b/external/bsd/ntp/dist/include/ntp_calendar.h index 9c22c4259a89..873dd15224df 100644 --- a/external/bsd/ntp/dist/include/ntp_calendar.h +++ b/external/bsd/ntp/dist/include/ntp_calendar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_calendar.h,v 1.1.1.3 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: ntp_calendar.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_calendar.h - definitions for the calendar time-of-day routine diff --git a/external/bsd/ntp/dist/include/ntp_cmdargs.h b/external/bsd/ntp/dist/include/ntp_cmdargs.h index d6ce50ac923f..0dc45b8a1700 100644 --- a/external/bsd/ntp/dist/include/ntp_cmdargs.h +++ b/external/bsd/ntp/dist/include/ntp_cmdargs.h @@ -1,3 +1,3 @@ -/* $NetBSD: ntp_cmdargs.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_cmdargs.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ extern void getCmdOpts(int, char **); diff --git a/external/bsd/ntp/dist/include/ntp_config.h b/external/bsd/ntp/dist/include/ntp_config.h index 7859f042b27c..e0ded6794eae 100644 --- a/external/bsd/ntp/dist/include/ntp_config.h +++ b/external/bsd/ntp/dist/include/ntp_config.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_config.h,v 1.5 2013/12/30 17:42:19 christos Exp $ */ +/* $NetBSD: ntp_config.h,v 1.6 2014/12/19 20:43:14 christos Exp $ */ #ifndef NTP_CONFIG_H #define NTP_CONFIG_H diff --git a/external/bsd/ntp/dist/include/ntp_control.h b/external/bsd/ntp/dist/include/ntp_control.h index b8d4556fca97..e8893a3d745b 100644 --- a/external/bsd/ntp/dist/include/ntp_control.h +++ b/external/bsd/ntp/dist/include/ntp_control.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_control.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_control.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_control.h - definitions related to NTP mode 6 control messages diff --git a/external/bsd/ntp/dist/include/ntp_crypto.h b/external/bsd/ntp/dist/include/ntp_crypto.h index 70b3dfec7ed6..14907e78b1c1 100644 --- a/external/bsd/ntp/dist/include/ntp_crypto.h +++ b/external/bsd/ntp/dist/include/ntp_crypto.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_crypto.h,v 1.1.1.3 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: ntp_crypto.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_crypto.h - definitions for cryptographic operations diff --git a/external/bsd/ntp/dist/include/ntp_datum.h b/external/bsd/ntp/dist/include/ntp_datum.h index 97ebd2692fa8..3b5047b89ac8 100644 --- a/external/bsd/ntp/dist/include/ntp_datum.h +++ b/external/bsd/ntp/dist/include/ntp_datum.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_datum.h,v 1.1.1.1 2009/12/13 16:54:50 kardel Exp $ */ +/* $NetBSD: ntp_datum.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ struct btfp_time /* Structure for reading 5 time words */ /* in one ioctl(2) operation. */ diff --git a/external/bsd/ntp/dist/include/ntp_debug.h b/external/bsd/ntp/dist/include/ntp_debug.h index 4bdc64d83645..69eb918accce 100644 --- a/external/bsd/ntp/dist/include/ntp_debug.h +++ b/external/bsd/ntp/dist/include/ntp_debug.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_debug.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_debug.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Header diff --git a/external/bsd/ntp/dist/include/ntp_filegen.h b/external/bsd/ntp/dist/include/ntp_filegen.h index 11390d85420b..c7497f845fae 100644 --- a/external/bsd/ntp/dist/include/ntp_filegen.h +++ b/external/bsd/ntp/dist/include/ntp_filegen.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_filegen.h,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntp_filegen.h,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_filegen.h,v 3.9 1996/12/01 16:02:45 kardel Exp diff --git a/external/bsd/ntp/dist/include/ntp_fp.h b/external/bsd/ntp/dist/include/ntp_fp.h index 897a0d4b7174..5fa7e2a43a8e 100644 --- a/external/bsd/ntp/dist/include/ntp_fp.h +++ b/external/bsd/ntp/dist/include/ntp_fp.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_fp.h,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntp_fp.h,v 1.5 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_fp.h - definitions for NTP fixed/floating-point arithmetic @@ -206,7 +206,7 @@ typedef u_int32 u_fp; (((v_i) & 0x80000000) != 0) #define M_ISGT(a_i, a_f, b_i, b_f) /* a > b signed */ \ - (((int32)(a_i)) > ((int32)(b_i)) || \ + (((u_int32)((a_i) ^ 0x80000000) > (u_int32)((b_i) ^ 0x80000000)) || \ ((a_i) == (b_i) && ((u_int32)(a_f)) > ((u_int32)(b_f)))) #define M_ISGTU(a_i, a_f, b_i, b_f) /* a > b unsigned */ \ @@ -218,11 +218,11 @@ typedef u_int32 u_fp; ((a_i) == (b_i) && ((u_int32)(a_f)) >= ((u_int32)(b_f)))) #define M_ISGEQ(a_i, a_f, b_i, b_f) /* a >= b signed */ \ - (((u_int32)(a_i) - (u_int32)(b_i) + 0x80000000 > 0x80000000) || \ + (((u_int32)((a_i) ^ 0x80000000) > (u_int32)((b_i) ^ 0x80000000)) || \ ((a_i) == (b_i) && (u_int32)(a_f) >= (u_int32)(b_f))) #define M_ISEQU(a_i, a_f, b_i, b_f) /* a == b unsigned */ \ - ((a_i) == (b_i) && (a_f) == (b_f)) + ((u_int32)(a_i) == (u_int32)(b_i) && (u_int32)(a_f) == (u_int32)(b_f)) /* * Operations on the long fp format diff --git a/external/bsd/ntp/dist/include/ntp_if.h b/external/bsd/ntp/dist/include/ntp_if.h index 08f963c801b5..a076259707a7 100644 --- a/external/bsd/ntp/dist/include/ntp_if.h +++ b/external/bsd/ntp/dist/include/ntp_if.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_if.h,v 1.1.1.1 2009/12/13 16:54:51 kardel Exp $ */ +/* $NetBSD: ntp_if.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Sockets are not standard. diff --git a/external/bsd/ntp/dist/include/ntp_intres.h b/external/bsd/ntp/dist/include/ntp_intres.h index bc559c9af292..4eea7abaac11 100644 --- a/external/bsd/ntp/dist/include/ntp_intres.h +++ b/external/bsd/ntp/dist/include/ntp_intres.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_intres.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_intres.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_intres.h - client interface to blocking-worker name resolution. diff --git a/external/bsd/ntp/dist/include/ntp_io.h b/external/bsd/ntp/dist/include/ntp_io.h index 248622afb673..bff3eb886b65 100644 --- a/external/bsd/ntp/dist/include/ntp_io.h +++ b/external/bsd/ntp/dist/include/ntp_io.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_io.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_io.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ #ifndef NTP_IO_H #define NTP_IO_H diff --git a/external/bsd/ntp/dist/include/ntp_libopts.h b/external/bsd/ntp/dist/include/ntp_libopts.h index 48a63d1c1086..8f04768b0398 100644 --- a/external/bsd/ntp/dist/include/ntp_libopts.h +++ b/external/bsd/ntp/dist/include/ntp_libopts.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_libopts.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_libopts.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_libopts.h diff --git a/external/bsd/ntp/dist/include/ntp_lineedit.h b/external/bsd/ntp/dist/include/ntp_lineedit.h index cd8ae430e8b5..c3ad6756e814 100644 --- a/external/bsd/ntp/dist/include/ntp_lineedit.h +++ b/external/bsd/ntp/dist/include/ntp_lineedit.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_lineedit.h,v 1.1.1.1 2009/12/13 16:54:51 kardel Exp $ */ +/* $NetBSD: ntp_lineedit.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* diff --git a/external/bsd/ntp/dist/include/ntp_lists.h b/external/bsd/ntp/dist/include/ntp_lists.h index 347db520a449..e6663f044805 100644 --- a/external/bsd/ntp/dist/include/ntp_lists.h +++ b/external/bsd/ntp/dist/include/ntp_lists.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_lists.h,v 1.1.1.2 2012/01/31 21:23:10 kardel Exp $ */ +/* $NetBSD: ntp_lists.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_lists.h - linked lists common code diff --git a/external/bsd/ntp/dist/include/ntp_machine.h b/external/bsd/ntp/dist/include/ntp_machine.h index 4c0f558df156..64a4ee0a23c6 100644 --- a/external/bsd/ntp/dist/include/ntp_machine.h +++ b/external/bsd/ntp/dist/include/ntp_machine.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_machine.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_machine.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_machine.h diff --git a/external/bsd/ntp/dist/include/ntp_malloc.h b/external/bsd/ntp/dist/include/ntp_malloc.h index ba11bb078d98..6cf4236fa4c3 100644 --- a/external/bsd/ntp/dist/include/ntp_malloc.h +++ b/external/bsd/ntp/dist/include/ntp_malloc.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_malloc.h,v 1.1.1.2 2012/01/31 21:23:25 kardel Exp $ */ +/* $NetBSD: ntp_malloc.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Define malloc and friends. diff --git a/external/bsd/ntp/dist/include/ntp_md5.h b/external/bsd/ntp/dist/include/ntp_md5.h index cbc9c8a07610..d55610eee66e 100644 --- a/external/bsd/ntp/dist/include/ntp_md5.h +++ b/external/bsd/ntp/dist/include/ntp_md5.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_md5.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_md5.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_md5.h: deal with md5.h headers diff --git a/external/bsd/ntp/dist/include/ntp_net.h b/external/bsd/ntp/dist/include/ntp_net.h index 34e3a43a0a5e..79e649e7de57 100644 --- a/external/bsd/ntp/dist/include/ntp_net.h +++ b/external/bsd/ntp/dist/include/ntp_net.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_net.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_net.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_net.h - definitions for NTP network stuff diff --git a/external/bsd/ntp/dist/include/ntp_prio_q.h b/external/bsd/ntp/dist/include/ntp_prio_q.h index f547c5c20000..d2d734dd4f33 100644 --- a/external/bsd/ntp/dist/include/ntp_prio_q.h +++ b/external/bsd/ntp/dist/include/ntp_prio_q.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_prio_q.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_prio_q.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* ntp_prio_q.h * diff --git a/external/bsd/ntp/dist/include/ntp_proto.h b/external/bsd/ntp/dist/include/ntp_proto.h index 6e4c959e79e4..88e0aba8714a 100644 --- a/external/bsd/ntp/dist/include/ntp_proto.h +++ b/external/bsd/ntp/dist/include/ntp_proto.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_proto.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_proto.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ #ifndef NTP_PROTO_H #define NTP_PROTO_H diff --git a/external/bsd/ntp/dist/include/ntp_random.h b/external/bsd/ntp/dist/include/ntp_random.h index 935975aa89f0..ea0ac8ff4f8f 100644 --- a/external/bsd/ntp/dist/include/ntp_random.h +++ b/external/bsd/ntp/dist/include/ntp_random.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_random.h,v 1.1.1.2 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: ntp_random.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/include/ntp_refclock.h b/external/bsd/ntp/dist/include/ntp_refclock.h index 8ca3938baab1..703106d6c07d 100644 --- a/external/bsd/ntp/dist/include/ntp_refclock.h +++ b/external/bsd/ntp/dist/include/ntp_refclock.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_refclock.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_refclock.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_refclock.h - definitions for reference clock support diff --git a/external/bsd/ntp/dist/include/ntp_request.h b/external/bsd/ntp/dist/include/ntp_request.h index 902800a5a5f4..d78c24a14f9b 100644 --- a/external/bsd/ntp/dist/include/ntp_request.h +++ b/external/bsd/ntp/dist/include/ntp_request.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_request.h,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntp_request.h,v 1.5 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_request.h - definitions for the ntpd remote query facility diff --git a/external/bsd/ntp/dist/include/ntp_rfc2553.h b/external/bsd/ntp/dist/include/ntp_rfc2553.h index a6ec1505d4f7..8e49829848a7 100644 --- a/external/bsd/ntp/dist/include/ntp_rfc2553.h +++ b/external/bsd/ntp/dist/include/ntp_rfc2553.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_rfc2553.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_rfc2553.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. diff --git a/external/bsd/ntp/dist/include/ntp_select.h b/external/bsd/ntp/dist/include/ntp_select.h index f9831cfc5d89..85870e13472d 100644 --- a/external/bsd/ntp/dist/include/ntp_select.h +++ b/external/bsd/ntp/dist/include/ntp_select.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_select.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_select.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Not all machines define FD_SET in sys/types.h diff --git a/external/bsd/ntp/dist/include/ntp_stdlib.h b/external/bsd/ntp/dist/include/ntp_stdlib.h index 4a1eecfae9d3..5067c3a41160 100644 --- a/external/bsd/ntp/dist/include/ntp_stdlib.h +++ b/external/bsd/ntp/dist/include/ntp_stdlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_stdlib.h,v 1.6 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntp_stdlib.h,v 1.7 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_stdlib.h - Prototypes for NTP lib. diff --git a/external/bsd/ntp/dist/include/ntp_string.h b/external/bsd/ntp/dist/include/ntp_string.h index 902bc193184f..7ca3bb08e1f1 100644 --- a/external/bsd/ntp/dist/include/ntp_string.h +++ b/external/bsd/ntp/dist/include/ntp_string.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_string.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_string.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Define string ops: strchr strrchr memcmp memmove memset diff --git a/external/bsd/ntp/dist/include/ntp_syscall.h b/external/bsd/ntp/dist/include/ntp_syscall.h index 5d70a95f3a4a..599e92a5bfb1 100644 --- a/external/bsd/ntp/dist/include/ntp_syscall.h +++ b/external/bsd/ntp/dist/include/ntp_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_syscall.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_syscall.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_syscall.h - various ways to perform the ntp_adjtime() and ntp_gettime() diff --git a/external/bsd/ntp/dist/include/ntp_syslog.h b/external/bsd/ntp/dist/include/ntp_syslog.h index eebbae0b9788..257f3c0dd0fe 100644 --- a/external/bsd/ntp/dist/include/ntp_syslog.h +++ b/external/bsd/ntp/dist/include/ntp_syslog.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_syslog.h,v 1.1.1.3 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_syslog.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * A hack for platforms which require specially built syslog facilities diff --git a/external/bsd/ntp/dist/include/ntp_tty.h b/external/bsd/ntp/dist/include/ntp_tty.h index 2d73937d81b4..ece009c8514e 100644 --- a/external/bsd/ntp/dist/include/ntp_tty.h +++ b/external/bsd/ntp/dist/include/ntp_tty.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_tty.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_tty.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_tty.h - header file for serial lines handling diff --git a/external/bsd/ntp/dist/include/ntp_types.h b/external/bsd/ntp/dist/include/ntp_types.h index 1527a2c7fd24..7a469dbc50fc 100644 --- a/external/bsd/ntp/dist/include/ntp_types.h +++ b/external/bsd/ntp/dist/include/ntp_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_types.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_types.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_types.h - defines how int32 and u_int32 are treated. diff --git a/external/bsd/ntp/dist/include/ntp_unixtime.h b/external/bsd/ntp/dist/include/ntp_unixtime.h index c90142ccc851..a5125f693ba1 100644 --- a/external/bsd/ntp/dist/include/ntp_unixtime.h +++ b/external/bsd/ntp/dist/include/ntp_unixtime.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_unixtime.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: ntp_unixtime.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_unixtime.h - much of what was here is now in timevalops.h diff --git a/external/bsd/ntp/dist/include/ntp_worker.h b/external/bsd/ntp/dist/include/ntp_worker.h index c40eaf7dbe28..5a208be5d23e 100644 --- a/external/bsd/ntp/dist/include/ntp_worker.h +++ b/external/bsd/ntp/dist/include/ntp_worker.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_worker.h,v 1.1.1.1 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_worker.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_worker.h diff --git a/external/bsd/ntp/dist/include/ntp_workimpl.h b/external/bsd/ntp/dist/include/ntp_workimpl.h index 4f6ab299c63b..581a8ceca0eb 100644 --- a/external/bsd/ntp/dist/include/ntp_workimpl.h +++ b/external/bsd/ntp/dist/include/ntp_workimpl.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_workimpl.h,v 1.1.1.1 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntp_workimpl.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * ntp_workimpl.h - selects worker child implementation diff --git a/external/bsd/ntp/dist/include/ntpd.h b/external/bsd/ntp/dist/include/ntpd.h index 6f1ba0f8fc30..786916aeee97 100644 --- a/external/bsd/ntp/dist/include/ntpd.h +++ b/external/bsd/ntp/dist/include/ntpd.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpd.h,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntpd.h,v 1.5 2014/12/19 20:43:14 christos Exp $ */ /* * ntpd.h - Prototypes and external variables for ntpd. @@ -288,7 +288,7 @@ extern void record_clock_stats (sockaddr_u *, const char *); extern int mprintf_clock_stats(sockaddr_u *, const char *, ...) NTP_PRINTF(2, 3); extern void record_raw_stats (sockaddr_u *srcadr, sockaddr_u *dstadr, l_fp *t1, l_fp *t2, l_fp *t3, l_fp *t4, int leap, int version, int mode, int stratum, int poll, int precision, double root_delay, double root_dispersion, u_int32 refid); -extern int check_leap_file (void); +extern void check_leap_file (int is_daily_check, u_int32 ntptime, const time_t * systime); extern void record_crypto_stats (sockaddr_u *, const char *); #ifdef DEBUG extern void record_timing_stats (const char *); @@ -402,7 +402,7 @@ extern int pll_status; /* status bits for kernel pll */ extern int ntp_enable; /* clock discipline enabled */ extern int pll_control; /* kernel support available */ extern int kern_enable; /* kernel support enabled */ -extern int pps_enable; /* kernel PPS discipline enabled */ +extern int hardpps_enable; /* kernel PPS discipline enabled */ extern int ext_enable; /* external clock enabled */ extern int cal_enable; /* refclock calibrate enable */ extern int allow_panic; /* allow panic correction */ diff --git a/external/bsd/ntp/dist/include/ntpsim.h b/external/bsd/ntp/dist/include/ntpsim.h index 5c61e323ecba..4dcbff43e625 100644 --- a/external/bsd/ntp/dist/include/ntpsim.h +++ b/external/bsd/ntp/dist/include/ntpsim.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpsim.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ntpsim.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* ntpsim.h * diff --git a/external/bsd/ntp/dist/include/parse.h b/external/bsd/ntp/dist/include/parse.h index 93ef59ae15e5..8df1f6d0a76b 100644 --- a/external/bsd/ntp/dist/include/parse.h +++ b/external/bsd/ntp/dist/include/parse.h @@ -1,4 +1,4 @@ -/* $NetBSD: parse.h,v 1.1.1.1 2009/12/13 16:54:53 kardel Exp $ */ +/* $NetBSD: parse.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/include/parse.h,v 4.12 2007/01/14 08:36:03 kardel RELEASE_20070114_A diff --git a/external/bsd/ntp/dist/include/parse_conf.h b/external/bsd/ntp/dist/include/parse_conf.h index 9ed021fe7c62..6d326ed1e5a8 100644 --- a/external/bsd/ntp/dist/include/parse_conf.h +++ b/external/bsd/ntp/dist/include/parse_conf.h @@ -1,4 +1,4 @@ -/* $NetBSD: parse_conf.h,v 1.1.1.1 2009/12/13 16:54:53 kardel Exp $ */ +/* $NetBSD: parse_conf.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/include/parse_conf.h,v 4.7 2005/06/25 10:58:45 kardel RELEASE_20050625_A diff --git a/external/bsd/ntp/dist/include/recvbuff.h b/external/bsd/ntp/dist/include/recvbuff.h index 6444089dc1e5..ed7b2eebb322 100644 --- a/external/bsd/ntp/dist/include/recvbuff.h +++ b/external/bsd/ntp/dist/include/recvbuff.h @@ -1,4 +1,4 @@ -/* $NetBSD: recvbuff.h,v 1.1.1.3 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: recvbuff.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ #ifndef RECVBUFF_H #define RECVBUFF_H diff --git a/external/bsd/ntp/dist/include/refclock_atom.h b/external/bsd/ntp/dist/include/refclock_atom.h index 4cf5996a897c..d77a71e8e00e 100644 --- a/external/bsd/ntp/dist/include/refclock_atom.h +++ b/external/bsd/ntp/dist/include/refclock_atom.h @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_atom.h,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: refclock_atom.h,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Definitions for the atom driver and its friends diff --git a/external/bsd/ntp/dist/include/ssl_applink.c b/external/bsd/ntp/dist/include/ssl_applink.c index ce3a470d681a..833de7b2ec76 100644 --- a/external/bsd/ntp/dist/include/ssl_applink.c +++ b/external/bsd/ntp/dist/include/ssl_applink.c @@ -1,4 +1,4 @@ -/* $NetBSD: ssl_applink.c,v 1.1.1.1 2009/12/13 16:54:54 kardel Exp $ */ +/* $NetBSD: ssl_applink.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * include/ssl_applink.c -- common NTP code for openssl/applink.c diff --git a/external/bsd/ntp/dist/include/timepps-SCO.h b/external/bsd/ntp/dist/include/timepps-SCO.h index 6e89c447c85e..ab396d2b236d 100644 --- a/external/bsd/ntp/dist/include/timepps-SCO.h +++ b/external/bsd/ntp/dist/include/timepps-SCO.h @@ -1,4 +1,4 @@ -/* $NetBSD: timepps-SCO.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: timepps-SCO.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*********************************************************************** * * diff --git a/external/bsd/ntp/dist/include/timepps-Solaris.h b/external/bsd/ntp/dist/include/timepps-Solaris.h index 6dd0969266cd..7220a832d940 100644 --- a/external/bsd/ntp/dist/include/timepps-Solaris.h +++ b/external/bsd/ntp/dist/include/timepps-Solaris.h @@ -1,4 +1,4 @@ -/* $NetBSD: timepps-Solaris.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: timepps-Solaris.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*********************************************************************** * * diff --git a/external/bsd/ntp/dist/include/timepps-SunOS.h b/external/bsd/ntp/dist/include/timepps-SunOS.h index dd1d83d1d77e..b23502ee12fa 100644 --- a/external/bsd/ntp/dist/include/timepps-SunOS.h +++ b/external/bsd/ntp/dist/include/timepps-SunOS.h @@ -1,4 +1,4 @@ -/* $NetBSD: timepps-SunOS.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: timepps-SunOS.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*********************************************************************** * * diff --git a/external/bsd/ntp/dist/include/timespecops.h b/external/bsd/ntp/dist/include/timespecops.h index 4313da5e8d14..cf3baf4b476c 100644 --- a/external/bsd/ntp/dist/include/timespecops.h +++ b/external/bsd/ntp/dist/include/timespecops.h @@ -1,4 +1,4 @@ -/* $NetBSD: timespecops.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: timespecops.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * timespecops.h -- calculations on 'struct timespec' values diff --git a/external/bsd/ntp/dist/include/timetoa.h b/external/bsd/ntp/dist/include/timetoa.h index 7240f859c0bc..0b9beb8fdab3 100644 --- a/external/bsd/ntp/dist/include/timetoa.h +++ b/external/bsd/ntp/dist/include/timetoa.h @@ -1,4 +1,4 @@ -/* $NetBSD: timetoa.h,v 1.1.1.1 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: timetoa.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * timetoa.h -- time_t related string formatting diff --git a/external/bsd/ntp/dist/include/timevalops.h b/external/bsd/ntp/dist/include/timevalops.h index a409750460d8..deacf0826bf2 100644 --- a/external/bsd/ntp/dist/include/timevalops.h +++ b/external/bsd/ntp/dist/include/timevalops.h @@ -1,4 +1,4 @@ -/* $NetBSD: timevalops.h,v 1.1.1.1 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: timevalops.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * timevalops.h -- calculations on 'struct timeval' values diff --git a/external/bsd/ntp/dist/include/trimble.h b/external/bsd/ntp/dist/include/trimble.h index 9ae9abbf54eb..f8b16c079996 100644 --- a/external/bsd/ntp/dist/include/trimble.h +++ b/external/bsd/ntp/dist/include/trimble.h @@ -1,4 +1,4 @@ -/* $NetBSD: trimble.h,v 1.1.1.2 2013/12/27 23:30:46 christos Exp $ */ +/* $NetBSD: trimble.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/include/trimble.h,v 4.6 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/include/vint64ops.h b/external/bsd/ntp/dist/include/vint64ops.h index 50b33a9de9a2..df2ea710e462 100644 --- a/external/bsd/ntp/dist/include/vint64ops.h +++ b/external/bsd/ntp/dist/include/vint64ops.h @@ -1,4 +1,4 @@ -/* $NetBSD: vint64ops.h,v 1.1.1.1 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: vint64ops.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * vint64ops.h - operations on 'vint64' values diff --git a/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h b/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h index 2ab65bed31e3..fdbc6cb6c374 100644 --- a/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h +++ b/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h @@ -1,4 +1,4 @@ -/* $NetBSD: bsd_audioirig.h,v 1.1.1.3 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: bsd_audioirig.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * $Header: bsd_audioirig.h,v 1.0 93/08/02 12:42:00 diff --git a/external/bsd/ntp/dist/kernel/sys/i8253.h b/external/bsd/ntp/dist/kernel/sys/i8253.h index 3abcd87dff34..c253011e758a 100644 --- a/external/bsd/ntp/dist/kernel/sys/i8253.h +++ b/external/bsd/ntp/dist/kernel/sys/i8253.h @@ -1,4 +1,4 @@ -/* $NetBSD: i8253.h,v 1.1.1.1 2009/12/13 16:54:57 kardel Exp $ */ +/* $NetBSD: i8253.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* Copyright (c) 1995 Vixie Enterprises * diff --git a/external/bsd/ntp/dist/kernel/sys/parsestreams.h b/external/bsd/ntp/dist/kernel/sys/parsestreams.h index ce0ed4f60d12..bcf86f994e7c 100644 --- a/external/bsd/ntp/dist/kernel/sys/parsestreams.h +++ b/external/bsd/ntp/dist/kernel/sys/parsestreams.h @@ -1,4 +1,4 @@ -/* $NetBSD: parsestreams.h,v 1.1.1.1 2009/12/13 16:54:57 kardel Exp $ */ +/* $NetBSD: parsestreams.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * /src/NTP/ntp4-dev/kernel/sys/parsestreams.h,v 4.5 2005/06/25 10:52:47 kardel RELEASE_20050625_A diff --git a/external/bsd/ntp/dist/kernel/sys/pcl720.h b/external/bsd/ntp/dist/kernel/sys/pcl720.h index d30fc9f40281..4dcf9cab99cd 100644 --- a/external/bsd/ntp/dist/kernel/sys/pcl720.h +++ b/external/bsd/ntp/dist/kernel/sys/pcl720.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcl720.h,v 1.1.1.1 2009/12/13 16:54:57 kardel Exp $ */ +/* $NetBSD: pcl720.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* Copyright (c) 1995 Vixie Enterprises * diff --git a/external/bsd/ntp/dist/kernel/sys/ppsclock.h b/external/bsd/ntp/dist/kernel/sys/ppsclock.h index 9bd325a65080..6186085a9729 100644 --- a/external/bsd/ntp/dist/kernel/sys/ppsclock.h +++ b/external/bsd/ntp/dist/kernel/sys/ppsclock.h @@ -1,4 +1,4 @@ -/* $NetBSD: ppsclock.h,v 1.1.1.1 2009/12/13 16:54:57 kardel Exp $ */ +/* $NetBSD: ppsclock.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * This software was developed by the Computer Systems Engineering group diff --git a/external/bsd/ntp/dist/kernel/sys/timex.h b/external/bsd/ntp/dist/kernel/sys/timex.h index 6071f98bd1d9..d5d9a933fecf 100644 --- a/external/bsd/ntp/dist/kernel/sys/timex.h +++ b/external/bsd/ntp/dist/kernel/sys/timex.h @@ -1,4 +1,4 @@ -/* $NetBSD: timex.h,v 1.1.1.1 2009/12/13 16:54:58 kardel Exp $ */ +/* $NetBSD: timex.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /****************************************************************************** * * diff --git a/external/bsd/ntp/dist/kernel/sys/tpro.h b/external/bsd/ntp/dist/kernel/sys/tpro.h index b22a383b1f81..807f88b6e75a 100644 --- a/external/bsd/ntp/dist/kernel/sys/tpro.h +++ b/external/bsd/ntp/dist/kernel/sys/tpro.h @@ -1,4 +1,4 @@ -/* $NetBSD: tpro.h,v 1.1.1.1 2009/12/13 16:54:58 kardel Exp $ */ +/* $NetBSD: tpro.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Structure for the KSI/Odetics TPRO-S data returned in reponse to a diff --git a/external/bsd/ntp/dist/kernel/sys/tt560_api.h b/external/bsd/ntp/dist/kernel/sys/tt560_api.h index f01f713f45ba..1052b22960c9 100644 --- a/external/bsd/ntp/dist/kernel/sys/tt560_api.h +++ b/external/bsd/ntp/dist/kernel/sys/tt560_api.h @@ -1,4 +1,4 @@ -/* $NetBSD: tt560_api.h,v 1.1.1.1 2009/12/13 16:54:58 kardel Exp $ */ +/* $NetBSD: tt560_api.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /*********************************************************************** * diff --git a/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h index 718f854da079..9d75283bb269 100644 --- a/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/app_api.c b/external/bsd/ntp/dist/lib/isc/app_api.c index 0d2791ac7aee..929709b274be 100644 --- a/external/bsd/ntp/dist/lib/isc/app_api.c +++ b/external/bsd/ntp/dist/lib/isc/app_api.c @@ -1,4 +1,4 @@ -/* $NetBSD: app_api.c,v 1.1.1.1 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: app_api.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/assertions.c b/external/bsd/ntp/dist/lib/isc/assertions.c index 93458bb5a1c3..49c4c63e0f6a 100644 --- a/external/bsd/ntp/dist/lib/isc/assertions.c +++ b/external/bsd/ntp/dist/lib/isc/assertions.c @@ -1,4 +1,4 @@ -/* $NetBSD: assertions.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: assertions.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c b/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c index 35548d906940..9666c66ea5f1 100644 --- a/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c +++ b/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c @@ -1,4 +1,4 @@ -/* $NetBSD: backtrace-emptytbl.c,v 1.1.1.1 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: backtrace-emptytbl.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/backtrace.c b/external/bsd/ntp/dist/lib/isc/backtrace.c index 8f7211695f61..5a3cf2b1b451 100644 --- a/external/bsd/ntp/dist/lib/isc/backtrace.c +++ b/external/bsd/ntp/dist/lib/isc/backtrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: backtrace.c,v 1.2 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: backtrace.c,v 1.3 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/base32.c b/external/bsd/ntp/dist/lib/isc/base32.c index 97f7ea14c8de..d0c41133f57f 100644 --- a/external/bsd/ntp/dist/lib/isc/base32.c +++ b/external/bsd/ntp/dist/lib/isc/base32.c @@ -1,4 +1,4 @@ -/* $NetBSD: base32.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: base32.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2008, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/base64.c b/external/bsd/ntp/dist/lib/isc/base64.c index ceadc0371fee..cf3aa2941d8d 100644 --- a/external/bsd/ntp/dist/lib/isc/base64.c +++ b/external/bsd/ntp/dist/lib/isc/base64.c @@ -1,4 +1,4 @@ -/* $NetBSD: base64.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: base64.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/bitstring.c b/external/bsd/ntp/dist/lib/isc/bitstring.c index 44532f31b2bb..50360d596d83 100644 --- a/external/bsd/ntp/dist/lib/isc/bitstring.c +++ b/external/bsd/ntp/dist/lib/isc/bitstring.c @@ -1,4 +1,4 @@ -/* $NetBSD: bitstring.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: bitstring.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/buffer.c b/external/bsd/ntp/dist/lib/isc/buffer.c index 2fdc50ad8f01..87a33b22ecb2 100644 --- a/external/bsd/ntp/dist/lib/isc/buffer.c +++ b/external/bsd/ntp/dist/lib/isc/buffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: buffer.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: buffer.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/bufferlist.c b/external/bsd/ntp/dist/lib/isc/bufferlist.c index 64b89ecc540b..9a94d4c06715 100644 --- a/external/bsd/ntp/dist/lib/isc/bufferlist.c +++ b/external/bsd/ntp/dist/lib/isc/bufferlist.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferlist.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: bufferlist.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/commandline.c b/external/bsd/ntp/dist/lib/isc/commandline.c index 2d6431906849..2b9675eeb7bd 100644 --- a/external/bsd/ntp/dist/lib/isc/commandline.c +++ b/external/bsd/ntp/dist/lib/isc/commandline.c @@ -1,4 +1,4 @@ -/* $NetBSD: commandline.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: commandline.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/entropy.c b/external/bsd/ntp/dist/lib/isc/entropy.c index 1d115196691b..b520b923c53a 100644 --- a/external/bsd/ntp/dist/lib/isc/entropy.c +++ b/external/bsd/ntp/dist/lib/isc/entropy.c @@ -1,4 +1,4 @@ -/* $NetBSD: entropy.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: entropy.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/error.c b/external/bsd/ntp/dist/lib/isc/error.c index 94c43d1eff8f..fd143ad6050f 100644 --- a/external/bsd/ntp/dist/lib/isc/error.c +++ b/external/bsd/ntp/dist/lib/isc/error.c @@ -1,4 +1,4 @@ -/* $NetBSD: error.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: error.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/event.c b/external/bsd/ntp/dist/lib/isc/event.c index 1fc2c749c529..bf2f23ad46a7 100644 --- a/external/bsd/ntp/dist/lib/isc/event.c +++ b/external/bsd/ntp/dist/lib/isc/event.c @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: event.c,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/fsaccess.c b/external/bsd/ntp/dist/lib/isc/fsaccess.c index 52258379fa74..d034dc972661 100644 --- a/external/bsd/ntp/dist/lib/isc/fsaccess.c +++ b/external/bsd/ntp/dist/lib/isc/fsaccess.c @@ -1,4 +1,4 @@ -/* $NetBSD: fsaccess.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: fsaccess.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/hash.c b/external/bsd/ntp/dist/lib/isc/hash.c index d0d1adb1254f..c676d3b5d344 100644 --- a/external/bsd/ntp/dist/lib/isc/hash.c +++ b/external/bsd/ntp/dist/lib/isc/hash.c @@ -1,4 +1,4 @@ -/* $NetBSD: hash.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: hash.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/heap.c b/external/bsd/ntp/dist/lib/isc/heap.c index a393f0f7c765..e72e9fe92b2b 100644 --- a/external/bsd/ntp/dist/lib/isc/heap.c +++ b/external/bsd/ntp/dist/lib/isc/heap.c @@ -1,4 +1,4 @@ -/* $NetBSD: heap.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: heap.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/hex.c b/external/bsd/ntp/dist/lib/isc/hex.c index b2bb5b854fc4..5a418e653bf8 100644 --- a/external/bsd/ntp/dist/lib/isc/hex.c +++ b/external/bsd/ntp/dist/lib/isc/hex.c @@ -1,4 +1,4 @@ -/* $NetBSD: hex.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: hex.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/hmacmd5.c b/external/bsd/ntp/dist/lib/isc/hmacmd5.c index 7c25bb03508c..ced591ad269b 100644 --- a/external/bsd/ntp/dist/lib/isc/hmacmd5.c +++ b/external/bsd/ntp/dist/lib/isc/hmacmd5.c @@ -1,4 +1,4 @@ -/* $NetBSD: hmacmd5.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: hmacmd5.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/hmacsha.c b/external/bsd/ntp/dist/lib/isc/hmacsha.c index d734815d8104..8adb27c8e9b4 100644 --- a/external/bsd/ntp/dist/lib/isc/hmacsha.c +++ b/external/bsd/ntp/dist/lib/isc/hmacsha.c @@ -1,4 +1,4 @@ -/* $NetBSD: hmacsha.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: hmacsha.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2005-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/httpd.c b/external/bsd/ntp/dist/lib/isc/httpd.c index 5ae1c455fc30..729eacc24426 100644 --- a/external/bsd/ntp/dist/lib/isc/httpd.c +++ b/external/bsd/ntp/dist/lib/isc/httpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: httpd.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: httpd.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2006-2008, 2010-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h index 63270d6e752d..27065e297ebf 100644 --- a/external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2006, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/Makefile b/external/bsd/ntp/dist/lib/isc/include/isc/Makefile deleted file mode 100644 index 5ed6d2087c0b..000000000000 --- a/external/bsd/ntp/dist/lib/isc/include/isc/Makefile +++ /dev/null @@ -1,439 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# lib/isc/include/isc/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = /deacon/backroom/snaps/ntp-dev/lib/isc/include/isc -top_srcdir = /deacon/backroom/snaps/ntp-dev -VPATH = /deacon/backroom/snaps/ntp-dev/lib/isc/include/isc -pkgdatadir = $(datadir)/ntp -pkglibdir = $(libdir)/ntp -pkgincludedir = $(includedir)/ntp -top_builddir = ../../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/local/gnu/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = sparc-sun-solaris2.10 -host_triplet = sparc-sun-solaris2.10 -subdir = lib/isc/include/isc -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ - $(top_srcdir)/m4/define_dir.m4 \ - $(top_srcdir)/m4/ntp_cacheversion.m4 \ - $(top_srcdir)/m4/ntp_dir_sep.m4 \ - $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ - $(top_srcdir)/m4/ntp_vpathhack.m4 \ - $(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run tar -AR = ar -ARLIB_DIR = arlib -AUTOCONF = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run autoconf -AUTOHEADER = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run autoheader -AUTOMAKE = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run automake-1.9 -AWK = gawk -BINSUBDIR = bin -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -D_LARGEFILE64_SOURCE -Wall -Wcast-qual -Wmissing-prototypes -Wpointer-arith -Wshadow -Winit-self -Wno-strict-prototypes -CHUTEST = -CLKTEST = -CPP = gcc -E -CPPFLAGS = -D__EXTENSIONS__ -I/usr/sfw/include -CYGPATH_W = echo -DCFD = -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EDITLINE_LIBS = -EF_LIBS = -EF_PROGS = -EGREP = grep -E -EXEEXT = -HAVE_INLINE = -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_LIBOPTS_FALSE = -INSTALL_LIBOPTS_TRUE = # -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LCRYPTO = -lcrypto -LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -LIBOBJS = -LIBOPTS_CFLAGS = -I$(top_srcdir)/libopts -LIBOPTS_DIR = libopts -LIBOPTS_LDADD = $(top_builddir)/libopts/libopts.la -LIBPARSE = -LIBS = -lkvm -lelf -lsocket -lrt -lmd5 -lnsl -lgen -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LSCF = -lscf -LTLIBOBJS = -MAKEINFO = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run makeinfo -MAKE_ADJTIMED = -MAKE_CHECK_LAYOUT = check-layout -MAKE_CHECK_Y2K = -MAKE_LIBNTPSIM = libntpsim.a -MAKE_LIBPARSE = -MAKE_LIBPARSE_KERNEL = -MAKE_NTPDSIM = ntpdsim -MAKE_NTPSNMPD = -MAKE_NTPTIME = ntptime -MAKE_PARSEKMODULE = -MAKE_TICKADJ = tickadj -MAKE_TIMETRIM = -NEED_LIBOPTS_FALSE = # -NEED_LIBOPTS_TRUE = -OBJEXT = o -OPENSSL = -OPENSSL_INC = /usr/sfw/include -OPENSSL_LIB = /usr/sfw/lib -PACKAGE = ntp -PACKAGE_BUGREPORT = -PACKAGE_NAME = ntp -PACKAGE_STRING = ntp 4.2.5p221 -PACKAGE_TARNAME = ntp -PACKAGE_VERSION = 4.2.5p221 -PATH_NET_SNMP_CONFIG = -PATH_PERL = /usr/local/bin/perl -PATH_SEPARATOR = : -PATH_SH = /bin/sh -PROPDELAY = -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/sh -SNMP_CFLAGS = -SNMP_CPPFLAGS = -SNMP_LIBS = -STRIP = strip -TESTDCF = -VERSION = 4.2.5p221 -VPATH_HACK_FALSE = -VPATH_HACK_TRUE = # -YACC = bison -y -ac_ct_AR = ar -ac_ct_CC = gcc -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = sparc-sun-solaris2.10 -build_alias = -build_cpu = sparc -build_os = solaris2.10 -build_vendor = sun -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = sparc-sun-solaris2.10 -host_alias = -host_cpu = sparc -host_os = solaris2.10 -host_vendor = sun -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /deacon/backroom/snaps/ntp-dev/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -subdirs = arlib sntp -sysconfdir = ${prefix}/etc -target_alias = -NULL = -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -AUTOMAKE_OPTIONS = -ETAGS_ARGS = $(srcdir)/Makefile.am -#EXTRA_DIST = TAGS -noinst_HEADERS = \ - app.h \ - assertions.h \ - boolean.h \ - buffer.h \ - error.h \ - file.h \ - formatcheck.h \ - interfaceiter.h \ - ipv6.h \ - lang.h \ - lib.h \ - list.h \ - log.h \ - magic.h \ - md5.h \ - mem.h \ - msgcat.h \ - msgs.h \ - mutex.h \ - netaddr.h \ - netscope.h \ - once.h \ - platform.h \ - print.h \ - result.h \ - region.h \ - sockaddr.h \ - stdio.h \ - string.h \ - types.h \ - util.h \ - $(NULL) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/isc/include/isc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/isc/include/isc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -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_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-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 \ - mostlyclean-libtool pdf pdf-am ps ps-am 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. -.NOEXPORT: diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/app.h b/external/bsd/ntp/dist/lib/isc/include/isc/app.h index 494c273d817e..811aaa617dee 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/app.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/app.h @@ -1,4 +1,4 @@ -/* $NetBSD: app.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: app.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/assertions.h b/external/bsd/ntp/dist/lib/isc/include/isc/assertions.h index aacf13eba560..bbb731e653ab 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/assertions.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/assertions.h @@ -1,4 +1,4 @@ -/* $NetBSD: assertions.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: assertions.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h b/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h index c45395413cca..e450cdb76ebd 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h @@ -1,4 +1,4 @@ -/* $NetBSD: backtrace.h,v 1.1.1.1 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: backtrace.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/base32.h b/external/bsd/ntp/dist/lib/isc/include/isc/base32.h index d3b60034f645..34a8e7ee10b3 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/base32.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/base32.h @@ -1,4 +1,4 @@ -/* $NetBSD: base32.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: base32.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/base64.h b/external/bsd/ntp/dist/lib/isc/include/isc/base64.h index c91ae83bf97d..a8fe3f8446a0 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/base64.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/base64.h @@ -1,4 +1,4 @@ -/* $NetBSD: base64.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: base64.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/bind9.h b/external/bsd/ntp/dist/lib/isc/include/isc/bind9.h index b471e012c364..7023773337dd 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/bind9.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/bind9.h @@ -1,4 +1,4 @@ -/* $NetBSD: bind9.h,v 1.1.1.1 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: bind9.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h b/external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h index dcf27cd9275d..0fe81d7d6a74 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h @@ -1,4 +1,4 @@ -/* $NetBSD: bitstring.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: bitstring.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/boolean.h b/external/bsd/ntp/dist/lib/isc/include/isc/boolean.h index 052947ecd055..cf0f178f9521 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/boolean.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/boolean.h @@ -1,4 +1,4 @@ -/* $NetBSD: boolean.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: boolean.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/buffer.h b/external/bsd/ntp/dist/lib/isc/include/isc/buffer.h index 10264912334e..2f77a1179d52 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/buffer.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/buffer.h @@ -1,4 +1,4 @@ -/* $NetBSD: buffer.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: buffer.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2008, 2010 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h b/external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h index 8ab2abbc13f9..f499fd052c31 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferlist.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: bufferlist.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/commandline.h b/external/bsd/ntp/dist/lib/isc/include/isc/commandline.h index 3ce38b1265b0..7f26bc5fc4d1 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/commandline.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/commandline.h @@ -1,4 +1,4 @@ -/* $NetBSD: commandline.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: commandline.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/entropy.h b/external/bsd/ntp/dist/lib/isc/include/isc/entropy.h index 2b3a23d6ab4b..fbd5c84a1c95 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/entropy.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/entropy.h @@ -1,4 +1,4 @@ -/* $NetBSD: entropy.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: entropy.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/error.h b/external/bsd/ntp/dist/lib/isc/include/isc/error.h index 96b05ad0f028..f044ce1c4842 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/error.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/error.h @@ -1,4 +1,4 @@ -/* $NetBSD: error.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: error.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/event.h b/external/bsd/ntp/dist/lib/isc/include/isc/event.h index 1531887c3257..2f434335d3b5 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/event.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/event.h @@ -1,4 +1,4 @@ -/* $NetBSD: event.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: event.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h b/external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h index dc5bca5a6ce4..7b4dceb6ec3d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h @@ -1,4 +1,4 @@ -/* $NetBSD: eventclass.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: eventclass.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/file.h b/external/bsd/ntp/dist/lib/isc/include/isc/file.h index dfb30988ae2f..3b0a07e54d80 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/file.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/file.h @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: file.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h b/external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h index 1e533dbfe9ba..d9740ea5a919 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h @@ -1,4 +1,4 @@ -/* $NetBSD: formatcheck.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: formatcheck.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h b/external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h index 540649445e44..4c1ebca99807 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h @@ -1,4 +1,4 @@ -/* $NetBSD: fsaccess.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: fsaccess.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/hash.h b/external/bsd/ntp/dist/lib/isc/include/isc/hash.h index d5abc2b0b2d2..f711b815baa6 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/hash.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: hash.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: hash.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/heap.h b/external/bsd/ntp/dist/lib/isc/include/isc/heap.h index a8c04bcbe066..3031e0162b9c 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/heap.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/heap.h @@ -1,4 +1,4 @@ -/* $NetBSD: heap.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: heap.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/hex.h b/external/bsd/ntp/dist/lib/isc/include/isc/hex.h index acec76b94b7d..c26623a62dc7 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/hex.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/hex.h @@ -1,4 +1,4 @@ -/* $NetBSD: hex.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: hex.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h b/external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h index 6cfbe8c328d0..694302054ccf 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h @@ -1,4 +1,4 @@ -/* $NetBSD: hmacmd5.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: hmacmd5.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h b/external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h index cc6349edf841..c396b5d0e31f 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h @@ -1,4 +1,4 @@ -/* $NetBSD: hmacsha.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: hmacsha.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/httpd.h b/external/bsd/ntp/dist/lib/isc/include/isc/httpd.h index b995bfb4c8d6..39424135a63d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/httpd.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/httpd.h @@ -1,4 +1,4 @@ -/* $NetBSD: httpd.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: httpd.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2006-2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h b/external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h index 8b45d0b6d9e6..ef0c1fd42d0a 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h @@ -1,4 +1,4 @@ -/* $NetBSD: interfaceiter.h,v 1.1.1.3 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: interfaceiter.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h b/external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h index 0ac234144a40..104b8e2ad8e3 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h @@ -1,4 +1,4 @@ -/* $NetBSD: ipv6.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: ipv6.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h b/external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h index de0487b87d3b..4a29522b004d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: iterated_hash.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: iterated_hash.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/lang.h b/external/bsd/ntp/dist/lib/isc/include/isc/lang.h index 20659bcc405b..220c1fa33654 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/lang.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/lang.h @@ -1,4 +1,4 @@ -/* $NetBSD: lang.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: lang.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/lex.h b/external/bsd/ntp/dist/lib/isc/include/isc/lex.h index 277ae32da5be..43544ae28eec 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/lex.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/lex.h @@ -1,4 +1,4 @@ -/* $NetBSD: lex.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: lex.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h b/external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h index 5d52129bddf4..01a460d9b3c5 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h @@ -1,4 +1,4 @@ -/* $NetBSD: lfsr.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: lfsr.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/lib.h b/external/bsd/ntp/dist/lib/isc/include/isc/lib.h index fe751333b77b..f85dc193f3b1 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/lib.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/lib.h @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: lib.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/list.h b/external/bsd/ntp/dist/lib/isc/include/isc/list.h index ba928a9d26bb..b1ab1655be84 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/list.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/list.h @@ -1,4 +1,4 @@ -/* $NetBSD: list.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: list.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/log.h b/external/bsd/ntp/dist/lib/isc/include/isc/log.h index 4a255bb291e1..753eccd8df49 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/log.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/log.h @@ -1,4 +1,4 @@ -/* $NetBSD: log.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: log.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/magic.h b/external/bsd/ntp/dist/lib/isc/include/isc/magic.h index 1c552915da87..1c24d7f2e07a 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/magic.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/magic.h @@ -1,4 +1,4 @@ -/* $NetBSD: magic.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: magic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/md5.h b/external/bsd/ntp/dist/lib/isc/include/isc/md5.h index 7393bb35fe07..46b771f47bba 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/md5.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/md5.h @@ -1,4 +1,4 @@ -/* $NetBSD: md5.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: md5.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/mem.h b/external/bsd/ntp/dist/lib/isc/include/isc/mem.h index c93fc24675fc..e90c89168582 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/mem.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/mem.h @@ -1,4 +1,4 @@ -/* $NetBSD: mem.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: mem.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h b/external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h index b9093a6e147b..358c8f0bd296 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h @@ -1,4 +1,4 @@ -/* $NetBSD: msgcat.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: msgcat.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/msgs.h b/external/bsd/ntp/dist/lib/isc/include/isc/msgs.h index 026567613e5e..aed3e618f1c5 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/msgs.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/msgs.h @@ -1,4 +1,4 @@ -/* $NetBSD: msgs.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: msgs.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h b/external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h index a3f7f9cbd1bf..c438e77589a4 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h @@ -1,4 +1,4 @@ -/* $NetBSD: mutexblock.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: mutexblock.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/namespace.h b/external/bsd/ntp/dist/lib/isc/include/isc/namespace.h index 9fb7218d7253..e3307424cf8d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/namespace.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/namespace.h @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.1.1.1 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: namespace.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2009-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h b/external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h index d37651188048..59fca97dbd7c 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h @@ -1,4 +1,4 @@ -/* $NetBSD: netaddr.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: netaddr.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/netscope.h b/external/bsd/ntp/dist/lib/isc/include/isc/netscope.h index 5f6befba84c5..00889d0f55fb 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/netscope.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/netscope.h @@ -1,4 +1,4 @@ -/* $NetBSD: netscope.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: netscope.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h b/external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h index c3ee8f6d3eb5..e72419b590b6 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h @@ -1,4 +1,4 @@ -/* $NetBSD: ondestroy.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: ondestroy.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/os.h b/external/bsd/ntp/dist/lib/isc/include/isc/os.h index a8f70b139884..257138769edc 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/os.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/os.h @@ -1,4 +1,4 @@ -/* $NetBSD: os.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: os.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/parseint.h b/external/bsd/ntp/dist/lib/isc/include/isc/parseint.h index 5dc4c41cc79a..46e31f589b59 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/parseint.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/parseint.h @@ -1,4 +1,4 @@ -/* $NetBSD: parseint.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: parseint.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/platform.h b/external/bsd/ntp/dist/lib/isc/include/isc/platform.h index 4fede226c18c..d60fd8b19ad6 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/platform.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/platform.h @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: platform.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 1999-2001 Internet Software Consortium. diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/portset.h b/external/bsd/ntp/dist/lib/isc/include/isc/portset.h index 863936f51e0f..a9eb148a637a 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/portset.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/portset.h @@ -1,4 +1,4 @@ -/* $NetBSD: portset.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: portset.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2008, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/print.h b/external/bsd/ntp/dist/lib/isc/include/isc/print.h index bf72530e6c5e..8f06078f778d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/print.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/print.h @@ -1,4 +1,4 @@ -/* $NetBSD: print.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: print.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/queue.h b/external/bsd/ntp/dist/lib/isc/include/isc/queue.h index 706e31f64864..495ad5120605 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/queue.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/queue.h @@ -1,4 +1,4 @@ -/* $NetBSD: queue.h,v 1.1.1.1 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: queue.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/quota.h b/external/bsd/ntp/dist/lib/isc/include/isc/quota.h index d5c70eac1a3c..4c284033d4ba 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/quota.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/quota.h @@ -1,4 +1,4 @@ -/* $NetBSD: quota.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: quota.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/radix.h b/external/bsd/ntp/dist/lib/isc/include/isc/radix.h index 4741f8e61607..47d60cac6652 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/radix.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/radix.h @@ -1,4 +1,4 @@ -/* $NetBSD: radix.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: radix.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/random.h b/external/bsd/ntp/dist/lib/isc/include/isc/random.h index 679967956f44..288bd2ab1b73 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/random.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/random.h @@ -1,4 +1,4 @@ -/* $NetBSD: random.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: random.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h b/external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h index e47060777222..0f3130169e93 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h @@ -1,4 +1,4 @@ -/* $NetBSD: ratelimiter.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: ratelimiter.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/refcount.h b/external/bsd/ntp/dist/lib/isc/include/isc/refcount.h index 78dcdd33e3a3..378eaa36d34b 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/refcount.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/refcount.h @@ -1,4 +1,4 @@ -/* $NetBSD: refcount.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: refcount.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/region.h b/external/bsd/ntp/dist/lib/isc/include/isc/region.h index 8af3f2c0b85f..532a5404ee4c 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/region.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/region.h @@ -1,4 +1,4 @@ -/* $NetBSD: region.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: region.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/resource.h b/external/bsd/ntp/dist/lib/isc/include/isc/resource.h index 85ca34263a22..a8f6f25bc48f 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/resource.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/resource.h @@ -1,4 +1,4 @@ -/* $NetBSD: resource.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: resource.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/result.h b/external/bsd/ntp/dist/lib/isc/include/isc/result.h index 3a318c64d15e..4e84e1879669 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/result.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/result.h @@ -1,4 +1,4 @@ -/* $NetBSD: result.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: result.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h b/external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h index 72df8ae4fee9..35dd1f8c13a2 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h @@ -1,4 +1,4 @@ -/* $NetBSD: resultclass.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: resultclass.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h b/external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h index 80b3c17b1e6b..977d15482c9c 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h @@ -1,4 +1,4 @@ -/* $NetBSD: rwlock.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: rwlock.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/serial.h b/external/bsd/ntp/dist/lib/isc/include/isc/serial.h index 82f8a6e6651a..c6e12e92fd0d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/serial.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/serial.h @@ -1,4 +1,4 @@ -/* $NetBSD: serial.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: serial.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/sha1.h b/external/bsd/ntp/dist/lib/isc/include/isc/sha1.h index 26c905dd5848..fb9b5c58cf9d 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/sha1.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/sha1.h @@ -1,4 +1,4 @@ -/* $NetBSD: sha1.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: sha1.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/sha2.h b/external/bsd/ntp/dist/lib/isc/include/isc/sha2.h index c6ae54a1ee8b..62eed003dc35 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/sha2.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/sha2.h @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: sha2.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h b/external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h index d696396217a6..3089f92fc286 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h @@ -1,4 +1,4 @@ -/* $NetBSD: sockaddr.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: sockaddr.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/socket.h b/external/bsd/ntp/dist/lib/isc/include/isc/socket.h index c35cba6f5155..55e0491825ce 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/socket.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/socket.h @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: socket.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/stats.h b/external/bsd/ntp/dist/lib/isc/include/isc/stats.h index 7b6856f0ea01..afbcb76268b5 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/stats.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/stats.h @@ -1,4 +1,4 @@ -/* $NetBSD: stats.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: stats.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/stdio.h b/external/bsd/ntp/dist/lib/isc/include/isc/stdio.h index 86602d109a63..58812de901c0 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/stdio.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/stdio.h @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: stdio.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h b/external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h index d22cbf61ec15..81f1a780d231 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: stdlib.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/string.h b/external/bsd/ntp/dist/lib/isc/include/isc/string.h index 740eaa6f6b2c..52f81b752aef 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/string.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/string.h @@ -1,4 +1,4 @@ -/* $NetBSD: string.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: string.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/symtab.h b/external/bsd/ntp/dist/lib/isc/include/isc/symtab.h index 6afe0d3bc960..9744dc117de9 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/symtab.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/symtab.h @@ -1,4 +1,4 @@ -/* $NetBSD: symtab.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: symtab.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/task.h b/external/bsd/ntp/dist/lib/isc/include/isc/task.h index 1468c54e733f..72a7bbe68232 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/task.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/task.h @@ -1,4 +1,4 @@ -/* $NetBSD: task.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: task.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/taskpool.h b/external/bsd/ntp/dist/lib/isc/include/isc/taskpool.h index 8aac906ebb78..dd8b76ed5134 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/taskpool.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/taskpool.h @@ -1,4 +1,4 @@ -/* $NetBSD: taskpool.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: taskpool.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/timer.h b/external/bsd/ntp/dist/lib/isc/include/isc/timer.h index 6c9414893d92..832e4caf0f94 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/timer.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/timer.h @@ -1,4 +1,4 @@ -/* $NetBSD: timer.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: timer.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/types.h b/external/bsd/ntp/dist/lib/isc/include/isc/types.h index 2cca18f71ec8..2799bc4cfad0 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/types.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: types.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2009, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/util.h b/external/bsd/ntp/dist/lib/isc/include/isc/util.h index 922f4cdbc937..30e587e00c00 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/util.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/util.h @@ -1,4 +1,4 @@ -/* $NetBSD: util.h,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: util.h,v 1.4 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/version.h b/external/bsd/ntp/dist/lib/isc/include/isc/version.h index 01ca85ceac28..50fa18441b97 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/version.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.1.1.2 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: version.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/include/isc/xml.h b/external/bsd/ntp/dist/lib/isc/include/isc/xml.h index 41c6c674e581..065a5fb6e153 100644 --- a/external/bsd/ntp/dist/lib/isc/include/isc/xml.h +++ b/external/bsd/ntp/dist/lib/isc/include/isc/xml.h @@ -1,4 +1,4 @@ -/* $NetBSD: xml.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: xml.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2006, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/inet_aton.c b/external/bsd/ntp/dist/lib/isc/inet_aton.c index 8935a9d9756f..f8665e730f60 100644 --- a/external/bsd/ntp/dist/lib/isc/inet_aton.c +++ b/external/bsd/ntp/dist/lib/isc/inet_aton.c @@ -1,4 +1,4 @@ -/* $NetBSD: inet_aton.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: inet_aton.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/inet_ntop.c b/external/bsd/ntp/dist/lib/isc/inet_ntop.c index 8b8e328e39f9..c968cdfcbaaf 100644 --- a/external/bsd/ntp/dist/lib/isc/inet_ntop.c +++ b/external/bsd/ntp/dist/lib/isc/inet_ntop.c @@ -1,4 +1,4 @@ -/* $NetBSD: inet_ntop.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: inet_ntop.c,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/inet_pton.c b/external/bsd/ntp/dist/lib/isc/inet_pton.c index 36e09543004d..a641b8538a76 100644 --- a/external/bsd/ntp/dist/lib/isc/inet_pton.c +++ b/external/bsd/ntp/dist/lib/isc/inet_pton.c @@ -1,4 +1,4 @@ -/* $NetBSD: inet_pton.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: inet_pton.c,v 1.5 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/iterated_hash.c b/external/bsd/ntp/dist/lib/isc/iterated_hash.c index 72bcfa0f6f63..e907f3800f86 100644 --- a/external/bsd/ntp/dist/lib/isc/iterated_hash.c +++ b/external/bsd/ntp/dist/lib/isc/iterated_hash.c @@ -1,4 +1,4 @@ -/* $NetBSD: iterated_hash.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: iterated_hash.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2006, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/lex.c b/external/bsd/ntp/dist/lib/isc/lex.c index e63b543fba2f..ebaa8716197e 100644 --- a/external/bsd/ntp/dist/lib/isc/lex.c +++ b/external/bsd/ntp/dist/lib/isc/lex.c @@ -1,4 +1,4 @@ -/* $NetBSD: lex.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: lex.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/lfsr.c b/external/bsd/ntp/dist/lib/isc/lfsr.c index 420f507e167d..a986e3704537 100644 --- a/external/bsd/ntp/dist/lib/isc/lfsr.c +++ b/external/bsd/ntp/dist/lib/isc/lfsr.c @@ -1,4 +1,4 @@ -/* $NetBSD: lfsr.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: lfsr.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/lib.c b/external/bsd/ntp/dist/lib/isc/lib.c index e6fd8dc672dc..684e1b7282e9 100644 --- a/external/bsd/ntp/dist/lib/isc/lib.c +++ b/external/bsd/ntp/dist/lib/isc/lib.c @@ -1,4 +1,4 @@ -/* $NetBSD: lib.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: lib.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/log.c b/external/bsd/ntp/dist/lib/isc/log.c index 66734f5d4638..b79de50a3e69 100644 --- a/external/bsd/ntp/dist/lib/isc/log.c +++ b/external/bsd/ntp/dist/lib/isc/log.c @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: log.c,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/md5.c b/external/bsd/ntp/dist/lib/isc/md5.c index b0360835f06d..706867095bc6 100644 --- a/external/bsd/ntp/dist/lib/isc/md5.c +++ b/external/bsd/ntp/dist/lib/isc/md5.c @@ -1,4 +1,4 @@ -/* $NetBSD: md5.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: md5.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/mem.c b/external/bsd/ntp/dist/lib/isc/mem.c index 88a2057d42b7..5bf2eda9adf5 100644 --- a/external/bsd/ntp/dist/lib/isc/mem.c +++ b/external/bsd/ntp/dist/lib/isc/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: mem.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2010, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/mem_api.c b/external/bsd/ntp/dist/lib/isc/mem_api.c index 960b518a81ff..08ad9866eaf7 100644 --- a/external/bsd/ntp/dist/lib/isc/mem_api.c +++ b/external/bsd/ntp/dist/lib/isc/mem_api.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem_api.c,v 1.1.1.1 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: mem_api.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009, 2010 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h index 5ff1203346e2..40537beba833 100644 --- a/external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/mutexblock.c b/external/bsd/ntp/dist/lib/isc/mutexblock.c index 3d22255ea5ee..790f57a72293 100644 --- a/external/bsd/ntp/dist/lib/isc/mutexblock.c +++ b/external/bsd/ntp/dist/lib/isc/mutexblock.c @@ -1,4 +1,4 @@ -/* $NetBSD: mutexblock.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: mutexblock.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/netaddr.c b/external/bsd/ntp/dist/lib/isc/netaddr.c index b716a3d5c040..8f4b3e750b2f 100644 --- a/external/bsd/ntp/dist/lib/isc/netaddr.c +++ b/external/bsd/ntp/dist/lib/isc/netaddr.c @@ -1,4 +1,4 @@ -/* $NetBSD: netaddr.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: netaddr.c,v 1.5 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/netscope.c b/external/bsd/ntp/dist/lib/isc/netscope.c index 16f24cf5dbd8..0bda7df91b28 100644 --- a/external/bsd/ntp/dist/lib/isc/netscope.c +++ b/external/bsd/ntp/dist/lib/isc/netscope.c @@ -1,4 +1,4 @@ -/* $NetBSD: netscope.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: netscope.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nls/msgcat.c b/external/bsd/ntp/dist/lib/isc/nls/msgcat.c index 6c080f5cfa87..ac800d434422 100644 --- a/external/bsd/ntp/dist/lib/isc/nls/msgcat.c +++ b/external/bsd/ntp/dist/lib/isc/nls/msgcat.c @@ -1,4 +1,4 @@ -/* $NetBSD: msgcat.c,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: msgcat.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h index c9bb76d02f93..f0757ca9432f 100644 --- a/external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/condition.c b/external/bsd/ntp/dist/lib/isc/nothreads/condition.c index 119ed4cddb2a..99b89aae11c2 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/condition.c +++ b/external/bsd/ntp/dist/lib/isc/nothreads/condition.c @@ -1,4 +1,4 @@ -/* $NetBSD: condition.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: condition.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h index 473cdf4a19f9..886ab82604f9 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h +++ b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h @@ -1,4 +1,4 @@ -/* $NetBSD: condition.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: condition.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h index 55425301acb0..4da9507845b6 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h +++ b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: mutex.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h index 487f4de5722d..2da4d9614021 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h +++ b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h @@ -1,4 +1,4 @@ -/* $NetBSD: once.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: once.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h index 01b1b04f4a3b..390c8749833b 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h +++ b/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h @@ -1,4 +1,4 @@ -/* $NetBSD: thread.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: thread.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/mutex.c b/external/bsd/ntp/dist/lib/isc/nothreads/mutex.c index 66647d0a4e6e..c9c815e2ad98 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/mutex.c +++ b/external/bsd/ntp/dist/lib/isc/nothreads/mutex.c @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: mutex.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/nothreads/thread.c b/external/bsd/ntp/dist/lib/isc/nothreads/thread.c index 9c220cfe8a63..43162a7d4f7e 100644 --- a/external/bsd/ntp/dist/lib/isc/nothreads/thread.c +++ b/external/bsd/ntp/dist/lib/isc/nothreads/thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: thread.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: thread.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/ondestroy.c b/external/bsd/ntp/dist/lib/isc/ondestroy.c index f053918c495d..e6d5a7429ef4 100644 --- a/external/bsd/ntp/dist/lib/isc/ondestroy.c +++ b/external/bsd/ntp/dist/lib/isc/ondestroy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ondestroy.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: ondestroy.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/parseint.c b/external/bsd/ntp/dist/lib/isc/parseint.c index 230abd5b54aa..0bcc15be2396 100644 --- a/external/bsd/ntp/dist/lib/isc/parseint.c +++ b/external/bsd/ntp/dist/lib/isc/parseint.c @@ -1,4 +1,4 @@ -/* $NetBSD: parseint.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: parseint.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/portset.c b/external/bsd/ntp/dist/lib/isc/portset.c index c8033c558a45..ca59ecdd7087 100644 --- a/external/bsd/ntp/dist/lib/isc/portset.c +++ b/external/bsd/ntp/dist/lib/isc/portset.c @@ -1,4 +1,4 @@ -/* $NetBSD: portset.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: portset.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/powerpc/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/powerpc/include/isc/atomic.h index c365e8d08642..253afa9e2623 100644 --- a/external/bsd/ntp/dist/lib/isc/powerpc/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/powerpc/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/print.c b/external/bsd/ntp/dist/lib/isc/print.c index 07ac34e52743..5eac042ba5b2 100644 --- a/external/bsd/ntp/dist/lib/isc/print.c +++ b/external/bsd/ntp/dist/lib/isc/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: print.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2008, 2010 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/condition.c b/external/bsd/ntp/dist/lib/isc/pthreads/condition.c index 6a9b170ae7e8..b26f6fc42f9c 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/condition.c +++ b/external/bsd/ntp/dist/lib/isc/pthreads/condition.c @@ -1,4 +1,4 @@ -/* $NetBSD: condition.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: condition.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h index 9c5e585e6f49..4129c83503a6 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h +++ b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h @@ -1,4 +1,4 @@ -/* $NetBSD: condition.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: condition.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h index 6a8296af51d5..12a0f0e9f85b 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h +++ b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: mutex.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h index b10cdc9d44a6..a295411fccc2 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h +++ b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h @@ -1,4 +1,4 @@ -/* $NetBSD: once.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: once.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h index be52dbd7f51f..21f1991431ce 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h +++ b/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h @@ -1,4 +1,4 @@ -/* $NetBSD: thread.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: thread.h,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/mutex.c b/external/bsd/ntp/dist/lib/isc/pthreads/mutex.c index de7eb346c6d4..1431aa4f9fef 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/mutex.c +++ b/external/bsd/ntp/dist/lib/isc/pthreads/mutex.c @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: mutex.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/pthreads/thread.c b/external/bsd/ntp/dist/lib/isc/pthreads/thread.c index 1771c978a690..9008ccfc61b9 100644 --- a/external/bsd/ntp/dist/lib/isc/pthreads/thread.c +++ b/external/bsd/ntp/dist/lib/isc/pthreads/thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: thread.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: thread.c,v 1.2 2014/12/19 20:43:15 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/quota.c b/external/bsd/ntp/dist/lib/isc/quota.c index 8b77ca7cf06c..3be28ec69d43 100644 --- a/external/bsd/ntp/dist/lib/isc/quota.c +++ b/external/bsd/ntp/dist/lib/isc/quota.c @@ -1,4 +1,4 @@ -/* $NetBSD: quota.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: quota.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/radix.c b/external/bsd/ntp/dist/lib/isc/radix.c index 04cf162bb8db..c0fd47d7b6ee 100644 --- a/external/bsd/ntp/dist/lib/isc/radix.c +++ b/external/bsd/ntp/dist/lib/isc/radix.c @@ -1,4 +1,4 @@ -/* $NetBSD: radix.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: radix.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2007-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/random.c b/external/bsd/ntp/dist/lib/isc/random.c index dbf4be9073c9..7c66cd44b962 100644 --- a/external/bsd/ntp/dist/lib/isc/random.c +++ b/external/bsd/ntp/dist/lib/isc/random.c @@ -1,4 +1,4 @@ -/* $NetBSD: random.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: random.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/ratelimiter.c b/external/bsd/ntp/dist/lib/isc/ratelimiter.c index dba3aca17de6..c02ca03cfb01 100644 --- a/external/bsd/ntp/dist/lib/isc/ratelimiter.c +++ b/external/bsd/ntp/dist/lib/isc/ratelimiter.c @@ -1,4 +1,4 @@ -/* $NetBSD: ratelimiter.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: ratelimiter.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/refcount.c b/external/bsd/ntp/dist/lib/isc/refcount.c index e78fe979e44a..37dfa7578d48 100644 --- a/external/bsd/ntp/dist/lib/isc/refcount.c +++ b/external/bsd/ntp/dist/lib/isc/refcount.c @@ -1,4 +1,4 @@ -/* $NetBSD: refcount.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: refcount.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/region.c b/external/bsd/ntp/dist/lib/isc/region.c index 21652390779c..bbe765a4b025 100644 --- a/external/bsd/ntp/dist/lib/isc/region.c +++ b/external/bsd/ntp/dist/lib/isc/region.c @@ -1,4 +1,4 @@ -/* $NetBSD: region.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: region.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/result.c b/external/bsd/ntp/dist/lib/isc/result.c index 04775b72dac1..188e00dc80e5 100644 --- a/external/bsd/ntp/dist/lib/isc/result.c +++ b/external/bsd/ntp/dist/lib/isc/result.c @@ -1,4 +1,4 @@ -/* $NetBSD: result.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: result.c,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/rwlock.c b/external/bsd/ntp/dist/lib/isc/rwlock.c index a73f45b188f4..6f042f3b6d13 100644 --- a/external/bsd/ntp/dist/lib/isc/rwlock.c +++ b/external/bsd/ntp/dist/lib/isc/rwlock.c @@ -1,4 +1,4 @@ -/* $NetBSD: rwlock.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: rwlock.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/serial.c b/external/bsd/ntp/dist/lib/isc/serial.c index 80e4b19ac96f..6ba20d95f68e 100644 --- a/external/bsd/ntp/dist/lib/isc/serial.c +++ b/external/bsd/ntp/dist/lib/isc/serial.c @@ -1,4 +1,4 @@ -/* $NetBSD: serial.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: serial.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/sha1.c b/external/bsd/ntp/dist/lib/isc/sha1.c index ff2d21bd255b..b699ffa43a01 100644 --- a/external/bsd/ntp/dist/lib/isc/sha1.c +++ b/external/bsd/ntp/dist/lib/isc/sha1.c @@ -1,4 +1,4 @@ -/* $NetBSD: sha1.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: sha1.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/sha2.c b/external/bsd/ntp/dist/lib/isc/sha2.c index fc3285cd162e..629f75503c81 100644 --- a/external/bsd/ntp/dist/lib/isc/sha2.c +++ b/external/bsd/ntp/dist/lib/isc/sha2.c @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: sha2.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2005-2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/sockaddr.c b/external/bsd/ntp/dist/lib/isc/sockaddr.c index 5ee217a5030a..864e2386dad6 100644 --- a/external/bsd/ntp/dist/lib/isc/sockaddr.c +++ b/external/bsd/ntp/dist/lib/isc/sockaddr.c @@ -1,4 +1,4 @@ -/* $NetBSD: sockaddr.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: sockaddr.c,v 1.4 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/socket_api.c b/external/bsd/ntp/dist/lib/isc/socket_api.c index d2d3b336401b..946de0bb0b7d 100644 --- a/external/bsd/ntp/dist/lib/isc/socket_api.c +++ b/external/bsd/ntp/dist/lib/isc/socket_api.c @@ -1,4 +1,4 @@ -/* $NetBSD: socket_api.c,v 1.1.1.1 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: socket_api.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h index e678dae0958a..f46e9bbc239b 100644 --- a/external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:42 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/stats.c b/external/bsd/ntp/dist/lib/isc/stats.c index 962081f49ca1..d124f8cc4537 100644 --- a/external/bsd/ntp/dist/lib/isc/stats.c +++ b/external/bsd/ntp/dist/lib/isc/stats.c @@ -1,4 +1,4 @@ -/* $NetBSD: stats.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: stats.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/string.c b/external/bsd/ntp/dist/lib/isc/string.c index 00e4dd3b2fef..6f0ffcc5f5ed 100644 --- a/external/bsd/ntp/dist/lib/isc/string.c +++ b/external/bsd/ntp/dist/lib/isc/string.c @@ -1,4 +1,4 @@ -/* $NetBSD: string.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: string.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/strtoul.c b/external/bsd/ntp/dist/lib/isc/strtoul.c index 29d2f255c01d..70bf14ddc20c 100644 --- a/external/bsd/ntp/dist/lib/isc/strtoul.c +++ b/external/bsd/ntp/dist/lib/isc/strtoul.c @@ -1,4 +1,4 @@ -/* $NetBSD: strtoul.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: strtoul.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/symtab.c b/external/bsd/ntp/dist/lib/isc/symtab.c index 497b1be0de3b..29b2fa1f0b1a 100644 --- a/external/bsd/ntp/dist/lib/isc/symtab.c +++ b/external/bsd/ntp/dist/lib/isc/symtab.c @@ -1,4 +1,4 @@ -/* $NetBSD: symtab.c,v 1.1.1.2 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: symtab.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/task.c b/external/bsd/ntp/dist/lib/isc/task.c index 472a6b049285..60f0720c3f0a 100644 --- a/external/bsd/ntp/dist/lib/isc/task.c +++ b/external/bsd/ntp/dist/lib/isc/task.c @@ -1,4 +1,4 @@ -/* $NetBSD: task.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: task.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/task_api.c b/external/bsd/ntp/dist/lib/isc/task_api.c index 771f3cc1e28a..fa29b980fe0f 100644 --- a/external/bsd/ntp/dist/lib/isc/task_api.c +++ b/external/bsd/ntp/dist/lib/isc/task_api.c @@ -1,4 +1,4 @@ -/* $NetBSD: task_api.c,v 1.1.1.1 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: task_api.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/task_p.h b/external/bsd/ntp/dist/lib/isc/task_p.h index fe4623214db5..7d3c201d048e 100644 --- a/external/bsd/ntp/dist/lib/isc/task_p.h +++ b/external/bsd/ntp/dist/lib/isc/task_p.h @@ -1,4 +1,4 @@ -/* $NetBSD: task_p.h,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: task_p.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/taskpool.c b/external/bsd/ntp/dist/lib/isc/taskpool.c index ac803c827bdb..4dce56daed8d 100644 --- a/external/bsd/ntp/dist/lib/isc/taskpool.c +++ b/external/bsd/ntp/dist/lib/isc/taskpool.c @@ -1,4 +1,4 @@ -/* $NetBSD: taskpool.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: taskpool.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/hash_test.c b/external/bsd/ntp/dist/lib/isc/tests/hash_test.c index b1a3a8cb6428..8ba4babfcc8d 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/hash_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/hash_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: hash_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: hash_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/isctest.c b/external/bsd/ntp/dist/lib/isc/tests/isctest.c index e5b604b4d307..a65dce297cb9 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/isctest.c +++ b/external/bsd/ntp/dist/lib/isc/tests/isctest.c @@ -1,4 +1,4 @@ -/* $NetBSD: isctest.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: isctest.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/isctest.h b/external/bsd/ntp/dist/lib/isc/tests/isctest.h index bbb876b45c78..a9f5df0c2aeb 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/isctest.h +++ b/external/bsd/ntp/dist/lib/isc/tests/isctest.h @@ -1,4 +1,4 @@ -/* $NetBSD: isctest.h,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: isctest.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/queue_test.c b/external/bsd/ntp/dist/lib/isc/tests/queue_test.c index e0e844142aa2..494ce0a17ef0 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/queue_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/queue_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: queue_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: queue_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/socket_test.c b/external/bsd/ntp/dist/lib/isc/tests/socket_test.c index 19e94be94e34..6ef0f757a5af 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/socket_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/socket_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: socket_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: socket_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/symtab_test.c b/external/bsd/ntp/dist/lib/isc/tests/symtab_test.c index 0d2159d56965..f3d9b046ebff 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/symtab_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/symtab_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: symtab_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: symtab_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/task_test.c b/external/bsd/ntp/dist/lib/isc/tests/task_test.c index ba3c7cc734c2..b0a2d1d7b668 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/task_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/task_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: task_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: task_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/tests/taskpool_test.c b/external/bsd/ntp/dist/lib/isc/tests/taskpool_test.c index b6a05788ef53..0f4fdb4246c8 100644 --- a/external/bsd/ntp/dist/lib/isc/tests/taskpool_test.c +++ b/external/bsd/ntp/dist/lib/isc/tests/taskpool_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: taskpool_test.c,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: taskpool_test.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/timer.c b/external/bsd/ntp/dist/lib/isc/timer.c index 379b1a8cca99..d7c8c7fc2b76 100644 --- a/external/bsd/ntp/dist/lib/isc/timer.c +++ b/external/bsd/ntp/dist/lib/isc/timer.c @@ -1,4 +1,4 @@ -/* $NetBSD: timer.c,v 1.1.1.2 2013/12/27 23:30:37 christos Exp $ */ +/* $NetBSD: timer.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/timer_api.c b/external/bsd/ntp/dist/lib/isc/timer_api.c index aba8a9dfdf53..7ec26ee0e253 100644 --- a/external/bsd/ntp/dist/lib/isc/timer_api.c +++ b/external/bsd/ntp/dist/lib/isc/timer_api.c @@ -1,4 +1,4 @@ -/* $NetBSD: timer_api.c,v 1.1.1.1 2013/12/27 23:30:38 christos Exp $ */ +/* $NetBSD: timer_api.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/timer_p.h b/external/bsd/ntp/dist/lib/isc/timer_p.h index cfe32f69f512..ee3859b41ecf 100644 --- a/external/bsd/ntp/dist/lib/isc/timer_p.h +++ b/external/bsd/ntp/dist/lib/isc/timer_p.h @@ -1,4 +1,4 @@ -/* $NetBSD: timer_p.h,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: timer_p.h,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/app.c b/external/bsd/ntp/dist/lib/isc/unix/app.c index e309b26f62ac..4abb32761e04 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/app.c +++ b/external/bsd/ntp/dist/lib/isc/unix/app.c @@ -1,4 +1,4 @@ -/* $NetBSD: app.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: app.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/dir.c b/external/bsd/ntp/dist/lib/isc/unix/dir.c index 0629302b9dea..a585baee1a11 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/dir.c +++ b/external/bsd/ntp/dist/lib/isc/unix/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: dir.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/entropy.c b/external/bsd/ntp/dist/lib/isc/unix/entropy.c index a803648eb5a8..4f95f15e1808 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/entropy.c +++ b/external/bsd/ntp/dist/lib/isc/unix/entropy.c @@ -1,4 +1,4 @@ -/* $NetBSD: entropy.c,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: entropy.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/errno2result.c b/external/bsd/ntp/dist/lib/isc/unix/errno2result.c index b7762d97ca27..dfeb09a4ba54 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/errno2result.c +++ b/external/bsd/ntp/dist/lib/isc/unix/errno2result.c @@ -1,4 +1,4 @@ -/* $NetBSD: errno2result.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: errno2result.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/errno2result.h b/external/bsd/ntp/dist/lib/isc/unix/errno2result.h index 5341bec43670..ed248329aa64 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/errno2result.h +++ b/external/bsd/ntp/dist/lib/isc/unix/errno2result.h @@ -1,4 +1,4 @@ -/* $NetBSD: errno2result.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: errno2result.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/file.c b/external/bsd/ntp/dist/lib/isc/unix/file.c index 1d1516fc7080..c8cc84f22565 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/file.c +++ b/external/bsd/ntp/dist/lib/isc/unix/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: file.c,v 1.4 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/fsaccess.c b/external/bsd/ntp/dist/lib/isc/unix/fsaccess.c index 56ec353a62e8..59e4f43e356f 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/fsaccess.c +++ b/external/bsd/ntp/dist/lib/isc/unix/fsaccess.c @@ -1,4 +1,4 @@ -/* $NetBSD: fsaccess.c,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: fsaccess.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c b/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c index 156c8b6bc7b3..ae1c9d22ebd4 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c +++ b/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifiter_getifaddrs.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ifiter_getifaddrs.c,v 1.4 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") @@ -57,6 +57,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) { isc_interfaceiter_t *iter; isc_result_t result; char strbuf[ISC_STRERRORSIZE]; + int trys, ret; REQUIRE(mctx != NULL); REQUIRE(iterp != NULL); @@ -88,10 +89,17 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) { iter->valid = ISC_R_FAILURE; #endif - if (getifaddrs(&iter->ifaddrs) < 0) { + /* If interrupted, try again */ + for (trys = 0; trys < 3; trys++) { + if ((ret = getifaddrs(&iter->ifaddrs)) >= 0) + break; + if (errno != EINTR) + break; + } + if (ret < 0) { isc__strerror(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, - "getting interface addresses: %s: %s", + "getting interface addresses: %s: %s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_IFITERGETIFADDRS, ISC_MSG_GETIFADDRS, diff --git a/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c b/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c index e6632f6f2d3e..92b29fd38cbb 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c +++ b/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifiter_ioctl.c,v 1.1.1.3 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: ifiter_ioctl.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c b/external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c index 8e70cd382bf5..145c758e1b5b 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c +++ b/external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifiter_sysctl.c,v 1.1.1.3 2013/12/27 23:30:43 christos Exp $ */ +/* $NetBSD: ifiter_sysctl.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/Makefile b/external/bsd/ntp/dist/lib/isc/unix/include/isc/Makefile deleted file mode 100644 index 7c9a4b0bae13..000000000000 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/Makefile +++ /dev/null @@ -1,415 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# lib/isc/unix/include/isc/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = /deacon/backroom/snaps/ntp-dev/lib/isc/unix/include/isc -top_srcdir = /deacon/backroom/snaps/ntp-dev -VPATH = /deacon/backroom/snaps/ntp-dev/lib/isc/unix/include/isc -pkgdatadir = $(datadir)/ntp -pkglibdir = $(libdir)/ntp -pkgincludedir = $(includedir)/ntp -top_builddir = ../../../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/local/gnu/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = sparc-sun-solaris2.10 -host_triplet = sparc-sun-solaris2.10 -subdir = lib/isc/unix/include/isc -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ - $(top_srcdir)/m4/define_dir.m4 \ - $(top_srcdir)/m4/ntp_cacheversion.m4 \ - $(top_srcdir)/m4/ntp_dir_sep.m4 \ - $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ - $(top_srcdir)/m4/ntp_vpathhack.m4 \ - $(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run tar -AR = ar -ARLIB_DIR = arlib -AUTOCONF = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run autoconf -AUTOHEADER = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run autoheader -AUTOMAKE = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run automake-1.9 -AWK = gawk -BINSUBDIR = bin -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -D_LARGEFILE64_SOURCE -Wall -Wcast-qual -Wmissing-prototypes -Wpointer-arith -Wshadow -Winit-self -Wno-strict-prototypes -CHUTEST = -CLKTEST = -CPP = gcc -E -CPPFLAGS = -D__EXTENSIONS__ -I/usr/sfw/include -CYGPATH_W = echo -DCFD = -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EDITLINE_LIBS = -EF_LIBS = -EF_PROGS = -EGREP = grep -E -EXEEXT = -HAVE_INLINE = -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_LIBOPTS_FALSE = -INSTALL_LIBOPTS_TRUE = # -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LCRYPTO = -lcrypto -LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -LIBOBJS = -LIBOPTS_CFLAGS = -I$(top_srcdir)/libopts -LIBOPTS_DIR = libopts -LIBOPTS_LDADD = $(top_builddir)/libopts/libopts.la -LIBPARSE = -LIBS = -lkvm -lelf -lsocket -lrt -lmd5 -lnsl -lgen -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LSCF = -lscf -LTLIBOBJS = -MAKEINFO = ${SHELL} /deacon/backroom/snaps/ntp-dev/missing --run makeinfo -MAKE_ADJTIMED = -MAKE_CHECK_LAYOUT = check-layout -MAKE_CHECK_Y2K = -MAKE_LIBNTPSIM = libntpsim.a -MAKE_LIBPARSE = -MAKE_LIBPARSE_KERNEL = -MAKE_NTPDSIM = ntpdsim -MAKE_NTPSNMPD = -MAKE_NTPTIME = ntptime -MAKE_PARSEKMODULE = -MAKE_TICKADJ = tickadj -MAKE_TIMETRIM = -NEED_LIBOPTS_FALSE = # -NEED_LIBOPTS_TRUE = -OBJEXT = o -OPENSSL = -OPENSSL_INC = /usr/sfw/include -OPENSSL_LIB = /usr/sfw/lib -PACKAGE = ntp -PACKAGE_BUGREPORT = -PACKAGE_NAME = ntp -PACKAGE_STRING = ntp 4.2.5p221 -PACKAGE_TARNAME = ntp -PACKAGE_VERSION = 4.2.5p221 -PATH_NET_SNMP_CONFIG = -PATH_PERL = /usr/local/bin/perl -PATH_SEPARATOR = : -PATH_SH = /bin/sh -PROPDELAY = -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/sh -SNMP_CFLAGS = -SNMP_CPPFLAGS = -SNMP_LIBS = -STRIP = strip -TESTDCF = -VERSION = 4.2.5p221 -VPATH_HACK_FALSE = -VPATH_HACK_TRUE = # -YACC = bison -y -ac_ct_AR = ar -ac_ct_CC = gcc -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = sparc-sun-solaris2.10 -build_alias = -build_cpu = sparc -build_os = solaris2.10 -build_vendor = sun -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = sparc-sun-solaris2.10 -host_alias = -host_cpu = sparc -host_os = solaris2.10 -host_vendor = sun -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /deacon/backroom/snaps/ntp-dev/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -subdirs = arlib sntp -sysconfdir = ${prefix}/etc -target_alias = -NULL = -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -AUTOMAKE_OPTIONS = -ETAGS_ARGS = $(srcdir)/Makefile.am -#EXTRA_DIST = TAGS -noinst_HEADERS = \ - dir.h \ - int.h \ - net.h \ - offset.h \ - stat.h \ - strerror.h \ - time.h \ - $(NULL) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/isc/unix/include/isc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/isc/unix/include/isc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -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_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-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 \ - mostlyclean-libtool pdf pdf-am ps ps-am 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. -.NOEXPORT: diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h index e2c94f4a0b45..f4867e78efd4 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: dir.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h index 066899420dc3..0890de6e29b1 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h @@ -1,4 +1,4 @@ -/* $NetBSD: int.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: int.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h index 3500eca6ea78..e54aa234fc9d 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h @@ -1,4 +1,4 @@ -/* $NetBSD: keyboard.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: keyboard.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/net.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/net.h index 074919296209..a3bfc3eb9068 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/net.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/net.h @@ -1,4 +1,4 @@ -/* $NetBSD: net.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: net.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h index b886a4fae861..b0f39a24cc9c 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h @@ -1,4 +1,4 @@ -/* $NetBSD: netdb.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: netdb.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h index 12964171803f..e79e9ee786b3 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h @@ -1,4 +1,4 @@ -/* $NetBSD: offset.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: offset.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h index eb138f39e95c..77fa636c71fb 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h @@ -1,4 +1,4 @@ -/* $NetBSD: stat.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: stat.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/stdtime.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/stdtime.h index aa986437764f..98a5b38de3cf 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/stdtime.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/stdtime.h @@ -1,4 +1,4 @@ -/* $NetBSD: stdtime.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: stdtime.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h index d7048a5a1134..972bdb37cdc0 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h @@ -1,4 +1,4 @@ -/* $NetBSD: strerror.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: strerror.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h index 67a1be2b148e..dce6e7f324a2 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h @@ -1,4 +1,4 @@ -/* $NetBSD: syslog.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: syslog.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h b/external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h index a568e05423dd..abc7768b4a4b 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h +++ b/external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: time.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c b/external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c index 4ff92ae62579..e8926d5e6a4d 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c +++ b/external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c @@ -1,4 +1,4 @@ -/* $NetBSD: interfaceiter.c,v 1.1.1.3 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: interfaceiter.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/ipv6.c b/external/bsd/ntp/dist/lib/isc/unix/ipv6.c index 8b40b226af06..38ef66559512 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/ipv6.c +++ b/external/bsd/ntp/dist/lib/isc/unix/ipv6.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipv6.c,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: ipv6.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/keyboard.c b/external/bsd/ntp/dist/lib/isc/unix/keyboard.c index ded2fee06b1d..e3a93326ca5e 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/keyboard.c +++ b/external/bsd/ntp/dist/lib/isc/unix/keyboard.c @@ -1,4 +1,4 @@ -/* $NetBSD: keyboard.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: keyboard.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/net.c b/external/bsd/ntp/dist/lib/isc/unix/net.c index d4da0e85cd64..f0631a908d46 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/net.c +++ b/external/bsd/ntp/dist/lib/isc/unix/net.c @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: net.c,v 1.5 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/os.c b/external/bsd/ntp/dist/lib/isc/unix/os.c index 3c4a8205b8d5..2fca6dd7d7bb 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/os.c +++ b/external/bsd/ntp/dist/lib/isc/unix/os.c @@ -1,4 +1,4 @@ -/* $NetBSD: os.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: os.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/resource.c b/external/bsd/ntp/dist/lib/isc/unix/resource.c index 7030cb634735..c0fee3e3cb06 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/resource.c +++ b/external/bsd/ntp/dist/lib/isc/unix/resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: resource.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: resource.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/socket.c b/external/bsd/ntp/dist/lib/isc/unix/socket.c index 2e2963df60d0..4d2f1d1b649e 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/socket.c +++ b/external/bsd/ntp/dist/lib/isc/unix/socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: socket.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: socket.c,v 1.4 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/socket_p.h b/external/bsd/ntp/dist/lib/isc/unix/socket_p.h index 647f078a3867..7980ea760327 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/socket_p.h +++ b/external/bsd/ntp/dist/lib/isc/unix/socket_p.h @@ -1,4 +1,4 @@ -/* $NetBSD: socket_p.h,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: socket_p.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/stdio.c b/external/bsd/ntp/dist/lib/isc/unix/stdio.c index 78f94c937ad7..665aacb641cf 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/stdio.c +++ b/external/bsd/ntp/dist/lib/isc/unix/stdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: stdio.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/stdtime.c b/external/bsd/ntp/dist/lib/isc/unix/stdtime.c index 2b54e223af3d..9d522f84095a 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/stdtime.c +++ b/external/bsd/ntp/dist/lib/isc/unix/stdtime.c @@ -1,4 +1,4 @@ -/* $NetBSD: stdtime.c,v 1.1.1.2 2013/12/27 23:30:45 christos Exp $ */ +/* $NetBSD: stdtime.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/strerror.c b/external/bsd/ntp/dist/lib/isc/unix/strerror.c index f72a8cf87fea..94b811b20fd8 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/strerror.c +++ b/external/bsd/ntp/dist/lib/isc/unix/strerror.c @@ -1,4 +1,4 @@ -/* $NetBSD: strerror.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: strerror.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/syslog.c b/external/bsd/ntp/dist/lib/isc/unix/syslog.c index 4965a9d745ce..96ed81ac44ea 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/syslog.c +++ b/external/bsd/ntp/dist/lib/isc/unix/syslog.c @@ -1,4 +1,4 @@ -/* $NetBSD: syslog.c,v 1.1.1.2 2013/12/27 23:30:44 christos Exp $ */ +/* $NetBSD: syslog.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/unix/time.c b/external/bsd/ntp/dist/lib/isc/unix/time.c index a7e715a9f0c2..47a7ea77336f 100644 --- a/external/bsd/ntp/dist/lib/isc/unix/time.c +++ b/external/bsd/ntp/dist/lib/isc/unix/time.c @@ -1,4 +1,4 @@ -/* $NetBSD: time.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: time.c,v 1.4 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2008, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/version.c b/external/bsd/ntp/dist/lib/isc/version.c index 9ad4d105b156..39a8e54146a4 100644 --- a/external/bsd/ntp/dist/lib/isc/version.c +++ b/external/bsd/ntp/dist/lib/isc/version.c @@ -1,4 +1,4 @@ -/* $NetBSD: version.c,v 1.1.1.2 2013/12/27 23:30:39 christos Exp $ */ +/* $NetBSD: version.c,v 1.2 2014/12/19 20:43:14 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/DLLMain.c b/external/bsd/ntp/dist/lib/isc/win32/DLLMain.c index d6a6e58deac4..9d6e46a251ff 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/DLLMain.c +++ b/external/bsd/ntp/dist/lib/isc/win32/DLLMain.c @@ -1,4 +1,4 @@ -/* $NetBSD: DLLMain.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: DLLMain.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/app.c b/external/bsd/ntp/dist/lib/isc/win32/app.c index e18185596aa5..57e176aba8a9 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/app.c +++ b/external/bsd/ntp/dist/lib/isc/win32/app.c @@ -1,4 +1,4 @@ -/* $NetBSD: app.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: app.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/condition.c b/external/bsd/ntp/dist/lib/isc/win32/condition.c index 71b3547ddf7e..683f6b7efe37 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/condition.c +++ b/external/bsd/ntp/dist/lib/isc/win32/condition.c @@ -1,4 +1,4 @@ -/* $NetBSD: condition.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: condition.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/dir.c b/external/bsd/ntp/dist/lib/isc/win32/dir.c index 676f05f870e0..07d531fe5db6 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/dir.c +++ b/external/bsd/ntp/dist/lib/isc/win32/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: dir.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/entropy.c b/external/bsd/ntp/dist/lib/isc/win32/entropy.c index faaae59fa0d6..e8c06614e72e 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/entropy.c +++ b/external/bsd/ntp/dist/lib/isc/win32/entropy.c @@ -1,4 +1,4 @@ -/* $NetBSD: entropy.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: entropy.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/errno2result.c b/external/bsd/ntp/dist/lib/isc/win32/errno2result.c index 0ac75844bbaa..c86b286ca4cc 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/errno2result.c +++ b/external/bsd/ntp/dist/lib/isc/win32/errno2result.c @@ -1,4 +1,4 @@ -/* $NetBSD: errno2result.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: errno2result.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/errno2result.h b/external/bsd/ntp/dist/lib/isc/win32/errno2result.h index f68cf98b2e11..ae1ae8eb5a43 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/errno2result.h +++ b/external/bsd/ntp/dist/lib/isc/win32/errno2result.h @@ -1,4 +1,4 @@ -/* $NetBSD: errno2result.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: errno2result.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/file.c b/external/bsd/ntp/dist/lib/isc/win32/file.c index 85bdfe1acc13..7228f864037a 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/file.c +++ b/external/bsd/ntp/dist/lib/isc/win32/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: file.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/fsaccess.c b/external/bsd/ntp/dist/lib/isc/win32/fsaccess.c index 51906f01eddc..c3b9d406caf0 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/fsaccess.c +++ b/external/bsd/ntp/dist/lib/isc/win32/fsaccess.c @@ -1,4 +1,4 @@ -/* $NetBSD: fsaccess.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: fsaccess.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h index a0101aa56a4e..0c65a82fd690 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h @@ -1,4 +1,4 @@ -/* $NetBSD: bind_registry.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: bind_registry.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h index 24fbee465921..c7c8dc13e865 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h @@ -1,4 +1,4 @@ -/* $NetBSD: bindevt.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: bindevt.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h index 82db1ccf0960..7ae2c6881f53 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h @@ -1,4 +1,4 @@ -/* $NetBSD: condition.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: condition.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h index d209377aa25a..a16f7eb23348 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: dir.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h index bf67b84f5986..f714e13b926f 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h @@ -1,4 +1,4 @@ -/* $NetBSD: int.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: int.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ipv6.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ipv6.h index 73996655c174..6ede3f8a7ea1 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ipv6.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ipv6.h @@ -1,4 +1,4 @@ -/* $NetBSD: ipv6.h,v 1.1.1.3 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: ipv6.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h index c4272f6b6704..03ba30e53753 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h @@ -1,4 +1,4 @@ -/* $NetBSD: keyboard.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: keyboard.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h index f7f861940c5e..10bfe44ef7dc 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: mutex.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/net.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/net.h index 2a0822377685..99d6b05c78cf 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/net.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/net.h @@ -1,4 +1,4 @@ -/* $NetBSD: net.h,v 1.1.1.3 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: net.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h index dde1cf903516..5bc46e8c180a 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h @@ -1,4 +1,4 @@ -/* $NetBSD: netdb.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: netdb.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h index 21adc736390c..0256046d773b 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntgroups.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: ntgroups.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h index cfa9a0c68fdb..b2b5c4e93995 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpaths.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: ntpaths.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h index 47d9d25480ee..0e0417d65fe6 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h @@ -1,4 +1,4 @@ -/* $NetBSD: offset.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: offset.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h index 4c5abc80441e..c3eab45e5a81 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h @@ -1,4 +1,4 @@ -/* $NetBSD: once.h,v 1.1.1.3 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: once.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h index 2334cc52ff97..a5a8cdbeb2bd 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.1.1.3 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: platform.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h index 428459d77284..ef068daa2ff0 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h @@ -1,4 +1,4 @@ -/* $NetBSD: stat.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: stat.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/stdtime.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/stdtime.h index 3338e054a056..02cdc2102b43 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/stdtime.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/stdtime.h @@ -1,4 +1,4 @@ -/* $NetBSD: stdtime.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: stdtime.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h index 8bb42ba0b4f2..ea0320dba41b 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h @@ -1,4 +1,4 @@ -/* $NetBSD: strerror.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: strerror.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h index 00c8ae6880f3..3d325fd73a65 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h @@ -1,4 +1,4 @@ -/* $NetBSD: syslog.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: syslog.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h index 7fc94d2fcb24..833a85e4ac39 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h @@ -1,4 +1,4 @@ -/* $NetBSD: thread.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: thread.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h index b1320e7584a9..9a7a3910b274 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: time.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2006-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h b/external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h index 2702a5e9af72..eada3d72c264 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h +++ b/external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h @@ -1,4 +1,4 @@ -/* $NetBSD: win32os.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: win32os.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c b/external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c index de47c246645f..8323ad70f53d 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c +++ b/external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c @@ -1,4 +1,4 @@ -/* $NetBSD: interfaceiter.c,v 1.1.1.3 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: interfaceiter.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/ipv6.c b/external/bsd/ntp/dist/lib/isc/win32/ipv6.c index 1437b9b08002..258e70cb85c0 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/ipv6.c +++ b/external/bsd/ntp/dist/lib/isc/win32/ipv6.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipv6.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: ipv6.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/keyboard.c b/external/bsd/ntp/dist/lib/isc/win32/keyboard.c index 27b27def646f..f87ff503109c 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/keyboard.c +++ b/external/bsd/ntp/dist/lib/isc/win32/keyboard.c @@ -1,4 +1,4 @@ -/* $NetBSD: keyboard.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: keyboard.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/libgen.h b/external/bsd/ntp/dist/lib/isc/win32/libgen.h index f79dfa255be6..da4995c3e533 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/libgen.h +++ b/external/bsd/ntp/dist/lib/isc/win32/libgen.h @@ -1,4 +1,4 @@ -/* $NetBSD: libgen.h,v 1.1.1.1 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: libgen.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/net.c b/external/bsd/ntp/dist/lib/isc/win32/net.c index 10514f309bbd..ae3d9b13f517 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/net.c +++ b/external/bsd/ntp/dist/lib/isc/win32/net.c @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.1.1.3 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: net.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/netdb.h b/external/bsd/ntp/dist/lib/isc/win32/netdb.h index 3d61a5feb2c8..f68497c72c11 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/netdb.h +++ b/external/bsd/ntp/dist/lib/isc/win32/netdb.h @@ -1,4 +1,4 @@ -/* $NetBSD: netdb.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: netdb.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/ntgroups.c b/external/bsd/ntp/dist/lib/isc/win32/ntgroups.c index 5d5443079f33..430763df79a1 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/ntgroups.c +++ b/external/bsd/ntp/dist/lib/isc/win32/ntgroups.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntgroups.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: ntgroups.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2006, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/ntpaths.c b/external/bsd/ntp/dist/lib/isc/win32/ntpaths.c index 22578ef4a0df..7eac3495d44c 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/ntpaths.c +++ b/external/bsd/ntp/dist/lib/isc/win32/ntpaths.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpaths.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: ntpaths.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/once.c b/external/bsd/ntp/dist/lib/isc/win32/once.c index 07238eab6b44..15216fe61ab5 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/once.c +++ b/external/bsd/ntp/dist/lib/isc/win32/once.c @@ -1,4 +1,4 @@ -/* $NetBSD: once.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: once.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/os.c b/external/bsd/ntp/dist/lib/isc/win32/os.c index b8f1ab34e2f8..33786385403f 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/os.c +++ b/external/bsd/ntp/dist/lib/isc/win32/os.c @@ -1,4 +1,4 @@ -/* $NetBSD: os.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: os.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/resource.c b/external/bsd/ntp/dist/lib/isc/win32/resource.c index a29ca381e9c5..34ed3b2ed2ac 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/resource.c +++ b/external/bsd/ntp/dist/lib/isc/win32/resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: resource.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: resource.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/socket.c b/external/bsd/ntp/dist/lib/isc/win32/socket.c index eda321ba2db9..b5890c42ed05 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/socket.c +++ b/external/bsd/ntp/dist/lib/isc/win32/socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: socket.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: socket.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/stdio.c b/external/bsd/ntp/dist/lib/isc/win32/stdio.c index a3900aee54c3..8ea6e2c5b8b0 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/stdio.c +++ b/external/bsd/ntp/dist/lib/isc/win32/stdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.c,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: stdio.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/stdtime.c b/external/bsd/ntp/dist/lib/isc/win32/stdtime.c index a03be9f1d859..e55eb585f9dd 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/stdtime.c +++ b/external/bsd/ntp/dist/lib/isc/win32/stdtime.c @@ -1,4 +1,4 @@ -/* $NetBSD: stdtime.c,v 1.1.1.3 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: stdtime.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/strerror.c b/external/bsd/ntp/dist/lib/isc/win32/strerror.c index 9ce66fa02580..b30cb3f55ef0 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/strerror.c +++ b/external/bsd/ntp/dist/lib/isc/win32/strerror.c @@ -1,4 +1,4 @@ -/* $NetBSD: strerror.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: strerror.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/syslog.c b/external/bsd/ntp/dist/lib/isc/win32/syslog.c index 5bb831ddf522..9925f325cc23 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/syslog.c +++ b/external/bsd/ntp/dist/lib/isc/win32/syslog.c @@ -1,4 +1,4 @@ -/* $NetBSD: syslog.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: syslog.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/syslog.h b/external/bsd/ntp/dist/lib/isc/win32/syslog.h index 03a3bf417012..6fe231f34177 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/syslog.h +++ b/external/bsd/ntp/dist/lib/isc/win32/syslog.h @@ -1,4 +1,4 @@ -/* $NetBSD: syslog.h,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: syslog.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/thread.c b/external/bsd/ntp/dist/lib/isc/win32/thread.c index 6431903c40c1..aa72d9520a14 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/thread.c +++ b/external/bsd/ntp/dist/lib/isc/win32/thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: thread.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: thread.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/time.c b/external/bsd/ntp/dist/lib/isc/win32/time.c index 379a29afed20..7b0972972b1e 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/time.c +++ b/external/bsd/ntp/dist/lib/isc/win32/time.c @@ -1,4 +1,4 @@ -/* $NetBSD: time.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: time.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2006-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/unistd.h b/external/bsd/ntp/dist/lib/isc/win32/unistd.h index 9750c2b39ed6..12af094b1094 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/unistd.h +++ b/external/bsd/ntp/dist/lib/isc/win32/unistd.h @@ -1,4 +1,4 @@ -/* $NetBSD: unistd.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: unistd.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/version.c b/external/bsd/ntp/dist/lib/isc/win32/version.c index 2e20f5dc2031..3862ab099628 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/version.c +++ b/external/bsd/ntp/dist/lib/isc/win32/version.c @@ -1,4 +1,4 @@ -/* $NetBSD: version.c,v 1.1.1.2 2013/12/27 23:30:40 christos Exp $ */ +/* $NetBSD: version.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/win32/win32os.c b/external/bsd/ntp/dist/lib/isc/win32/win32os.c index a5f1dab908a7..4c2b0cf4c019 100644 --- a/external/bsd/ntp/dist/lib/isc/win32/win32os.c +++ b/external/bsd/ntp/dist/lib/isc/win32/win32os.c @@ -1,4 +1,4 @@ -/* $NetBSD: win32os.c,v 1.1.1.3 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: win32os.c,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h index afec87dbdfa9..949917b78de3 100644 --- a/external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h b/external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h index 1a9ee3db66d3..3202129f5da9 100644 --- a/external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h +++ b/external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.1.1.2 2013/12/27 23:30:41 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.2 2014/12/19 20:43:16 christos Exp $ */ /* * Copyright (C) 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/ntp/dist/libjsmn/jsmn.c b/external/bsd/ntp/dist/libjsmn/jsmn.c index 9f58fe528b1b..2efacfdea827 100644 --- a/external/bsd/ntp/dist/libjsmn/jsmn.c +++ b/external/bsd/ntp/dist/libjsmn/jsmn.c @@ -1,4 +1,4 @@ -/* $NetBSD: jsmn.c,v 1.1.1.1 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: jsmn.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #include #include @@ -11,7 +11,7 @@ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *tok; - if (parser->toknext >= num_tokens) { + if ((size_t)parser->toknext >= num_tokens) { return NULL; } tok = &tokens[parser->toknext++]; diff --git a/external/bsd/ntp/dist/libjsmn/jsmn.h b/external/bsd/ntp/dist/libjsmn/jsmn.h index a6952db03408..567c7e505750 100644 --- a/external/bsd/ntp/dist/libjsmn/jsmn.h +++ b/external/bsd/ntp/dist/libjsmn/jsmn.h @@ -1,4 +1,4 @@ -/* $NetBSD: jsmn.h,v 1.1.1.1 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: jsmn.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifndef __JSMN_H_ #define __JSMN_H_ diff --git a/external/bsd/ntp/dist/libjsmn/jsmn_test.c b/external/bsd/ntp/dist/libjsmn/jsmn_test.c index 51c6e682203b..5e0d1bfad458 100644 --- a/external/bsd/ntp/dist/libjsmn/jsmn_test.c +++ b/external/bsd/ntp/dist/libjsmn/jsmn_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: jsmn_test.c,v 1.1.1.1 2014/12/19 20:37:38 christos Exp $ */ +/* $NetBSD: jsmn_test.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #include #include diff --git a/external/bsd/ntp/dist/libntp/a_md5encrypt.c b/external/bsd/ntp/dist/libntp/a_md5encrypt.c index 0433aeec2efb..25107d40ac65 100644 --- a/external/bsd/ntp/dist/libntp/a_md5encrypt.c +++ b/external/bsd/ntp/dist/libntp/a_md5encrypt.c @@ -1,4 +1,4 @@ -/* $NetBSD: a_md5encrypt.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: a_md5encrypt.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * digest support for NTP, MD5 and with OpenSSL more diff --git a/external/bsd/ntp/dist/libntp/adjtime.c b/external/bsd/ntp/dist/libntp/adjtime.c index 68ba6cea62dd..ee68711aa93c 100644 --- a/external/bsd/ntp/dist/libntp/adjtime.c +++ b/external/bsd/ntp/dist/libntp/adjtime.c @@ -1,4 +1,4 @@ -/* $NetBSD: adjtime.c,v 1.1.1.1 2009/12/13 16:55:01 kardel Exp $ */ +/* $NetBSD: adjtime.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H # include diff --git a/external/bsd/ntp/dist/libntp/adjtimex.c b/external/bsd/ntp/dist/libntp/adjtimex.c index b36bada37511..136c804ac9d5 100644 --- a/external/bsd/ntp/dist/libntp/adjtimex.c +++ b/external/bsd/ntp/dist/libntp/adjtimex.c @@ -1,4 +1,4 @@ -/* $NetBSD: adjtimex.c,v 1.1.1.1 2009/12/13 16:55:06 kardel Exp $ */ +/* $NetBSD: adjtimex.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. diff --git a/external/bsd/ntp/dist/libntp/atoint.c b/external/bsd/ntp/dist/libntp/atoint.c index 341126f6adb9..385eba6f64e0 100644 --- a/external/bsd/ntp/dist/libntp/atoint.c +++ b/external/bsd/ntp/dist/libntp/atoint.c @@ -1,4 +1,4 @@ -/* $NetBSD: atoint.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: atoint.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * atoint - convert an ascii string to a signed long, with error checking diff --git a/external/bsd/ntp/dist/libntp/atolfp.c b/external/bsd/ntp/dist/libntp/atolfp.c index 7269258bc268..8f88bcacc224 100644 --- a/external/bsd/ntp/dist/libntp/atolfp.c +++ b/external/bsd/ntp/dist/libntp/atolfp.c @@ -1,4 +1,4 @@ -/* $NetBSD: atolfp.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: atolfp.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * atolfp - convert an ascii string to an l_fp number diff --git a/external/bsd/ntp/dist/libntp/atouint.c b/external/bsd/ntp/dist/libntp/atouint.c index 80e2d56d5d38..e87300cc3137 100644 --- a/external/bsd/ntp/dist/libntp/atouint.c +++ b/external/bsd/ntp/dist/libntp/atouint.c @@ -1,4 +1,4 @@ -/* $NetBSD: atouint.c,v 1.4 2014/04/01 17:34:44 kardel Exp $ */ +/* $NetBSD: atouint.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ #include #include diff --git a/external/bsd/ntp/dist/libntp/audio.c b/external/bsd/ntp/dist/libntp/audio.c index 4de683579897..9659552fa13e 100644 --- a/external/bsd/ntp/dist/libntp/audio.c +++ b/external/bsd/ntp/dist/libntp/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.5 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: audio.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * audio.c - audio interface for reference clock audio drivers diff --git a/external/bsd/ntp/dist/libntp/authkeys.c b/external/bsd/ntp/dist/libntp/authkeys.c index 49ef7febe82b..00c2c00e0a75 100644 --- a/external/bsd/ntp/dist/libntp/authkeys.c +++ b/external/bsd/ntp/dist/libntp/authkeys.c @@ -1,4 +1,4 @@ -/* $NetBSD: authkeys.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: authkeys.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * authkeys.c - routines to manage the storage of authentication keys diff --git a/external/bsd/ntp/dist/libntp/authreadkeys.c b/external/bsd/ntp/dist/libntp/authreadkeys.c index 2c7765c7127b..c561baa53271 100644 --- a/external/bsd/ntp/dist/libntp/authreadkeys.c +++ b/external/bsd/ntp/dist/libntp/authreadkeys.c @@ -1,4 +1,4 @@ -/* $NetBSD: authreadkeys.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: authreadkeys.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * authreadkeys.c - routines to support the reading of the key file @@ -78,7 +78,7 @@ authreadkeys( keyid_t keyno; int keytype; char buf[512]; /* lots of room for line */ - u_char keystr[20]; + u_char keystr[32]; /* Bug 2537 */ size_t len; size_t j; @@ -177,7 +177,7 @@ authreadkeys( continue; } len = strlen(token); - if (len <= sizeof(keystr)) { + if (len <= 20) { /* Bug 2537 */ MD5auth_setkey(keyno, keytype, (u_char *)token, len); } else { char hex[] = "0123456789abcdef"; diff --git a/external/bsd/ntp/dist/libntp/authusekey.c b/external/bsd/ntp/dist/libntp/authusekey.c index b6e031e5a115..88471b0fbbaa 100644 --- a/external/bsd/ntp/dist/libntp/authusekey.c +++ b/external/bsd/ntp/dist/libntp/authusekey.c @@ -1,4 +1,4 @@ -/* $NetBSD: authusekey.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: authusekey.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * authusekey - decode a key from ascii and use it diff --git a/external/bsd/ntp/dist/libntp/bsd_strerror.c b/external/bsd/ntp/dist/libntp/bsd_strerror.c index 90057202c8fd..36a57b640675 100644 --- a/external/bsd/ntp/dist/libntp/bsd_strerror.c +++ b/external/bsd/ntp/dist/libntp/bsd_strerror.c @@ -1,4 +1,4 @@ -/* $NetBSD: bsd_strerror.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: bsd_strerror.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/libntp/buftvtots.c b/external/bsd/ntp/dist/libntp/buftvtots.c index 3bd7585e38d8..bf08b501b78e 100644 --- a/external/bsd/ntp/dist/libntp/buftvtots.c +++ b/external/bsd/ntp/dist/libntp/buftvtots.c @@ -1,4 +1,4 @@ -/* $NetBSD: buftvtots.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: buftvtots.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * buftvtots - pull a Unix-format (struct timeval) time stamp out of diff --git a/external/bsd/ntp/dist/libntp/caljulian.c b/external/bsd/ntp/dist/libntp/caljulian.c index 6907863ead13..6ddfc4331516 100644 --- a/external/bsd/ntp/dist/libntp/caljulian.c +++ b/external/bsd/ntp/dist/libntp/caljulian.c @@ -1,4 +1,4 @@ -/* $NetBSD: caljulian.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: caljulian.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * caljulian - determine the Julian date from an NTP time. diff --git a/external/bsd/ntp/dist/libntp/caltontp.c b/external/bsd/ntp/dist/libntp/caltontp.c index f0ad31fcf51d..286e92ddaacf 100644 --- a/external/bsd/ntp/dist/libntp/caltontp.c +++ b/external/bsd/ntp/dist/libntp/caltontp.c @@ -1,4 +1,4 @@ -/* $NetBSD: caltontp.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: caltontp.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * caltontp - convert a date to an NTP time diff --git a/external/bsd/ntp/dist/libntp/calyearstart.c b/external/bsd/ntp/dist/libntp/calyearstart.c index 4b6602272d63..1f42a800e824 100644 --- a/external/bsd/ntp/dist/libntp/calyearstart.c +++ b/external/bsd/ntp/dist/libntp/calyearstart.c @@ -1,4 +1,4 @@ -/* $NetBSD: calyearstart.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: calyearstart.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * calyearstart - determine the NTP time at midnight of January 1 in diff --git a/external/bsd/ntp/dist/libntp/clocktime.c b/external/bsd/ntp/dist/libntp/clocktime.c index 479403c722c9..a0bac5cd0db2 100644 --- a/external/bsd/ntp/dist/libntp/clocktime.c +++ b/external/bsd/ntp/dist/libntp/clocktime.c @@ -1,4 +1,4 @@ -/* $NetBSD: clocktime.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: clocktime.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * clocktime - compute the NTP date from a day of year, hour, minute diff --git a/external/bsd/ntp/dist/libntp/clocktypes.c b/external/bsd/ntp/dist/libntp/clocktypes.c index d0bad598e17f..1c6864adad06 100644 --- a/external/bsd/ntp/dist/libntp/clocktypes.c +++ b/external/bsd/ntp/dist/libntp/clocktypes.c @@ -1,4 +1,4 @@ -/* $NetBSD: clocktypes.c,v 1.1.1.3 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: clocktypes.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Data for pretty printing clock types diff --git a/external/bsd/ntp/dist/libntp/decodenetnum.c b/external/bsd/ntp/dist/libntp/decodenetnum.c index 8639218077da..4150bf7ef2c9 100644 --- a/external/bsd/ntp/dist/libntp/decodenetnum.c +++ b/external/bsd/ntp/dist/libntp/decodenetnum.c @@ -1,4 +1,4 @@ -/* $NetBSD: decodenetnum.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: decodenetnum.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * decodenetnum - return a net number (this is crude, but careful) diff --git a/external/bsd/ntp/dist/libntp/dofptoa.c b/external/bsd/ntp/dist/libntp/dofptoa.c index cc9d69ccef07..7d9ae60560ff 100644 --- a/external/bsd/ntp/dist/libntp/dofptoa.c +++ b/external/bsd/ntp/dist/libntp/dofptoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dofptoa.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: dofptoa.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * dofptoa - do the grunge work to convert an fp number to ascii diff --git a/external/bsd/ntp/dist/libntp/dolfptoa.c b/external/bsd/ntp/dist/libntp/dolfptoa.c index 199e94b67e0e..b412d389eb8a 100644 --- a/external/bsd/ntp/dist/libntp/dolfptoa.c +++ b/external/bsd/ntp/dist/libntp/dolfptoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dolfptoa.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: dolfptoa.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * dolfptoa - do the grunge work of converting an l_fp number to decimal diff --git a/external/bsd/ntp/dist/libntp/emalloc.c b/external/bsd/ntp/dist/libntp/emalloc.c index 8c205779abc3..90b3f328e1c3 100644 --- a/external/bsd/ntp/dist/libntp/emalloc.c +++ b/external/bsd/ntp/dist/libntp/emalloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: emalloc.c,v 1.2 2012/02/04 16:31:02 christos Exp $ */ +/* $NetBSD: emalloc.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * emalloc - return new memory obtained from the system. Belch if none. diff --git a/external/bsd/ntp/dist/libntp/findconfig.c b/external/bsd/ntp/dist/libntp/findconfig.c index 2144ab536f60..4d01949b9e84 100644 --- a/external/bsd/ntp/dist/libntp/findconfig.c +++ b/external/bsd/ntp/dist/libntp/findconfig.c @@ -1,4 +1,4 @@ -/* $NetBSD: findconfig.c,v 1.1.1.3 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: findconfig.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/external/bsd/ntp/dist/libntp/getopt.c b/external/bsd/ntp/dist/libntp/getopt.c index 76ec712423f2..f91a36695c04 100644 --- a/external/bsd/ntp/dist/libntp/getopt.c +++ b/external/bsd/ntp/dist/libntp/getopt.c @@ -1,4 +1,4 @@ -/* $NetBSD: getopt.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: getopt.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * getopt - get option letter from argv diff --git a/external/bsd/ntp/dist/libntp/hextoint.c b/external/bsd/ntp/dist/libntp/hextoint.c index d8aa24f7113a..783bd86fbc55 100644 --- a/external/bsd/ntp/dist/libntp/hextoint.c +++ b/external/bsd/ntp/dist/libntp/hextoint.c @@ -1,4 +1,4 @@ -/* $NetBSD: hextoint.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: hextoint.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * hextoint - convert an ascii string in hex to an unsigned diff --git a/external/bsd/ntp/dist/libntp/hextolfp.c b/external/bsd/ntp/dist/libntp/hextolfp.c index 26722c096f1e..75c2b0fdf6b7 100644 --- a/external/bsd/ntp/dist/libntp/hextolfp.c +++ b/external/bsd/ntp/dist/libntp/hextolfp.c @@ -1,4 +1,4 @@ -/* $NetBSD: hextolfp.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: hextolfp.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * hextolfp - convert an ascii hex string to an l_fp number diff --git a/external/bsd/ntp/dist/libntp/humandate.c b/external/bsd/ntp/dist/libntp/humandate.c index da0836ce986e..78f0fede2aec 100644 --- a/external/bsd/ntp/dist/libntp/humandate.c +++ b/external/bsd/ntp/dist/libntp/humandate.c @@ -1,4 +1,4 @@ -/* $NetBSD: humandate.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: humandate.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * humandate.c - convert an NTP (or the current) time to something readable diff --git a/external/bsd/ntp/dist/libntp/icom.c b/external/bsd/ntp/dist/libntp/icom.c index e9607f7799c8..6aefe9d40827 100644 --- a/external/bsd/ntp/dist/libntp/icom.c +++ b/external/bsd/ntp/dist/libntp/icom.c @@ -1,4 +1,4 @@ -/* $NetBSD: icom.c,v 1.4 2013/10/20 02:47:38 christos Exp $ */ +/* $NetBSD: icom.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * Program to control ICOM radios diff --git a/external/bsd/ntp/dist/libntp/iosignal.c b/external/bsd/ntp/dist/libntp/iosignal.c index e4794ab9d3ec..5834d0bf4237 100644 --- a/external/bsd/ntp/dist/libntp/iosignal.c +++ b/external/bsd/ntp/dist/libntp/iosignal.c @@ -1,4 +1,4 @@ -/* $NetBSD: iosignal.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: iosignal.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * iosignal.c - input/output routines for ntpd. The socket-opening code diff --git a/external/bsd/ntp/dist/libntp/lib_strbuf.c b/external/bsd/ntp/dist/libntp/lib_strbuf.c index 0b6e20c601cb..4a276cdb7d94 100644 --- a/external/bsd/ntp/dist/libntp/lib_strbuf.c +++ b/external/bsd/ntp/dist/libntp/lib_strbuf.c @@ -1,4 +1,4 @@ -/* $NetBSD: lib_strbuf.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: lib_strbuf.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * lib_strbuf - library string storage diff --git a/external/bsd/ntp/dist/libntp/machines.c b/external/bsd/ntp/dist/libntp/machines.c index 278c35c9a848..142a11a405b8 100644 --- a/external/bsd/ntp/dist/libntp/machines.c +++ b/external/bsd/ntp/dist/libntp/machines.c @@ -1,4 +1,4 @@ -/* $NetBSD: machines.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: machines.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* machines.c - provide special support for peculiar architectures * diff --git a/external/bsd/ntp/dist/libntp/mktime.c b/external/bsd/ntp/dist/libntp/mktime.c index c98f4481db72..e2a1283ed1c4 100644 --- a/external/bsd/ntp/dist/libntp/mktime.c +++ b/external/bsd/ntp/dist/libntp/mktime.c @@ -1,4 +1,4 @@ -/* $NetBSD: mktime.c,v 1.1.1.4 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: mktime.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Copyright (c) 1987, 1989 Regents of the University of California. diff --git a/external/bsd/ntp/dist/libntp/modetoa.c b/external/bsd/ntp/dist/libntp/modetoa.c index dd871b2ee829..32848fb16b79 100644 --- a/external/bsd/ntp/dist/libntp/modetoa.c +++ b/external/bsd/ntp/dist/libntp/modetoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: modetoa.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: modetoa.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * modetoa - return an asciized mode diff --git a/external/bsd/ntp/dist/libntp/mstolfp.c b/external/bsd/ntp/dist/libntp/mstolfp.c index 76ced06dfba0..794e03978888 100644 --- a/external/bsd/ntp/dist/libntp/mstolfp.c +++ b/external/bsd/ntp/dist/libntp/mstolfp.c @@ -1,4 +1,4 @@ -/* $NetBSD: mstolfp.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: mstolfp.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * mstolfp - convert an ascii string in milliseconds to an l_fp number diff --git a/external/bsd/ntp/dist/libntp/msyslog.c b/external/bsd/ntp/dist/libntp/msyslog.c index 6538ac325054..564f1c268eac 100644 --- a/external/bsd/ntp/dist/libntp/msyslog.c +++ b/external/bsd/ntp/dist/libntp/msyslog.c @@ -1,4 +1,4 @@ -/* $NetBSD: msyslog.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: msyslog.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * msyslog - either send a message to the terminal or print it on diff --git a/external/bsd/ntp/dist/libntp/netof.c b/external/bsd/ntp/dist/libntp/netof.c index 744c38f7ce19..74251d718879 100644 --- a/external/bsd/ntp/dist/libntp/netof.c +++ b/external/bsd/ntp/dist/libntp/netof.c @@ -1,4 +1,4 @@ -/* $NetBSD: netof.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: netof.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * netof - return the net address part of an ip address in a sockaddr_storage structure diff --git a/external/bsd/ntp/dist/libntp/ntp_calendar.c b/external/bsd/ntp/dist/libntp/ntp_calendar.c index 922605a32c93..34cf04193106 100644 --- a/external/bsd/ntp/dist/libntp/ntp_calendar.c +++ b/external/bsd/ntp/dist/libntp/ntp_calendar.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_calendar.c,v 1.3 2014/01/15 14:40:30 apb Exp $ */ +/* $NetBSD: ntp_calendar.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_calendar.c - calendar and helper functions @@ -161,18 +161,34 @@ ntpcal_get_build_date( static const char build[] = __TIME__ "/" __DATE__; #endif static const char mlist[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; + char monstr[4]; const char * cp; unsigned short hour, minute, second, day, year; - /* Note: The above quantities are used for sscanf 'hu' format, + /* Note: The above quantities are used for sscanf 'hu' format, * so using 'uint16_t' is contra-indicated! */ + +#ifdef DEBUG + static int ignore = 0; +#endif ZERO(*jd); jd->year = 1970; jd->month = 1; jd->monthday = 1; +#ifdef DEBUG + /* check environment if build date should be ignored */ + if (0 == ignore) { + const char * envstr; + envstr = getenv("NTPD_IGNORE_BUILD_DATE"); + ignore = 1 + (envstr && (!*envstr || !strcasecmp(envstr, "yes"))); + } + if (ignore > 1) + return FALSE; +#endif + if (6 == sscanf(build, "%hu:%hu:%hu/%3s %hu %hu", &hour, &minute, &second, monstr, &day, &year)) { cp = strstr(mlist, monstr); @@ -1258,6 +1274,20 @@ ntpcal_date_to_time( * * ================================================================== */ +int +ntpcal_ntp64_to_date( + struct calendar *jd, + const vint64 *ntp + ) +{ + ntpcal_split ds; + + ds = ntpcal_daysplit(ntp); + ds.hi += ntpcal_daysec_to_date(jd, ds.lo); + + return ntpcal_rd_to_date(jd, ds.hi + DAY_NTP_STARTS); +} + int ntpcal_ntp_to_date( struct calendar *jd, @@ -1265,19 +1295,28 @@ ntpcal_ntp_to_date( const time_t *piv ) { - vint64 vl; - ntpcal_split ds; + vint64 ntp64; /* * Unfold ntp time around current time into NTP domain. Split * into days and seconds, shift days into CE domain and * process the parts. */ - vl = ntpcal_ntp_to_ntp(ntp, piv); - ds = ntpcal_daysplit(&vl); - ds.hi += ntpcal_daysec_to_date(jd, ds.lo); + ntp64 = ntpcal_ntp_to_ntp(ntp, piv); + return ntpcal_ntp64_to_date(jd, &ntp64); +} - return ntpcal_rd_to_date(jd, ds.hi + DAY_NTP_STARTS); + +vint64 +ntpcal_date_to_ntp64( + const struct calendar *jd + ) +{ + /* + * Convert date to NTP. Ignore yearday, use d/m/y only. + */ + return ntpcal_dayjoin(ntpcal_date_to_rd(jd) - DAY_NTP_STARTS, + ntpcal_date_to_daysec(jd)); } @@ -1287,12 +1326,13 @@ ntpcal_date_to_ntp( ) { /* - * Convert date to NTP. Ignore yearday, use d/m/y only. + * Get lower half of 64-bit NTP timestamp from date/time. */ - return ntpcal_dayjoin(ntpcal_date_to_rd(jd) - DAY_NTP_STARTS, - ntpcal_date_to_daysec(jd)).d_s.lo; + return ntpcal_date_to_ntp64(jd).d_s.lo; } + + /* * ================================================================== * @@ -1493,23 +1533,19 @@ isocal_split_eraweeks( * stamp. */ int -isocal_ntp_to_date( +isocal_ntp64_to_date( struct isodate *id, - uint32_t ntp, - const time_t *piv + const vint64 *ntp ) { - vint64 vl; ntpcal_split ds; int32_t ts[3]; /* - * Unfold ntp time around current time into NTP domain. Split - * into days and seconds, shift days into CE domain and - * process the parts. + * Split NTP time into days and seconds, shift days into CE + * domain and process the parts. */ - vl = ntpcal_ntp_to_ntp(ntp, piv); - ds = ntpcal_daysplit(&vl); + ds = ntpcal_daysplit(ntp); /* split time part */ ds.hi += priv_timesplit(ts, ds.lo); @@ -1534,12 +1570,29 @@ isocal_ntp_to_date( return (ds.hi >= 0 && ds.hi < 0x0000FFFF); } +int +isocal_ntp_to_date( + struct isodate *id, + uint32_t ntp, + const time_t *piv + ) +{ + vint64 ntp64; + + /* + * Unfold ntp time around current time into NTP domain, then + * convert the full time stamp. + */ + ntp64 = ntpcal_ntp_to_ntp(ntp, piv); + return isocal_ntp64_to_date(id, &ntp64); +} + /* * Convert a ISO date spec into a second in the NTP time scale, * properly truncated to 32 bit. */ -uint32_t -isocal_date_to_ntp( +vint64 +isocal_date_to_ntp64( const struct isodate *id ) { @@ -1551,7 +1604,18 @@ isocal_date_to_ntp( /* days is RDN of ISO date now */ secs = ntpcal_etime_to_seconds(id->hour, id->minute, id->second); - return ntpcal_dayjoin(days - DAY_NTP_STARTS, secs).d_s.lo; + return ntpcal_dayjoin(days - DAY_NTP_STARTS, secs); +} + +uint32_t +isocal_date_to_ntp( + const struct isodate *id + ) +{ + /* + * Get lower half of 64-bit NTP timestamp from date/time. + */ + return isocal_date_to_ntp64(id).d_s.lo; } /* -*-EOF-*- */ diff --git a/external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c b/external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c index 04ce5f3e1463..a5bda7d974d8 100644 --- a/external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c +++ b/external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_crypto_rnd.c,v 1.1.1.1 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: ntp_crypto_rnd.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Crypto-quality random number functions @@ -87,6 +87,7 @@ ntp_crypto_random_buf( err = ERR_get_error(); err_str = ERR_error_string(err, NULL); /* XXX: Log the error */ + (void)&err_str; return -1; } diff --git a/external/bsd/ntp/dist/libntp/ntp_intres.c b/external/bsd/ntp/dist/libntp/ntp_intres.c index 8c3571131ce7..c933b588a350 100644 --- a/external/bsd/ntp/dist/libntp/ntp_intres.c +++ b/external/bsd/ntp/dist/libntp/ntp_intres.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_intres.c,v 1.3 2013/12/31 21:37:01 pgoyette Exp $ */ +/* $NetBSD: ntp_intres.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_intres.c - Implements a generic blocking worker child or thread, diff --git a/external/bsd/ntp/dist/libntp/ntp_libopts.c b/external/bsd/ntp/dist/libntp/ntp_libopts.c index aff27adeed8b..ea3a4dc1823d 100644 --- a/external/bsd/ntp/dist/libntp/ntp_libopts.c +++ b/external/bsd/ntp/dist/libntp/ntp_libopts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_libopts.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: ntp_libopts.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_libopts.c diff --git a/external/bsd/ntp/dist/libntp/ntp_lineedit.c b/external/bsd/ntp/dist/libntp/ntp_lineedit.c index 235d18da939f..3ce3a0e15b82 100644 --- a/external/bsd/ntp/dist/libntp/ntp_lineedit.c +++ b/external/bsd/ntp/dist/libntp/ntp_lineedit.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_lineedit.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ntp_lineedit.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_lineedit.c - generic interface to various line editing libs diff --git a/external/bsd/ntp/dist/libntp/ntp_random.c b/external/bsd/ntp/dist/libntp/ntp_random.c index 4d147077ca58..7f1d52a556d0 100644 --- a/external/bsd/ntp/dist/libntp/ntp_random.c +++ b/external/bsd/ntp/dist/libntp/ntp_random.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_random.c,v 1.1.1.3 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: ntp_random.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Copyright (c) 1983, 1993 diff --git a/external/bsd/ntp/dist/libntp/ntp_rfc2553.c b/external/bsd/ntp/dist/libntp/ntp_rfc2553.c index d4427be28c0c..2873d6c950ec 100644 --- a/external/bsd/ntp/dist/libntp/ntp_rfc2553.c +++ b/external/bsd/ntp/dist/libntp/ntp_rfc2553.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_rfc2553.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: ntp_rfc2553.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. diff --git a/external/bsd/ntp/dist/libntp/ntp_worker.c b/external/bsd/ntp/dist/libntp/ntp_worker.c index e74659e7cbc5..44bd6553a6f8 100644 --- a/external/bsd/ntp/dist/libntp/ntp_worker.c +++ b/external/bsd/ntp/dist/libntp/ntp_worker.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_worker.c,v 1.1.1.1 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: ntp_worker.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_worker.c diff --git a/external/bsd/ntp/dist/libntp/numtoa.c b/external/bsd/ntp/dist/libntp/numtoa.c index b7582d30c66c..e2c3639ec396 100644 --- a/external/bsd/ntp/dist/libntp/numtoa.c +++ b/external/bsd/ntp/dist/libntp/numtoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: numtoa.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: numtoa.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * numtoa - return asciized network numbers store in local array space diff --git a/external/bsd/ntp/dist/libntp/numtohost.c b/external/bsd/ntp/dist/libntp/numtohost.c index eae013beaa8c..7814da361a14 100644 --- a/external/bsd/ntp/dist/libntp/numtohost.c +++ b/external/bsd/ntp/dist/libntp/numtohost.c @@ -1,4 +1,4 @@ -/* $NetBSD: numtohost.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: numtohost.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * numtohost - convert network number to host name. diff --git a/external/bsd/ntp/dist/libntp/octtoint.c b/external/bsd/ntp/dist/libntp/octtoint.c index d5115f5b4057..74cd49f03822 100644 --- a/external/bsd/ntp/dist/libntp/octtoint.c +++ b/external/bsd/ntp/dist/libntp/octtoint.c @@ -1,4 +1,4 @@ -/* $NetBSD: octtoint.c,v 1.3 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: octtoint.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * octtoint - convert an ascii string in octal to an unsigned diff --git a/external/bsd/ntp/dist/libntp/prettydate.c b/external/bsd/ntp/dist/libntp/prettydate.c index 00402b0b7a74..e7283d23839d 100644 --- a/external/bsd/ntp/dist/libntp/prettydate.c +++ b/external/bsd/ntp/dist/libntp/prettydate.c @@ -1,4 +1,4 @@ -/* $NetBSD: prettydate.c,v 1.3 2014/01/02 18:26:03 joerg Exp $ */ +/* $NetBSD: prettydate.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * prettydate - convert a time stamp to something readable diff --git a/external/bsd/ntp/dist/libntp/recvbuff.c b/external/bsd/ntp/dist/libntp/recvbuff.c index 0d7994b86e70..4361c6e12a1a 100644 --- a/external/bsd/ntp/dist/libntp/recvbuff.c +++ b/external/bsd/ntp/dist/libntp/recvbuff.c @@ -1,4 +1,4 @@ -/* $NetBSD: recvbuff.c,v 1.1.1.3 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: recvbuff.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H # include diff --git a/external/bsd/ntp/dist/libntp/refnumtoa.c b/external/bsd/ntp/dist/libntp/refnumtoa.c index b9f4ca5c80f4..d8794eab7df3 100644 --- a/external/bsd/ntp/dist/libntp/refnumtoa.c +++ b/external/bsd/ntp/dist/libntp/refnumtoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: refnumtoa.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: refnumtoa.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refnumtoa - return asciized refclock addresses stored in local array space diff --git a/external/bsd/ntp/dist/libntp/snprintf.c b/external/bsd/ntp/dist/libntp/snprintf.c index 46900efe56ba..85986f4e8603 100644 --- a/external/bsd/ntp/dist/libntp/snprintf.c +++ b/external/bsd/ntp/dist/libntp/snprintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: snprintf.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: snprintf.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Modified by Dave Hart for integration into NTP 4.2.7 diff --git a/external/bsd/ntp/dist/libntp/socket.c b/external/bsd/ntp/dist/libntp/socket.c index 438a51008c6b..4c6c6a24a687 100644 --- a/external/bsd/ntp/dist/libntp/socket.c +++ b/external/bsd/ntp/dist/libntp/socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: socket.c,v 1.1.1.1 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: socket.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * socket.c - low-level socket operations diff --git a/external/bsd/ntp/dist/libntp/socktoa.c b/external/bsd/ntp/dist/libntp/socktoa.c index 56b6a70c9347..160daa0c69c5 100644 --- a/external/bsd/ntp/dist/libntp/socktoa.c +++ b/external/bsd/ntp/dist/libntp/socktoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: socktoa.c,v 1.2 2014/01/03 20:26:45 joerg Exp $ */ +/* $NetBSD: socktoa.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * socktoa.c socktoa(), sockporttoa(), and sock_hash() diff --git a/external/bsd/ntp/dist/libntp/socktohost.c b/external/bsd/ntp/dist/libntp/socktohost.c index dd78fbe9e106..2cf0c2000d3b 100644 --- a/external/bsd/ntp/dist/libntp/socktohost.c +++ b/external/bsd/ntp/dist/libntp/socktohost.c @@ -1,4 +1,4 @@ -/* $NetBSD: socktohost.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: socktohost.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * socktoa - return a numeric host name from a sockaddr_storage structure diff --git a/external/bsd/ntp/dist/libntp/ssl_init.c b/external/bsd/ntp/dist/libntp/ssl_init.c index 3ba777cd947f..e8c37ac14773 100644 --- a/external/bsd/ntp/dist/libntp/ssl_init.c +++ b/external/bsd/ntp/dist/libntp/ssl_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: ssl_init.c,v 1.4 2013/12/28 03:20:13 christos Exp $ */ +/* $NetBSD: ssl_init.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ssl_init.c Common OpenSSL initialization code for the various diff --git a/external/bsd/ntp/dist/libntp/statestr.c b/external/bsd/ntp/dist/libntp/statestr.c index 12bfd7cb1e08..189dafbd845b 100644 --- a/external/bsd/ntp/dist/libntp/statestr.c +++ b/external/bsd/ntp/dist/libntp/statestr.c @@ -1,4 +1,4 @@ -/* $NetBSD: statestr.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: statestr.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * pretty printing of status information diff --git a/external/bsd/ntp/dist/libntp/strdup.c b/external/bsd/ntp/dist/libntp/strdup.c index b1ec16af265a..1e555946c418 100644 --- a/external/bsd/ntp/dist/libntp/strdup.c +++ b/external/bsd/ntp/dist/libntp/strdup.c @@ -1,4 +1,4 @@ -/* $NetBSD: strdup.c,v 1.1.1.2 2012/01/31 21:23:56 kardel Exp $ */ +/* $NetBSD: strdup.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/libntp/strl_obsd.c b/external/bsd/ntp/dist/libntp/strl_obsd.c index 9d94b179e015..5b515fbe76ea 100644 --- a/external/bsd/ntp/dist/libntp/strl_obsd.c +++ b/external/bsd/ntp/dist/libntp/strl_obsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: strl_obsd.c,v 1.1.1.1 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: strl_obsd.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Why use strlcpy()/strlcat() instead of standard strncpy()/strncat()? diff --git a/external/bsd/ntp/dist/libntp/syssignal.c b/external/bsd/ntp/dist/libntp/syssignal.c index 1f2ee3f8c46b..80e59db66a04 100644 --- a/external/bsd/ntp/dist/libntp/syssignal.c +++ b/external/bsd/ntp/dist/libntp/syssignal.c @@ -1,4 +1,4 @@ -/* $NetBSD: syssignal.c,v 1.1.1.2 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: syssignal.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H # include diff --git a/external/bsd/ntp/dist/libntp/systime.c b/external/bsd/ntp/dist/libntp/systime.c index 96674946cb77..b83dbceeeb1a 100644 --- a/external/bsd/ntp/dist/libntp/systime.c +++ b/external/bsd/ntp/dist/libntp/systime.c @@ -1,4 +1,4 @@ -/* $NetBSD: systime.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: systime.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * systime -- routines to fiddle a UNIX clock. diff --git a/external/bsd/ntp/dist/libntp/systime_s.c b/external/bsd/ntp/dist/libntp/systime_s.c index da531316207b..c9c7fb2e419f 100644 --- a/external/bsd/ntp/dist/libntp/systime_s.c +++ b/external/bsd/ntp/dist/libntp/systime_s.c @@ -1,4 +1,4 @@ -/* $NetBSD: systime_s.c,v 1.1.1.1 2009/12/13 16:55:06 kardel Exp $ */ +/* $NetBSD: systime_s.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #define SIM #include "systime.c" diff --git a/external/bsd/ntp/dist/libntp/timetoa.c b/external/bsd/ntp/dist/libntp/timetoa.c index f1889f26a5b1..2842f991c698 100644 --- a/external/bsd/ntp/dist/libntp/timetoa.c +++ b/external/bsd/ntp/dist/libntp/timetoa.c @@ -1,4 +1,4 @@ -/* $NetBSD: timetoa.c,v 1.2 2014/01/02 21:35:19 joerg Exp $ */ +/* $NetBSD: timetoa.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * timetoa.c -- time_t related string formatting diff --git a/external/bsd/ntp/dist/libntp/timevalops.c b/external/bsd/ntp/dist/libntp/timevalops.c index cf3d40cedf46..30f5bd2a2b81 100644 --- a/external/bsd/ntp/dist/libntp/timevalops.c +++ b/external/bsd/ntp/dist/libntp/timevalops.c @@ -1,4 +1,4 @@ -/* $NetBSD: timevalops.c,v 1.1.1.1 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: timevalops.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * timevalops.c -- calculations on 'struct timeval' values diff --git a/external/bsd/ntp/dist/libntp/uglydate.c b/external/bsd/ntp/dist/libntp/uglydate.c index 9d42ffaf9f7a..ce0e461ed323 100644 --- a/external/bsd/ntp/dist/libntp/uglydate.c +++ b/external/bsd/ntp/dist/libntp/uglydate.c @@ -1,4 +1,4 @@ -/* $NetBSD: uglydate.c,v 1.1.1.3 2013/12/27 23:30:47 christos Exp $ */ +/* $NetBSD: uglydate.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * uglydate - convert a time stamp to something barely readable diff --git a/external/bsd/ntp/dist/libntp/vint64ops.c b/external/bsd/ntp/dist/libntp/vint64ops.c index cc8e3ead4c2b..31ee9de88647 100644 --- a/external/bsd/ntp/dist/libntp/vint64ops.c +++ b/external/bsd/ntp/dist/libntp/vint64ops.c @@ -1,4 +1,4 @@ -/* $NetBSD: vint64ops.c,v 1.1.1.1 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: vint64ops.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * vint64ops.c - operations on 'vint64' values diff --git a/external/bsd/ntp/dist/libntp/work_fork.c b/external/bsd/ntp/dist/libntp/work_fork.c index d0aada8ca3c5..8a484834ee3a 100644 --- a/external/bsd/ntp/dist/libntp/work_fork.c +++ b/external/bsd/ntp/dist/libntp/work_fork.c @@ -1,4 +1,4 @@ -/* $NetBSD: work_fork.c,v 1.2 2014/01/20 19:03:33 kardel Exp $ */ +/* $NetBSD: work_fork.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * work_fork.c - fork implementation for blocking worker child. diff --git a/external/bsd/ntp/dist/libntp/work_thread.c b/external/bsd/ntp/dist/libntp/work_thread.c index 6c5929d27d80..00f339d02867 100644 --- a/external/bsd/ntp/dist/libntp/work_thread.c +++ b/external/bsd/ntp/dist/libntp/work_thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: work_thread.c,v 1.1.1.2 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: work_thread.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * work_thread.c - threads implementation for blocking worker child. diff --git a/external/bsd/ntp/dist/libntp/ymd2yd.c b/external/bsd/ntp/dist/libntp/ymd2yd.c index 9b91f8c8adae..fe0d640ee0b1 100644 --- a/external/bsd/ntp/dist/libntp/ymd2yd.c +++ b/external/bsd/ntp/dist/libntp/ymd2yd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ymd2yd.c,v 1.1.1.2 2013/12/27 23:30:48 christos Exp $ */ +/* $NetBSD: ymd2yd.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ymd2yd - compute the date in the year from y/m/d diff --git a/external/bsd/ntp/dist/libparse/binio.c b/external/bsd/ntp/dist/libparse/binio.c index 139a483b73cd..1f6a404b55b9 100644 --- a/external/bsd/ntp/dist/libparse/binio.c +++ b/external/bsd/ntp/dist/libparse/binio.c @@ -1,4 +1,4 @@ -/* $NetBSD: binio.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: binio.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libntp/binio.c,v 4.5 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_computime.c b/external/bsd/ntp/dist/libparse/clk_computime.c index 010a82c0ab61..a0dcd886cb4c 100644 --- a/external/bsd/ntp/dist/libparse/clk_computime.c +++ b/external/bsd/ntp/dist/libparse/clk_computime.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_computime.c,v 1.1.1.1 2009/12/13 16:55:22 kardel Exp $ */ +/* $NetBSD: clk_computime.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H # include diff --git a/external/bsd/ntp/dist/libparse/clk_dcf7000.c b/external/bsd/ntp/dist/libparse/clk_dcf7000.c index 8e8939adb3f7..c7fcf25a3f56 100644 --- a/external/bsd/ntp/dist/libparse/clk_dcf7000.c +++ b/external/bsd/ntp/dist/libparse/clk_dcf7000.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_dcf7000.c,v 1.1.1.1 2009/12/13 16:55:22 kardel Exp $ */ +/* $NetBSD: clk_dcf7000.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_dcf7000.c,v 4.10 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_hopf6021.c b/external/bsd/ntp/dist/libparse/clk_hopf6021.c index 2524e947d349..fa79e1f13c6a 100644 --- a/external/bsd/ntp/dist/libparse/clk_hopf6021.c +++ b/external/bsd/ntp/dist/libparse/clk_hopf6021.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_hopf6021.c,v 1.1.1.1 2009/12/13 16:55:22 kardel Exp $ */ +/* $NetBSD: clk_hopf6021.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_hopf6021.c,v 4.10 2004/11/14 15:29:41 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_meinberg.c b/external/bsd/ntp/dist/libparse/clk_meinberg.c index cdbc9c727f22..ee15391688b0 100644 --- a/external/bsd/ntp/dist/libparse/clk_meinberg.c +++ b/external/bsd/ntp/dist/libparse/clk_meinberg.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_meinberg.c,v 1.2 2010/12/04 23:08:35 christos Exp $ */ +/* $NetBSD: clk_meinberg.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/libparse/clk_meinberg.c,v 4.12.2.1 2005/09/25 10:22:35 kardel RELEASE_20050925_A diff --git a/external/bsd/ntp/dist/libparse/clk_rawdcf.c b/external/bsd/ntp/dist/libparse/clk_rawdcf.c index 9ca2ae14db44..8b0671601502 100644 --- a/external/bsd/ntp/dist/libparse/clk_rawdcf.c +++ b/external/bsd/ntp/dist/libparse/clk_rawdcf.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_rawdcf.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: clk_rawdcf.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/libparse/clk_rawdcf.c,v 4.18 2006/06/22 18:40:01 kardel RELEASE_20060622_A diff --git a/external/bsd/ntp/dist/libparse/clk_rcc8000.c b/external/bsd/ntp/dist/libparse/clk_rcc8000.c index 23a032d38641..bfc6b16b1777 100644 --- a/external/bsd/ntp/dist/libparse/clk_rcc8000.c +++ b/external/bsd/ntp/dist/libparse/clk_rcc8000.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_rcc8000.c,v 1.1.1.1 2009/12/13 16:55:22 kardel Exp $ */ +/* $NetBSD: clk_rcc8000.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_rcc8000.c,v 4.9 2004/11/14 15:29:41 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_schmid.c b/external/bsd/ntp/dist/libparse/clk_schmid.c index 013feeba84f5..e6435a6c7172 100644 --- a/external/bsd/ntp/dist/libparse/clk_schmid.c +++ b/external/bsd/ntp/dist/libparse/clk_schmid.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_schmid.c,v 1.1.1.1 2009/12/13 16:55:21 kardel Exp $ */ +/* $NetBSD: clk_schmid.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_schmid.c,v 4.9 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_sel240x.c b/external/bsd/ntp/dist/libparse/clk_sel240x.c index 98beb2aca64b..0e1f561e68e8 100644 --- a/external/bsd/ntp/dist/libparse/clk_sel240x.c +++ b/external/bsd/ntp/dist/libparse/clk_sel240x.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_sel240x.c,v 1.1.1.1 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: clk_sel240x.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ ////////////////////////////////////////////////////////////////////////////// // Copyright (c) 2009,2012 - diff --git a/external/bsd/ntp/dist/libparse/clk_trimtaip.c b/external/bsd/ntp/dist/libparse/clk_trimtaip.c index a250342d8be1..9b355113d602 100644 --- a/external/bsd/ntp/dist/libparse/clk_trimtaip.c +++ b/external/bsd/ntp/dist/libparse/clk_trimtaip.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_trimtaip.c,v 1.1.1.1 2009/12/13 16:55:22 kardel Exp $ */ +/* $NetBSD: clk_trimtaip.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_trimtaip.c,v 4.11 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/clk_trimtsip.c b/external/bsd/ntp/dist/libparse/clk_trimtsip.c index 485788936aa2..80d222cc7b87 100644 --- a/external/bsd/ntp/dist/libparse/clk_trimtsip.c +++ b/external/bsd/ntp/dist/libparse/clk_trimtsip.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_trimtsip.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: clk_trimtsip.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/libparse/clk_trimtsip.c,v 4.19 2009/11/01 10:47:49 kardel RELEASE_20091101_A diff --git a/external/bsd/ntp/dist/libparse/clk_varitext.c b/external/bsd/ntp/dist/libparse/clk_varitext.c index a8947be37181..278fd33d27bb 100644 --- a/external/bsd/ntp/dist/libparse/clk_varitext.c +++ b/external/bsd/ntp/dist/libparse/clk_varitext.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_varitext.c,v 1.1.1.1 2009/12/13 16:55:23 kardel Exp $ */ +/* $NetBSD: clk_varitext.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ #ifdef HAVE_CONFIG_H # include diff --git a/external/bsd/ntp/dist/libparse/clk_wharton.c b/external/bsd/ntp/dist/libparse/clk_wharton.c index ec59a338a26c..f92c86e6c4a5 100644 --- a/external/bsd/ntp/dist/libparse/clk_wharton.c +++ b/external/bsd/ntp/dist/libparse/clk_wharton.c @@ -1,4 +1,4 @@ -/* $NetBSD: clk_wharton.c,v 1.1.1.2 2013/12/27 23:30:50 christos Exp $ */ +/* $NetBSD: clk_wharton.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/clk_wharton.c,v 4.2 2004/11/14 15:29:41 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/data_mbg.c b/external/bsd/ntp/dist/libparse/data_mbg.c index a7d2fcab2a1d..d2e50f50d15f 100644 --- a/external/bsd/ntp/dist/libparse/data_mbg.c +++ b/external/bsd/ntp/dist/libparse/data_mbg.c @@ -1,4 +1,4 @@ -/* $NetBSD: data_mbg.c,v 1.4 2014/02/27 18:12:41 joerg Exp $ */ +/* $NetBSD: data_mbg.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/libparse/data_mbg.c,v 4.8 2006/06/22 18:40:01 kardel RELEASE_20060622_A diff --git a/external/bsd/ntp/dist/libparse/gpstolfp.c b/external/bsd/ntp/dist/libparse/gpstolfp.c index 0b5235d6cd11..4eb4f8a471e1 100644 --- a/external/bsd/ntp/dist/libparse/gpstolfp.c +++ b/external/bsd/ntp/dist/libparse/gpstolfp.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpstolfp.c,v 1.1.1.2 2013/12/27 23:30:50 christos Exp $ */ +/* $NetBSD: gpstolfp.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libntp/gpstolfp.c,v 4.8 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/ieee754io.c b/external/bsd/ntp/dist/libparse/ieee754io.c index e538936a7d15..8c9a95999269 100644 --- a/external/bsd/ntp/dist/libparse/ieee754io.c +++ b/external/bsd/ntp/dist/libparse/ieee754io.c @@ -1,4 +1,4 @@ -/* $NetBSD: ieee754io.c,v 1.1.1.2 2013/12/27 23:30:50 christos Exp $ */ +/* $NetBSD: ieee754io.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libntp/ieee754io.c,v 4.12 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/info_trimble.c b/external/bsd/ntp/dist/libparse/info_trimble.c index bbd38a85ddd9..d6c71a6c9796 100644 --- a/external/bsd/ntp/dist/libparse/info_trimble.c +++ b/external/bsd/ntp/dist/libparse/info_trimble.c @@ -1,10 +1,9 @@ -/* $NetBSD: info_trimble.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: info_trimble.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * Automatically generated - do not modify */ - -#include +#include "config.h" #include "ntp_types.h" #include "ntpd.h" #include "trimble.h" @@ -94,3 +93,4 @@ cmd_info_t trimble_rcmds[] = { { CMD_RSUPER, "CMD_RSUPER", "super paket (0x8F)", "", 0 }, { 0xFF, "", "", "", 0 } }; + diff --git a/external/bsd/ntp/dist/libparse/mfp_mul.c b/external/bsd/ntp/dist/libparse/mfp_mul.c index a1791a0f4f64..970a1de07a3f 100644 --- a/external/bsd/ntp/dist/libparse/mfp_mul.c +++ b/external/bsd/ntp/dist/libparse/mfp_mul.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfp_mul.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: mfp_mul.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/mfp_mul.c,v 4.9 2005/07/17 20:34:40 kardel RELEASE_20050717_A diff --git a/external/bsd/ntp/dist/libparse/parse.c b/external/bsd/ntp/dist/libparse/parse.c index 918751e61a1b..ac02b83b575c 100644 --- a/external/bsd/ntp/dist/libparse/parse.c +++ b/external/bsd/ntp/dist/libparse/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: parse.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/parse.c,v 4.20 2005/08/06 17:39:40 kardel RELEASE_20050806_A diff --git a/external/bsd/ntp/dist/libparse/parse_conf.c b/external/bsd/ntp/dist/libparse/parse_conf.c index 105ce28cfadd..f57910d0788b 100644 --- a/external/bsd/ntp/dist/libparse/parse_conf.c +++ b/external/bsd/ntp/dist/libparse/parse_conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse_conf.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: parse_conf.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/parse_conf.c,v 4.9 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/parsesolaris.c b/external/bsd/ntp/dist/libparse/parsesolaris.c index 1d2579c71302..b72c7aa1e810 100644 --- a/external/bsd/ntp/dist/libparse/parsesolaris.c +++ b/external/bsd/ntp/dist/libparse/parsesolaris.c @@ -1,4 +1,4 @@ -/* $NetBSD: parsesolaris.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: parsesolaris.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/parsesolaris.c,v 4.11 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/parsestreams.c b/external/bsd/ntp/dist/libparse/parsestreams.c index 4f5156385025..2cc113c26266 100644 --- a/external/bsd/ntp/dist/libparse/parsestreams.c +++ b/external/bsd/ntp/dist/libparse/parsestreams.c @@ -1,4 +1,4 @@ -/* $NetBSD: parsestreams.c,v 1.1.1.1 2009/12/13 16:55:24 kardel Exp $ */ +/* $NetBSD: parsestreams.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/parsestreams.c,v 4.11 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/libparse/trim_info.c b/external/bsd/ntp/dist/libparse/trim_info.c index 769f5e8d6e91..e488713ef201 100644 --- a/external/bsd/ntp/dist/libparse/trim_info.c +++ b/external/bsd/ntp/dist/libparse/trim_info.c @@ -1,4 +1,4 @@ -/* $NetBSD: trim_info.c,v 1.1.1.2 2013/12/27 23:30:49 christos Exp $ */ +/* $NetBSD: trim_info.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/ntp4-dev/libparse/trim_info.c,v 4.5 2005/04/16 17:32:10 kardel RELEASE_20050508_A diff --git a/external/bsd/ntp/dist/ntpd/check_y2k.c b/external/bsd/ntp/dist/ntpd/check_y2k.c index bd62e5687c38..b76b9332d5d8 100644 --- a/external/bsd/ntp/dist/ntpd/check_y2k.c +++ b/external/bsd/ntp/dist/ntpd/check_y2k.c @@ -1,4 +1,4 @@ -/* $NetBSD: check_y2k.c,v 1.1.1.2 2013/12/27 23:30:54 christos Exp $ */ +/* $NetBSD: check_y2k.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* check_y2k.c -- test ntp code constructs for Y2K correctness Y2KFixes [*/ diff --git a/external/bsd/ntp/dist/ntpd/cmd_args.c b/external/bsd/ntp/dist/ntpd/cmd_args.c index 4b38ed0ae43d..ed3621218f18 100644 --- a/external/bsd/ntp/dist/ntpd/cmd_args.c +++ b/external/bsd/ntp/dist/ntpd/cmd_args.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmd_args.c,v 1.1.1.3 2013/12/27 23:30:58 christos Exp $ */ +/* $NetBSD: cmd_args.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * cmd_args.c = command-line argument processing diff --git a/external/bsd/ntp/dist/ntpd/declcond.h b/external/bsd/ntp/dist/ntpd/declcond.h index 5812ae7bf84b..a08e33f6b3b8 100644 --- a/external/bsd/ntp/dist/ntpd/declcond.h +++ b/external/bsd/ntp/dist/ntpd/declcond.h @@ -1,4 +1,4 @@ -/* $NetBSD: declcond.h,v 1.1.1.1 2013/12/27 23:31:02 christos Exp $ */ +/* $NetBSD: declcond.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * declcond.h - declarations conditionalized for ntpd diff --git a/external/bsd/ntp/dist/ntpd/jupiter.h b/external/bsd/ntp/dist/ntpd/jupiter.h index e40d0a842fb2..39ac00bd098a 100644 --- a/external/bsd/ntp/dist/ntpd/jupiter.h +++ b/external/bsd/ntp/dist/ntpd/jupiter.h @@ -1,4 +1,4 @@ -/* $NetBSD: jupiter.h,v 1.1.1.2 2012/01/31 21:25:30 kardel Exp $ */ +/* $NetBSD: jupiter.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* @(#) Header (LBL) */ diff --git a/external/bsd/ntp/dist/ntpd/keyword-gen.c b/external/bsd/ntp/dist/ntpd/keyword-gen.c index 712bfce54837..390f7f0abf98 100644 --- a/external/bsd/ntp/dist/ntpd/keyword-gen.c +++ b/external/bsd/ntp/dist/ntpd/keyword-gen.c @@ -1,4 +1,4 @@ -/* $NetBSD: keyword-gen.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: keyword-gen.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * keyword-gen.c -- generate keyword scanner finite state machine and diff --git a/external/bsd/ntp/dist/ntpd/ntp_config.c b/external/bsd/ntp/dist/ntpd/ntp_config.c index d54b04b2ba16..1e9b3aad58cb 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_config.c +++ b/external/bsd/ntp/dist/ntpd/ntp_config.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_config.c,v 1.8 2013/12/30 17:42:19 christos Exp $ */ +/* $NetBSD: ntp_config.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ /* ntp_config.c * @@ -56,6 +56,9 @@ #include "ntpd-opts.h" +/* Bison still(!) does not emit usable prototypes for the calling code */ +int yyparse (struct FILE_INFO *ip_file); + /* list of servers from command line for config_peers() */ int cmdline_server_count; char ** cmdline_servers; @@ -130,7 +133,6 @@ typedef struct peer_resolved_ctx_tag { /* * Definitions of things either imported from or exported to outside */ -extern int yyparse(void); extern int yydebug; /* ntp_parser.c (.y) */ int curr_include_level; /* The current include level */ struct FILE_INFO *fp[MAXINCLUDELEVEL+1]; @@ -146,7 +148,7 @@ int config_priority; #endif const char *config_file; -char default_ntp_signd_socket[] = +static char default_ntp_signd_socket[] = #ifdef NTP_SIGND_PATH NTP_SIGND_PATH; #else @@ -191,7 +193,6 @@ int old_config_style = 1; /* A boolean flag, which when set, */ int cryptosw; /* crypto command called */ -extern int sys_maxclock; extern char *stats_drift_file; /* name of the driftfile */ #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED @@ -219,6 +220,7 @@ static void apply_enable_disable(attr_val_fifo *q, int enable); #ifdef FREE_CFG_T static void free_auth_node(config_tree *); +static void free_all_config_trees(void); static void free_config_access(config_tree *); static void free_config_auth(config_tree *); @@ -331,13 +333,13 @@ static int peerflag_bits(peer_node *); #endif /* !SIM */ #ifdef WORKER -void peer_name_resolved(int, int, void *, const char *, const char *, +static void peer_name_resolved(int, int, void *, const char *, const char *, const struct addrinfo *, const struct addrinfo *); -void unpeer_name_resolved(int, int, void *, const char *, const char *, +static void unpeer_name_resolved(int, int, void *, const char *, const char *, const struct addrinfo *, const struct addrinfo *); -void trap_name_resolved(int, int, void *, const char *, const char *, +static void trap_name_resolved(int, int, void *, const char *, const char *, const struct addrinfo *, const struct addrinfo *); #endif @@ -348,7 +350,7 @@ enum gnn_type { t_MSK /* Network Mask */ }; -void ntpd_set_tod_using(const char *); +static void ntpd_set_tod_using(const char *); static char * normal_dtoa(double); static u_int32 get_pfxmatch(const char **, struct masks *); static u_int32 get_match(const char *, struct masks *); @@ -399,7 +401,7 @@ init_syntax_tree( #ifdef FREE_CFG_T -void +static void free_all_config_trees(void) { config_tree *ptree; @@ -672,7 +674,7 @@ dump_config_tree( ? HEAD_PFIFO(ptree->enable_opts) : HEAD_PFIFO(ptree->disable_opts); if (atrv != NULL) { - fprintf(df, (enable) + fprintf(df, "%s", (enable) ? "enable" : "disable"); for ( ; atrv != NULL; atrv = atrv->link) @@ -709,7 +711,7 @@ dump_config_tree( if (atrv != NULL) { fprintf(df, "rlimit"); for ( ; atrv != NULL; atrv = atrv->link) { - NTP_INSIST(T_Integer == atrv->type); + INSIST(T_Integer == atrv->type); fprintf(df, " %s %d", keyword(atrv->attr), atrv->value.i); } @@ -720,7 +722,7 @@ dump_config_tree( if (atrv != NULL) { fprintf(df, "tinker"); for ( ; atrv != NULL; atrv = atrv->link) { - NTP_INSIST(T_Double == atrv->type); + INSIST(T_Double == atrv->type); fprintf(df, " %s %s", keyword(atrv->attr), normal_dtoa(atrv->value.d)); } @@ -781,8 +783,8 @@ dump_config_tree( atrv = HEAD_PFIFO(peern->peerflags); for ( ; atrv != NULL; atrv = atrv->link) { - NTP_INSIST(T_Flag == atrv->attr); - NTP_INSIST(T_Integer == atrv->type); + INSIST(T_Flag == atrv->attr); + INSIST(T_Integer == atrv->type); fprintf(df, " %s", keyword(atrv->value.i)); } @@ -1021,7 +1023,7 @@ concat_gen_fifos( pf2 = second; if (NULL == pf1) return pf2; - else if (NULL == pf2) + if (NULL == pf2) return pf1; CONCAT_FIFO(*pf1, *pf2, link); @@ -1408,11 +1410,12 @@ destroy_int_fifo( int_node * i_n; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(i_n, *fifo, link); - if (i_n != NULL) - free(i_n); - } while (i_n != NULL); + if (i_n == NULL) + break; + free(i_n); + } free(fifo); } } @@ -1426,14 +1429,13 @@ destroy_string_fifo( string_node * sn; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(sn, *fifo, link); - if (sn != NULL) { - if (sn->s != NULL) - free(sn->s); - free(sn); - } - } while (sn != NULL); + if (sn == NULL) + break; + free(sn->s); + free(sn); + } free(fifo); } } @@ -1447,14 +1449,14 @@ destroy_attr_val_fifo( attr_val * av; if (av_fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(av, *av_fifo, link); - if (av != NULL) { - if (T_String == av->type) - free(av->value.s); - free(av); - } - } while (av != NULL); + if (av == NULL) + break; + if (T_String == av->type) + free(av->value.s); + free(av); + } free(av_fifo); } } @@ -1468,13 +1470,13 @@ destroy_filegen_fifo( filegen_node * fg; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(fg, *fifo, link); - if (fg != NULL) { - destroy_attr_val_fifo(fg->options); - free(fg); - } - } while (fg != NULL); + if (fg == NULL) + break; + destroy_attr_val_fifo(fg->options); + free(fg); + } free(fifo); } } @@ -1488,11 +1490,12 @@ destroy_restrict_fifo( restrict_node * rn; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(rn, *fifo, link); - if (rn != NULL) - destroy_restrict_node(rn); - } while (rn != NULL); + if (rn == NULL) + break; + destroy_restrict_node(rn); + } free(fifo); } } @@ -1506,14 +1509,14 @@ destroy_setvar_fifo( setvar_node * sv; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(sv, *fifo, link); - if (sv != NULL) { - free(sv->var); - free(sv->val); - free(sv); - } - } while (sv != NULL); + if (sv == NULL) + break; + free(sv->var); + free(sv->val); + free(sv); + } free(fifo); } } @@ -1527,14 +1530,14 @@ destroy_addr_opts_fifo( addr_opts_node * aon; if (fifo != NULL) { - do { + for (;;) { UNLINK_FIFO(aon, *fifo, link); - if (aon != NULL) { - destroy_address_node(aon->addr); - destroy_attr_val_fifo(aon->options); - free(aon); - } - } while (aon != NULL); + if (aon == NULL) + break; + destroy_address_node(aon->addr); + destroy_attr_val_fifo(aon->options); + free(aon); + } free(fifo); } } @@ -1601,15 +1604,13 @@ create_addr_opts_node( } +#ifdef SIM script_info * create_sim_script_info( double duration, attr_val_fifo * script_queue ) { -#ifndef SIM - return NULL; -#else /* SIM follows */ script_info *my_info; attr_val *my_attr_val; @@ -1656,8 +1657,8 @@ create_sim_script_info( } return my_info; -#endif /* SIM */ } +#endif /* SIM */ #ifdef SIM @@ -1700,6 +1701,7 @@ get_next_address( #endif /* SIM */ +#ifdef SIM server_info * create_sim_server( address_node * addr, @@ -1707,9 +1709,6 @@ create_sim_server( script_info_fifo * script ) { -#ifndef SIM - return NULL; -#else /* SIM follows */ server_info *my_info; my_info = emalloc_zero(sizeof(*my_info)); @@ -1719,8 +1718,8 @@ create_sim_server( UNLINK_FIFO(my_info->curr_script, *my_info->script, link); return my_info; -#endif /* SIM */ } +#endif /* SIM */ sim_node * create_sim_node( @@ -1798,11 +1797,12 @@ destroy_address_fifo( address_node * addr_node; if (pfifo != NULL) { - do { + for (;;) { UNLINK_FIFO(addr_node, *pfifo, link); - if (addr_node != NULL) - destroy_address_node(addr_node); - } while (addr_node != NULL); + if (addr_node == NULL) + break; + destroy_address_node(addr_node); + } free(pfifo); } } @@ -1842,7 +1842,7 @@ config_auth( switch (my_val->attr) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Host: @@ -1960,7 +1960,7 @@ config_auth( #ifdef AUTOKEY /* crypto revoke command */ if (ptree->auth.revoke) - sys_revoke = 1 << ptree->auth.revoke; + sys_revoke = 1UL << ptree->auth.revoke; #endif /* AUTOKEY */ } #endif /* !SIM */ @@ -1996,7 +1996,7 @@ config_tos( switch(tos->attr) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Ceiling: @@ -2148,7 +2148,7 @@ config_monitor( switch (my_opts->value.i) { default: - NTP_INSIST(0); + INSIST(0); break; case T_None: @@ -2282,7 +2282,7 @@ config_access( case T_Incmem: if (0 <= my_opt->value.i) - mru_incalloc = (my_opt->value.u * 1024) + mru_incalloc = (my_opt->value.u * 1024U) / sizeof(mon_entry); else range_err = TRUE; @@ -2297,7 +2297,7 @@ config_access( case T_Initmem: if (0 <= my_opt->value.i) - mru_initalloc = (my_opt->value.u * 1024) + mru_initalloc = (my_opt->value.u * 1024U) / sizeof(mon_entry); else range_err = TRUE; @@ -2323,7 +2323,7 @@ config_access( case T_Maxmem: if (0 <= my_opt->value.i) - mru_maxdepth = my_opt->value.u * 1024 / + mru_maxdepth = (my_opt->value.u * 1024U) / sizeof(mon_entry); else mru_maxdepth = UINT_MAX; @@ -2385,7 +2385,7 @@ config_access( switch (curr_flag->i) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Ntpport: @@ -2460,6 +2460,19 @@ config_access( msyslog(LOG_WARNING, "%s", signd_warning); } + /* It would be swell if we could identify the line number */ + if ((RES_KOD & flags) && !(RES_LIMITED & flags)) { + const char *kod_where = (my_node->addr) + ? my_node->addr->address + : (mflags & RESM_SOURCE) + ? "source" + : "default"; + const char *kod_warn = "KOD does nothing without LIMITED."; + + fprintf(stderr, "restrict %s: %s\n", kod_where, kod_warn); + msyslog(LOG_WARNING, "restrict %s: %s", kod_where, kod_warn); + } + ZERO_SOCK(&addr); ai_list = NULL; pai = NULL; @@ -2516,14 +2529,14 @@ config_access( my_node->addr->address); continue; } - NTP_INSIST(ai_list != NULL); + INSIST(ai_list != NULL); pai = ai_list; - NTP_INSIST(pai->ai_addr != NULL); - NTP_INSIST(sizeof(addr) >= + INSIST(pai->ai_addr != NULL); + INSIST(sizeof(addr) >= pai->ai_addrlen); memcpy(&addr, pai->ai_addr, pai->ai_addrlen); - NTP_INSIST(AF_INET == AF(&addr) || + INSIST(AF_INET == AF(&addr) || AF_INET6 == AF(&addr)); } @@ -2559,13 +2572,13 @@ config_access( &mask, mflags, flags, 0); if (pai != NULL && NULL != (pai = pai->ai_next)) { - NTP_INSIST(pai->ai_addr != NULL); - NTP_INSIST(sizeof(addr) >= + INSIST(pai->ai_addr != NULL); + INSIST(sizeof(addr) >= pai->ai_addrlen); ZERO_SOCK(&addr); memcpy(&addr, pai->ai_addr, pai->ai_addrlen); - NTP_INSIST(AF_INET == AF(&addr) || + INSIST(AF_INET == AF(&addr) || AF_INET6 == AF(&addr)); SET_HOSTMASK(&mask, AF(&addr)); } @@ -2603,7 +2616,7 @@ config_rlimit( switch (rlimit_av->attr) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Memlock: @@ -2665,7 +2678,7 @@ config_tinker( switch (tinker->attr) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Allan: @@ -2728,7 +2741,7 @@ free_config_tinker( * config_nic_rules - apply interface listen/ignore/drop items */ #ifndef SIM -void +static void config_nic_rules( config_tree *ptree ) @@ -2863,12 +2876,11 @@ free_config_nic_rules( nic_rule_node *curr_node; if (ptree->nic_rules != NULL) { - while (1) { + for (;;) { UNLINK_FIFO(curr_node, *ptree->nic_rules, link); if (NULL == curr_node) break; - if (curr_node->if_name != NULL) - free(curr_node->if_name); + free(curr_node->if_name); free(curr_node); } free(ptree->nic_rules); @@ -3001,6 +3013,9 @@ config_logconfig( case '=': ntp_syslogmask = get_logmask(my_lc->value.s); break; + default: + INSIST(0); + break; } } } @@ -3272,7 +3287,7 @@ config_trap( * Callback invoked when config_trap()'s DNS lookup completes. */ # ifdef WORKER -void +static void trap_name_resolved( int rescode, int gai_errno, @@ -3287,6 +3302,9 @@ trap_name_resolved( struct interface *localaddr; sockaddr_u peeraddr; + (void)gai_errno; + (void)service; + (void)hints; pstp = context; if (rescode) { msyslog(LOG_ERR, @@ -3295,7 +3313,7 @@ trap_name_resolved( free(pstp); return; } - NTP_INSIST(sizeof(peeraddr) >= res->ai_addrlen); + INSIST(sizeof(peeraddr) >= res->ai_addrlen); ZERO(peeraddr); memcpy(&peeraddr, res->ai_addr, res->ai_addrlen); localaddr = NULL; @@ -3637,7 +3655,7 @@ peerflag_bits( switch (option->value.i) { default: - NTP_INSIST(0); + INSIST(0); break; case T_Autokey: @@ -3752,7 +3770,7 @@ config_peers( ZERO_SOCK(&peeraddr); /* Find the correct host-mode */ hmode = get_correct_host_mode(curr_peer->host_mode); - NTP_INSIST(hmode != 0); + INSIST(hmode != 0); if (T_Pool == curr_peer->host_mode) { AF(&peeraddr) = curr_peer->addr->type; @@ -3831,7 +3849,7 @@ config_peers( * Callback invoked when config_peers()'s DNS lookup completes. */ #ifdef WORKER -void +static void peer_name_resolved( int rescode, int gai_errno, @@ -3847,6 +3865,9 @@ peer_name_resolved( u_short af; const char * fam_spec; + (void)gai_errno; + (void)service; + (void)hints; ctx = context; DPRINTF(1, ("peer_name_resolved(%s) rescode %d\n", name, rescode)); @@ -3910,7 +3931,7 @@ free_config_peers( peer_node *curr_peer; if (ptree->peers != NULL) { - while (1) { + for (;;) { UNLINK_FIFO(curr_peer, *ptree->peers, link); if (NULL == curr_peer) break; @@ -4012,7 +4033,7 @@ config_unpeers( * Callback invoked when config_unpeers()'s DNS lookup completes. */ #ifdef WORKER -void +static void unpeer_name_resolved( int rescode, int gai_errno, @@ -4028,6 +4049,8 @@ unpeer_name_resolved( u_short af; const char * fam_spec; + (void)context; + (void)hints; DPRINTF(1, ("unpeer_name_resolved(%s) rescode %d\n", name, rescode)); if (rescode) { @@ -4039,7 +4062,7 @@ unpeer_name_resolved( * Loop through the addresses found */ for (; res != NULL; res = res->ai_next) { - NTP_INSIST(res->ai_addrlen <= sizeof(peeraddr)); + INSIST(res->ai_addrlen <= sizeof(peeraddr)); memcpy(&peeraddr, res->ai_addr, res->ai_addrlen); DPRINTF(1, ("unpeer: searching for peer %s\n", stoa(&peeraddr))); @@ -4070,7 +4093,7 @@ free_config_unpeers( unpeer_node *curr_unpeer; if (ptree->unpeers != NULL) { - while (1) { + for (;;) { UNLINK_FIFO(curr_unpeer, *ptree->unpeers, link); if (NULL == curr_unpeer) break; @@ -4236,21 +4259,21 @@ free_config_sim( return; FREE_ATTR_VAL_FIFO(sim_n->init_opts); - while (1) { + for (;;) { UNLINK_FIFO(serv_n, *sim_n->servers, link); if (NULL == serv_n) break; - script_n = serv_n->curr_script; - while (script_n != NULL) { - free(script_n); - if (serv_n->script != NULL) + free(serv_n->curr_script); + if (serv_n->script != NULL) { + for (;;) { UNLINK_FIFO(script_n, *serv_n->script, link); - else - break; - } - if (serv_n->script != NULL) + if (script_n == NULL) + break; + free(script_n); + } free(serv_n->script); + } free(serv_n); } free(sim_n); @@ -4323,7 +4346,8 @@ config_ntpdsim( config_tos(ptree); config_monitor(ptree); config_tinker(ptree); - /* config_rlimit(ptree); *//* not needed for the simulator */ + if (0) + config_rlimit(ptree); /* not needed for the simulator */ config_system_opts(ptree); config_logconfig(ptree); config_vars(ptree); @@ -4349,11 +4373,10 @@ config_remotely( remote_cuckoo.fname = origin; remote_cuckoo.line_no = 1; remote_cuckoo.col_no = 1; - ip_file = &remote_cuckoo; input_from_file = 0; init_syntax_tree(&cfgt); - yyparse(); + yyparse(&remote_cuckoo); cfgt.source.attr = CONF_SOURCE_NTPQ; cfgt.timestamp = time(NULL); cfgt.source.value.s = estrdup(stoa(remote_addr)); @@ -4451,8 +4474,7 @@ getconfig( #ifdef DEBUG yydebug = !!(debug >= 5); #endif - ip_file = fp[curr_include_level]; - yyparse(); + yyparse(fp[curr_include_level]); DPRINTF(1, ("Finished Parsing!!\n")); @@ -4538,13 +4560,13 @@ save_and_apply_config_tree(void) #ifndef SAVECONFIG UNLINK_SLIST(punlinked, cfg_tree_history, ptree, link, config_tree); - NTP_INSIST(punlinked == ptree); + INSIST(punlinked == ptree); free_config_tree(ptree); #endif } -void +static void ntpd_set_tod_using( const char *which ) @@ -4908,7 +4930,7 @@ ntp_rlimit( case RLIMIT_NOFILE: /* * For large systems the default file descriptor limit may - * not be enough. + * not be enough. */ DPRINTF(2, ("ntp_rlimit: NOFILE: %d %s\n", (int)(rl_value / rl_scale), rl_sstr)); diff --git a/external/bsd/ntp/dist/ntpd/ntp_control.c b/external/bsd/ntp/dist/ntpd/ntp_control.c index 9eafe86c4c00..5b803067243a 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_control.c +++ b/external/bsd/ntp/dist/ntpd/ntp_control.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_control.c,v 1.8 2014/01/02 21:37:00 joerg Exp $ */ +/* $NetBSD: ntp_control.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_control.c - respond to mode 6 control messages and send async @@ -730,6 +730,7 @@ static const u_char clocktypes[] = { CTL_SST_TS_UHF, /* REFCLK_RIPENCC (43) */ CTL_SST_TS_UHF, /* REFCLK_NEOCLOCK4X (44) */ CTL_SST_TS_UHF, /* REFCLK_TSYNCPCI (45) */ + CTL_SST_TS_UHF /* REFCLK_GPSDJSON (46) */ }; #endif /* REFCLOCK */ @@ -799,6 +800,10 @@ static u_char res_async; /* sending async trap response? */ static char *reqpt; static char *reqend; +#ifndef MIN +#define MIN(a, b) (((a) <= (b)) ? (a) : (b)) +#endif + /* * init_control - initialize request data */ @@ -1315,6 +1320,7 @@ ctl_putdata( ) { int overhead; + unsigned int currentlen; overhead = 0; if (!bin) { @@ -1337,12 +1343,22 @@ ctl_putdata( /* * Save room for trailing junk */ - if (dlen + overhead + datapt > dataend) { + while (dlen + overhead + datapt > dataend) { /* * Not enough room in this one, flush it out. */ + currentlen = MIN(dlen, dataend - datapt); + + memcpy(datapt, dp, currentlen); + + datapt += currentlen; + dp += currentlen; + dlen -= currentlen; + datalinelen += currentlen; + ctl_flushpkt(CTL_MORE); } + memcpy(datapt, dp, dlen); datapt += dlen; datalinelen += dlen; @@ -2317,11 +2333,14 @@ ctl_putsys( case CS_CERTIF: for (cp = cinfo; cp != NULL; cp = cp->link) { + tstamp_t tstamp; + snprintf(str, sizeof(str), "%s %s 0x%x", cp->subject, cp->issuer, cp->flags); ctl_putstr(sys_var[CS_CERTIF].text, str, strlen(str)); - ctl_putfs(sys_var[CS_REVTIME].text, cp->last); + tstamp = caltontp(&(cp->last)); /* XXX too small to hold some values, but that's what ctl_putfs requires */ + ctl_putfs(sys_var[CS_REVTIME].text, tstamp); } break; @@ -3270,6 +3289,20 @@ static void configure( /* Initialize the remote config buffer */ data_count = reqend - reqpt; + + if (data_count > sizeof(remote_config.buffer) - 2) { + snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "runtime configuration failed: request too long"); + ctl_putdata(remote_config.err_msg, + strlen(remote_config.err_msg), 0); + ctl_flushpkt(0); + msyslog(LOG_NOTICE, + "runtime config from %s rejected: request too long", + stoa(&rbufp->recv_srcadr)); + return; + } + memcpy(remote_config.buffer, reqpt, data_count); if (data_count > 0 && '\n' != remote_config.buffer[data_count - 1]) @@ -3334,7 +3367,8 @@ static u_int32 derive_nonce( u_int32 ts_f ) { - static u_int32 salt[2]; + static u_int32 salt[4]; + static u_long last_salt_update; union d_tag { u_char digest[EVP_MAX_MD_SIZE]; u_int32 extract; @@ -3342,9 +3376,13 @@ static u_int32 derive_nonce( EVP_MD_CTX ctx; u_int len; - while (!salt[0]) + while (!salt[0] || current_time - last_salt_update >= 3600) { salt[0] = ntp_random(); - salt[1] = conf_file_sum; + salt[1] = ntp_random(); + salt[2] = ntp_random(); + salt[3] = ntp_random(); + last_salt_update = current_time; + } EVP_DigestInit(&ctx, EVP_get_digestbynid(NID_md5)); EVP_DigestUpdate(&ctx, salt, sizeof(salt)); diff --git a/external/bsd/ntp/dist/ntpd/ntp_crypto.c b/external/bsd/ntp/dist/ntpd/ntp_crypto.c index f496b71aaac6..0f06c5f9eb9d 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_crypto.c +++ b/external/bsd/ntp/dist/ntpd/ntp_crypto.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_crypto.c,v 1.6 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_crypto.c,v 1.7 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_crypto.c - NTP version 4 public key routines @@ -9,6 +9,7 @@ #ifdef AUTOKEY #include +#include /* strtoul */ #include #include #include @@ -35,6 +36,33 @@ #include "ntp_syscall.h" #endif /* KERNEL_PLL */ +/* + * calcomp - compare two calendar structures, ignoring yearday and weekday; like strcmp + * No, it's not a plotter. If you don't understand that, you're too young. + */ +static int calcomp(struct calendar *pjd1, struct calendar *pjd2) +{ + int32_t diff; /* large enough to hold the signed difference between two uint16_t values */ + + diff = pjd1->year - pjd2->year; + if (diff < 0) return -1; else if (diff > 0) return 1; + /* same year; compare months */ + diff = pjd1->month - pjd2->month; + if (diff < 0) return -1; else if (diff > 0) return 1; + /* same year and month; compare monthday */ + diff = pjd1->monthday - pjd2->monthday; + if (diff < 0) return -1; else if (diff > 0) return 1; + /* same year and month and monthday; compare time */ + diff = pjd1->hour - pjd2->hour; + if (diff < 0) return -1; else if (diff > 0) return 1; + diff = pjd1->minute - pjd2->minute; + if (diff < 0) return -1; else if (diff > 0) return 1; + diff = pjd1->second - pjd2->second; + if (diff < 0) return -1; else if (diff > 0) return 1; + /* identical */ + return 0; +} + /* * Extension field message format * @@ -166,7 +194,7 @@ static int crypto_gq (struct exten *, struct peer *); static int crypto_mv (struct exten *, struct peer *); static int crypto_send (struct exten *, struct value *, int); static tstamp_t crypto_time (void); -static u_long asn2ntp (ASN1_TIME *); +static void asn_to_calendar (ASN1_TIME *, struct calendar*); static struct cert_info *cert_parse (const u_char *, long, tstamp_t); static int cert_sign (struct exten *, struct value *); static struct cert_info *cert_install (struct exten *, struct peer *); @@ -426,6 +454,7 @@ crypto_recv( ep = (struct exten *)pkt; code = ntohl(ep->opcode) & 0xffff0000; len = ntohl(ep->opcode) & 0x0000ffff; + // HMS: Why pkt[1] instead of ep->associd ? associd = (associd_t)ntohl(pkt[1]); rval = XEVNT_OK; #ifdef DEBUG @@ -792,15 +821,24 @@ crypto_recv( * errors. */ if (vallen == (u_int)EVP_PKEY_size(host_pkey)) { - if (RSA_private_decrypt(vallen, - (u_char *)ep->pkt, - (u_char *)&temp32, - host_pkey->pkey.rsa, - RSA_PKCS1_OAEP_PADDING) <= 0) { + u_int32 *cookiebuf = malloc( + RSA_size(host_pkey->pkey.rsa)); + if (!cookiebuf) { rval = XEVNT_CKY; break; + } + + if (RSA_private_decrypt(vallen, + (u_char *)ep->pkt, + (u_char *)cookiebuf, + host_pkey->pkey.rsa, + RSA_PKCS1_OAEP_PADDING) != 4) { + rval = XEVNT_CKY; + free(cookiebuf); + break; } else { - cookie = ntohl(temp32); + cookie = ntohl(*cookiebuf); + free(cookiebuf); } } else { rval = XEVNT_CKY; @@ -1076,6 +1114,7 @@ crypto_xmit( char certname[MAXHOSTNAME + 1]; /* subject name buffer */ char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ tstamp_t tstamp; + struct calendar tscal; u_int vallen; struct value vtemp; associd_t associd; @@ -1135,8 +1174,9 @@ crypto_xmit( * signed and may or may not be trusted. */ case CRYPTO_SIGN: - if (tstamp < cert_host->first || tstamp > - cert_host->last) + (void)ntpcal_ntp_to_date(&tscal, tstamp, NULL); + if ((calcomp(&tscal, &(cert_host->first)) < 0) + || (calcomp(&tscal, &(cert_host->last)) > 0)) rval = XEVNT_PER; else len = crypto_send(fp, &cert_host->cert, start); @@ -1906,39 +1946,62 @@ crypto_time() /* - * asn2ntp - convert ASN1_TIME time structure to NTP time. + * asn_to_calendar - convert ASN1_TIME time structure to struct calendar. * - * Returns NTP seconds (no errors) */ -u_long -asn2ntp ( - ASN1_TIME *asn1time /* pointer to ASN1_TIME structure */ +static +void +asn_to_calendar ( + ASN1_TIME *asn1time, /* pointer to ASN1_TIME structure */ + struct calendar *pjd /* pointer to result */ ) { - char *v; /* pointer to ASN1_TIME string */ - struct calendar jd; /* used to convert to NTP time */ + size_t len; /* length of ASN1_TIME string */ + char v[24]; /* writable copy of ASN1_TIME string */ + unsigned long temp; /* result from strtoul */ /* * Extract time string YYMMDDHHMMSSZ from ASN1 time structure. + * Or YYYYMMDDHHMMSSZ. * Note that the YY, MM, DD fields start with one, the HH, MM, - * SS fiels start with zero and the Z character is ignored. - * Also note that years less than 50 map to years greater than + * SS fields start with zero and the Z character is ignored. + * Also note that two-digit years less than 50 map to years greater than * 100. Dontcha love ASN.1? Better than MIL-188. */ - v = (char *)asn1time->data; - jd.year = (v[0] - '0') * 10 + v[1] - '0'; - if (jd.year < 50) - jd.year += 100; - jd.year += 1900; /* should we do century unfolding here? */ - jd.month = (v[2] - '0') * 10 + v[3] - '0'; - jd.monthday = (v[4] - '0') * 10 + v[5] - '0'; - jd.hour = (v[6] - '0') * 10 + v[7] - '0'; - jd.minute = (v[8] - '0') * 10 + v[9] - '0'; - jd.second = (v[10] - '0') * 10 + v[11] - '0'; - jd.yearday = 0; - jd.weekday = 0; + len = asn1time->length; + NTP_REQUIRE(len < sizeof(v)); + (void)strncpy(v, (char *)(asn1time->data), len); + NTP_REQUIRE(len >= 13); + temp = strtoul(v+len-3, NULL, 10); + pjd->second = temp; + v[len-3] = '\0'; - return caltontp(&jd); + temp = strtoul(v+len-5, NULL, 10); + pjd->minute = temp; + v[len-5] = '\0'; + + temp = strtoul(v+len-7, NULL, 10); + pjd->hour = temp; + v[len-7] = '\0'; + + temp = strtoul(v+len-9, NULL, 10); + pjd->monthday = temp; + v[len-9] = '\0'; + + temp = strtoul(v+len-11, NULL, 10); + pjd->month = temp; + v[len-11] = '\0'; + + temp = strtoul(v, NULL, 10); + /* handle two-digit years */ + if (temp < 50UL) + temp += 100UL; + if (temp < 150UL) + temp += 1900UL; + pjd->year = temp; + + pjd->yearday = pjd->weekday = 0; + return; } @@ -2038,8 +2101,10 @@ crypto_alice( /* * The identity parameters must have correct format and content. */ - if (peer->ident_pkey == NULL) + if (peer->ident_pkey == NULL) { + msyslog(LOG_NOTICE, "crypto_alice: scheme unavailable"); return (XEVNT_ID); + } if ((dsa = peer->ident_pkey->pkey->pkey.dsa) == NULL) { msyslog(LOG_NOTICE, "crypto_alice: defective key"); @@ -2405,6 +2470,7 @@ crypto_bob2( BIGNUM *r, *k, *g, *y; u_char *ptr; u_int len; + int s_len; /* * If the GQ parameters are not valid, something awful @@ -2451,8 +2517,8 @@ crypto_bob2( * Encode the values in ASN.1 and sign. The filestamp is from * the local file. */ - len = i2d_DSA_SIG(sdsa, NULL); - if (len <= 0) { + len = s_len = i2d_DSA_SIG(sdsa, NULL); + if (s_len <= 0) { msyslog(LOG_ERR, "crypto_bob2: %s", ERR_error_string(ERR_get_error(), NULL)); DSA_SIG_free(sdsa); @@ -2946,6 +3012,7 @@ cert_sign( EVP_PKEY *pkey; /* public key */ EVP_MD_CTX ctx; /* message digest context */ tstamp_t tstamp; /* NTP timestamp */ + struct calendar tscal; u_int len; const u_char *cptr; u_char *ptr; @@ -3006,7 +3073,9 @@ cert_sign( * Sign and verify the client certificate, but only if the host * certificate has not expired. */ - if (tstamp < cert_host->first || tstamp > cert_host->last) { + (void)ntpcal_ntp_to_date(&tscal, tstamp, NULL); + if ((calcomp(&tscal, &(cert_host->first)) < 0) + || (calcomp(&tscal, &(cert_host->last)) > 0)) { X509_free(cert); return (XEVNT_PER); } @@ -3193,7 +3262,8 @@ cert_hike( * Signature X is valid only if it begins during the * lifetime of Y. */ - if (xp->first < yp->first || xp->first > yp->last) { + if ((calcomp(&(xp->first), &(yp->first)) < 0) + || (calcomp(&(xp->first), &(yp->last)) > 0)) { xp->flags |= CERT_ERROR; return (XEVNT_PER); } @@ -3230,6 +3300,7 @@ cert_parse( const u_char *ptr; char *pch; int temp, cnt, i; + struct calendar fscal; /* * Decode ASN.1 objects and construct certificate structure. @@ -3290,8 +3361,8 @@ cert_parse( return (NULL); } ret->issuer = estrdup(pch + 3); - ret->first = asn2ntp(X509_get_notBefore(cert)); - ret->last = asn2ntp(X509_get_notAfter(cert)); + asn_to_calendar(X509_get_notBefore(cert), &(ret->first)); + asn_to_calendar(X509_get_notAfter(cert), &(ret->last)); /* * Extract extension fields. These are ad hoc ripoffs of @@ -3374,10 +3445,18 @@ cert_parse( * Verify certificate valid times. Note that certificates cannot * be retroactive. */ - if (ret->first > ret->last || ret->first < fstamp) { + (void)ntpcal_ntp_to_date(&fscal, fstamp, NULL); + if ((calcomp(&(ret->first), &(ret->last)) > 0) + || (calcomp(&(ret->first), &fscal) < 0)) { msyslog(LOG_NOTICE, - "cert_parse: invalid times %s first %u last %u fstamp %u", - ret->subject, ret->first, ret->last, fstamp); + "cert_parse: invalid times %s first %u-%02u-%02uT%02u:%02u:%02u last %u-%02u-%02uT%02u:%02u:%02u fstamp %u-%02u-%02uT%02u:%02u:%02u", + ret->subject, + ret->first.year, ret->first.month, ret->first.monthday, + ret->first.hour, ret->first.minute, ret->first.second, + ret->last.year, ret->last.month, ret->last.monthday, + ret->last.hour, ret->last.minute, ret->last.second, + fscal.year, fscal.month, fscal.monthday, + fscal.hour, fscal.minute, fscal.second); cert_free(ret); X509_free(cert); return (NULL); @@ -3721,7 +3800,7 @@ crypto_setup(void) if (host_filename != NULL) strlcpy(hostname, host_filename, sizeof(hostname)); if (passwd == NULL) - passwd = hostname; + passwd = estrdup(hostname); memset(&hostval, 0, sizeof(hostval)); memset(&pubkey, 0, sizeof(pubkey)); memset(&tai_leap, 0, sizeof(tai_leap)); diff --git a/external/bsd/ntp/dist/ntpd/ntp_filegen.c b/external/bsd/ntp/dist/ntpd/ntp_filegen.c index a5c64e058f82..ec3c9c260420 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_filegen.c +++ b/external/bsd/ntp/dist/ntpd/ntp_filegen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_filegen.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_filegen.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_filegen.c,v 3.12 1994/01/25 19:06:11 kardel Exp diff --git a/external/bsd/ntp/dist/ntpd/ntp_io.c b/external/bsd/ntp/dist/ntpd/ntp_io.c index f14567a07538..70f0df363847 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_io.c +++ b/external/bsd/ntp/dist/ntpd/ntp_io.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_io.c,v 1.14 2014/01/26 02:21:08 mlelstv Exp $ */ +/* $NetBSD: ntp_io.c,v 1.15 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_io.c - input/output routines for ntpd. The socket-opening code @@ -11,6 +11,12 @@ #include #include +#ifdef HAVE_FNMATCH_H +# include +# if !defined(FNM_CASEFOLD) && defined(FNM_IGNORECASE) +# define FNM_CASEFOLD FNM_IGNORECASE +# endif +#endif #ifdef HAVE_SYS_PARAM_H # include #endif @@ -265,7 +271,9 @@ static SOCKET open_socket (sockaddr_u *, int, int, endpt *); static char * fdbits (int, fd_set *); static void set_reuseaddr (int); static isc_boolean_t socket_broadcast_enable (struct interface *, SOCKET, sockaddr_u *); +#ifdef OS_MISSES_SPECIFIC_ROUTE_UPDATES static isc_boolean_t socket_broadcast_disable (struct interface *, sockaddr_u *); +#endif typedef struct remaddr remaddr_t; @@ -710,7 +718,9 @@ is_ip_address( ) { struct in_addr in4; - struct in6_addr in6; + struct addrinfo hints; + struct addrinfo *result; + struct sockaddr_in6 *resaddr6; char tmpbuf[128]; char *pch; @@ -746,14 +756,16 @@ is_ip_address( } else { strlcpy(tmpbuf, host, sizeof(tmpbuf)); } - pch = strchr(tmpbuf, '%'); - if (pch != NULL) - *pch = '\0'; - - if (inet_pton(AF_INET6, tmpbuf, &in6) == 1) { + ZERO(hints); + hints.ai_family = AF_INET6; + hints.ai_flags |= AI_NUMERICHOST; + if (getaddrinfo(tmpbuf, NULL, &hints, &result) == 0) { AF(addr) = AF_INET6; - SET_ADDR6N(addr, in6); + resaddr6 = (struct sockaddr_in6 *)result->ai_addr; + SET_ADDR6N(addr, resaddr6->sin6_addr); + SET_SCOPE(addr, resaddr6->sin6_scope_id); + freeaddrinfo(result); return TRUE; } } @@ -1353,7 +1365,12 @@ interface_action( case MATCH_IFNAME: if (if_name != NULL - && !strcasecmp(if_name, rule->if_name)) { +#if defined(HAVE_FNMATCH) && defined(FNM_CASEFOLD) + && !fnmatch(rule->if_name, if_name, FNM_CASEFOLD) +#else + && !strcasecmp(if_name, rule->if_name) +#endif + ) { DPRINTF(4, ("interface name match - %s\n", action_text(rule->action))); @@ -2258,6 +2275,7 @@ socket_broadcast_enable( #endif /* SO_BROADCAST */ } +#ifdef OS_MISSES_SPECIFIC_ROUTE_UPDATES /* * Remove a broadcast address from a given socket * The socket is in the ep_list all we need to do is disable @@ -2284,6 +2302,7 @@ socket_broadcast_disable( return ISC_FALSE; #endif /* SO_BROADCAST */ } +#endif /* OS_MISSES_SPECIFIC_ROUTE_UPDATES */ #endif /* OPEN_BCAST_SOCKET */ @@ -3461,6 +3480,33 @@ read_network_packet( DPRINTF(3, ("read_network_packet: fd=%d length %d from %s\n", fd, buflen, stoa(&rb->recv_srcadr))); + /* + ** Bug 2672: Some OSes (MacOSX and Linux) don't block spoofed ::1 + */ + + // temporary hack... +#ifndef HAVE_SOLARIS_PRIVS + if (AF_INET6 == itf->family) { + DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n", + stoa(&rb->recv_srcadr), + IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&rb->recv_srcadr)), + stoa(&itf->sin), + !IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&itf->sin)) + )); + } + + if ( AF_INET6 == itf->family + && IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&rb->recv_srcadr)) + && !IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&itf->sin)) + ) { + packets_dropped++; + DPRINTF(1, ("DROPPING that packet\n")); + freerecvbuf(rb); + return buflen; + } + DPRINTF(1, ("processing that packet\n")); +#endif + /* * Got one. Mark how and when it got here, * put it on the full list and do bookkeeping. @@ -4444,18 +4490,18 @@ delete_interface_from_list( { remaddr_t *unlinked; - do { + for (;;) { UNLINK_EXPR_SLIST(unlinked, remoteaddr_list, iface == UNLINK_EXPR_SLIST_CURRENT()->ep, link, remaddr_t); - if (unlinked != NULL) { - DPRINTF(4, ("Deleted addr %s for interface #%d %s from list of addresses\n", - stoa(&unlinked->addr), iface->ifnum, - iface->name)); - free(unlinked); - } - } while (unlinked != NULL); + if (unlinked == NULL) + break; + DPRINTF(4, ("Deleted addr %s for interface #%d %s from list of addresses\n", + stoa(&unlinked->addr), iface->ifnum, + iface->name)); + free(unlinked); + } } diff --git a/external/bsd/ntp/dist/ntpd/ntp_leapsec.c b/external/bsd/ntp/dist/ntpd/ntp_leapsec.c index 8c43ea77d4b1..3ba45721c483 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_leapsec.c +++ b/external/bsd/ntp/dist/ntpd/ntp_leapsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_leapsec.c,v 1.1.1.2 2014/12/19 20:37:41 christos Exp $ */ +/* $NetBSD: ntp_leapsec.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_leapsec.c - leap second processing for NTPD @@ -974,7 +974,7 @@ leapsec_validate( do_hash_data(&mdctx, line+2); else if (!strncmp(line, "#$", 2)) do_hash_data(&mdctx, line+2); - else if (isdigit(line[0])) + else if (isdigit((unsigned char)line[0])) do_hash_data(&mdctx, line); } isc_sha1_final(&mdctx, ldig.hv); diff --git a/external/bsd/ntp/dist/ntpd/ntp_leapsec.h b/external/bsd/ntp/dist/ntpd/ntp_leapsec.h index 133dd74b2ccf..cca7340b5180 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_leapsec.h +++ b/external/bsd/ntp/dist/ntpd/ntp_leapsec.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_leapsec.h,v 1.1.1.2 2014/12/19 20:37:39 christos Exp $ */ +/* $NetBSD: ntp_leapsec.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_leapsec.h - leap second processing for NTPD diff --git a/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c b/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c index 6f24a1e4d900..f855ea31409d 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c +++ b/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_loopfilter.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_loopfilter.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_loopfilter.c - implements the NTP loop filter algorithm @@ -18,6 +18,7 @@ #include "ntp_unixtime.h" #include "ntp_stdlib.h" +#include #include #include @@ -128,6 +129,11 @@ static int loop_started; /* TRUE after LOOP_DRIFTINIT */ static void rstclock (int, double); /* transition function */ static double direct_freq(double); /* direct set frequency */ static void set_freq(double); /* set frequency */ +#ifndef PATH_MAX +# define PATH_MAX MAX_PATH +#endif +static char relative_path[PATH_MAX + 1]; /* relative path per recursive make */ +static char *this_file = NULL; #ifdef KERNEL_PLL static struct timex ntv; /* ntp_adjtime() parameters */ @@ -145,7 +151,7 @@ static void stop_kern_loop(void); int ntp_enable = TRUE; /* clock discipline enabled */ int pll_control; /* kernel support available */ int kern_enable = TRUE; /* kernel support enabled */ -int pps_enable; /* kernel PPS discipline enabled */ +int hardpps_enable; /* kernel PPS discipline enabled */ int ext_enable; /* external clock enabled */ int pps_stratum; /* pps stratum */ int allow_panic = FALSE; /* allow panic correction */ @@ -194,6 +200,19 @@ sync_status(const char *what, int status) report_event(EVNT_KERN, NULL, tbuf); } +/* + * file_name - return pointer to non-relative portion of this C file pathname + */ +static char *file_name(void) +{ + if (this_file == NULL) { + (void)strncpy(relative_path, __FILE__, PATH_MAX); + for (this_file=relative_path; *this_file && + ! isalnum((unsigned char)*this_file); this_file++) ; + } + return this_file; +} + /* * init_loopfilter - initialize loop filter data */ @@ -208,6 +227,111 @@ init_loopfilter(void) freq_cnt = (int)clock_minstep; } +#ifdef KERNEL_PLL +/* + * ntp_adjtime_error_handler - process errors from ntp_adjtime + */ +static void +ntp_adjtime_error_handler( + const char *caller, /* name of calling function */ + struct timex *ptimex, /* pointer to struct timex */ + int ret, /* return value from ntp_adjtime */ + int saved_errno, /* value of errno when ntp_adjtime returned */ + int pps_call, /* ntp_adjtime call was PPS-related */ + int tai_call, /* ntp_adjtime call was TAI-related */ + int line /* line number of ntp_adjtime call */ + ) +{ + switch (ret) { + case -1: + switch (saved_errno) { + case EFAULT: + msyslog(LOG_ERR, "%s: %s line %d: invalid struct timex pointer: 0x%lx", + caller, file_name(), line, + (long)((void *)ptimex) + ); + break; + case EINVAL: + msyslog(LOG_ERR, "%s: %s line %d: invalid struct timex \"constant\" element value: %ld", + caller, file_name(), line, + (long)(ptimex->constant) + ); + break; + case EPERM: + if (tai_call) { + errno = saved_errno; + msyslog(LOG_ERR, + "%s: ntp_adjtime(TAI) failed: %m", + caller); + } + errno = saved_errno; + msyslog(LOG_ERR, "%s: %s line %d: ntp_adjtime: %m", + caller, file_name(), line + ); + break; + default: + msyslog(LOG_NOTICE, "%s: %s line %d: unhandled errno value %d after failed ntp_adjtime call", + caller, file_name(), line, + saved_errno + ); + break; + } + break; +#ifdef TIME_OK + case TIME_OK: /* 0 no leap second warning */ + /* OK means OK */ + break; +#endif +#ifdef TIME_INS + case TIME_INS: /* 1 positive leap second warning */ + msyslog(LOG_INFO, "%s: %s line %d: kernel reports positive leap second warning state", + caller, file_name(), line + ); + break; +#endif +#ifdef TIME_DEL + case TIME_DEL: /* 2 negative leap second warning */ + msyslog(LOG_INFO, "%s: %s line %d: kernel reports negative leap second warning state", + caller, file_name(), line + ); + break; +#endif +#ifdef TIME_OOP + case TIME_OOP: /* 3 leap second in progress */ + msyslog(LOG_INFO, "%s: %s line %d: kernel reports leap second in progress", + caller, file_name(), line + ); + break; +#endif +#ifdef TIME_WAIT + case TIME_WAIT: /* 4 leap second has occured */ + msyslog(LOG_INFO, "%s: %s line %d: kernel reports leap second has occured", + caller, file_name(), line + ); + break; +#endif +#ifdef TIME_ERROR + case TIME_ERROR: /* loss of synchronization */ + if (pps_call && !(ptimex->status & STA_PPSSIGNAL)) + report_event(EVNT_KERN, NULL, + "PPS no signal"); + errno = saved_errno; + DPRINTF(1, ("kernel loop status (%s) %d %m\n", + k_st_flags(ptimex->status), errno)); + break; +#endif + default: + msyslog(LOG_NOTICE, "%s: %s line %d: unhandled return value %d from ntp_adjtime in %s at line %d", + caller, file_name(), line, + ret, + __func__, __LINE__ + ); + break; + } + return; +} +#endif + /* * local_clock - the NTP logical clock loop filter. * @@ -228,6 +352,7 @@ local_clock( { int rval; /* return code */ int osys_poll; /* old system poll */ + int ntp_adj_ret; /* returned by ntp_adjtime */ double mu; /* interval since last update */ double clock_frequency; /* clock frequency */ double dtemp, etemp; /* double temps */ @@ -545,6 +670,9 @@ local_clock( dtemp); ntv.constant = sys_poll - 4; #endif /* STA_NANO */ + if (ntv.constant < 0) + ntv.constant = 0; + ntv.esterror = (u_int32)(clock_jitter * 1e6); ntv.maxerror = (u_int32)((sys_rootdelay / 2 + sys_rootdisp) * 1e6); @@ -553,8 +681,7 @@ local_clock( /* * Enable/disable the PPS if requested. */ - if (pps_enable) { - ntv.status |= STA_PPSTIME | STA_PPSFREQ; + if (hardpps_enable) { if (!(pll_status & STA_PPSTIME)) sync_status("PPS enbled", ntv.status); } else { @@ -573,12 +700,8 @@ local_clock( * the pps. In any case, fetch the kernel offset, * frequency and jitter. */ - if (ntp_adjtime(&ntv) == TIME_ERROR) { - if (pps_enable && !(ntv.status & STA_PPSSIGNAL)) - report_event(EVNT_KERN, NULL, - "PPS no signal"); - DPRINTF(1, ("kernel loop status (%s) %d %m\n", - k_st_flags(ntv.status), errno)); + if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) { + ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, hardpps_enable, 0, __LINE__ - 1); } pll_status = ntv.status; #ifdef STA_NANO @@ -607,7 +730,9 @@ local_clock( loop_tai = sys_tai; ntv.modes = MOD_TAI; ntv.constant = sys_tai; - ntp_adjtime(&ntv); + if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) { + ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, 0, 1, __LINE__ - 1); + } } #endif /* STA_NANO */ } @@ -830,6 +955,7 @@ set_freq( ) { const char * loop_desc; + int ntp_adj_ret; drift_comp = freq; loop_desc = "ntpd"; @@ -841,7 +967,9 @@ set_freq( loop_desc = "kernel"; ntv.freq = DTOFREQ(drift_comp); } - ntp_adjtime(&ntv); + if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) { + ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, 0, 0, __LINE__ - 1); + } } #endif /* KERNEL_PLL */ mprintf_event(EVNT_FSET, NULL, "%s %.3f PPM", loop_desc, @@ -854,6 +982,7 @@ static void start_kern_loop(void) { static int atexit_done; + int ntp_adj_ret; pll_control = TRUE; ZERO(ntv); @@ -861,7 +990,7 @@ start_kern_loop(void) ntv.status = STA_PLL; ntv.maxerror = MAXDISPERSE; ntv.esterror = MAXDISPERSE; - ntv.constant = sys_poll; + ntv.constant = sys_poll; /* why is it that here constant is unconditionally set to sys_poll, whereas elsewhere is is modified depending on nanosecond vs. microsecond kernel? */ #ifdef SIGSYS /* * Use sigsetjmp() to save state and then call ntp_adjtime(); if @@ -874,8 +1003,11 @@ start_kern_loop(void) msyslog(LOG_ERR, "sigaction() trap SIGSYS: %m"); pll_control = FALSE; } else { - if (sigsetjmp(env, 1) == 0) - ntp_adjtime(&ntv); + if (sigsetjmp(env, 1) == 0) { + if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) { + ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, 0, 0, __LINE__ - 1); + } + } if (sigaction(SIGSYS, &sigsys, NULL)) { msyslog(LOG_ERR, "sigaction() restore SIGSYS: %m"); @@ -883,7 +1015,9 @@ start_kern_loop(void) } } #else /* SIGSYS */ - ntp_adjtime(&ntv); + if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) { + ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, 0, 0, __LINE__ - 1); + } #endif /* SIGSYS */ /* diff --git a/external/bsd/ntp/dist/ntpd/ntp_monitor.c b/external/bsd/ntp/dist/ntpd/ntp_monitor.c index 1655303183e7..7b6dc657339d 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_monitor.c +++ b/external/bsd/ntp/dist/ntpd/ntp_monitor.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_monitor.c,v 1.1.1.4 2014/12/19 20:37:40 christos Exp $ */ +/* $NetBSD: ntp_monitor.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_monitor - monitor ntpd statistics diff --git a/external/bsd/ntp/dist/ntpd/ntp_parser.c b/external/bsd/ntp/dist/ntpd/ntp_parser.c index 97cf76a844c1..1b9d09ec3f35 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_parser.c +++ b/external/bsd/ntp/dist/ntpd/ntp_parser.c @@ -1,30 +1,71 @@ -#ifndef lint -#if __GNUC__ - 0 >= 4 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ >= 1) -__attribute__((__used__)) -#endif -static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; -#endif +/* $NetBSD: ntp_parser.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ -#ifdef _LIBC -#include "namespace.h" -#endif -#include -#include +/* A Bison parser, made by GNU Bison 3.0.2. */ -#define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +/* Bison implementation for Yacc-like parsers in C -#define YYEMPTY (-1) -#define yyclearin (yychar = YYEMPTY) -#define yyerrok (yyerrflag = 0) -#define YYRECOVERING() (yyerrflag != 0) + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. -#define YYPREFIX "yy" + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "3.0.2" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ #define YYPURE 0 -#line 14 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + + + + +/* Copy the first part of user declarations. */ +#line 14 "ntp_parser.y" /* yacc.c:339 */ + #ifdef HAVE_CONFIG_H # include #endif @@ -45,164 +86,330 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; for both the simulator and the daemon */ - - struct FILE_INFO *ip_file; /* configuration file stream */ - #define YYMALLOC emalloc #define YYFREE free #define YYERROR_VERBOSE #define YYMAXDEPTH 1000 /* stop the madness sooner */ - void yyerror(const char *msg); - extern int input_from_file; /* else from ntpq :config */ -#line 51 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" -#ifdef YYSTYPE -#undef YYSTYPE_IS_DECLARED -#define YYSTYPE_IS_DECLARED 1 -#endif -#ifndef YYSTYPE_IS_DECLARED -#define YYSTYPE_IS_DECLARED 1 -typedef union { - char * String; - double Double; - int Integer; - unsigned U_int; - gen_fifo * Generic_fifo; - attr_val * Attr_val; - attr_val_fifo * Attr_val_fifo; - int_fifo * Int_fifo; - string_fifo * String_fifo; - address_node * Address_node; - address_fifo * Address_fifo; - setvar_node * Set_var; - server_info * Sim_server; - server_info_fifo * Sim_server_fifo; - script_info * Sim_script; - script_info_fifo * Sim_script_fifo; -} YYSTYPE; -#endif /* !YYSTYPE_IS_DECLARED */ -#line 83 "ntp_parser.c" + void yyerror(struct FILE_INFO *ip_file, const char *msg); -/* compatibility with bison */ -#ifdef YYPARSE_PARAM -/* compatibility with FreeBSD */ -# ifdef YYPARSE_PARAM_TYPE -# define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM) -# else -# define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM) + #ifdef SIM + # define ONLY_SIM(a) (a) + #else + # define ONLY_SIM(a) NULL + #endif + +#line 100 "../../ntpd/ntp_parser.c" /* yacc.c:339 */ + +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 #else -# define YYPARSE_DECL() yyparse(void) +# define YYERROR_VERBOSE 0 #endif -/* Parameters sent to lex. */ -#ifdef YYLEX_PARAM -# define YYLEX_DECL() yylex(void *YYLEX_PARAM) -# define YYLEX yylex(YYLEX_PARAM) -#else -# define YYLEX_DECL() yylex(void) -# define YYLEX yylex() +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_Y_TAB_H_INCLUDED +# define YY_YY_Y_TAB_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int yydebug; #endif -/* Parameters sent to yyerror. */ -#ifndef YYERROR_DECL -#define YYERROR_DECL() yyerror(const char *s) +/* Token type. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Ellipsis = 290, + T_Enable = 291, + T_End = 292, + T_False = 293, + T_File = 294, + T_Filegen = 295, + T_Filenum = 296, + T_Flag1 = 297, + T_Flag2 = 298, + T_Flag3 = 299, + T_Flag4 = 300, + T_Flake = 301, + T_Floor = 302, + T_Freq = 303, + T_Fudge = 304, + T_Host = 305, + T_Huffpuff = 306, + T_Iburst = 307, + T_Ident = 308, + T_Ignore = 309, + T_Incalloc = 310, + T_Incmem = 311, + T_Initalloc = 312, + T_Initmem = 313, + T_Includefile = 314, + T_Integer = 315, + T_Interface = 316, + T_Intrange = 317, + T_Io = 318, + T_Ipv4 = 319, + T_Ipv4_flag = 320, + T_Ipv6 = 321, + T_Ipv6_flag = 322, + T_Kernel = 323, + T_Key = 324, + T_Keys = 325, + T_Keysdir = 326, + T_Kod = 327, + T_Mssntp = 328, + T_Leapfile = 329, + T_Limited = 330, + T_Link = 331, + T_Listen = 332, + T_Logconfig = 333, + T_Logfile = 334, + T_Loopstats = 335, + T_Lowpriotrap = 336, + T_Manycastclient = 337, + T_Manycastserver = 338, + T_Mask = 339, + T_Maxage = 340, + T_Maxclock = 341, + T_Maxdepth = 342, + T_Maxdist = 343, + T_Maxmem = 344, + T_Maxpoll = 345, + T_Mem = 346, + T_Memlock = 347, + T_Minclock = 348, + T_Mindepth = 349, + T_Mindist = 350, + T_Minimum = 351, + T_Minpoll = 352, + T_Minsane = 353, + T_Mode = 354, + T_Mode7 = 355, + T_Monitor = 356, + T_Month = 357, + T_Mru = 358, + T_Multicastclient = 359, + T_Nic = 360, + T_Nolink = 361, + T_Nomodify = 362, + T_Nomrulist = 363, + T_None = 364, + T_Nonvolatile = 365, + T_Nopeer = 366, + T_Noquery = 367, + T_Noselect = 368, + T_Noserve = 369, + T_Notrap = 370, + T_Notrust = 371, + T_Ntp = 372, + T_Ntpport = 373, + T_NtpSignDsocket = 374, + T_Orphan = 375, + T_Orphanwait = 376, + T_Panic = 377, + T_Peer = 378, + T_Peerstats = 379, + T_Phone = 380, + T_Pid = 381, + T_Pidfile = 382, + T_Pool = 383, + T_Port = 384, + T_Preempt = 385, + T_Prefer = 386, + T_Protostats = 387, + T_Pw = 388, + T_Randfile = 389, + T_Rawstats = 390, + T_Refid = 391, + T_Requestkey = 392, + T_Reset = 393, + T_Restrict = 394, + T_Revoke = 395, + T_Rlimit = 396, + T_Saveconfigdir = 397, + T_Server = 398, + T_Setvar = 399, + T_Source = 400, + T_Stacksize = 401, + T_Statistics = 402, + T_Stats = 403, + T_Statsdir = 404, + T_Step = 405, + T_Stepout = 406, + T_Stratum = 407, + T_String = 408, + T_Sys = 409, + T_Sysstats = 410, + T_Tick = 411, + T_Time1 = 412, + T_Time2 = 413, + T_Timer = 414, + T_Timingstats = 415, + T_Tinker = 416, + T_Tos = 417, + T_Trap = 418, + T_True = 419, + T_Trustedkey = 420, + T_Ttl = 421, + T_Type = 422, + T_U_int = 423, + T_Unconfig = 424, + T_Unpeer = 425, + T_Version = 426, + T_WanderThreshold = 427, + T_Week = 428, + T_Wildcard = 429, + T_Xleave = 430, + T_Year = 431, + T_Flag = 432, + T_EOC = 433, + T_Simulate = 434, + T_Beep_Delay = 435, + T_Sim_Duration = 436, + T_Server_Offset = 437, + T_Duration = 438, + T_Freq_Offset = 439, + T_Wander = 440, + T_Jitter = 441, + T_Prop_Delay = 442, + T_Proc_Delay = 443 + }; #endif -#ifndef YYERROR_CALL -#define YYERROR_CALL(msg) yyerror(msg) -#endif - -extern int YYPARSE_DECL(); - - -#define T_Abbrev 257 -#define T_Age 258 -#define T_All 259 -#define T_Allan 260 -#define T_Allpeers 261 -#define T_Auth 262 -#define T_Autokey 263 -#define T_Automax 264 -#define T_Average 265 -#define T_Bclient 266 -#define T_Beacon 267 -#define T_Broadcast 268 -#define T_Broadcastclient 269 -#define T_Broadcastdelay 270 -#define T_Burst 271 -#define T_Calibrate 272 -#define T_Ceiling 273 -#define T_Clockstats 274 -#define T_Cohort 275 -#define T_ControlKey 276 -#define T_Crypto 277 -#define T_Cryptostats 278 -#define T_Ctl 279 -#define T_Day 280 -#define T_Default 281 -#define T_Digest 282 -#define T_Disable 283 -#define T_Discard 284 -#define T_Dispersion 285 -#define T_Double 286 -#define T_Driftfile 287 -#define T_Drop 288 -#define T_Ellipsis 289 -#define T_Enable 290 -#define T_End 291 -#define T_False 292 -#define T_File 293 -#define T_Filegen 294 -#define T_Filenum 295 -#define T_Flag1 296 -#define T_Flag2 297 -#define T_Flag3 298 -#define T_Flag4 299 -#define T_Flake 300 -#define T_Floor 301 -#define T_Freq 302 -#define T_Fudge 303 -#define T_Host 304 -#define T_Huffpuff 305 -#define T_Iburst 306 -#define T_Ident 307 -#define T_Ignore 308 -#define T_Incalloc 309 -#define T_Incmem 310 -#define T_Initalloc 311 -#define T_Initmem 312 -#define T_Includefile 313 -#define T_Integer 314 -#define T_Interface 315 -#define T_Intrange 316 -#define T_Io 317 -#define T_Ipv4 318 -#define T_Ipv4_flag 319 -#define T_Ipv6 320 -#define T_Ipv6_flag 321 -#define T_Kernel 322 -#define T_Key 323 -#define T_Keys 324 -#define T_Keysdir 325 -#define T_Kod 326 -#define T_Mssntp 327 -#define T_Leapfile 328 -#define T_Limited 329 -#define T_Link 330 -#define T_Listen 331 -#define T_Logconfig 332 -#define T_Logfile 333 -#define T_Loopstats 334 -#define T_Lowpriotrap 335 -#define T_Manycastclient 336 -#define T_Manycastserver 337 -#define T_Mask 338 -#define T_Maxage 339 -#define T_Maxclock 340 -#define T_Maxdepth 341 -#define T_Maxdist 342 -#define T_Maxmem 343 -#define T_Maxpoll 344 -#define T_Mdnstries 345 +/* Tokens. */ +#define T_Abbrev 258 +#define T_Age 259 +#define T_All 260 +#define T_Allan 261 +#define T_Allpeers 262 +#define T_Auth 263 +#define T_Autokey 264 +#define T_Automax 265 +#define T_Average 266 +#define T_Bclient 267 +#define T_Beacon 268 +#define T_Broadcast 269 +#define T_Broadcastclient 270 +#define T_Broadcastdelay 271 +#define T_Burst 272 +#define T_Calibrate 273 +#define T_Ceiling 274 +#define T_Clockstats 275 +#define T_Cohort 276 +#define T_ControlKey 277 +#define T_Crypto 278 +#define T_Cryptostats 279 +#define T_Ctl 280 +#define T_Day 281 +#define T_Default 282 +#define T_Digest 283 +#define T_Disable 284 +#define T_Discard 285 +#define T_Dispersion 286 +#define T_Double 287 +#define T_Driftfile 288 +#define T_Drop 289 +#define T_Ellipsis 290 +#define T_Enable 291 +#define T_End 292 +#define T_False 293 +#define T_File 294 +#define T_Filegen 295 +#define T_Filenum 296 +#define T_Flag1 297 +#define T_Flag2 298 +#define T_Flag3 299 +#define T_Flag4 300 +#define T_Flake 301 +#define T_Floor 302 +#define T_Freq 303 +#define T_Fudge 304 +#define T_Host 305 +#define T_Huffpuff 306 +#define T_Iburst 307 +#define T_Ident 308 +#define T_Ignore 309 +#define T_Incalloc 310 +#define T_Incmem 311 +#define T_Initalloc 312 +#define T_Initmem 313 +#define T_Includefile 314 +#define T_Integer 315 +#define T_Interface 316 +#define T_Intrange 317 +#define T_Io 318 +#define T_Ipv4 319 +#define T_Ipv4_flag 320 +#define T_Ipv6 321 +#define T_Ipv6_flag 322 +#define T_Kernel 323 +#define T_Key 324 +#define T_Keys 325 +#define T_Keysdir 326 +#define T_Kod 327 +#define T_Mssntp 328 +#define T_Leapfile 329 +#define T_Limited 330 +#define T_Link 331 +#define T_Listen 332 +#define T_Logconfig 333 +#define T_Logfile 334 +#define T_Loopstats 335 +#define T_Lowpriotrap 336 +#define T_Manycastclient 337 +#define T_Manycastserver 338 +#define T_Mask 339 +#define T_Maxage 340 +#define T_Maxclock 341 +#define T_Maxdepth 342 +#define T_Maxdist 343 +#define T_Maxmem 344 +#define T_Maxpoll 345 #define T_Mem 346 #define T_Memlock 347 #define T_Minclock 348 @@ -301,741 +508,3055 @@ extern int YYPARSE_DECL(); #define T_Jitter 441 #define T_Prop_Delay 442 #define T_Proc_Delay 443 -#define YYERRCODE 256 -static const short yylhs[] = { -1, - 0, 86, 86, 86, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 88, 7, - 7, 7, 7, 7, 3, 3, 31, 4, 4, 46, - 46, 43, 43, 43, 44, 45, 45, 45, 45, 45, - 45, 45, 45, 47, 47, 48, 48, 48, 48, 48, - 48, 49, 50, 89, 72, 72, 90, 90, 90, 90, - 91, 91, 91, 91, 91, 91, 91, 91, 91, 11, - 11, 10, 10, 12, 12, 12, 12, 12, 94, 69, - 69, 66, 66, 66, 68, 68, 68, 68, 68, 68, - 67, 67, 67, 67, 92, 92, 92, 56, 56, 55, - 55, 55, 55, 55, 55, 55, 55, 18, 18, 17, - 17, 17, 17, 32, 32, 16, 16, 19, 19, 19, - 19, 19, 19, 19, 93, 93, 93, 93, 93, 93, - 93, 93, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 15, - 15, 13, 14, 14, 14, 40, 40, 38, 39, 39, - 39, 39, 39, 39, 39, 39, 95, 23, 23, 20, - 20, 20, 20, 20, 22, 22, 21, 21, 21, 21, - 96, 54, 54, 53, 52, 52, 52, 97, 97, 61, - 61, 58, 58, 59, 59, 59, 59, 59, 59, 60, - 60, 98, 65, 65, 64, 63, 63, 63, 63, 63, - 63, 63, 63, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 35, 35, 35, 36, - 36, 36, 37, 37, 101, 101, 101, 73, 62, 62, - 71, 71, 70, 70, 34, 34, 33, 29, 29, 30, - 30, 41, 41, 41, 41, 28, 28, 28, 51, 9, - 9, 8, 8, 8, 8, 8, 8, 8, 24, 24, - 25, 25, 26, 26, 27, 57, 57, 5, 5, 6, - 6, 6, 42, 42, 100, 102, 75, 75, 74, 76, - 76, 77, 77, 78, 79, 80, 82, 82, 81, 84, - 84, 85, 83, 83, 83, 83, 83, -}; -static const short yylen[] = { 2, - 1, 3, 2, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 1, 1, 1, 2, 1, 1, 1, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, - 1, 2, 1, 2, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, - 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, - 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 3, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 3, 5, 3, 4, - 4, 3, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 1, 2, 1, 1, 1, 2, 1, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 2, 1, 2, - 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 2, 2, 1, 2, 1, 1, 1, 2, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 1, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 2, 3, 1, - 2, 2, 2, 2, 3, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 4, 1, 0, - 0, 2, 2, 2, 2, 1, 1, 3, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 2, 1, 1, 1, 5, 2, 1, 2, 1, 1, - 1, 1, 1, 1, 5, 1, 3, 2, 3, 1, - 1, 2, 1, 5, 4, 3, 2, 1, 6, 3, - 2, 3, 1, 1, 1, 1, 1, -}; -static const short yydefred[] = { 0, - 0, 0, 23, 57, 227, 0, 70, 0, 0, 0, - 0, 220, 0, 0, 230, 0, 250, 0, 0, 231, - 0, 233, 24, 0, 0, 0, 0, 251, 228, 0, - 22, 0, 232, 21, 0, 0, 0, 0, 0, 234, - 20, 0, 0, 0, 229, 0, 0, 0, 0, 0, - 55, 56, 286, 0, 0, 214, 0, 0, 0, 0, - 215, 0, 0, 0, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 0, 4, 61, - 62, 0, 194, 195, 196, 197, 200, 198, 199, 201, - 191, 192, 193, 0, 153, 154, 155, 151, 0, 0, - 0, 221, 0, 100, 101, 102, 103, 107, 104, 105, - 106, 108, 28, 29, 27, 0, 0, 25, 0, 64, - 65, 247, 246, 0, 279, 0, 60, 159, 160, 161, - 162, 163, 164, 165, 166, 157, 0, 0, 0, 69, - 277, 0, 66, 262, 263, 264, 265, 266, 267, 268, - 261, 0, 133, 0, 0, 133, 133, 0, 67, 187, - 185, 186, 0, 183, 0, 0, 224, 99, 0, 96, - 206, 207, 208, 209, 210, 211, 212, 213, 0, 204, - 0, 90, 85, 0, 86, 94, 92, 93, 91, 89, - 87, 88, 81, 0, 0, 0, 241, 273, 0, 0, - 272, 274, 270, 0, 30, 258, 257, 256, 0, 284, - 283, 216, 217, 218, 54, 0, 3, 0, 78, 74, - 75, 76, 77, 0, 71, 0, 190, 152, 150, 236, - 0, 0, 177, 178, 179, 180, 0, 0, 175, 176, - 169, 0, 0, 0, 26, 219, 245, 278, 158, 156, - 276, 260, 0, 133, 133, 0, 0, 0, 184, 182, - 0, 98, 205, 203, 282, 280, 281, 84, 83, 82, - 80, 0, 0, 271, 269, 0, 252, 253, 254, 249, - 255, 248, 2, 290, 291, 0, 0, 0, 73, 72, - 117, 116, 0, 114, 115, 0, 113, 109, 112, 173, - 174, 172, 171, 170, 168, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 134, 0, 0, 133, 0, 0, 0, 242, 0, 36, - 37, 38, 53, 46, 48, 47, 50, 39, 40, 41, - 42, 49, 51, 43, 31, 32, 35, 33, 0, 34, - 0, 288, 0, 0, 0, 293, 0, 0, 110, 124, - 120, 122, 118, 119, 121, 123, 111, 0, 239, 238, - 244, 243, 0, 44, 45, 52, 0, 287, 285, 292, - 0, 289, 275, 296, 0, 0, 0, 0, 298, 0, - 0, 0, 294, 297, 295, 0, 0, 303, 304, 305, - 306, 307, 0, 0, 0, 0, 299, 0, 301, 302, - 300, -}; -static const short yydgoto[] = { 54, - 321, 253, 125, 117, 126, 268, 55, 151, 152, 225, - 82, 226, 98, 99, 100, 297, 298, 231, 367, 241, - 242, 243, 244, 204, 200, 201, 202, 209, 56, 57, - 118, 299, 123, 124, 58, 59, 60, 136, 137, 138, - 282, 212, 345, 346, 347, 276, 348, 349, 350, 351, - 61, 163, 164, 165, 112, 169, 142, 91, 92, 93, - 94, 370, 179, 180, 181, 193, 194, 195, 196, 328, - 272, 62, 167, 286, 287, 288, 355, 356, 386, 357, - 389, 390, 403, 404, 405, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 102, 78, -}; -static const short yysindex[] = { -231, - -399, -279, 0, 0, 0, -278, 0, -127, -225, -354, - -127, 0, -257, -297, 0, -353, 0, -351, -350, 0, - -344, 0, 0, -297, -241, -59, -297, 0, 0, -343, - 0, -333, 0, 0, -236, -200, -177, -234, -280, 0, - 0, -327, -257, -325, 0, -189, 155, -322, -36, -227, - 0, 0, 0, 0, -297, 0, -261, -270, -316, -310, - 0, -297, -22, -334, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -23, 0, 0, - 0, -197, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -127, 0, 0, 0, 0, -211, -225, - -168, 0, -127, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -208, -299, 0, -22, 0, - 0, 0, 0, -344, 0, -297, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -195, -59, -297, 0, - 0, -285, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -200, 0, -157, -145, 0, 0, -190, 0, 0, - 0, 0, -164, 0, -280, 93, 0, 0, -257, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -270, 0, - -189, 0, 0, -282, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -270, -159, 155, 0, 0, -155, -36, - 0, 0, 0, -154, 0, 0, 0, 0, -252, 0, - 0, 0, 0, 0, 0, -276, 0, -406, 0, 0, - 0, 0, 0, -144, 0, -239, 0, 0, 0, 0, - -63, -233, 0, 0, 0, 0, -232, -142, 0, 0, - 0, -282, -270, -208, 0, 0, 0, 0, 0, 0, - 0, 0, 106, 0, 0, 106, 106, -322, 0, 0, - -230, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -289, -115, 0, 0, 61, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -237, -385, 120, 0, 0, - 0, 0, -207, 0, 0, -249, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 106, 106, 0, -84, -322, -112, 0, -108, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -303, 0, - -201, 0, 139, -222, -119, 0, 85, -270, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 106, 0, 0, - 0, 0, 171, 0, 0, 0, -297, 0, 0, 0, - -218, 0, 0, 0, 154, -217, -270, 164, 0, -117, - -194, -270, 0, 0, 0, 103, -206, 0, 0, 0, - 0, 0, 177, -123, -193, -270, 0, -192, 0, 0, - 0, -}; -static const short yyrindex[] = { -184, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -176, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -175, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -173, 0, 0, 0, 0, 0, -170, - -169, 0, -167, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -184, 0, - 0, 0, 0, -163, 0, -162, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -160, -158, 0, - 0, -156, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -150, 0, -165, -152, 0, 0, 92, 0, 0, - 0, 0, 0, 0, -147, 0, 0, 0, -146, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -139, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -399, 0, 0, 0, -138, - 0, 0, 0, -137, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -136, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -134, 0, 0, 0, 0, 0, 0, - 0, 0, -133, 0, 0, -132, -129, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -128, 0, 0, 0, -126, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -125, -124, 0, -121, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -120, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -}; -static const short yygindex[] = { 0, - 0, -114, -14, 0, 217, 17, 0, 122, 0, 0, - 0, 0, 188, 0, 0, 0, 0, 0, 0, 45, - 0, 0, 0, 0, 0, 125, 0, 0, 0, 0, - -34, 0, 198, 0, 0, 0, 0, 189, 0, 0, - 0, -174, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 161, 0, -31, 0, 0, -75, 0, 0, - 317, 0, 0, 148, 0, 134, 0, 0, 0, 0, - 0, 0, 0, 44, 0, 0, 0, -21, 0, 0, - -57, 0, 0, 0, -69, 0, -45, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -}; -#define YYTABLESIZE 532 -static const short yytable[] = { 116, - 1, 407, 158, 199, 263, 379, 277, 393, 360, 265, - 374, 168, 353, 197, 160, 210, 104, 216, 227, 269, - 105, 113, 157, 114, 1, 326, 206, 227, 284, 285, - 361, 266, 2, 79, 80, 81, 3, 4, 5, 95, - 205, 256, 257, 211, 6, 7, 207, 215, 232, 284, - 285, 8, 9, 101, 119, 10, 120, 121, 11, 12, - 144, 145, 13, 122, 140, 278, 161, 279, 304, 208, - 171, 14, 127, 246, 141, 15, 106, 143, 146, 159, - 166, 16, 170, 17, 219, 115, 203, 233, 234, 235, - 236, 213, 18, 19, 327, 172, 20, 214, 217, 218, - 21, 22, 228, 153, 23, 24, 220, 362, 245, 221, - 115, 248, 173, 25, 363, 174, 147, 230, 249, 375, - 162, 107, 251, 254, 248, 96, 26, 27, 28, 108, - 97, 364, 109, 29, 83, 255, 267, 262, 84, 322, - 323, 154, 30, 155, 85, 148, 31, 258, 32, 259, - 33, 34, 110, 261, 270, 280, 283, 111, 273, 275, - 35, 36, 37, 38, 39, 40, 41, 42, 290, 289, - 43, 302, 44, 329, 300, 301, 281, 325, 365, 45, - 358, 366, 237, 382, 46, 47, 48, 175, 49, 50, - 222, 223, 51, 52, 86, 352, 369, 224, 238, 377, - 359, 372, 53, 239, 240, 373, 376, 381, 149, 368, - 378, 383, 391, 150, 387, 176, 177, 396, 385, 291, - 388, 178, 156, 324, 392, 397, 292, 87, 88, 293, - 115, 410, 398, 399, 400, 401, 402, 406, 395, 409, - 411, 2, 28, 139, 89, 3, 4, 5, 5, 128, - 129, 130, 131, 6, 7, 29, 237, 63, 303, 189, - 8, 9, 125, 235, 10, 188, 294, 11, 12, 222, - 58, 13, 126, 252, 59, 90, 223, 198, 353, 132, - 14, 133, 259, 134, 15, 181, 95, 229, 305, 135, - 16, 371, 17, 202, 68, 226, 97, 295, 167, 129, - 132, 18, 19, 127, 225, 20, 19, 130, 131, 21, - 22, 240, 128, 23, 24, 398, 399, 400, 401, 402, - 388, 247, 25, 330, 274, 260, 250, 103, 264, 271, - 354, 331, 394, 380, 408, 26, 27, 28, 0, 0, - 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 0, 30, 0, 0, 0, 31, 0, 32, 296, 33, - 34, 0, 384, 0, 0, 0, 332, 333, 0, 35, - 36, 37, 38, 39, 40, 41, 42, 0, 0, 43, - 0, 44, 0, 334, 0, 0, 0, 0, 45, 0, - 0, 25, 0, 46, 47, 48, 0, 49, 50, 25, - 0, 51, 52, 0, 335, 306, 0, 0, 0, 0, - 0, 53, 336, 307, 337, 0, 0, 25, 25, 0, - 25, 182, 0, 0, 0, 0, 25, 183, 338, 184, - 0, 308, 309, 5, 310, 0, 0, 0, 0, 0, - 311, 0, 0, 0, 0, 339, 340, 0, 0, 0, - 0, 0, 0, 25, 25, 185, 0, 25, 25, 0, - 25, 25, 25, 0, 25, 0, 0, 312, 313, 0, - 0, 314, 315, 0, 316, 317, 318, 0, 319, 341, - 0, 342, 0, 0, 0, 0, 343, 0, 0, 0, - 344, 0, 0, 0, 186, 0, 187, 0, 0, 0, - 0, 0, 188, 0, 189, 0, 0, 190, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, - 0, 0, 0, 0, 25, 0, 0, 0, 0, 191, - 192, 320, -}; -static const short yycheck[] = { 14, - 0, 125, 37, 40, 179, 125, 259, 125, 258, 292, - 314, 43, 398, 48, 295, 286, 274, 63, 94, 194, - 278, 319, 37, 321, 256, 315, 288, 103, 435, 436, - 280, 314, 264, 433, 314, 314, 268, 269, 270, 265, - 55, 156, 157, 314, 276, 277, 308, 62, 257, 435, - 436, 283, 284, 408, 408, 287, 408, 408, 290, 291, - 261, 262, 294, 408, 408, 318, 347, 320, 243, 331, - 260, 303, 314, 119, 408, 307, 334, 314, 279, 314, - 408, 313, 408, 315, 282, 408, 314, 296, 297, 298, - 299, 408, 324, 325, 384, 285, 328, 408, 433, 123, - 332, 333, 314, 281, 336, 337, 304, 357, 408, 307, - 408, 126, 302, 345, 364, 305, 317, 286, 314, 423, - 401, 379, 408, 281, 139, 351, 358, 359, 360, 387, - 356, 381, 390, 365, 262, 281, 419, 169, 266, 254, - 255, 319, 374, 321, 272, 346, 378, 338, 380, 314, - 382, 383, 410, 61, 314, 408, 433, 415, 314, 314, - 392, 393, 394, 395, 396, 397, 398, 399, 408, 314, - 402, 314, 404, 289, 408, 408, 429, 408, 428, 411, - 61, 431, 391, 358, 416, 417, 418, 377, 420, 421, - 388, 389, 424, 425, 322, 433, 281, 395, 407, 61, - 408, 314, 434, 412, 413, 314, 408, 123, 409, 324, - 433, 41, 387, 414, 61, 405, 406, 392, 437, 283, - 438, 411, 400, 258, 61, 123, 290, 355, 356, 293, - 408, 406, 439, 440, 441, 442, 443, 61, 433, 433, - 433, 264, 408, 27, 372, 268, 269, 270, 433, 309, - 310, 311, 312, 276, 277, 408, 433, 433, 242, 433, - 283, 284, 433, 433, 287, 433, 330, 290, 291, 433, - 433, 294, 433, 152, 433, 403, 433, 314, 398, 339, - 303, 341, 433, 343, 307, 433, 433, 100, 244, 349, - 313, 326, 315, 433, 433, 433, 433, 361, 433, 433, - 433, 324, 325, 433, 433, 328, 433, 433, 433, 332, - 333, 433, 433, 336, 337, 439, 440, 441, 442, 443, - 438, 124, 345, 263, 200, 165, 138, 11, 181, 196, - 287, 271, 390, 355, 404, 358, 359, 360, -1, -1, - -1, -1, 365, -1, -1, -1, -1, -1, -1, -1, - -1, 374, -1, -1, -1, 378, -1, 380, 422, 382, - 383, -1, 377, -1, -1, -1, 306, 307, -1, 392, - 393, 394, 395, 396, 397, 398, 399, -1, -1, 402, - -1, 404, -1, 323, -1, -1, -1, -1, 411, -1, - -1, 300, -1, 416, 417, 418, -1, 420, 421, 308, - -1, 424, 425, -1, 344, 300, -1, -1, -1, -1, - -1, 434, 352, 308, 354, -1, -1, 326, 327, -1, - 329, 267, -1, -1, -1, -1, 335, 273, 368, 275, - -1, 326, 327, 433, 329, -1, -1, -1, -1, -1, - 335, -1, -1, -1, -1, 385, 386, -1, -1, -1, - -1, -1, -1, 362, 363, 301, -1, 366, 367, -1, - 369, 370, 371, -1, 373, -1, -1, 362, 363, -1, - -1, 366, 367, -1, 369, 370, 371, -1, 373, 419, - -1, 421, -1, -1, -1, -1, 426, -1, -1, -1, - 430, -1, -1, -1, 340, -1, 342, -1, -1, -1, - -1, -1, 348, -1, 350, -1, -1, 353, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 426, -1, -1, - -1, -1, -1, -1, 433, -1, -1, -1, -1, 375, - 376, 426, -}; -#define YYFINAL 54 -#ifndef YYDEBUG -#define YYDEBUG 0 -#endif -#define YYMAXTOKEN 443 -#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) -static const char *yytname[] = { -"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,"'('","')'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'='",0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'{'",0,"'}'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"T_Abbrev", -"T_Age","T_All","T_Allan","T_Allpeers","T_Auth","T_Autokey","T_Automax", -"T_Average","T_Bclient","T_Beacon","T_Broadcast","T_Broadcastclient", -"T_Broadcastdelay","T_Burst","T_Calibrate","T_Ceiling","T_Clockstats", -"T_Cohort","T_ControlKey","T_Crypto","T_Cryptostats","T_Ctl","T_Day", -"T_Default","T_Digest","T_Disable","T_Discard","T_Dispersion","T_Double", -"T_Driftfile","T_Drop","T_Ellipsis","T_Enable","T_End","T_False","T_File", -"T_Filegen","T_Filenum","T_Flag1","T_Flag2","T_Flag3","T_Flag4","T_Flake", -"T_Floor","T_Freq","T_Fudge","T_Host","T_Huffpuff","T_Iburst","T_Ident", -"T_Ignore","T_Incalloc","T_Incmem","T_Initalloc","T_Initmem","T_Includefile", -"T_Integer","T_Interface","T_Intrange","T_Io","T_Ipv4","T_Ipv4_flag","T_Ipv6", -"T_Ipv6_flag","T_Kernel","T_Key","T_Keys","T_Keysdir","T_Kod","T_Mssntp", -"T_Leapfile","T_Limited","T_Link","T_Listen","T_Logconfig","T_Logfile", -"T_Loopstats","T_Lowpriotrap","T_Manycastclient","T_Manycastserver","T_Mask", -"T_Maxage","T_Maxclock","T_Maxdepth","T_Maxdist","T_Maxmem","T_Maxpoll", -"T_Mdnstries","T_Mem","T_Memlock","T_Minclock","T_Mindepth","T_Mindist", -"T_Minimum","T_Minpoll","T_Minsane","T_Mode","T_Mode7","T_Monitor","T_Month", -"T_Mru","T_Multicastclient","T_Nic","T_Nolink","T_Nomodify","T_Nomrulist", -"T_None","T_Nonvolatile","T_Nopeer","T_Noquery","T_Noselect","T_Noserve", -"T_Notrap","T_Notrust","T_Ntp","T_Ntpport","T_NtpSignDsocket","T_Orphan", -"T_Orphanwait","T_Panic","T_Peer","T_Peerstats","T_Phone","T_Pid","T_Pidfile", -"T_Pool","T_Port","T_Preempt","T_Prefer","T_Protostats","T_Pw","T_Randfile", -"T_Rawstats","T_Refid","T_Requestkey","T_Reset","T_Restrict","T_Revoke", -"T_Rlimit","T_Saveconfigdir","T_Server","T_Setvar","T_Source","T_Stacksize", -"T_Statistics","T_Stats","T_Statsdir","T_Step","T_Stepout","T_Stratum", -"T_String","T_Sys","T_Sysstats","T_Tick","T_Time1","T_Time2","T_Timer", -"T_Timingstats","T_Tinker","T_Tos","T_Trap","T_True","T_Trustedkey","T_Ttl", -"T_Type","T_U_int","T_Unconfig","T_Unpeer","T_Version","T_WanderThreshold", -"T_Week","T_Wildcard","T_Xleave","T_Year","T_Flag","T_EOC","T_Simulate", -"T_Beep_Delay","T_Sim_Duration","T_Server_Offset","T_Duration","T_Freq_Offset", -"T_Wander","T_Jitter","T_Prop_Delay","T_Proc_Delay","illegal-token", +/* Value type. */ +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE YYSTYPE; +union YYSTYPE +{ +#line 54 "ntp_parser.y" /* yacc.c:355 */ + + char * String; + double Double; + int Integer; + unsigned U_int; + gen_fifo * Generic_fifo; + attr_val * Attr_val; + attr_val_fifo * Attr_val_fifo; + int_fifo * Int_fifo; + string_fifo * String_fifo; + address_node * Address_node; + address_fifo * Address_fifo; + setvar_node * Set_var; + server_info * Sim_server; + server_info_fifo * Sim_server_fifo; + script_info * Sim_script; + script_info_fifo * Sim_script_fifo; + +#line 535 "../../ntpd/ntp_parser.c" /* yacc.c:355 */ }; +# define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 +#endif + + +extern YYSTYPE yylval; + +int yyparse (struct FILE_INFO *ip_file); + +#endif /* !YY_YY_Y_TAB_H_INCLUDED */ + +/* Copy the second part of user declarations. */ + +#line 550 "../../ntpd/ntp_parser.c" /* yacc.c:358 */ + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#else +typedef signed char yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if defined YYENABLE_NLS && YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) +# endif +# endif +# ifndef YY_ +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(E) ((void) (E)) +#else +# define YYUSE(E) /* empty */ +#endif + +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") +#else +# define YY_INITIAL_VALUE(Value) Value +#endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS +# include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined EXIT_SUCCESS +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined EXIT_SUCCESS +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +# define YYCOPY_NEEDED 1 + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + +#endif + +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 203 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 653 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 194 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 104 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 307 +/* YYNSTATES -- Number of states. */ +#define YYNSTATES 411 + +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 443 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 190, 191, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 189, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 192, 2, 193, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188 +}; + #if YYDEBUG -static const char *yyrule[] = { -"$accept : configuration", -"configuration : command_list", -"command_list : command_list command T_EOC", -"command_list : command T_EOC", -"command_list : error T_EOC", -"command :", -"command : server_command", -"command : unpeer_command", -"command : other_mode_command", -"command : authentication_command", -"command : monitoring_command", -"command : access_control_command", -"command : orphan_mode_command", -"command : fudge_command", -"command : rlimit_command", -"command : system_option_command", -"command : tinker_command", -"command : miscellaneous_command", -"command : simulate_command", -"server_command : client_type address option_list", -"client_type : T_Server", -"client_type : T_Pool", -"client_type : T_Peer", -"client_type : T_Broadcast", -"client_type : T_Manycastclient", -"address : ip_address", -"address : address_fam T_String", -"ip_address : T_String", -"address_fam : T_Ipv4_flag", -"address_fam : T_Ipv6_flag", -"option_list :", -"option_list : option_list option", -"option : option_flag", -"option : option_int", -"option : option_str", -"option_flag : option_flag_keyword", -"option_flag_keyword : T_Autokey", -"option_flag_keyword : T_Burst", -"option_flag_keyword : T_Iburst", -"option_flag_keyword : T_Noselect", -"option_flag_keyword : T_Preempt", -"option_flag_keyword : T_Prefer", -"option_flag_keyword : T_True", -"option_flag_keyword : T_Xleave", -"option_int : option_int_keyword T_Integer", -"option_int : option_int_keyword T_U_int", -"option_int_keyword : T_Key", -"option_int_keyword : T_Minpoll", -"option_int_keyword : T_Maxpoll", -"option_int_keyword : T_Ttl", -"option_int_keyword : T_Mode", -"option_int_keyword : T_Version", -"option_str : option_str_keyword T_String", -"option_str_keyword : T_Ident", -"unpeer_command : unpeer_keyword address", -"unpeer_keyword : T_Unconfig", -"unpeer_keyword : T_Unpeer", -"other_mode_command : T_Broadcastclient", -"other_mode_command : T_Manycastserver address_list", -"other_mode_command : T_Multicastclient address_list", -"other_mode_command : T_Mdnstries T_Integer", -"authentication_command : T_Automax T_Integer", -"authentication_command : T_ControlKey T_Integer", -"authentication_command : T_Crypto crypto_command_list", -"authentication_command : T_Keys T_String", -"authentication_command : T_Keysdir T_String", -"authentication_command : T_Requestkey T_Integer", -"authentication_command : T_Revoke T_Integer", -"authentication_command : T_Trustedkey integer_list_range", -"authentication_command : T_NtpSignDsocket T_String", -"crypto_command_list :", -"crypto_command_list : crypto_command_list crypto_command", -"crypto_command : crypto_str_keyword T_String", -"crypto_command : T_Revoke T_Integer", -"crypto_str_keyword : T_Host", -"crypto_str_keyword : T_Ident", -"crypto_str_keyword : T_Pw", -"crypto_str_keyword : T_Randfile", -"crypto_str_keyword : T_Digest", -"orphan_mode_command : T_Tos tos_option_list", -"tos_option_list : tos_option_list tos_option", -"tos_option_list : tos_option", -"tos_option : tos_option_int_keyword T_Integer", -"tos_option : tos_option_dbl_keyword number", -"tos_option : T_Cohort boolean", -"tos_option_int_keyword : T_Ceiling", -"tos_option_int_keyword : T_Floor", -"tos_option_int_keyword : T_Orphan", -"tos_option_int_keyword : T_Orphanwait", -"tos_option_int_keyword : T_Minsane", -"tos_option_int_keyword : T_Beacon", -"tos_option_dbl_keyword : T_Mindist", -"tos_option_dbl_keyword : T_Maxdist", -"tos_option_dbl_keyword : T_Minclock", -"tos_option_dbl_keyword : T_Maxclock", -"monitoring_command : T_Statistics stats_list", -"monitoring_command : T_Statsdir T_String", -"monitoring_command : T_Filegen stat filegen_option_list", -"stats_list : stats_list stat", -"stats_list : stat", -"stat : T_Clockstats", -"stat : T_Cryptostats", -"stat : T_Loopstats", -"stat : T_Peerstats", -"stat : T_Rawstats", -"stat : T_Sysstats", -"stat : T_Timingstats", -"stat : T_Protostats", -"filegen_option_list :", -"filegen_option_list : filegen_option_list filegen_option", -"filegen_option : T_File T_String", -"filegen_option : T_Type filegen_type", -"filegen_option : link_nolink", -"filegen_option : enable_disable", -"link_nolink : T_Link", -"link_nolink : T_Nolink", -"enable_disable : T_Enable", -"enable_disable : T_Disable", -"filegen_type : T_None", -"filegen_type : T_Pid", -"filegen_type : T_Day", -"filegen_type : T_Week", -"filegen_type : T_Month", -"filegen_type : T_Year", -"filegen_type : T_Age", -"access_control_command : T_Discard discard_option_list", -"access_control_command : T_Mru mru_option_list", -"access_control_command : T_Restrict address ac_flag_list", -"access_control_command : T_Restrict ip_address T_Mask ip_address ac_flag_list", -"access_control_command : T_Restrict T_Default ac_flag_list", -"access_control_command : T_Restrict T_Ipv4_flag T_Default ac_flag_list", -"access_control_command : T_Restrict T_Ipv6_flag T_Default ac_flag_list", -"access_control_command : T_Restrict T_Source ac_flag_list", -"ac_flag_list :", -"ac_flag_list : ac_flag_list access_control_flag", -"access_control_flag : T_Flake", -"access_control_flag : T_Ignore", -"access_control_flag : T_Kod", -"access_control_flag : T_Mssntp", -"access_control_flag : T_Limited", -"access_control_flag : T_Lowpriotrap", -"access_control_flag : T_Nomodify", -"access_control_flag : T_Nomrulist", -"access_control_flag : T_Nopeer", -"access_control_flag : T_Noquery", -"access_control_flag : T_Noserve", -"access_control_flag : T_Notrap", -"access_control_flag : T_Notrust", -"access_control_flag : T_Ntpport", -"access_control_flag : T_Version", -"discard_option_list : discard_option_list discard_option", -"discard_option_list : discard_option", -"discard_option : discard_option_keyword T_Integer", -"discard_option_keyword : T_Average", -"discard_option_keyword : T_Minimum", -"discard_option_keyword : T_Monitor", -"mru_option_list : mru_option_list mru_option", -"mru_option_list : mru_option", -"mru_option : mru_option_keyword T_Integer", -"mru_option_keyword : T_Incalloc", -"mru_option_keyword : T_Incmem", -"mru_option_keyword : T_Initalloc", -"mru_option_keyword : T_Initmem", -"mru_option_keyword : T_Maxage", -"mru_option_keyword : T_Maxdepth", -"mru_option_keyword : T_Maxmem", -"mru_option_keyword : T_Mindepth", -"fudge_command : T_Fudge address fudge_factor_list", -"fudge_factor_list : fudge_factor_list fudge_factor", -"fudge_factor_list : fudge_factor", -"fudge_factor : fudge_factor_dbl_keyword number", -"fudge_factor : fudge_factor_bool_keyword boolean", -"fudge_factor : T_Stratum T_Integer", -"fudge_factor : T_Abbrev T_String", -"fudge_factor : T_Refid T_String", -"fudge_factor_dbl_keyword : T_Time1", -"fudge_factor_dbl_keyword : T_Time2", -"fudge_factor_bool_keyword : T_Flag1", -"fudge_factor_bool_keyword : T_Flag2", -"fudge_factor_bool_keyword : T_Flag3", -"fudge_factor_bool_keyword : T_Flag4", -"rlimit_command : T_Rlimit rlimit_option_list", -"rlimit_option_list : rlimit_option_list rlimit_option", -"rlimit_option_list : rlimit_option", -"rlimit_option : rlimit_option_keyword T_Integer", -"rlimit_option_keyword : T_Memlock", -"rlimit_option_keyword : T_Stacksize", -"rlimit_option_keyword : T_Filenum", -"system_option_command : T_Enable system_option_list", -"system_option_command : T_Disable system_option_list", -"system_option_list : system_option_list system_option", -"system_option_list : system_option", -"system_option : system_option_flag_keyword", -"system_option : system_option_local_flag_keyword", -"system_option_flag_keyword : T_Auth", -"system_option_flag_keyword : T_Bclient", -"system_option_flag_keyword : T_Calibrate", -"system_option_flag_keyword : T_Kernel", -"system_option_flag_keyword : T_Monitor", -"system_option_flag_keyword : T_Ntp", -"system_option_local_flag_keyword : T_Mode7", -"system_option_local_flag_keyword : T_Stats", -"tinker_command : T_Tinker tinker_option_list", -"tinker_option_list : tinker_option_list tinker_option", -"tinker_option_list : tinker_option", -"tinker_option : tinker_option_keyword number", -"tinker_option_keyword : T_Allan", -"tinker_option_keyword : T_Dispersion", -"tinker_option_keyword : T_Freq", -"tinker_option_keyword : T_Huffpuff", -"tinker_option_keyword : T_Panic", -"tinker_option_keyword : T_Step", -"tinker_option_keyword : T_Stepout", -"tinker_option_keyword : T_Tick", -"miscellaneous_command : interface_command", -"miscellaneous_command : reset_command", -"miscellaneous_command : misc_cmd_dbl_keyword number", -"miscellaneous_command : misc_cmd_str_keyword T_String", -"miscellaneous_command : misc_cmd_str_lcl_keyword T_String", -"miscellaneous_command : T_Includefile T_String command", -"miscellaneous_command : T_End", -"miscellaneous_command : T_Driftfile drift_parm", -"miscellaneous_command : T_Logconfig log_config_list", -"miscellaneous_command : T_Phone string_list", -"miscellaneous_command : T_Setvar variable_assign", -"miscellaneous_command : T_Trap ip_address trap_option_list", -"miscellaneous_command : T_Ttl integer_list", -"misc_cmd_dbl_keyword : T_Broadcastdelay", -"misc_cmd_dbl_keyword : T_Nonvolatile", -"misc_cmd_dbl_keyword : T_Tick", -"misc_cmd_str_keyword : T_Ident", -"misc_cmd_str_keyword : T_Leapfile", -"misc_cmd_str_keyword : T_Pidfile", -"misc_cmd_str_lcl_keyword : T_Logfile", -"misc_cmd_str_lcl_keyword : T_Saveconfigdir", -"drift_parm : T_String", -"drift_parm : T_String T_Double", -"drift_parm :", -"variable_assign : T_String '=' T_String t_default_or_zero", -"t_default_or_zero : T_Default", -"t_default_or_zero :", -"trap_option_list :", -"trap_option_list : trap_option_list trap_option", -"trap_option : T_Port T_Integer", -"trap_option : T_Interface ip_address", -"log_config_list : log_config_list log_config_command", -"log_config_list : log_config_command", -"log_config_command : T_String", -"interface_command : interface_nic nic_rule_action nic_rule_class", -"interface_command : interface_nic nic_rule_action T_String", -"interface_nic : T_Interface", -"interface_nic : T_Nic", -"nic_rule_class : T_All", -"nic_rule_class : T_Ipv4", -"nic_rule_class : T_Ipv6", -"nic_rule_class : T_Wildcard", -"nic_rule_action : T_Listen", -"nic_rule_action : T_Ignore", -"nic_rule_action : T_Drop", -"reset_command : T_Reset counter_set_list", -"counter_set_list : counter_set_list counter_set_keyword", -"counter_set_list : counter_set_keyword", -"counter_set_keyword : T_Allpeers", -"counter_set_keyword : T_Auth", -"counter_set_keyword : T_Ctl", -"counter_set_keyword : T_Io", -"counter_set_keyword : T_Mem", -"counter_set_keyword : T_Sys", -"counter_set_keyword : T_Timer", -"integer_list : integer_list T_Integer", -"integer_list : T_Integer", -"integer_list_range : integer_list_range integer_list_range_elt", -"integer_list_range : integer_list_range_elt", -"integer_list_range_elt : T_Integer", -"integer_list_range_elt : integer_range", -"integer_range : '(' T_Integer T_Ellipsis T_Integer ')'", -"string_list : string_list T_String", -"string_list : T_String", -"address_list : address_list address", -"address_list : address", -"boolean : T_Integer", -"boolean : T_True", -"boolean : T_False", -"number : T_Integer", -"number : T_Double", -"simulate_command : sim_conf_start '{' sim_init_statement_list sim_server_list '}'", -"sim_conf_start : T_Simulate", -"sim_init_statement_list : sim_init_statement_list sim_init_statement T_EOC", -"sim_init_statement_list : sim_init_statement T_EOC", -"sim_init_statement : sim_init_keyword '=' number", -"sim_init_keyword : T_Beep_Delay", -"sim_init_keyword : T_Sim_Duration", -"sim_server_list : sim_server_list sim_server", -"sim_server_list : sim_server", -"sim_server : sim_server_name '{' sim_server_offset sim_act_list '}'", -"sim_server_offset : T_Server_Offset '=' number T_EOC", -"sim_server_name : T_Server '=' address", -"sim_act_list : sim_act_list sim_act", -"sim_act_list : sim_act", -"sim_act : T_Duration '=' number '{' sim_act_stmt_list '}'", -"sim_act_stmt_list : sim_act_stmt_list sim_act_stmt T_EOC", -"sim_act_stmt_list : sim_act_stmt T_EOC", -"sim_act_stmt : sim_act_keyword '=' number", -"sim_act_keyword : T_Freq_Offset", -"sim_act_keyword : T_Wander", -"sim_act_keyword : T_Jitter", -"sim_act_keyword : T_Prop_Delay", -"sim_act_keyword : T_Proc_Delay", - + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +static const yytype_uint16 yyrline[] = +{ + 0, 363, 363, 367, 368, 369, 383, 384, 385, 386, + 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, + 404, 414, 415, 416, 417, 418, 422, 423, 428, 433, + 435, 441, 442, 450, 451, 452, 456, 461, 462, 463, + 464, 465, 466, 467, 468, 472, 474, 479, 480, 481, + 482, 483, 484, 488, 493, 502, 512, 513, 523, 525, + 527, 538, 545, 547, 552, 554, 556, 558, 560, 569, + 575, 576, 584, 586, 598, 599, 600, 601, 602, 611, + 616, 621, 629, 631, 633, 638, 639, 640, 641, 642, + 643, 647, 648, 649, 650, 659, 661, 670, 680, 685, + 693, 694, 695, 696, 697, 698, 699, 700, 705, 706, + 714, 724, 733, 748, 753, 754, 758, 759, 763, 764, + 765, 766, 767, 768, 769, 778, 782, 786, 794, 802, + 810, 825, 840, 853, 854, 862, 863, 864, 865, 866, + 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, + 880, 885, 893, 898, 899, 900, 904, 909, 917, 922, + 923, 924, 925, 926, 927, 928, 929, 937, 947, 952, + 960, 962, 964, 966, 968, 973, 974, 978, 979, 980, + 981, 989, 994, 999, 1007, 1012, 1013, 1014, 1023, 1025, + 1030, 1035, 1043, 1045, 1062, 1063, 1064, 1065, 1066, 1067, + 1071, 1072, 1080, 1085, 1090, 1098, 1103, 1104, 1105, 1106, + 1107, 1108, 1109, 1110, 1119, 1120, 1121, 1128, 1135, 1151, + 1170, 1175, 1177, 1179, 1181, 1183, 1190, 1195, 1196, 1197, + 1201, 1202, 1203, 1207, 1208, 1212, 1219, 1229, 1238, 1243, + 1245, 1250, 1251, 1259, 1261, 1269, 1274, 1282, 1307, 1314, + 1324, 1325, 1329, 1330, 1331, 1332, 1336, 1337, 1338, 1342, + 1347, 1352, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 1376, + 1381, 1389, 1394, 1402, 1404, 1408, 1413, 1418, 1426, 1431, + 1439, 1448, 1449, 1453, 1454, 1463, 1481, 1485, 1490, 1498, + 1503, 1504, 1508, 1513, 1521, 1526, 1531, 1536, 1541, 1549, + 1554, 1559, 1567, 1572, 1573, 1574, 1575, 1576 }; #endif -int yydebug; -int yynerrs; - -int yyerrflag; -int yychar; -YYSTYPE yyval; -YYSTYPE yylval; - -/* define the initial stack-sizes */ -#ifdef YYSTACKSIZE -#undef YYMAXDEPTH -#define YYMAXDEPTH YYSTACKSIZE -#else -#ifdef YYMAXDEPTH -#define YYSTACKSIZE YYMAXDEPTH -#else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 -#endif +#if YYDEBUG || YYERROR_VERBOSE || 1 +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "T_Abbrev", "T_Age", "T_All", "T_Allan", + "T_Allpeers", "T_Auth", "T_Autokey", "T_Automax", "T_Average", + "T_Bclient", "T_Beacon", "T_Broadcast", "T_Broadcastclient", + "T_Broadcastdelay", "T_Burst", "T_Calibrate", "T_Ceiling", + "T_Clockstats", "T_Cohort", "T_ControlKey", "T_Crypto", "T_Cryptostats", + "T_Ctl", "T_Day", "T_Default", "T_Digest", "T_Disable", "T_Discard", + "T_Dispersion", "T_Double", "T_Driftfile", "T_Drop", "T_Ellipsis", + "T_Enable", "T_End", "T_False", "T_File", "T_Filegen", "T_Filenum", + "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake", "T_Floor", + "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", "T_Iburst", "T_Ident", + "T_Ignore", "T_Incalloc", "T_Incmem", "T_Initalloc", "T_Initmem", + "T_Includefile", "T_Integer", "T_Interface", "T_Intrange", "T_Io", + "T_Ipv4", "T_Ipv4_flag", "T_Ipv6", "T_Ipv6_flag", "T_Kernel", "T_Key", + "T_Keys", "T_Keysdir", "T_Kod", "T_Mssntp", "T_Leapfile", "T_Limited", + "T_Link", "T_Listen", "T_Logconfig", "T_Logfile", "T_Loopstats", + "T_Lowpriotrap", "T_Manycastclient", "T_Manycastserver", "T_Mask", + "T_Maxage", "T_Maxclock", "T_Maxdepth", "T_Maxdist", "T_Maxmem", + "T_Maxpoll", "T_Mem", "T_Memlock", "T_Minclock", "T_Mindepth", + "T_Mindist", "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Mode7", + "T_Monitor", "T_Month", "T_Mru", "T_Multicastclient", "T_Nic", + "T_Nolink", "T_Nomodify", "T_Nomrulist", "T_None", "T_Nonvolatile", + "T_Nopeer", "T_Noquery", "T_Noselect", "T_Noserve", "T_Notrap", + "T_Notrust", "T_Ntp", "T_Ntpport", "T_NtpSignDsocket", "T_Orphan", + "T_Orphanwait", "T_Panic", "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", + "T_Pidfile", "T_Pool", "T_Port", "T_Preempt", "T_Prefer", "T_Protostats", + "T_Pw", "T_Randfile", "T_Rawstats", "T_Refid", "T_Requestkey", "T_Reset", + "T_Restrict", "T_Revoke", "T_Rlimit", "T_Saveconfigdir", "T_Server", + "T_Setvar", "T_Source", "T_Stacksize", "T_Statistics", "T_Stats", + "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", "T_Sys", + "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timer", "T_Timingstats", + "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", + "T_Type", "T_U_int", "T_Unconfig", "T_Unpeer", "T_Version", + "T_WanderThreshold", "T_Week", "T_Wildcard", "T_Xleave", "T_Year", + "T_Flag", "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", + "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", "T_Jitter", + "T_Prop_Delay", "T_Proc_Delay", "'='", "'('", "')'", "'{'", "'}'", + "$accept", "configuration", "command_list", "command", "server_command", + "client_type", "address", "ip_address", "address_fam", "option_list", + "option", "option_flag", "option_flag_keyword", "option_int", + "option_int_keyword", "option_str", "option_str_keyword", + "unpeer_command", "unpeer_keyword", "other_mode_command", + "authentication_command", "crypto_command_list", "crypto_command", + "crypto_str_keyword", "orphan_mode_command", "tos_option_list", + "tos_option", "tos_option_int_keyword", "tos_option_dbl_keyword", + "monitoring_command", "stats_list", "stat", "filegen_option_list", + "filegen_option", "link_nolink", "enable_disable", "filegen_type", + "access_control_command", "ac_flag_list", "access_control_flag", + "discard_option_list", "discard_option", "discard_option_keyword", + "mru_option_list", "mru_option", "mru_option_keyword", "fudge_command", + "fudge_factor_list", "fudge_factor", "fudge_factor_dbl_keyword", + "fudge_factor_bool_keyword", "rlimit_command", "rlimit_option_list", + "rlimit_option", "rlimit_option_keyword", "system_option_command", + "system_option_list", "system_option", "system_option_flag_keyword", + "system_option_local_flag_keyword", "tinker_command", + "tinker_option_list", "tinker_option", "tinker_option_keyword", + "miscellaneous_command", "misc_cmd_dbl_keyword", "misc_cmd_str_keyword", + "misc_cmd_str_lcl_keyword", "drift_parm", "variable_assign", + "t_default_or_zero", "trap_option_list", "trap_option", + "log_config_list", "log_config_command", "interface_command", + "interface_nic", "nic_rule_class", "nic_rule_action", "reset_command", + "counter_set_list", "counter_set_keyword", "integer_list", + "integer_list_range", "integer_list_range_elt", "integer_range", + "string_list", "address_list", "boolean", "number", "simulate_command", + "sim_conf_start", "sim_init_statement_list", "sim_init_statement", + "sim_init_keyword", "sim_server_list", "sim_server", "sim_server_offset", + "sim_server_name", "sim_act_list", "sim_act", "sim_act_stmt_list", + "sim_act_stmt", "sim_act_keyword", YY_NULLPTR +}; #endif -#define YYINITSTACKSIZE 500 +# ifdef YYPRINT +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, + 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, + 435, 436, 437, 438, 439, 440, 441, 442, 443, 61, + 40, 41, 123, 125 +}; +# endif + +#define YYPACT_NINF -178 + +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-178))) + +#define YYTABLE_NINF -7 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int16 yypact[] = +{ + 26, -153, -30, -178, -178, -178, -28, -178, 166, 18, + -109, 166, -178, 200, -47, -178, -102, -178, -96, -93, + -178, -89, -178, -178, -47, 330, -47, -178, -178, -85, + -178, -76, -178, -178, 20, -2, 45, 22, -22, -178, + -178, -67, 200, -65, -178, 107, 520, -63, -53, 35, + -178, -178, -178, 46, 203, -94, -178, -47, -178, -47, + -178, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -21, -55, -54, -178, 4, -178, -178, -77, -178, -178, + -178, 158, -178, -178, -178, -178, -178, -178, -178, -178, + 166, -178, -178, -178, -178, -178, -178, 18, -178, 47, + 84, -178, 166, -178, -178, -178, -178, -178, -178, -178, + -178, -178, -178, -178, -178, 49, -178, -33, 361, -178, + -178, -178, -89, -178, -178, -47, -178, -178, -178, -178, + -178, -178, -178, -178, 330, -178, 58, -47, -178, -178, + -31, -178, -178, -178, -178, -178, -178, -178, -178, -2, + -178, -178, 94, 98, -178, -178, 43, -178, -178, -178, + -178, -22, -178, 68, -57, -178, 200, -178, -178, -178, + -178, -178, -178, -178, -178, -178, -178, 107, -178, -21, + -178, -178, -25, -178, -178, -178, -178, -178, -178, -178, + -178, 520, -178, 75, -21, -178, -178, 86, -53, -178, + -178, -178, 87, -178, -19, -178, -178, -178, -178, -178, + -178, -178, -178, -178, -178, -178, 3, -107, -178, -178, + -178, -178, -178, 88, -178, 7, -178, -178, -178, -178, + -5, 8, -178, -178, -178, -178, 23, 111, -178, -178, + 49, -178, -21, -25, -178, -178, -178, -178, -178, -178, + -178, -178, 482, -178, -178, 482, 482, -63, -178, -178, + 28, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -178, -46, 144, -178, -178, -178, 416, -178, -178, -178, + -178, -178, -178, -178, -178, -127, 5, 10, -178, -178, + -178, -178, 40, -178, -178, 24, -178, -178, -178, -178, + -178, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -178, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -178, 482, 482, -178, 167, -63, 142, -178, 143, -178, + -178, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -178, -178, -178, -178, -178, -178, -178, -178, -51, -178, + 57, 27, 34, -117, -178, 29, -178, -21, -178, -178, + -178, -178, -178, -178, -178, -178, -178, 482, -178, -178, + -178, -178, 32, -178, -178, -178, -47, -178, -178, -178, + 33, -178, -178, -178, 38, 52, -21, 39, -146, -178, + 59, -21, -178, -178, -178, 50, -44, -178, -178, -178, + -178, -178, 60, 63, 41, -178, 71, -178, -21, -178, + -178 +}; + + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 0, 0, 0, 24, 58, 227, 0, 70, 0, 0, + 237, 0, 220, 0, 0, 230, 0, 250, 0, 0, + 231, 0, 233, 25, 0, 0, 0, 251, 228, 0, + 23, 0, 232, 22, 0, 0, 0, 0, 0, 234, + 21, 0, 0, 0, 229, 0, 0, 0, 0, 0, + 56, 57, 286, 0, 2, 0, 7, 0, 8, 0, + 9, 10, 13, 11, 12, 14, 15, 16, 17, 18, + 0, 0, 0, 214, 0, 215, 19, 0, 5, 61, + 62, 63, 194, 195, 196, 197, 200, 198, 199, 201, + 189, 191, 192, 193, 153, 154, 155, 125, 151, 0, + 235, 221, 188, 100, 101, 102, 103, 107, 104, 105, + 106, 108, 29, 30, 28, 0, 26, 0, 6, 64, + 65, 247, 222, 246, 279, 59, 159, 160, 161, 162, + 163, 164, 165, 166, 126, 157, 0, 60, 69, 277, + 223, 66, 262, 263, 264, 265, 266, 267, 268, 259, + 261, 133, 29, 30, 133, 133, 26, 67, 187, 185, + 186, 181, 183, 0, 0, 224, 95, 99, 96, 206, + 207, 208, 209, 210, 211, 212, 213, 202, 204, 0, + 90, 85, 0, 86, 94, 92, 93, 91, 89, 87, + 88, 79, 81, 0, 0, 241, 273, 0, 68, 272, + 274, 270, 226, 1, 0, 4, 31, 55, 284, 283, + 216, 217, 218, 258, 257, 256, 0, 0, 78, 74, + 75, 76, 77, 0, 71, 0, 190, 150, 152, 236, + 97, 0, 177, 178, 179, 180, 0, 0, 175, 176, + 167, 169, 0, 0, 27, 219, 245, 278, 156, 158, + 276, 260, 129, 133, 133, 132, 127, 0, 182, 184, + 0, 98, 203, 205, 282, 280, 281, 84, 80, 82, + 83, 225, 0, 271, 269, 3, 20, 252, 253, 254, + 249, 255, 248, 290, 291, 0, 0, 0, 73, 72, + 117, 116, 0, 114, 115, 0, 109, 112, 113, 173, + 174, 172, 168, 170, 171, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 134, 130, 131, 133, 240, 0, 0, 242, 0, 37, + 38, 39, 54, 47, 49, 48, 51, 40, 41, 42, + 43, 50, 52, 44, 32, 33, 36, 34, 0, 35, + 0, 0, 0, 0, 293, 0, 288, 0, 110, 124, + 120, 122, 118, 119, 121, 123, 111, 128, 239, 238, + 244, 243, 0, 45, 46, 53, 0, 287, 285, 292, + 0, 289, 275, 296, 0, 0, 0, 0, 0, 298, + 0, 0, 294, 297, 295, 0, 0, 303, 304, 305, + 306, 307, 0, 0, 0, 299, 0, 301, 0, 300, + 302 +}; + + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -178, -178, -178, -40, -178, -178, -14, -35, -178, -178, + -178, -178, -178, -178, -178, -178, -178, -178, -178, -178, + -178, -178, -178, -178, -178, -178, 64, -178, -178, -178, + -178, -32, -178, -178, -178, -178, -178, -178, -151, -178, + -178, 141, -178, -178, 116, -178, -178, -178, 11, -178, + -178, -178, -178, 93, -178, -178, 248, -69, -178, -178, + -178, -178, 83, -178, -178, -178, -178, -178, -178, -178, + -178, -178, -178, -178, 139, -178, -178, -178, -178, -178, + -178, 119, -178, -178, 67, -178, -178, 243, 36, -177, + -178, -178, -178, -15, -178, -178, -82, -178, -178, -178, + -116, -178, -126, -178 +}; + + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 53, 54, 55, 56, 57, 124, 116, 117, 276, + 344, 345, 346, 347, 348, 349, 350, 58, 59, 60, + 61, 81, 224, 225, 62, 191, 192, 193, 194, 63, + 166, 111, 230, 296, 297, 298, 366, 64, 252, 320, + 97, 98, 99, 134, 135, 136, 65, 240, 241, 242, + 243, 66, 161, 162, 163, 67, 90, 91, 92, 93, + 68, 177, 178, 179, 69, 70, 71, 72, 101, 165, + 369, 271, 327, 122, 123, 73, 74, 282, 216, 75, + 149, 150, 202, 198, 199, 200, 140, 125, 267, 210, + 76, 77, 285, 286, 287, 353, 354, 385, 355, 388, + 389, 402, 403, 404 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_int16 yytable[] = +{ + 115, 156, 263, 255, 256, 142, 143, 196, 277, 373, + 167, 208, 195, 264, 204, 325, 351, 270, 112, 158, + 113, 226, 155, 144, 290, 78, 351, 1, 359, 94, + 79, 291, 80, 226, 292, 265, 2, 387, 213, 209, + 3, 4, 5, 206, 100, 207, 203, 392, 6, 7, + 360, 118, 231, 283, 284, 8, 9, 119, 214, 10, + 120, 145, 11, 12, 121, 303, 13, 278, 138, 279, + 159, 293, 151, 283, 284, 14, 378, 139, 245, 15, + 141, 215, 157, 326, 205, 16, 164, 17, 168, 146, + 114, 232, 233, 234, 235, 201, 18, 19, 211, 212, + 20, 294, 321, 322, 21, 22, 114, 228, 23, 24, + 152, 247, 153, 169, 95, 217, 229, 374, 249, 96, + 244, 253, 250, 247, 160, 254, 361, 257, 259, 25, + 26, 27, 260, 362, 261, 269, 28, 197, 170, 266, + 397, 398, 399, 400, 401, 29, 272, 274, 288, 30, + 363, 31, 147, 32, 33, 171, 280, 148, 172, 275, + 289, 299, 295, 34, 35, 36, 37, 38, 39, 40, + 41, 301, 367, 42, 82, 43, 300, 281, 83, 328, + 381, 324, 44, 356, 84, 236, 218, 45, 46, 47, + 154, 48, 49, 358, 368, 50, 51, 364, 114, 357, + 365, 237, 371, 372, -6, 52, 238, 239, 219, 390, + 375, 220, 377, 2, 395, 384, 376, 3, 4, 5, + 103, 380, 323, 382, 104, 6, 7, 386, 391, 173, + 408, 410, 8, 9, 85, 387, 10, 394, 227, 11, + 12, 407, 396, 13, 397, 398, 399, 400, 401, 409, + 248, 302, 14, 405, 258, 268, 15, 174, 175, 102, + 262, 246, 16, 176, 17, 273, 86, 87, 251, 137, + 352, 379, 393, 18, 19, 0, 406, 20, 0, 304, + 105, 21, 22, 88, 0, 23, 24, 0, 0, 0, + 370, 221, 222, 0, 0, 0, 0, 0, 223, 0, + 0, 0, 0, 0, 0, 0, 25, 26, 27, 0, + 0, 0, 0, 28, 89, 0, 0, 0, 0, 0, + 0, 0, 29, 0, 106, 0, 30, 0, 31, 0, + 32, 33, 107, 0, 0, 108, 0, 0, 0, 0, + 34, 35, 36, 37, 38, 39, 40, 41, 0, 0, + 42, 0, 43, 0, 0, 109, 0, 0, 0, 44, + 110, 0, 383, 0, 45, 46, 47, 0, 48, 49, + 0, 2, 50, 51, 0, 3, 4, 5, 0, 0, + 0, -6, 52, 6, 7, 126, 127, 128, 129, 0, + 8, 9, 0, 0, 10, 0, 0, 11, 12, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, + 14, 0, 0, 0, 15, 130, 0, 131, 0, 132, + 16, 0, 17, 0, 133, 329, 0, 0, 0, 0, + 0, 18, 19, 330, 0, 20, 0, 0, 0, 21, + 22, 0, 0, 23, 24, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 25, 26, 27, 0, 331, 332, + 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, + 29, 0, 0, 0, 30, 333, 31, 0, 32, 33, + 0, 0, 0, 0, 0, 0, 0, 0, 34, 35, + 36, 37, 38, 39, 40, 41, 334, 0, 42, 0, + 43, 0, 0, 335, 0, 336, 0, 44, 0, 0, + 0, 0, 45, 46, 47, 0, 48, 49, 305, 337, + 50, 51, 0, 180, 0, 0, 306, 0, 0, 181, + 52, 182, 0, 0, 0, 0, 338, 339, 0, 0, + 0, 0, 0, 0, 307, 308, 0, 309, 0, 0, + 0, 0, 0, 310, 0, 0, 0, 183, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 340, 0, 341, 0, 0, 0, 0, 342, 0, 311, + 312, 343, 0, 313, 314, 0, 315, 316, 317, 0, + 318, 0, 0, 0, 0, 0, 184, 0, 185, 0, + 0, 0, 0, 186, 0, 187, 0, 0, 188, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 189, 190, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 319 +}; + +static const yytype_int16 yycheck[] = +{ + 14, 36, 179, 154, 155, 7, 8, 60, 5, 60, + 42, 32, 47, 38, 54, 61, 143, 194, 65, 41, + 67, 90, 36, 25, 29, 178, 143, 1, 4, 11, + 60, 36, 60, 102, 39, 60, 10, 183, 34, 60, + 14, 15, 16, 57, 153, 59, 0, 193, 22, 23, + 26, 153, 3, 180, 181, 29, 30, 153, 54, 33, + 153, 63, 36, 37, 153, 242, 40, 64, 153, 66, + 92, 76, 27, 180, 181, 49, 193, 153, 118, 53, + 60, 77, 60, 129, 178, 59, 153, 61, 153, 91, + 153, 42, 43, 44, 45, 60, 70, 71, 153, 153, + 74, 106, 253, 254, 78, 79, 153, 60, 82, 83, + 65, 125, 67, 6, 96, 192, 32, 168, 60, 101, + 153, 27, 153, 137, 146, 27, 102, 84, 60, 103, + 104, 105, 189, 109, 166, 60, 110, 190, 31, 164, + 184, 185, 186, 187, 188, 119, 60, 60, 60, 123, + 126, 125, 154, 127, 128, 48, 153, 159, 51, 178, + 153, 153, 167, 137, 138, 139, 140, 141, 142, 143, + 144, 60, 323, 147, 8, 149, 153, 174, 12, 35, + 357, 153, 156, 178, 18, 136, 28, 161, 162, 163, + 145, 165, 166, 153, 27, 169, 170, 173, 153, 189, + 176, 152, 60, 60, 178, 179, 157, 158, 50, 386, + 153, 53, 178, 10, 391, 182, 189, 14, 15, 16, + 20, 192, 257, 191, 24, 22, 23, 189, 189, 122, + 189, 408, 29, 30, 68, 183, 33, 178, 97, 36, + 37, 178, 192, 40, 184, 185, 186, 187, 188, 178, + 134, 240, 49, 193, 161, 191, 53, 150, 151, 11, + 177, 122, 59, 156, 61, 198, 100, 101, 149, 26, + 285, 353, 388, 70, 71, -1, 402, 74, -1, 243, + 80, 78, 79, 117, -1, 82, 83, -1, -1, -1, + 325, 133, 134, -1, -1, -1, -1, -1, 140, -1, + -1, -1, -1, -1, -1, -1, 103, 104, 105, -1, + -1, -1, -1, 110, 148, -1, -1, -1, -1, -1, + -1, -1, 119, -1, 124, -1, 123, -1, 125, -1, + 127, 128, 132, -1, -1, 135, -1, -1, -1, -1, + 137, 138, 139, 140, 141, 142, 143, 144, -1, -1, + 147, -1, 149, -1, -1, 155, -1, -1, -1, 156, + 160, -1, 376, -1, 161, 162, 163, -1, 165, 166, + -1, 10, 169, 170, -1, 14, 15, 16, -1, -1, + -1, 178, 179, 22, 23, 55, 56, 57, 58, -1, + 29, 30, -1, -1, 33, -1, -1, 36, 37, -1, + -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, + 49, -1, -1, -1, 53, 85, -1, 87, -1, 89, + 59, -1, 61, -1, 94, 9, -1, -1, -1, -1, + -1, 70, 71, 17, -1, 74, -1, -1, -1, 78, + 79, -1, -1, 82, 83, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 103, 104, 105, -1, 52, 53, + -1, 110, -1, -1, -1, -1, -1, -1, -1, -1, + 119, -1, -1, -1, 123, 69, 125, -1, 127, 128, + -1, -1, -1, -1, -1, -1, -1, -1, 137, 138, + 139, 140, 141, 142, 143, 144, 90, -1, 147, -1, + 149, -1, -1, 97, -1, 99, -1, 156, -1, -1, + -1, -1, 161, 162, 163, -1, 165, 166, 46, 113, + 169, 170, -1, 13, -1, -1, 54, -1, -1, 19, + 179, 21, -1, -1, -1, -1, 130, 131, -1, -1, + -1, -1, -1, -1, 72, 73, -1, 75, -1, -1, + -1, -1, -1, 81, -1, -1, -1, 47, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 164, -1, 166, -1, -1, -1, -1, 171, -1, 107, + 108, 175, -1, 111, 112, -1, 114, 115, 116, -1, + 118, -1, -1, -1, -1, -1, 86, -1, 88, -1, + -1, -1, -1, 93, -1, 95, -1, -1, 98, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 120, 121, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 171 +}; + + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint16 yystos[] = +{ + 0, 1, 10, 14, 15, 16, 22, 23, 29, 30, + 33, 36, 37, 40, 49, 53, 59, 61, 70, 71, + 74, 78, 79, 82, 83, 103, 104, 105, 110, 119, + 123, 125, 127, 128, 137, 138, 139, 140, 141, 142, + 143, 144, 147, 149, 156, 161, 162, 163, 165, 166, + 169, 170, 179, 195, 196, 197, 198, 199, 211, 212, + 213, 214, 218, 223, 231, 240, 245, 249, 254, 258, + 259, 260, 261, 269, 270, 273, 284, 285, 178, 60, + 60, 215, 8, 12, 18, 68, 100, 101, 117, 148, + 250, 251, 252, 253, 11, 96, 101, 234, 235, 236, + 153, 262, 250, 20, 24, 80, 124, 132, 135, 155, + 160, 225, 65, 67, 153, 200, 201, 202, 153, 153, + 153, 153, 267, 268, 200, 281, 55, 56, 57, 58, + 85, 87, 89, 94, 237, 238, 239, 281, 153, 153, + 280, 60, 7, 8, 25, 63, 91, 154, 159, 274, + 275, 27, 65, 67, 145, 200, 201, 60, 41, 92, + 146, 246, 247, 248, 153, 263, 224, 225, 153, 6, + 31, 48, 51, 122, 150, 151, 156, 255, 256, 257, + 13, 19, 21, 47, 86, 88, 93, 95, 98, 120, + 121, 219, 220, 221, 222, 201, 60, 190, 277, 278, + 279, 60, 276, 0, 197, 178, 200, 200, 32, 60, + 283, 153, 153, 34, 54, 77, 272, 192, 28, 50, + 53, 133, 134, 140, 216, 217, 251, 235, 60, 32, + 226, 3, 42, 43, 44, 45, 136, 152, 157, 158, + 241, 242, 243, 244, 153, 197, 268, 200, 238, 60, + 153, 275, 232, 27, 27, 232, 232, 84, 247, 60, + 189, 225, 256, 283, 38, 60, 164, 282, 220, 60, + 283, 265, 60, 278, 60, 178, 203, 5, 64, 66, + 153, 174, 271, 180, 181, 286, 287, 288, 60, 153, + 29, 36, 39, 76, 106, 167, 227, 228, 229, 153, + 153, 60, 242, 283, 282, 46, 54, 72, 73, 75, + 81, 107, 108, 111, 112, 114, 115, 116, 118, 171, + 233, 232, 232, 201, 153, 61, 129, 266, 35, 9, + 17, 52, 53, 69, 90, 97, 99, 113, 130, 131, + 164, 166, 171, 175, 204, 205, 206, 207, 208, 209, + 210, 143, 287, 289, 290, 292, 178, 189, 153, 4, + 26, 102, 109, 126, 173, 176, 230, 232, 27, 264, + 201, 60, 60, 60, 168, 153, 189, 178, 193, 290, + 192, 283, 191, 200, 182, 291, 189, 183, 293, 294, + 283, 189, 193, 294, 178, 283, 192, 184, 185, 186, + 187, 188, 295, 296, 297, 193, 296, 178, 189, 178, + 283 +}; + + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint16 yyr1[] = +{ + 0, 194, 195, 196, 196, 196, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 198, 199, 199, 199, 199, 199, 200, 200, 201, 202, + 202, 203, 203, 204, 204, 204, 205, 206, 206, 206, + 206, 206, 206, 206, 206, 207, 207, 208, 208, 208, + 208, 208, 208, 209, 210, 211, 212, 212, 213, 213, + 213, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 215, 215, 216, 216, 217, 217, 217, 217, 217, 218, + 219, 219, 220, 220, 220, 221, 221, 221, 221, 221, + 221, 222, 222, 222, 222, 223, 223, 223, 224, 224, + 225, 225, 225, 225, 225, 225, 225, 225, 226, 226, + 227, 227, 227, 227, 228, 228, 229, 229, 230, 230, + 230, 230, 230, 230, 230, 231, 231, 231, 231, 231, + 231, 231, 231, 232, 232, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 234, 234, 235, 236, 236, 236, 237, 237, 238, 239, + 239, 239, 239, 239, 239, 239, 239, 240, 241, 241, + 242, 242, 242, 242, 242, 243, 243, 244, 244, 244, + 244, 245, 246, 246, 247, 248, 248, 248, 249, 249, + 250, 250, 251, 251, 252, 252, 252, 252, 252, 252, + 253, 253, 254, 255, 255, 256, 257, 257, 257, 257, + 257, 257, 257, 257, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 259, 259, 259, + 260, 260, 260, 261, 261, 262, 262, 262, 263, 264, + 264, 265, 265, 266, 266, 267, 267, 268, 269, 269, + 270, 270, 271, 271, 271, 271, 272, 272, 272, 273, + 274, 274, 275, 275, 275, 275, 275, 275, 275, 276, + 276, 277, 277, 278, 278, 279, 280, 280, 281, 281, + 282, 282, 282, 283, 283, 284, 285, 286, 286, 287, + 288, 288, 289, 289, 290, 291, 292, 293, 293, 294, + 295, 295, 296, 297, 297, 297, 297, 297 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 3, 2, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, + 1, 1, 1, 2, 1, 2, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 0, 2, 2, 2, 1, 1, 1, 1, 1, 2, + 2, 1, 2, 2, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 3, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, + 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 3, 5, 3, + 4, 4, 3, 0, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 1, 2, 1, 1, 1, 2, 1, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 2, 1, + 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, + 1, 2, 2, 1, 2, 1, 1, 1, 2, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 1, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, + 1, 2, 2, 2, 2, 3, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 0, 4, 1, + 0, 0, 2, 2, 2, 2, 1, 1, 3, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 1, 2, 1, 1, 1, 5, 2, 1, 2, 1, + 1, 1, 1, 1, 1, 5, 1, 3, 2, 3, + 1, 1, 2, 1, 5, 4, 3, 2, 1, 6, + 3, 2, 3, 1, 1, 1, 1, 1 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (ip_file, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (0) + +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 + + + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif + + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, ip_file); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ + +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct FILE_INFO *ip_file) +{ + FILE *yyo = yyoutput; + YYUSE (yyo); + YYUSE (ip_file); + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + YYUSE (yytype); +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct FILE_INFO *ip_file) +{ + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep, ip_file); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +static void +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +{ + YYFPRINTF (stderr, "Stack now"); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +static void +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, struct FILE_INFO *ip_file) +{ + unsigned long int yylno = yyrline[yyrule]; + int yynrhs = yyr2[yyrule]; + int yyi; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , ip_file); + YYFPRINTF (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule, ip_file); \ +} while (0) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +static YYSIZE_T +yystrlen (const char *yystr) +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +yystpcpy (char *yydest, const char *yysrc) +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } + } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; +} +#endif /* YYERROR_VERBOSE */ + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct FILE_INFO *ip_file) +{ + YYUSE (yyvaluep); + YYUSE (ip_file); + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END +} + + + + +/* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; +/* Number of syntax errors so far. */ +int yynerrs; + + +/*----------. +| yyparse. | +`----------*/ + +int +yyparse (struct FILE_INFO *ip_file) +{ + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + + /* The stacks and their tools: + 'yyss': related to states. + 'yyvs': related to semantic values. + + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken = 0; + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yystacksize = YYINITDEPTH; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + + /* Do appropriate processing given the current state. Read a + lookahead token if we need one and don't already have one. */ + + /* First try to decide what to do without reference to lookahead token. */ + yyn = yypact[yystate]; + if (yypact_value_is_default (yyn)) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = yylex (ip_file); + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yytable_value_is_error (yyn)) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + /* Shift the lookahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token. */ + yychar = YYEMPTY; + + yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + '$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 5: +#line 370 "ntp_parser.y" /* yacc.c:1646 */ + { + /* I will need to incorporate much more fine grained + * error messages. The following should suffice for + * the time being. + */ + msyslog(LOG_ERR, + "syntax error in %s line %d, column %d", + ip_file->fname, + ip_file->err_line_no, + ip_file->err_col_no); + } +#line 2093 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 20: +#line 405 "ntp_parser.y" /* yacc.c:1646 */ + { + peer_node *my_node; + + my_node = create_peer_node((yyvsp[-2].Integer), (yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); + APPEND_G_FIFO(cfgt.peers, my_node); + } +#line 2104 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 27: +#line 424 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = create_address_node((yyvsp[0].String), (yyvsp[-1].Integer)); } +#line 2110 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 28: +#line 429 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = create_address_node((yyvsp[0].String), AF_UNSPEC); } +#line 2116 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 29: +#line 434 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Integer) = AF_INET; } +#line 2122 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 30: +#line 436 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Integer) = AF_INET6; } +#line 2128 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 31: +#line 441 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val_fifo) = NULL; } +#line 2134 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 32: +#line 443 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2143 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 36: +#line 457 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2149 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 45: +#line 473 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2155 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 46: +#line 475 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_uval((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2161 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 53: +#line 489 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2167 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 55: +#line 503 "ntp_parser.y" /* yacc.c:1646 */ + { + unpeer_node *my_node; + + my_node = create_unpeer_node((yyvsp[0].Address_node)); + if (my_node) + APPEND_G_FIFO(cfgt.unpeers, my_node); + } +#line 2179 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 58: +#line 524 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.broadcastclient = 1; } +#line 2185 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 59: +#line 526 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[0].Address_fifo)); } +#line 2191 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 60: +#line 528 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[0].Address_fifo)); } +#line 2197 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 61: +#line 539 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *atrv; + + atrv = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); + APPEND_G_FIFO(cfgt.vars, atrv); + } +#line 2208 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 62: +#line 546 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.control_key = (yyvsp[0].Integer); } +#line 2214 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 63: +#line 548 "ntp_parser.y" /* yacc.c:1646 */ + { + cfgt.auth.cryptosw++; + CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[0].Attr_val_fifo)); + } +#line 2223 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 64: +#line 553 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.keys = (yyvsp[0].String); } +#line 2229 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 65: +#line 555 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.keysdir = (yyvsp[0].String); } +#line 2235 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 66: +#line 557 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.request_key = (yyvsp[0].Integer); } +#line 2241 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 67: +#line 559 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.revoke = (yyvsp[0].Integer); } +#line 2247 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 68: +#line 561 "ntp_parser.y" /* yacc.c:1646 */ + { + cfgt.auth.trusted_key_list = (yyvsp[0].Attr_val_fifo); + + // if (!cfgt.auth.trusted_key_list) + // cfgt.auth.trusted_key_list = $2; + // else + // LINK_SLIST(cfgt.auth.trusted_key_list, $2, link); + } +#line 2260 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 69: +#line 570 "ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.ntp_signd_socket = (yyvsp[0].String); } +#line 2266 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 70: +#line 575 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val_fifo) = NULL; } +#line 2272 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 71: +#line 577 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2281 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 72: +#line 585 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2287 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 73: +#line 587 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val) = NULL; + cfgt.auth.revoke = (yyvsp[0].Integer); + msyslog(LOG_WARNING, + "'crypto revoke %d' is deprecated, " + "please use 'revoke %d' instead.", + cfgt.auth.revoke, cfgt.auth.revoke); + } +#line 2300 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 79: +#line 612 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[0].Attr_val_fifo)); } +#line 2306 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 80: +#line 617 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2315 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 81: +#line 622 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2324 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 82: +#line 630 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } +#line 2330 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 83: +#line 632 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2336 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 84: +#line 634 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } +#line 2342 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 95: +#line 660 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[0].Int_fifo)); } +#line 2348 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 96: +#line 662 "ntp_parser.y" /* yacc.c:1646 */ + { + if (input_from_file) { + cfgt.stats_dir = (yyvsp[0].String); + } else { + YYFREE((yyvsp[0].String)); + yyerror(ip_file, "statsdir remote configuration ignored"); + } + } +#line 2361 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 97: +#line 671 "ntp_parser.y" /* yacc.c:1646 */ + { + filegen_node *fgn; + + fgn = create_filegen_node((yyvsp[-1].Integer), (yyvsp[0].Attr_val_fifo)); + APPEND_G_FIFO(cfgt.filegen_opts, fgn); + } +#line 2372 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 98: +#line 681 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 2381 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 99: +#line 686 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Int_fifo) = NULL; + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 2390 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 108: +#line 705 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val_fifo) = NULL; } +#line 2396 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 109: +#line 707 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2405 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 110: +#line 715 "ntp_parser.y" /* yacc.c:1646 */ + { + if (input_from_file) { + (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + } else { + (yyval.Attr_val) = NULL; + YYFREE((yyvsp[0].String)); + yyerror(ip_file, "filegen file remote config ignored"); + } + } +#line 2419 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 111: +#line 725 "ntp_parser.y" /* yacc.c:1646 */ + { + if (input_from_file) { + (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); + } else { + (yyval.Attr_val) = NULL; + yyerror(ip_file, "filegen type remote config ignored"); + } + } +#line 2432 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 112: +#line 734 "ntp_parser.y" /* yacc.c:1646 */ + { + const char *err; + + if (input_from_file) { + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); + } else { + (yyval.Attr_val) = NULL; + if (T_Link == (yyvsp[0].Integer)) + err = "filegen link remote config ignored"; + else + err = "filegen nolink remote config ignored"; + yyerror(ip_file, err); + } + } +#line 2451 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 113: +#line 749 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2457 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 125: +#line 779 "ntp_parser.y" /* yacc.c:1646 */ + { + CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[0].Attr_val_fifo)); + } +#line 2465 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 126: +#line 783 "ntp_parser.y" /* yacc.c:1646 */ + { + CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[0].Attr_val_fifo)); + } +#line 2473 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 127: +#line 787 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node *rn; + + rn = create_restrict_node((yyvsp[-1].Address_node), NULL, (yyvsp[0].Int_fifo), + ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2485 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 128: +#line 795 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node *rn; + + rn = create_restrict_node((yyvsp[-3].Address_node), (yyvsp[-1].Address_node), (yyvsp[0].Int_fifo), + ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2497 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 129: +#line 803 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node *rn; + + rn = create_restrict_node(NULL, NULL, (yyvsp[0].Int_fifo), + ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2509 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 130: +#line 811 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node *rn; + + rn = create_restrict_node( + create_address_node( + estrdup("0.0.0.0"), + AF_INET), + create_address_node( + estrdup("0.0.0.0"), + AF_INET), + (yyvsp[0].Int_fifo), + ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2528 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 131: +#line 826 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node *rn; + + rn = create_restrict_node( + create_address_node( + estrdup("::"), + AF_INET6), + create_address_node( + estrdup("::"), + AF_INET6), + (yyvsp[0].Int_fifo), + ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2547 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 132: +#line 841 "ntp_parser.y" /* yacc.c:1646 */ + { + restrict_node * rn; + + APPEND_G_FIFO((yyvsp[0].Int_fifo), create_int_node((yyvsp[-1].Integer))); + rn = create_restrict_node( + NULL, NULL, (yyvsp[0].Int_fifo), ip_file->line_no); + APPEND_G_FIFO(cfgt.restrict_opts, rn); + } +#line 2560 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 133: +#line 853 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Int_fifo) = NULL; } +#line 2566 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 134: +#line 855 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 2575 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 150: +#line 881 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2584 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 151: +#line 886 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2593 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 152: +#line 894 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2599 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 156: +#line 905 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2608 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 157: +#line 910 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2617 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 158: +#line 918 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2623 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 167: +#line 938 "ntp_parser.y" /* yacc.c:1646 */ + { + addr_opts_node *aon; + + aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); + APPEND_G_FIFO(cfgt.fudge, aon); + } +#line 2634 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 168: +#line 948 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2643 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 169: +#line 953 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2652 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 170: +#line 961 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2658 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 171: +#line 963 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2664 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 172: +#line 965 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2670 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 173: +#line 967 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2676 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 174: +#line 969 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2682 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 181: +#line 990 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[0].Attr_val_fifo)); } +#line 2688 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 182: +#line 995 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2697 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 183: +#line 1000 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2706 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 184: +#line 1008 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2712 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 188: +#line 1024 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2718 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 189: +#line 1026 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2724 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 190: +#line 1031 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2733 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 191: +#line 1036 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2742 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 192: +#line 1044 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2748 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 193: +#line 1046 "ntp_parser.y" /* yacc.c:1646 */ + { + if (input_from_file) { + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); + } else { + char err_str[128]; + + (yyval.Attr_val) = NULL; + snprintf(err_str, sizeof(err_str), + "enable/disable %s remote configuration ignored", + keyword((yyvsp[0].Integer))); + yyerror(ip_file, err_str); + } + } +#line 2766 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 202: +#line 1081 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[0].Attr_val_fifo)); } +#line 2772 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 203: +#line 1086 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2781 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 204: +#line 1091 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2790 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 205: +#line 1099 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2796 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 216: +#line 1122 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *av; + + av = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); + APPEND_G_FIFO(cfgt.vars, av); + } +#line 2807 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 217: +#line 1129 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *av; + + av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + APPEND_G_FIFO(cfgt.vars, av); + } +#line 2818 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 218: +#line 1136 "ntp_parser.y" /* yacc.c:1646 */ + { + char error_text[64]; + attr_val *av; + + if (input_from_file) { + av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); + APPEND_G_FIFO(cfgt.vars, av); + } else { + YYFREE((yyvsp[0].String)); + snprintf(error_text, sizeof(error_text), + "%s remote config ignored", + keyword((yyvsp[-1].Integer))); + yyerror(ip_file, error_text); + } + } +#line 2838 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 219: +#line 1152 "ntp_parser.y" /* yacc.c:1646 */ + { + if (!input_from_file) { + yyerror(ip_file, "remote includefile ignored"); + break; + } + if (curr_include_level >= MAXINCLUDELEVEL) { + fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); + msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded."); + } else { + fp[curr_include_level + 1] = F_OPEN(FindConfig((yyvsp[-1].String)), "r"); + if (fp[curr_include_level + 1] == NULL) { + fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig((yyvsp[-1].String))); + msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[-1].String))); + } else { + ip_file = fp[++curr_include_level]; + } + } + } +#line 2861 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 220: +#line 1171 "ntp_parser.y" /* yacc.c:1646 */ + { + while (curr_include_level != -1) + FCLOSE(fp[curr_include_level--]); + } +#line 2870 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 221: +#line 1176 "ntp_parser.y" /* yacc.c:1646 */ + { /* see drift_parm below for actions */ } +#line 2876 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 222: +#line 1178 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[0].Attr_val_fifo)); } +#line 2882 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 223: +#line 1180 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[0].String_fifo)); } +#line 2888 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 224: +#line 1182 "ntp_parser.y" /* yacc.c:1646 */ + { APPEND_G_FIFO(cfgt.setvar, (yyvsp[0].Set_var)); } +#line 2894 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 225: +#line 1184 "ntp_parser.y" /* yacc.c:1646 */ + { + addr_opts_node *aon; + + aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); + APPEND_G_FIFO(cfgt.trap, aon); + } +#line 2905 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 226: +#line 1191 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[0].Attr_val_fifo)); } +#line 2911 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 235: +#line 1213 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, (yyvsp[0].String)); + APPEND_G_FIFO(cfgt.vars, av); + } +#line 2922 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 236: +#line 1220 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, (yyvsp[-1].String)); + APPEND_G_FIFO(cfgt.vars, av); + av = create_attr_dval(T_WanderThreshold, (yyvsp[0].Double)); + APPEND_G_FIFO(cfgt.vars, av); + } +#line 2935 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 237: +#line 1229 "ntp_parser.y" /* yacc.c:1646 */ + { + attr_val *av; + + av = create_attr_sval(T_Driftfile, ""); + APPEND_G_FIFO(cfgt.vars, av); + } +#line 2946 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 238: +#line 1239 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Set_var) = create_setvar_node((yyvsp[-3].String), (yyvsp[-1].String), (yyvsp[0].Integer)); } +#line 2952 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 240: +#line 1245 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Integer) = 0; } +#line 2958 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 241: +#line 1250 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val_fifo) = NULL; } +#line 2964 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 242: +#line 1252 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2973 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 243: +#line 1260 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2979 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 244: +#line 1262 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), estrdup((yyvsp[0].Address_node)->address)); + destroy_address_node((yyvsp[0].Address_node)); + } +#line 2988 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 245: +#line 1270 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 2997 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 246: +#line 1275 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 3006 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 247: +#line 1283 "ntp_parser.y" /* yacc.c:1646 */ + { + char prefix; + char * type; + + switch ((yyvsp[0].String)[0]) { + + case '+': + case '-': + case '=': + prefix = (yyvsp[0].String)[0]; + type = (yyvsp[0].String) + 1; + break; + + default: + prefix = '='; + type = (yyvsp[0].String); + } + + (yyval.Attr_val) = create_attr_sval(prefix, estrdup(type)); + YYFREE((yyvsp[0].String)); + } +#line 3032 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 248: +#line 1308 "ntp_parser.y" /* yacc.c:1646 */ + { + nic_rule_node *nrn; + + nrn = create_nic_rule_node((yyvsp[0].Integer), NULL, (yyvsp[-1].Integer)); + APPEND_G_FIFO(cfgt.nic_rules, nrn); + } +#line 3043 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 249: +#line 1315 "ntp_parser.y" /* yacc.c:1646 */ + { + nic_rule_node *nrn; + + nrn = create_nic_rule_node(0, (yyvsp[0].String), (yyvsp[-1].Integer)); + APPEND_G_FIFO(cfgt.nic_rules, nrn); + } +#line 3054 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 259: +#line 1343 "ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[0].Int_fifo)); } +#line 3060 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 260: +#line 1348 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 3069 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 261: +#line 1353 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Int_fifo) = NULL; + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 3078 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 269: +#line 1377 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 3087 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 270: +#line 1382 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); + } +#line 3096 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 271: +#line 1390 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 3105 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 272: +#line 1395 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); + } +#line 3114 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 273: +#line 1403 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[0].Integer)); } +#line 3120 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 275: +#line 1409 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[-3].Integer), (yyvsp[-1].Integer)); } +#line 3126 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 276: +#line 1414 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.String_fifo) = (yyvsp[-1].String_fifo); + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); + } +#line 3135 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 277: +#line 1419 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.String_fifo) = NULL; + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); + } +#line 3144 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 278: +#line 1427 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Address_fifo) = (yyvsp[-1].Address_fifo); + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); + } +#line 3153 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 279: +#line 1432 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Address_fifo) = NULL; + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); + } +#line 3162 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 280: +#line 1440 "ntp_parser.y" /* yacc.c:1646 */ + { + if ((yyvsp[0].Integer) != 0 && (yyvsp[0].Integer) != 1) { + yyerror(ip_file, "Integer value is not boolean (0 or 1). Assuming 1"); + (yyval.Integer) = 1; + } else { + (yyval.Integer) = (yyvsp[0].Integer); + } + } +#line 3175 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 281: +#line 1448 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Integer) = 1; } +#line 3181 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 282: +#line 1449 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Integer) = 0; } +#line 3187 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 283: +#line 1453 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Double) = (double)(yyvsp[0].Integer); } +#line 3193 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 285: +#line 1464 "ntp_parser.y" /* yacc.c:1646 */ + { + sim_node *sn; + + sn = create_sim_node((yyvsp[-2].Attr_val_fifo), (yyvsp[-1].Sim_server_fifo)); + APPEND_G_FIFO(cfgt.sim_details, sn); + + /* Revert from ; to \n for end-of-command */ + old_config_style = 1; + } +#line 3207 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 286: +#line 1481 "ntp_parser.y" /* yacc.c:1646 */ + { old_config_style = 0; } +#line 3213 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 287: +#line 1486 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + } +#line 3222 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 288: +#line 1491 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + } +#line 3231 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 289: +#line 1499 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } +#line 3237 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 292: +#line 1509 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Sim_server_fifo) = (yyvsp[-1].Sim_server_fifo); + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); + } +#line 3246 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 293: +#line 1514 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Sim_server_fifo) = NULL; + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); + } +#line 3255 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 294: +#line 1522 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[-4].Address_node), (yyvsp[-2].Double), (yyvsp[-1].Sim_script_fifo))); } +#line 3261 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 295: +#line 1527 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Double) = (yyvsp[-1].Double); } +#line 3267 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 296: +#line 1532 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = (yyvsp[0].Address_node); } +#line 3273 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 297: +#line 1537 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Sim_script_fifo) = (yyvsp[-1].Sim_script_fifo); + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); + } +#line 3282 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 298: +#line 1542 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Sim_script_fifo) = NULL; + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); + } +#line 3291 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 299: +#line 1550 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[-3].Double), (yyvsp[-1].Attr_val_fifo))); } +#line 3297 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 300: +#line 1555 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + } +#line 3306 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 301: +#line 1560 "ntp_parser.y" /* yacc.c:1646 */ + { + (yyval.Attr_val_fifo) = NULL; + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); + } +#line 3315 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + case 302: +#line 1568 "ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } +#line 3321 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + break; + + +#line 3325 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ + default: break; + } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + + /* Now 'shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ +yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (ip_file, YY_("syntax error")); +#else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) + { + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (ip_file, yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + } +# undef YYSYNTAX_ERROR +#endif + } + + + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ + + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval, ip_file); + yychar = YYEMPTY; + } + } + + /* Else will try to reuse lookahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + /* Do not reclaim the symbols of the rule whose action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + + yydestruct ("Error: popping", + yystos[yystate], yyvsp, ip_file); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); + } + + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#if !defined yyoverflow || YYERROR_VERBOSE +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (ip_file, YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, ip_file); + } + /* Do not reclaim the symbols of the rule whose action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp, ip_file); + YYPOPSTACK (1); + } +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + return yyresult; +} +#line 1579 "ntp_parser.y" /* yacc.c:1906 */ -typedef struct { - unsigned stacksize; - short *s_base; - short *s_mark; - short *s_last; - YYSTYPE *l_base; - YYSTYPE *l_mark; -} YYSTACKDATA; -/* variables for the parser stack */ -static YYSTACKDATA yystack; -#line 1580 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" void yyerror( + struct FILE_INFO *ip_file, const char *msg ) { @@ -1091,1229 +3612,3 @@ int main(int argc, char *argv[]) } #endif -#line 1093 "ntp_parser.c" - -#if YYDEBUG -#include /* needed for printf */ -#endif - -#include /* needed for malloc, etc */ -#include /* needed for memset */ - -/* allocate initial stack or double stack size, up to YYMAXDEPTH */ -static int yygrowstack(YYSTACKDATA *data) -{ - int i; - unsigned newsize; - short *newss; - YYSTYPE *newvs; - - if ((newsize = data->stacksize) == 0) - newsize = YYINITSTACKSIZE; - else if (newsize >= YYMAXDEPTH) - return -1; - else if ((newsize *= 2) > YYMAXDEPTH) - newsize = YYMAXDEPTH; - - i = (int) (data->s_mark - data->s_base); - newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); - if (newss == 0) - return -1; - - data->s_base = newss; - data->s_mark = newss + i; - - newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs)); - if (newvs == 0) - return -1; - - data->l_base = newvs; - data->l_mark = newvs + i; - - data->stacksize = newsize; - data->s_last = data->s_base + newsize - 1; - return 0; -} - -#if YYPURE || defined(YY_NO_LEAKS) -static void yyfreestack(YYSTACKDATA *data) -{ - free(data->s_base); - free(data->l_base); - memset(data, 0, sizeof(*data)); -} -#else -#define yyfreestack(data) /* nothing */ -#endif - -#define YYABORT goto yyabort -#define YYREJECT goto yyabort -#define YYACCEPT goto yyaccept -#define YYERROR goto yyerrlab - -int -YYPARSE_DECL() -{ - int yym, yyn, yystate; -#if YYDEBUG - const char *yys; - - if ((yys = getenv("YYDEBUG")) != 0) - { - yyn = *yys; - if (yyn >= '0' && yyn <= '9') - yydebug = yyn - '0'; - } -#endif - - yynerrs = 0; - yyerrflag = 0; - yychar = YYEMPTY; - yystate = 0; - -#if YYPURE - memset(&yystack, 0, sizeof(yystack)); -#endif - - if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow; - yystack.s_mark = yystack.s_base; - yystack.l_mark = yystack.l_base; - yystate = 0; - *yystack.s_mark = 0; - -yyloop: - if ((yyn = yydefred[yystate]) != 0) goto yyreduce; - if (yychar < 0) - { - if ((yychar = YYLEX) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = yytname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - } - if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, shifting to state %d\n", - YYPREFIX, yystate, yytable[yyn]); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - yystate = yytable[yyn]; - *++yystack.s_mark = yytable[yyn]; - *++yystack.l_mark = yylval; - yychar = YYEMPTY; - if (yyerrflag > 0) --yyerrflag; - goto yyloop; - } - if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { - yyn = yytable[yyn]; - goto yyreduce; - } - if (yyerrflag) goto yyinrecovery; - - yyerror("syntax error"); - - goto yyerrlab; - -yyerrlab: - ++yynerrs; - -yyinrecovery: - if (yyerrflag < 3) - { - yyerrflag = 3; - for (;;) - { - if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, error recovery shifting\ - to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - yystate = yytable[yyn]; - *++yystack.s_mark = yytable[yyn]; - *++yystack.l_mark = yylval; - goto yyloop; - } - else - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: error recovery discarding state %d\n", - YYPREFIX, *yystack.s_mark); -#endif - if (yystack.s_mark <= yystack.s_base) goto yyabort; - --yystack.s_mark; - --yystack.l_mark; - } - } - } - else - { - if (yychar == 0) goto yyabort; -#if YYDEBUG - if (yydebug) - { - yys = yytname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, error recovery discards token %d (%s)\n", - YYPREFIX, yystate, yychar, yys); - } -#endif - yychar = YYEMPTY; - goto yyloop; - } - -yyreduce: -#if YYDEBUG - if (yydebug) - printf("%sdebug: state %d, reducing by rule %d (%s)\n", - YYPREFIX, yystate, yyn, yyrule[yyn]); -#endif - yym = yylen[yyn]; - if (yym) - yyval = yystack.l_mark[1-yym]; - else - memset(&yyval, 0, sizeof yyval); - switch (yyn) - { -case 4: -#line 368 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - /* I will need to incorporate much more fine grained - * error messages. The following should suffice for - * the time being. - */ - msyslog(LOG_ERR, - "syntax error in %s line %d, column %d", - ip_file->fname, - ip_file->err_line_no, - ip_file->err_col_no); - } -break; -case 19: -#line 403 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - peer_node *my_node; - - my_node = create_peer_node(yystack.l_mark[-2].Integer, yystack.l_mark[-1].Address_node, yystack.l_mark[0].Attr_val_fifo); - APPEND_G_FIFO(cfgt.peers, my_node); - } -break; -case 26: -#line 422 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Address_node = create_address_node(yystack.l_mark[0].String, yystack.l_mark[-1].Integer); } -break; -case 27: -#line 427 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Address_node = create_address_node(yystack.l_mark[0].String, AF_UNSPEC); } -break; -case 28: -#line 432 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Integer = AF_INET; } -break; -case 29: -#line 434 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Integer = AF_INET6; } -break; -case 30: -#line 439 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val_fifo = NULL; } -break; -case 31: -#line 441 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 35: -#line 455 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(T_Flag, yystack.l_mark[0].Integer); } -break; -case 44: -#line 471 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 45: -#line 473 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_uval(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 52: -#line 487 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); } -break; -case 54: -#line 501 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - unpeer_node *my_node; - - my_node = create_unpeer_node(yystack.l_mark[0].Address_node); - if (my_node) - APPEND_G_FIFO(cfgt.unpeers, my_node); - } -break; -case 57: -#line 522 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.broadcastclient = 1; } -break; -case 58: -#line 524 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.manycastserver, yystack.l_mark[0].Address_fifo); } -break; -case 59: -#line 526 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.multicastclient, yystack.l_mark[0].Address_fifo); } -break; -case 60: -#line 528 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.mdnstries = yystack.l_mark[0].Integer; } -break; -case 61: -#line 539 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *atrv; - - atrv = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); - APPEND_G_FIFO(cfgt.vars, atrv); - } -break; -case 62: -#line 546 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.control_key = yystack.l_mark[0].Integer; } -break; -case 63: -#line 548 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - cfgt.auth.cryptosw++; - CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, yystack.l_mark[0].Attr_val_fifo); - } -break; -case 64: -#line 553 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.keys = yystack.l_mark[0].String; } -break; -case 65: -#line 555 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.keysdir = yystack.l_mark[0].String; } -break; -case 66: -#line 557 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.request_key = yystack.l_mark[0].Integer; } -break; -case 67: -#line 559 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.revoke = yystack.l_mark[0].Integer; } -break; -case 68: -#line 561 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - cfgt.auth.trusted_key_list = yystack.l_mark[0].Attr_val_fifo; - - /* if (!cfgt.auth.trusted_key_list)*/ - /* cfgt.auth.trusted_key_list = $2;*/ - /* else*/ - /* LINK_SLIST(cfgt.auth.trusted_key_list, $2, link);*/ - } -break; -case 69: -#line 570 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { cfgt.auth.ntp_signd_socket = yystack.l_mark[0].String; } -break; -case 70: -#line 575 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val_fifo = NULL; } -break; -case 71: -#line 577 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 72: -#line 585 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); } -break; -case 73: -#line 587 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val = NULL; - cfgt.auth.revoke = yystack.l_mark[0].Integer; - msyslog(LOG_WARNING, - "'crypto revoke %d' is deprecated, " - "please use 'revoke %d' instead.", - cfgt.auth.revoke, cfgt.auth.revoke); - } -break; -case 79: -#line 612 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.orphan_cmds, yystack.l_mark[0].Attr_val_fifo); } -break; -case 80: -#line 617 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 81: -#line 622 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 82: -#line 630 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-1].Integer, (double)yystack.l_mark[0].Integer); } -break; -case 83: -#line 632 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-1].Integer, yystack.l_mark[0].Double); } -break; -case 84: -#line 634 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-1].Integer, (double)yystack.l_mark[0].Integer); } -break; -case 95: -#line 660 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.stats_list, yystack.l_mark[0].Int_fifo); } -break; -case 96: -#line 662 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (input_from_file) { - cfgt.stats_dir = yystack.l_mark[0].String; - } else { - YYFREE(yystack.l_mark[0].String); - yyerror("statsdir remote configuration ignored"); - } - } -break; -case 97: -#line 671 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - filegen_node *fgn; - - fgn = create_filegen_node(yystack.l_mark[-1].Integer, yystack.l_mark[0].Attr_val_fifo); - APPEND_G_FIFO(cfgt.filegen_opts, fgn); - } -break; -case 98: -#line 681 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Int_fifo = yystack.l_mark[-1].Int_fifo; - APPEND_G_FIFO(yyval.Int_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 99: -#line 686 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Int_fifo = NULL; - APPEND_G_FIFO(yyval.Int_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 108: -#line 705 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val_fifo = NULL; } -break; -case 109: -#line 707 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 110: -#line 715 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (input_from_file) { - yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); - } else { - yyval.Attr_val = NULL; - YYFREE(yystack.l_mark[0].String); - yyerror("filegen file remote config ignored"); - } - } -break; -case 111: -#line 725 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (input_from_file) { - yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); - } else { - yyval.Attr_val = NULL; - yyerror("filegen type remote config ignored"); - } - } -break; -case 112: -#line 734 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - const char *err; - - if (input_from_file) { - yyval.Attr_val = create_attr_ival(T_Flag, yystack.l_mark[0].Integer); - } else { - yyval.Attr_val = NULL; - if (T_Link == yystack.l_mark[0].Integer) - err = "filegen link remote config ignored"; - else - err = "filegen nolink remote config ignored"; - yyerror(err); - } - } -break; -case 113: -#line 749 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(T_Flag, yystack.l_mark[0].Integer); } -break; -case 125: -#line 779 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - CONCAT_G_FIFOS(cfgt.discard_opts, yystack.l_mark[0].Attr_val_fifo); - } -break; -case 126: -#line 783 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - CONCAT_G_FIFOS(cfgt.mru_opts, yystack.l_mark[0].Attr_val_fifo); - } -break; -case 127: -#line 787 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node *rn; - - rn = create_restrict_node(yystack.l_mark[-1].Address_node, NULL, yystack.l_mark[0].Int_fifo, - ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 128: -#line 795 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node *rn; - - rn = create_restrict_node(yystack.l_mark[-3].Address_node, yystack.l_mark[-1].Address_node, yystack.l_mark[0].Int_fifo, - ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 129: -#line 803 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node *rn; - - rn = create_restrict_node(NULL, NULL, yystack.l_mark[0].Int_fifo, - ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 130: -#line 811 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node *rn; - - rn = create_restrict_node( - create_address_node( - estrdup("0.0.0.0"), - AF_INET), - create_address_node( - estrdup("0.0.0.0"), - AF_INET), - yystack.l_mark[0].Int_fifo, - ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 131: -#line 826 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node *rn; - - rn = create_restrict_node( - create_address_node( - estrdup("::"), - AF_INET6), - create_address_node( - estrdup("::"), - AF_INET6), - yystack.l_mark[0].Int_fifo, - ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 132: -#line 841 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - restrict_node * rn; - - APPEND_G_FIFO(yystack.l_mark[0].Int_fifo, create_int_node(yystack.l_mark[-1].Integer)); - rn = create_restrict_node( - NULL, NULL, yystack.l_mark[0].Int_fifo, ip_file->line_no); - APPEND_G_FIFO(cfgt.restrict_opts, rn); - } -break; -case 133: -#line 853 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Int_fifo = NULL; } -break; -case 134: -#line 855 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Int_fifo = yystack.l_mark[-1].Int_fifo; - APPEND_G_FIFO(yyval.Int_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 150: -#line 881 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 151: -#line 886 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 152: -#line 894 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 156: -#line 905 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 157: -#line 910 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 158: -#line 918 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 167: -#line 938 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - addr_opts_node *aon; - - aon = create_addr_opts_node(yystack.l_mark[-1].Address_node, yystack.l_mark[0].Attr_val_fifo); - APPEND_G_FIFO(cfgt.fudge, aon); - } -break; -case 168: -#line 948 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 169: -#line 953 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 170: -#line 961 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-1].Integer, yystack.l_mark[0].Double); } -break; -case 171: -#line 963 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 172: -#line 965 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 173: -#line 967 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); } -break; -case 174: -#line 969 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); } -break; -case 181: -#line 990 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.rlimit, yystack.l_mark[0].Attr_val_fifo); } -break; -case 182: -#line 995 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 183: -#line 1000 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 184: -#line 1008 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 188: -#line 1024 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.enable_opts, yystack.l_mark[0].Attr_val_fifo); } -break; -case 189: -#line 1026 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.disable_opts, yystack.l_mark[0].Attr_val_fifo); } -break; -case 190: -#line 1031 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 191: -#line 1036 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 192: -#line 1044 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(T_Flag, yystack.l_mark[0].Integer); } -break; -case 193: -#line 1046 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (input_from_file) { - yyval.Attr_val = create_attr_ival(T_Flag, yystack.l_mark[0].Integer); - } else { - char err_str[128]; - - yyval.Attr_val = NULL; - snprintf(err_str, sizeof(err_str), - "enable/disable %s remote configuration ignored", - keyword(yystack.l_mark[0].Integer)); - yyerror(err_str); - } - } -break; -case 202: -#line 1081 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.tinker, yystack.l_mark[0].Attr_val_fifo); } -break; -case 203: -#line 1086 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 204: -#line 1091 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 205: -#line 1099 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-1].Integer, yystack.l_mark[0].Double); } -break; -case 216: -#line 1122 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *av; - - av = create_attr_dval(yystack.l_mark[-1].Integer, yystack.l_mark[0].Double); - APPEND_G_FIFO(cfgt.vars, av); - } -break; -case 217: -#line 1129 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *av; - - av = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); - APPEND_G_FIFO(cfgt.vars, av); - } -break; -case 218: -#line 1136 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - char error_text[64]; - attr_val *av; - - if (input_from_file) { - av = create_attr_sval(yystack.l_mark[-1].Integer, yystack.l_mark[0].String); - APPEND_G_FIFO(cfgt.vars, av); - } else { - YYFREE(yystack.l_mark[0].String); - snprintf(error_text, sizeof(error_text), - "%s remote config ignored", - keyword(yystack.l_mark[-1].Integer)); - yyerror(error_text); - } - } -break; -case 219: -#line 1152 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (!input_from_file) { - yyerror("remote includefile ignored"); - break; - } - if (curr_include_level >= MAXINCLUDELEVEL) { - fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); - msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded."); - } else { - fp[curr_include_level + 1] = F_OPEN(FindConfig(yystack.l_mark[-1].String), "r"); - if (fp[curr_include_level + 1] == NULL) { - fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(yystack.l_mark[-1].String)); - msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", FindConfig(yystack.l_mark[-1].String)); - } else { - ip_file = fp[++curr_include_level]; - } - } - } -break; -case 220: -#line 1171 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - while (curr_include_level != -1) - FCLOSE(fp[curr_include_level--]); - } -break; -case 221: -#line 1176 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { /* see drift_parm below for actions */ } -break; -case 222: -#line 1178 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.logconfig, yystack.l_mark[0].Attr_val_fifo); } -break; -case 223: -#line 1180 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.phone, yystack.l_mark[0].String_fifo); } -break; -case 224: -#line 1182 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { APPEND_G_FIFO(cfgt.setvar, yystack.l_mark[0].Set_var); } -break; -case 225: -#line 1184 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - addr_opts_node *aon; - - aon = create_addr_opts_node(yystack.l_mark[-1].Address_node, yystack.l_mark[0].Attr_val_fifo); - APPEND_G_FIFO(cfgt.trap, aon); - } -break; -case 226: -#line 1191 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.ttl, yystack.l_mark[0].Attr_val_fifo); } -break; -case 235: -#line 1213 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *av; - - av = create_attr_sval(T_Driftfile, yystack.l_mark[0].String); - APPEND_G_FIFO(cfgt.vars, av); - } -break; -case 236: -#line 1220 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *av; - - av = create_attr_sval(T_Driftfile, yystack.l_mark[-1].String); - APPEND_G_FIFO(cfgt.vars, av); - av = create_attr_dval(T_WanderThreshold, yystack.l_mark[0].Double); - APPEND_G_FIFO(cfgt.vars, av); - } -break; -case 237: -#line 1229 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - attr_val *av; - - av = create_attr_sval(T_Driftfile, ""); - APPEND_G_FIFO(cfgt.vars, av); - } -break; -case 238: -#line 1239 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Set_var = create_setvar_node(yystack.l_mark[-3].String, yystack.l_mark[-1].String, yystack.l_mark[0].Integer); } -break; -case 240: -#line 1245 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Integer = 0; } -break; -case 241: -#line 1250 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val_fifo = NULL; } -break; -case 242: -#line 1252 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 243: -#line 1260 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival(yystack.l_mark[-1].Integer, yystack.l_mark[0].Integer); } -break; -case 244: -#line 1262 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val = create_attr_sval(yystack.l_mark[-1].Integer, estrdup(yystack.l_mark[0].Address_node->address)); - destroy_address_node(yystack.l_mark[0].Address_node); - } -break; -case 245: -#line 1270 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 246: -#line 1275 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 247: -#line 1283 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - char prefix; - char * type; - - switch (yystack.l_mark[0].String[0]) { - - case '+': - case '-': - case '=': - prefix = yystack.l_mark[0].String[0]; - type = yystack.l_mark[0].String + 1; - break; - - default: - prefix = '='; - type = yystack.l_mark[0].String; - } - - yyval.Attr_val = create_attr_sval(prefix, estrdup(type)); - YYFREE(yystack.l_mark[0].String); - } -break; -case 248: -#line 1308 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - nic_rule_node *nrn; - - nrn = create_nic_rule_node(yystack.l_mark[0].Integer, NULL, yystack.l_mark[-1].Integer); - APPEND_G_FIFO(cfgt.nic_rules, nrn); - } -break; -case 249: -#line 1315 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - nic_rule_node *nrn; - - nrn = create_nic_rule_node(0, yystack.l_mark[0].String, yystack.l_mark[-1].Integer); - APPEND_G_FIFO(cfgt.nic_rules, nrn); - } -break; -case 259: -#line 1343 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.reset_counters, yystack.l_mark[0].Int_fifo); } -break; -case 260: -#line 1348 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Int_fifo = yystack.l_mark[-1].Int_fifo; - APPEND_G_FIFO(yyval.Int_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 261: -#line 1353 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Int_fifo = NULL; - APPEND_G_FIFO(yyval.Int_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 269: -#line 1377 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 270: -#line 1382 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, create_int_node(yystack.l_mark[0].Integer)); - } -break; -case 271: -#line 1390 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-1].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 272: -#line 1395 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[0].Attr_val); - } -break; -case 273: -#line 1403 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_ival('i', yystack.l_mark[0].Integer); } -break; -case 275: -#line 1409 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_rangeval('-', yystack.l_mark[-3].Integer, yystack.l_mark[-1].Integer); } -break; -case 276: -#line 1414 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.String_fifo = yystack.l_mark[-1].String_fifo; - APPEND_G_FIFO(yyval.String_fifo, create_string_node(yystack.l_mark[0].String)); - } -break; -case 277: -#line 1419 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.String_fifo = NULL; - APPEND_G_FIFO(yyval.String_fifo, create_string_node(yystack.l_mark[0].String)); - } -break; -case 278: -#line 1427 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Address_fifo = yystack.l_mark[-1].Address_fifo; - APPEND_G_FIFO(yyval.Address_fifo, yystack.l_mark[0].Address_node); - } -break; -case 279: -#line 1432 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Address_fifo = NULL; - APPEND_G_FIFO(yyval.Address_fifo, yystack.l_mark[0].Address_node); - } -break; -case 280: -#line 1440 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - if (yystack.l_mark[0].Integer != 0 && yystack.l_mark[0].Integer != 1) { - yyerror("Integer value is not boolean (0 or 1). Assuming 1"); - yyval.Integer = 1; - } else { - yyval.Integer = yystack.l_mark[0].Integer; - } - } -break; -case 281: -#line 1448 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Integer = 1; } -break; -case 282: -#line 1449 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Integer = 0; } -break; -case 283: -#line 1453 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Double = (double)yystack.l_mark[0].Integer; } -break; -case 285: -#line 1464 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - sim_node *sn; - - sn = create_sim_node(yystack.l_mark[-2].Attr_val_fifo, yystack.l_mark[-1].Sim_server_fifo); - APPEND_G_FIFO(cfgt.sim_details, sn); - - /* Revert from ; to \n for end-of-command */ - old_config_style = 1; - } -break; -case 286: -#line 1481 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { old_config_style = 0; } -break; -case 287: -#line 1486 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-2].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[-1].Attr_val); - } -break; -case 288: -#line 1491 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[-1].Attr_val); - } -break; -case 289: -#line 1499 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-2].Integer, yystack.l_mark[0].Double); } -break; -case 292: -#line 1509 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Sim_server_fifo = yystack.l_mark[-1].Sim_server_fifo; - APPEND_G_FIFO(yyval.Sim_server_fifo, yystack.l_mark[0].Sim_server); - } -break; -case 293: -#line 1514 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Sim_server_fifo = NULL; - APPEND_G_FIFO(yyval.Sim_server_fifo, yystack.l_mark[0].Sim_server); - } -break; -case 294: -#line 1522 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Sim_server = create_sim_server(yystack.l_mark[-4].Address_node, yystack.l_mark[-2].Double, yystack.l_mark[-1].Sim_script_fifo); } -break; -case 295: -#line 1527 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Double = yystack.l_mark[-1].Double; } -break; -case 296: -#line 1532 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Address_node = yystack.l_mark[0].Address_node; } -break; -case 297: -#line 1537 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Sim_script_fifo = yystack.l_mark[-1].Sim_script_fifo; - APPEND_G_FIFO(yyval.Sim_script_fifo, yystack.l_mark[0].Sim_script); - } -break; -case 298: -#line 1542 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Sim_script_fifo = NULL; - APPEND_G_FIFO(yyval.Sim_script_fifo, yystack.l_mark[0].Sim_script); - } -break; -case 299: -#line 1550 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Sim_script = create_sim_script_info(yystack.l_mark[-3].Double, yystack.l_mark[-1].Attr_val_fifo); } -break; -case 300: -#line 1555 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = yystack.l_mark[-2].Attr_val_fifo; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[-1].Attr_val); - } -break; -case 301: -#line 1560 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { - yyval.Attr_val_fifo = NULL; - APPEND_G_FIFO(yyval.Attr_val_fifo, yystack.l_mark[-1].Attr_val); - } -break; -case 302: -#line 1568 "/net/quasar/src-5/NetBSD/src/external/bsd/ntp/dist/ntpd/ntp_parser.y" - { yyval.Attr_val = create_attr_dval(yystack.l_mark[-2].Integer, yystack.l_mark[0].Double); } -break; -#line 2259 "ntp_parser.c" - } - yystack.s_mark -= yym; - yystate = *yystack.s_mark; - yystack.l_mark -= yym; - yym = yylhs[yyn]; - if (yystate == 0 && yym == 0) - { -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state 0 to\ - state %d\n", YYPREFIX, YYFINAL); -#endif - yystate = YYFINAL; - *++yystack.s_mark = YYFINAL; - *++yystack.l_mark = yyval; - if (yychar < 0) - { - if ((yychar = YYLEX) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = yytname[YYTRANSLATE(yychar)]; - printf("%sdebug: state %d, reading %d (%s)\n", - YYPREFIX, YYFINAL, yychar, yys); - } -#endif - } - if (yychar == 0) goto yyaccept; - goto yyloop; - } - if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yystate) - yystate = yytable[yyn]; - else - yystate = yydgoto[yym]; -#if YYDEBUG - if (yydebug) - printf("%sdebug: after reduction, shifting from state %d \ -to state %d\n", YYPREFIX, *yystack.s_mark, yystate); -#endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) - { - goto yyoverflow; - } - *++yystack.s_mark = (short) yystate; - *++yystack.l_mark = yyval; - goto yyloop; - -yyoverflow: - yyerror("yacc stack overflow"); - -yyabort: - yyfreestack(&yystack); - return (1); - -yyaccept: - yyfreestack(&yystack); - return (0); -} diff --git a/external/bsd/ntp/dist/ntpd/ntp_parser.h b/external/bsd/ntp/dist/ntpd/ntp_parser.h index 43b64db3a9fb..becbf0d6549a 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_parser.h +++ b/external/bsd/ntp/dist/ntpd/ntp_parser.h @@ -1,92 +1,329 @@ -#define T_Abbrev 257 -#define T_Age 258 -#define T_All 259 -#define T_Allan 260 -#define T_Allpeers 261 -#define T_Auth 262 -#define T_Autokey 263 -#define T_Automax 264 -#define T_Average 265 -#define T_Bclient 266 -#define T_Beacon 267 -#define T_Broadcast 268 -#define T_Broadcastclient 269 -#define T_Broadcastdelay 270 -#define T_Burst 271 -#define T_Calibrate 272 -#define T_Ceiling 273 -#define T_Clockstats 274 -#define T_Cohort 275 -#define T_ControlKey 276 -#define T_Crypto 277 -#define T_Cryptostats 278 -#define T_Ctl 279 -#define T_Day 280 -#define T_Default 281 -#define T_Digest 282 -#define T_Disable 283 -#define T_Discard 284 -#define T_Dispersion 285 -#define T_Double 286 -#define T_Driftfile 287 -#define T_Drop 288 -#define T_Ellipsis 289 -#define T_Enable 290 -#define T_End 291 -#define T_False 292 -#define T_File 293 -#define T_Filegen 294 -#define T_Filenum 295 -#define T_Flag1 296 -#define T_Flag2 297 -#define T_Flag3 298 -#define T_Flag4 299 -#define T_Flake 300 -#define T_Floor 301 -#define T_Freq 302 -#define T_Fudge 303 -#define T_Host 304 -#define T_Huffpuff 305 -#define T_Iburst 306 -#define T_Ident 307 -#define T_Ignore 308 -#define T_Incalloc 309 -#define T_Incmem 310 -#define T_Initalloc 311 -#define T_Initmem 312 -#define T_Includefile 313 -#define T_Integer 314 -#define T_Interface 315 -#define T_Intrange 316 -#define T_Io 317 -#define T_Ipv4 318 -#define T_Ipv4_flag 319 -#define T_Ipv6 320 -#define T_Ipv6_flag 321 -#define T_Kernel 322 -#define T_Key 323 -#define T_Keys 324 -#define T_Keysdir 325 -#define T_Kod 326 -#define T_Mssntp 327 -#define T_Leapfile 328 -#define T_Limited 329 -#define T_Link 330 -#define T_Listen 331 -#define T_Logconfig 332 -#define T_Logfile 333 -#define T_Loopstats 334 -#define T_Lowpriotrap 335 -#define T_Manycastclient 336 -#define T_Manycastserver 337 -#define T_Mask 338 -#define T_Maxage 339 -#define T_Maxclock 340 -#define T_Maxdepth 341 -#define T_Maxdist 342 -#define T_Maxmem 343 -#define T_Maxpoll 344 -#define T_Mdnstries 345 +/* $NetBSD: ntp_parser.h,v 1.7 2014/12/19 20:43:17 christos Exp $ */ + +/* A Bison parser, made by GNU Bison 3.0.2. */ + +/* Bison interface for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +#ifndef YY_YY_______NTPD_NTP_PARSER_H_INCLUDED +# define YY_YY_______NTPD_NTP_PARSER_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token type. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Ellipsis = 290, + T_Enable = 291, + T_End = 292, + T_False = 293, + T_File = 294, + T_Filegen = 295, + T_Filenum = 296, + T_Flag1 = 297, + T_Flag2 = 298, + T_Flag3 = 299, + T_Flag4 = 300, + T_Flake = 301, + T_Floor = 302, + T_Freq = 303, + T_Fudge = 304, + T_Host = 305, + T_Huffpuff = 306, + T_Iburst = 307, + T_Ident = 308, + T_Ignore = 309, + T_Incalloc = 310, + T_Incmem = 311, + T_Initalloc = 312, + T_Initmem = 313, + T_Includefile = 314, + T_Integer = 315, + T_Interface = 316, + T_Intrange = 317, + T_Io = 318, + T_Ipv4 = 319, + T_Ipv4_flag = 320, + T_Ipv6 = 321, + T_Ipv6_flag = 322, + T_Kernel = 323, + T_Key = 324, + T_Keys = 325, + T_Keysdir = 326, + T_Kod = 327, + T_Mssntp = 328, + T_Leapfile = 329, + T_Limited = 330, + T_Link = 331, + T_Listen = 332, + T_Logconfig = 333, + T_Logfile = 334, + T_Loopstats = 335, + T_Lowpriotrap = 336, + T_Manycastclient = 337, + T_Manycastserver = 338, + T_Mask = 339, + T_Maxage = 340, + T_Maxclock = 341, + T_Maxdepth = 342, + T_Maxdist = 343, + T_Maxmem = 344, + T_Maxpoll = 345, + T_Mem = 346, + T_Memlock = 347, + T_Minclock = 348, + T_Mindepth = 349, + T_Mindist = 350, + T_Minimum = 351, + T_Minpoll = 352, + T_Minsane = 353, + T_Mode = 354, + T_Mode7 = 355, + T_Monitor = 356, + T_Month = 357, + T_Mru = 358, + T_Multicastclient = 359, + T_Nic = 360, + T_Nolink = 361, + T_Nomodify = 362, + T_Nomrulist = 363, + T_None = 364, + T_Nonvolatile = 365, + T_Nopeer = 366, + T_Noquery = 367, + T_Noselect = 368, + T_Noserve = 369, + T_Notrap = 370, + T_Notrust = 371, + T_Ntp = 372, + T_Ntpport = 373, + T_NtpSignDsocket = 374, + T_Orphan = 375, + T_Orphanwait = 376, + T_Panic = 377, + T_Peer = 378, + T_Peerstats = 379, + T_Phone = 380, + T_Pid = 381, + T_Pidfile = 382, + T_Pool = 383, + T_Port = 384, + T_Preempt = 385, + T_Prefer = 386, + T_Protostats = 387, + T_Pw = 388, + T_Randfile = 389, + T_Rawstats = 390, + T_Refid = 391, + T_Requestkey = 392, + T_Reset = 393, + T_Restrict = 394, + T_Revoke = 395, + T_Rlimit = 396, + T_Saveconfigdir = 397, + T_Server = 398, + T_Setvar = 399, + T_Source = 400, + T_Stacksize = 401, + T_Statistics = 402, + T_Stats = 403, + T_Statsdir = 404, + T_Step = 405, + T_Stepout = 406, + T_Stratum = 407, + T_String = 408, + T_Sys = 409, + T_Sysstats = 410, + T_Tick = 411, + T_Time1 = 412, + T_Time2 = 413, + T_Timer = 414, + T_Timingstats = 415, + T_Tinker = 416, + T_Tos = 417, + T_Trap = 418, + T_True = 419, + T_Trustedkey = 420, + T_Ttl = 421, + T_Type = 422, + T_U_int = 423, + T_Unconfig = 424, + T_Unpeer = 425, + T_Version = 426, + T_WanderThreshold = 427, + T_Week = 428, + T_Wildcard = 429, + T_Xleave = 430, + T_Year = 431, + T_Flag = 432, + T_EOC = 433, + T_Simulate = 434, + T_Beep_Delay = 435, + T_Sim_Duration = 436, + T_Server_Offset = 437, + T_Duration = 438, + T_Freq_Offset = 439, + T_Wander = 440, + T_Jitter = 441, + T_Prop_Delay = 442, + T_Proc_Delay = 443 + }; +#endif +/* Tokens. */ +#define T_Abbrev 258 +#define T_Age 259 +#define T_All 260 +#define T_Allan 261 +#define T_Allpeers 262 +#define T_Auth 263 +#define T_Autokey 264 +#define T_Automax 265 +#define T_Average 266 +#define T_Bclient 267 +#define T_Beacon 268 +#define T_Broadcast 269 +#define T_Broadcastclient 270 +#define T_Broadcastdelay 271 +#define T_Burst 272 +#define T_Calibrate 273 +#define T_Ceiling 274 +#define T_Clockstats 275 +#define T_Cohort 276 +#define T_ControlKey 277 +#define T_Crypto 278 +#define T_Cryptostats 279 +#define T_Ctl 280 +#define T_Day 281 +#define T_Default 282 +#define T_Digest 283 +#define T_Disable 284 +#define T_Discard 285 +#define T_Dispersion 286 +#define T_Double 287 +#define T_Driftfile 288 +#define T_Drop 289 +#define T_Ellipsis 290 +#define T_Enable 291 +#define T_End 292 +#define T_False 293 +#define T_File 294 +#define T_Filegen 295 +#define T_Filenum 296 +#define T_Flag1 297 +#define T_Flag2 298 +#define T_Flag3 299 +#define T_Flag4 300 +#define T_Flake 301 +#define T_Floor 302 +#define T_Freq 303 +#define T_Fudge 304 +#define T_Host 305 +#define T_Huffpuff 306 +#define T_Iburst 307 +#define T_Ident 308 +#define T_Ignore 309 +#define T_Incalloc 310 +#define T_Incmem 311 +#define T_Initalloc 312 +#define T_Initmem 313 +#define T_Includefile 314 +#define T_Integer 315 +#define T_Interface 316 +#define T_Intrange 317 +#define T_Io 318 +#define T_Ipv4 319 +#define T_Ipv4_flag 320 +#define T_Ipv6 321 +#define T_Ipv6_flag 322 +#define T_Kernel 323 +#define T_Key 324 +#define T_Keys 325 +#define T_Keysdir 326 +#define T_Kod 327 +#define T_Mssntp 328 +#define T_Leapfile 329 +#define T_Limited 330 +#define T_Link 331 +#define T_Listen 332 +#define T_Logconfig 333 +#define T_Logfile 334 +#define T_Loopstats 335 +#define T_Lowpriotrap 336 +#define T_Manycastclient 337 +#define T_Manycastserver 338 +#define T_Mask 339 +#define T_Maxage 340 +#define T_Maxclock 341 +#define T_Maxdepth 342 +#define T_Maxdist 343 +#define T_Maxmem 344 +#define T_Maxpoll 345 #define T_Mem 346 #define T_Memlock 347 #define T_Minclock 348 @@ -185,13 +422,14 @@ #define T_Jitter 441 #define T_Prop_Delay 442 #define T_Proc_Delay 443 -#ifdef YYSTYPE -#undef YYSTYPE_IS_DECLARED -#define YYSTYPE_IS_DECLARED 1 -#endif -#ifndef YYSTYPE_IS_DECLARED -#define YYSTYPE_IS_DECLARED 1 -typedef union { + +/* Value type. */ +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE YYSTYPE; +union YYSTYPE +{ +#line 54 "ntp_parser.y" /* yacc.c:1909 */ + char * String; double Double; int Integer; @@ -208,6 +446,16 @@ typedef union { server_info_fifo * Sim_server_fifo; script_info * Sim_script; script_info_fifo * Sim_script_fifo; -} YYSTYPE; -#endif /* !YYSTYPE_IS_DECLARED */ + +#line 449 "../../ntpd/ntp_parser.h" /* yacc.c:1909 */ +}; +# define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 +#endif + + extern YYSTYPE yylval; + +int yyparse (struct FILE_INFO *ip_file); + +#endif /* !YY_YY_______NTPD_NTP_PARSER_H_INCLUDED */ diff --git a/external/bsd/ntp/dist/ntpd/ntp_parser.y b/external/bsd/ntp/dist/ntpd/ntp_parser.y index c76f43488ba4..aba34f60c8b4 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_parser.y +++ b/external/bsd/ntp/dist/ntpd/ntp_parser.y @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_parser.y,v 1.7 2013/12/30 17:42:19 christos Exp $ */ +/* $NetBSD: ntp_parser.y,v 1.8 2014/12/19 20:43:17 christos Exp $ */ /* ntp_parser.y * @@ -10,6 +10,9 @@ * Copyright (c) 2006 */ +%parse-param {struct FILE_INFO *ip_file} +%lex-param {struct FILE_INFO *ip_file} + %{ #ifdef HAVE_CONFIG_H # include @@ -31,15 +34,17 @@ for both the simulator and the daemon */ - - struct FILE_INFO *ip_file; /* configuration file stream */ - #define YYMALLOC emalloc #define YYFREE free #define YYERROR_VERBOSE #define YYMAXDEPTH 1000 /* stop the madness sooner */ - void yyerror(const char *msg); - extern int input_from_file; /* else from ntpq :config */ + void yyerror(struct FILE_INFO *ip_file, const char *msg); + + #ifdef SIM + # define ONLY_SIM(a) (a) + #else + # define ONLY_SIM(a) NULL + #endif %} /* @@ -664,7 +669,7 @@ monitoring_command cfgt.stats_dir = $2; } else { YYFREE($2); - yyerror("statsdir remote configuration ignored"); + yyerror(ip_file, "statsdir remote configuration ignored"); } } | T_Filegen stat filegen_option_list @@ -718,7 +723,7 @@ filegen_option } else { $$ = NULL; YYFREE($2); - yyerror("filegen file remote config ignored"); + yyerror(ip_file, "filegen file remote config ignored"); } } | T_Type filegen_type @@ -727,7 +732,7 @@ filegen_option $$ = create_attr_ival($1, $2); } else { $$ = NULL; - yyerror("filegen type remote config ignored"); + yyerror(ip_file, "filegen type remote config ignored"); } } | link_nolink @@ -742,7 +747,7 @@ filegen_option err = "filegen link remote config ignored"; else err = "filegen nolink remote config ignored"; - yyerror(err); + yyerror(ip_file, err); } } | enable_disable @@ -1053,7 +1058,7 @@ system_option snprintf(err_str, sizeof(err_str), "enable/disable %s remote configuration ignored", keyword($1)); - yyerror(err_str); + yyerror(ip_file, err_str); } } ; @@ -1145,13 +1150,13 @@ miscellaneous_command snprintf(error_text, sizeof(error_text), "%s remote config ignored", keyword($1)); - yyerror(error_text); + yyerror(ip_file, error_text); } } | T_Includefile T_String command { if (!input_from_file) { - yyerror("remote includefile ignored"); + yyerror(ip_file, "remote includefile ignored"); break; } if (curr_include_level >= MAXINCLUDELEVEL) { @@ -1439,7 +1444,7 @@ boolean : T_Integer { if ($1 != 0 && $1 != 1) { - yyerror("Integer value is not boolean (0 or 1). Assuming 1"); + yyerror(ip_file, "Integer value is not boolean (0 or 1). Assuming 1"); $$ = 1; } else { $$ = $1; @@ -1519,7 +1524,7 @@ sim_server_list sim_server : sim_server_name '{' sim_server_offset sim_act_list '}' - { $$ = create_sim_server($1, $3, $4); } + { $$ = ONLY_SIM(create_sim_server($1, $3, $4)); } ; sim_server_offset @@ -1547,7 +1552,7 @@ sim_act_list sim_act : T_Duration '=' number '{' sim_act_stmt_list '}' - { $$ = create_sim_script_info($3, $5); } + { $$ = ONLY_SIM(create_sim_script_info($3, $5)); } ; sim_act_stmt_list @@ -1580,6 +1585,7 @@ sim_act_keyword void yyerror( + struct FILE_INFO *ip_file, const char *msg ) { diff --git a/external/bsd/ntp/dist/ntpd/ntp_peer.c b/external/bsd/ntp/dist/ntpd/ntp_peer.c index a311f08f0c5d..4e167358a047 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_peer.c +++ b/external/bsd/ntp/dist/ntpd/ntp_peer.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_peer.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_peer.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_peer.c - management of data maintained for peer associations diff --git a/external/bsd/ntp/dist/ntpd/ntp_prio_q.c b/external/bsd/ntp/dist/ntpd/ntp_prio_q.c index 603680882ec4..15bd4138f063 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_prio_q.c +++ b/external/bsd/ntp/dist/ntpd/ntp_prio_q.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_prio_q.c,v 1.1.1.1 2013/12/27 23:30:58 christos Exp $ */ +/* $NetBSD: ntp_prio_q.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* ntp_prio_q.c * diff --git a/external/bsd/ntp/dist/ntpd/ntp_proto.c b/external/bsd/ntp/dist/ntpd/ntp_proto.c index b70ee6ac7fa4..238bb98a20c4 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_proto.c +++ b/external/bsd/ntp/dist/ntpd/ntp_proto.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_proto.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_proto.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_proto.c - NTP version 4 protocol machinery @@ -488,7 +488,7 @@ receive( */ authlen = LEN_PKT_NOMAC; has_mac = rbufp->recv_length - authlen; - while (has_mac != 0) { + while (has_mac > 0) { u_int32 len; #ifdef AUTOKEY u_int32 hostlen; @@ -542,6 +542,14 @@ receive( } } + /* + * If has_mac is < 0 we had a malformed packet. + */ + if (has_mac < 0) { + sys_badlength++; + return; /* bad length */ + } + /* * If authentication required, a MAC must be present. */ @@ -1091,6 +1099,7 @@ receive( fast_xmit(rbufp, MODE_ACTIVE, 0, restrict_mask); sys_restricted++; + return; } } @@ -2127,7 +2136,7 @@ peer_clear( /* * Clear all values, including the optional crypto values above. */ - memset(CLEAR_TO_ZERO(peer), 0, LEN_CLEAR_TO_ZERO); + memset(CLEAR_TO_ZERO(peer), 0, LEN_CLEAR_TO_ZERO(peer)); peer->ppoll = peer->maxpoll; peer->hpoll = peer->minpoll; peer->disp = MAXDISPERSE; @@ -4000,7 +4009,7 @@ init_proto(void) sys_ttl[i] = (u_char)((i * 256) / MAX_TTL); sys_ttlmax = i; } - pps_enable = 0; + hardpps_enable = 0; stats_control = 1; } @@ -4065,7 +4074,7 @@ proto_config( break; case PROTO_PPS: /* PPS discipline (pps) */ - pps_enable = value; + hardpps_enable = value; break; case PROTO_FILEGEN: /* statistics (stats) */ diff --git a/external/bsd/ntp/dist/ntpd/ntp_refclock.c b/external/bsd/ntp/dist/ntpd/ntp_refclock.c index 86866fe380a8..c95f4e572ded 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_refclock.c +++ b/external/bsd/ntp/dist/ntpd/ntp_refclock.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_refclock.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_refclock.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_refclock - processing support for reference clocks @@ -580,7 +580,7 @@ refclock_gtlin( ) { const char *sp, *spend; - char *dp, *dpend; + char *dp, *dpend; int dlen; if (bmax <= 0) @@ -840,7 +840,7 @@ refclock_setup( ttyp->c_cflag = CS8 | CLOCAL | CREAD; if (lflags & LDISC_7O1) { /* HP Z3801A needs 7-bit, odd parity */ - ttyp->c_cflag = CS7 | PARENB | PARODD | CLOCAL | CREAD; + ttyp->c_cflag = CS7 | PARENB | PARODD | CLOCAL | CREAD; } cfsetispeed(&ttyb, speed); cfsetospeed(&ttyb, speed); @@ -1247,19 +1247,17 @@ refclock_params( } /* - * If flag3 is lit, select the kernel PPS. + * If flag3 is lit, select the kernel PPS if we can. */ if (mode & CLK_FLAG3) { if (time_pps_kcbind(ap->handle, PPS_KC_HARDPPS, ap->pps_params.mode & ~PPS_TSFMT_TSPEC, PPS_TSFMT_TSPEC) < 0) { - if (errno != EOPNOTSUPP) { - msyslog(LOG_ERR, - "refclock_params: time_pps_kcbind: %m"); - return (0); - } + msyslog(LOG_ERR, + "refclock_params: time_pps_kcbind: %m"); + return (0); } - pps_enable = 1; + hardpps_enable = 1; } return (1); } diff --git a/external/bsd/ntp/dist/ntpd/ntp_request.c b/external/bsd/ntp/dist/ntpd/ntp_request.c index 2562beacdcb6..af317581e929 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_request.c +++ b/external/bsd/ntp/dist/ntpd/ntp_request.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_request.c,v 1.8 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_request.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_request.c - respond to information requests @@ -1131,7 +1131,7 @@ sys_info( is->flags |= INFO_FLAG_MONITOR; if (ntp_enable) is->flags |= INFO_FLAG_NTP; - if (pps_enable) + if (hardpps_enable) is->flags |= INFO_FLAG_PPS_SYNC; if (stats_control) is->flags |= INFO_FLAG_FILEGEN; diff --git a/external/bsd/ntp/dist/ntpd/ntp_restrict.c b/external/bsd/ntp/dist/ntpd/ntp_restrict.c index 6b8b59d3ce6a..567ebd315dc6 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_restrict.c +++ b/external/bsd/ntp/dist/ntpd/ntp_restrict.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_restrict.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_restrict.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_restrict.c - determine host restrictions diff --git a/external/bsd/ntp/dist/ntpd/ntp_scanner.c b/external/bsd/ntp/dist/ntpd/ntp_scanner.c index a61750317699..f4645021b098 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_scanner.c +++ b/external/bsd/ntp/dist/ntpd/ntp_scanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_scanner.c,v 1.6 2013/12/30 17:41:57 christos Exp $ */ +/* $NetBSD: ntp_scanner.c,v 1.7 2014/12/19 20:43:17 christos Exp $ */ /* ntp_scanner.c @@ -39,7 +39,6 @@ #define MAX_LEXEME (1024 + 1) /* The maximum size of a lexeme */ char yytext[MAX_LEXEME]; /* Buffer for storing the input text/lexeme */ u_int32 conf_file_sum; /* Simple sum of characters read */ -extern int input_from_file; @@ -59,11 +58,9 @@ const char special_chars[] = "{}(),;|="; * --------- */ -int get_next_char(void); static int is_keyword(char *lexeme, follby *pfollowedby); - /* * keyword() - Return the keyword associated with token T_ identifier. * See also token_name() for the string-ized T_ identifier. @@ -192,9 +189,9 @@ FCLOSE( * input_from_file flag. */ -int +static int get_next_char( - void + struct FILE_INFO *ip_file ) { char ch; @@ -217,8 +214,9 @@ get_next_char( } } -void +static void push_back_char( + struct FILE_INFO *ip_file, int ch ) { @@ -481,7 +479,7 @@ create_string_token( */ int yylex( - void + struct FILE_INFO *ip_file ) { static follby followedby = FOLLBY_TOKEN; @@ -492,12 +490,14 @@ yylex( int token; /* The return value */ int ch; + if (input_from_file) + ip_file = fp[curr_include_level]; instring = FALSE; yylval_was_set = FALSE; do { /* Ignore whitespace at the beginning */ - while (EOF != (ch = get_next_char()) && + while (EOF != (ch = get_next_char(ip_file)) && isspace(ch) && !is_EOC(ch)) ; /* Null Statement */ @@ -533,7 +533,7 @@ yylex( yytext[1] = '\0'; goto normal_return; } else - push_back_char(ch); + push_back_char(ip_file, ch); /* save the position of start of the token */ ip_file->prev_token_line_no = ip_file->line_no; @@ -541,7 +541,7 @@ yylex( /* Read in the lexeme */ i = 0; - while (EOF != (ch = get_next_char())) { + while (EOF != (ch = get_next_char(ip_file))) { yytext[i] = (char)ch; @@ -555,7 +555,7 @@ yylex( /* Read the rest of the line on reading a start of comment character */ if ('#' == ch) { - while (EOF != (ch = get_next_char()) + while (EOF != (ch = get_next_char(ip_file)) && '\n' != ch) ; /* Null Statement */ break; @@ -573,7 +573,7 @@ yylex( */ if ('"' == ch) { instring = TRUE; - while (EOF != (ch = get_next_char()) && + while (EOF != (ch = get_next_char(ip_file)) && ch != '"' && ch != '\n') { yytext[i++] = (char)ch; if (i >= COUNTOF(yytext)) @@ -585,7 +585,7 @@ yylex( * not be pushed back, so we read another char. */ if ('"' == ch) - ch = get_next_char(); + ch = get_next_char(ip_file); } /* Pushback the last character read that is not a part * of this lexeme. @@ -594,9 +594,9 @@ yylex( * when there is no newline at the end of a file. */ if (EOF == ch) - push_back_char('\n'); + push_back_char(ip_file, '\n'); else - push_back_char(ch); + push_back_char(ip_file, ch); yytext[i] = '\0'; } while (i == 0); diff --git a/external/bsd/ntp/dist/ntpd/ntp_scanner.h b/external/bsd/ntp/dist/ntpd/ntp_scanner.h index 97711e41d11b..4d818f7683df 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_scanner.h +++ b/external/bsd/ntp/dist/ntpd/ntp_scanner.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_scanner.h,v 1.1.1.4 2014/12/19 20:37:41 christos Exp $ */ +/* $NetBSD: ntp_scanner.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* ntp_scanner.h * diff --git a/external/bsd/ntp/dist/ntpd/ntp_signd.c b/external/bsd/ntp/dist/ntpd/ntp_signd.c index 38d64d660521..639a0c825f7f 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_signd.c +++ b/external/bsd/ntp/dist/ntpd/ntp_signd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_signd.c,v 1.1.1.2 2013/12/27 23:30:55 christos Exp $ */ +/* $NetBSD: ntp_signd.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* Copyright 2008, Red Hat, Inc. Copyright 2008, Andrew Tridgell. diff --git a/external/bsd/ntp/dist/ntpd/ntp_timer.c b/external/bsd/ntp/dist/ntpd/ntp_timer.c index 86961cfe34be..4b6d13f2fcfb 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_timer.c +++ b/external/bsd/ntp/dist/ntpd/ntp_timer.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_timer.c,v 1.1.1.4 2014/12/19 20:37:40 christos Exp $ */ +/* $NetBSD: ntp_timer.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_timer.c - event timer support routines diff --git a/external/bsd/ntp/dist/ntpd/ntp_util.c b/external/bsd/ntp/dist/ntpd/ntp_util.c index 650fe0f5984f..8e7fd9de1948 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_util.c +++ b/external/bsd/ntp/dist/ntpd/ntp_util.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_util.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntp_util.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntp_util.c - stuff I didn't have any other place for @@ -57,9 +57,9 @@ * File names */ static char *key_file_name; /* keys file name */ -char *leapseconds_file; /* leapseconds file name */ -struct stat leapseconds_file_sb1; /* leapseconds file stat() buffer */ -struct stat leapseconds_file_sb2; /* leapseconds file stat() buffer */ +static char *leapfile_name; /* leapseconds file name */ +static struct stat leapfile_stat; /* leapseconds file stat() buffer */ +static int /*BOOL*/have_leapfile = FALSE; char *stats_drift_file; /* frequency file name */ static char *stats_temp_file; /* temp frequency file name */ static double wander_resid; /* last frequency update */ @@ -103,6 +103,7 @@ static double prev_drift_comp; /* last frequency update */ */ static void record_sys_stats(void); void ntpd_time_stepped(void); +static void check_leap_expiration(int, uint32_t, const time_t*); /* * Prototypes @@ -111,7 +112,6 @@ static void record_sys_stats(void); void uninit_util(void); #endif - /* * uninit_util - free memory allocated by init_util */ @@ -339,6 +339,7 @@ stats_config( int len; double old_drift; l_fp now; + time_t ttnow; #ifndef VMS const char temp_ext[] = ".TEMP"; #else @@ -468,38 +469,31 @@ stats_config( break; } fprintf(fp, "%d", (int)getpid()); - fclose(fp);; + fclose(fp); break; /* * Read leapseconds file. + * + * Note: Currently a leap file without SHA1 signature is + * accepted, but if there is a signature line, the signature + * must be valid or the file is rejected. */ case STATS_LEAP_FILE: if (!value || (len = strlen(value)) == 0) break; - leapseconds_file = erealloc(leapseconds_file, len + 1); - memcpy(leapseconds_file, value, len + 1); + leapfile_name = erealloc(leapfile_name, len + 1); + memcpy(leapfile_name, value, len + 1); - if ((fp = fopen(leapseconds_file, "r")) == NULL) { - msyslog(LOG_ERR, "leapseconds file %s: %m", - leapseconds_file); - break; - } - - if (-1 == fstat(fileno(fp), &leapseconds_file_sb1)) { - msyslog(LOG_ERR, - "leapseconds: stat(%s) failed: %m", - leapseconds_file); - } else if (!leapsec_load_file(fp, TRUE)) { - msyslog(LOG_ERR, - "format error leapseconds file %s", - leapseconds_file); - } else { + if (leapsec_load_file( + leapfile_name, &leapfile_stat, TRUE, TRUE)) + { leap_signature_t lsig; - leapsec_getsig(&lsig); get_systime(&now); + time(&ttnow); + leapsec_getsig(&lsig); mprintf_event(EVNT_TAI, NULL, "%d leap %s %s %s", lsig.taiof, @@ -508,8 +502,14 @@ stats_config( ? "expired" : "expires", fstostr(lsig.etime)); + + have_leapfile = TRUE; + + /* force an immediate daily expiration check of + * the leap seconds table + */ + check_leap_expiration(TRUE, now.l_ui, &ttnow); } - fclose(fp); break; default: @@ -864,55 +864,66 @@ record_timing_stats( /* * check_leap_file - See if the leapseconds file has been updated. * - * Returns: - * -1 if there was a problem, - * 0 if the leapfile has expired or less than 24hrs remaining TTL - * >0 # of full days until the leapfile expires + * Returns: n/a + * + * Note: This loads a new leapfile on the fly. Currently a leap file + * without SHA1 signature is accepted, but if there is a signature line, + * the signature must be valid or the file is rejected. */ -int +void check_leap_file( - void + int is_daily_check, + uint32_t ntptime , + const time_t *systime ) { - FILE *fp; - struct stat *sp1 = &leapseconds_file_sb1; - struct stat *sp2 = &leapseconds_file_sb2; - int rc = INT_MAX; /* assume not expired for long a time */ - l_fp now; + /* just do nothing if there is no leap file */ + if ( ! (leapfile_name && *leapfile_name)) + return; + + /* try to load leapfile, force it if no leapfile loaded yet */ + if (leapsec_load_file( + leapfile_name, &leapfile_stat, + !have_leapfile, is_daily_check)) + have_leapfile = TRUE; + else if (!have_leapfile) + return; + check_leap_expiration(is_daily_check, ntptime, systime); +} - if (leapseconds_file) { - get_systime(&now); - if ((fp = fopen(leapseconds_file, "r")) == NULL) { +/* + * check expiration of a loaded leap table + */ +static void +check_leap_expiration( + int is_daily_check, + uint32_t ntptime , + const time_t *systime + ) +{ + static const char * const logPrefix = "leapsecond file"; + int rc; + + /* test the expiration of the leap data and log with proper + * level and frequency (once/hour or once/day, depending on the + * state. + */ + rc = leapsec_daystolive(ntptime, systime); + if (rc == 0) { + msyslog(LOG_WARNING, + "%s ('%s'): will expire in less than one day", + logPrefix, leapfile_name); + } else if (is_daily_check && rc < 28) { + if (rc < 0) msyslog(LOG_ERR, - "check_leap_file: fopen(%s): %m", - leapseconds_file); - rc = -1; - } else if (fstat(fileno(fp), &leapseconds_file_sb2)) { - msyslog(LOG_ERR, - "check_leap_file: stat(%s): %m", - leapseconds_file); - rc = -1; - } else if ( (sp1->st_mtime != sp2->st_mtime) - || (sp1->st_ctime != sp2->st_ctime)) { - leapseconds_file_sb1 = leapseconds_file_sb2; - if (!leapsec_load_file(fp, TRUE)) { - msyslog(LOG_ERR, - "format error leapseconds file %s", - leapseconds_file); - rc = -1; - } - } - if (rc >= 0) { - rc = leapsec_daystolive(now.l_ui, NULL); - if (rc < 0) - rc = 0; - } - if (fp != NULL) - fclose(fp); + "%s ('%s'): expired less than %d day%s ago", + logPrefix, leapfile_name, -rc, (rc == -1 ? "" : "s")); + else + msyslog(LOG_WARNING, + "%s ('%s'): will expire in less than %d days", + logPrefix, leapfile_name, 1+rc); } - - return rc; } diff --git a/external/bsd/ntp/dist/ntpd/ntpd-opts.c b/external/bsd/ntp/dist/ntpd/ntpd-opts.c index e9cbc2ff999e..4ec28bdd4518 100644 --- a/external/bsd/ntp/dist/ntpd/ntpd-opts.c +++ b/external/bsd/ntp/dist/ntpd/ntpd-opts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpd-opts.c,v 1.1.1.4 2014/12/19 20:37:40 christos Exp $ */ +/* $NetBSD: ntpd-opts.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) diff --git a/external/bsd/ntp/dist/ntpd/ntpd-opts.h b/external/bsd/ntp/dist/ntpd/ntpd-opts.h index 68daf1cfc1dc..59e911a10b48 100644 --- a/external/bsd/ntp/dist/ntpd/ntpd-opts.h +++ b/external/bsd/ntp/dist/ntpd/ntpd-opts.h @@ -1,13 +1,13 @@ -/* $NetBSD: ntpd-opts.h,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpd-opts.h,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed December 24, 2013 at 11:37:02 AM by AutoGen 5.18.3pre5 + * It has been AutoGen-ed December 19, 2014 at 07:46:32 AM by AutoGen 5.18.5pre4 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 40:1:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -20,7 +20,7 @@ * The ntpd program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2013 The University of Delaware, all rights reserved. + * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -55,7 +55,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 163841 +#define AO_TEMPLATE_VERSION 167936 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -107,9 +107,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.7p404" +#define NTPD_VERSION "4.2.8" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p404" +#define NTPD_FULL_VERSION "ntpd 4.2.8" /** * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -382,11 +382,11 @@ typedef enum { #define VALUE_OPT_USEPCC 0x1004 #define VALUE_OPT_PCCFREQ 0x1005 #define VALUE_OPT_MDNS 'm' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for help-value option */ #define VALUE_OPT_HELP '?' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for more-help-value option */ #define VALUE_OPT_MORE_HELP '!' -/** option flag (value) for " (get "val-name") " option */ +/** option flag (value) for version-value option */ #define VALUE_OPT_VERSION 0x1006 /* * Interface defines not associated with particular options @@ -419,6 +419,11 @@ extern tOptions ntpdOptions; # include # endif +# ifndef ATTRIBUTE_FORMAT_ARG +# define ATTRIBUTE_FORMAT_ARG(_a) +# endif + +static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; return (char*)gettext(pz); diff --git a/external/bsd/ntp/dist/ntpd/ntpd.c b/external/bsd/ntp/dist/ntpd/ntpd.c index 96cee83c84a5..7ab73d30591a 100644 --- a/external/bsd/ntp/dist/ntpd/ntpd.c +++ b/external/bsd/ntp/dist/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpd.c,v 1.7 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpd.c,v 1.8 2014/12/19 20:43:17 christos Exp $ */ /* * ntpd.c - main program for the fixed point NTP daemon @@ -115,19 +115,25 @@ #endif /* HAVE_PRIV_H */ #endif /* HAVE_DROPROOT */ +#if defined (LIBSECCOMP) && (KERN_SECCOMP) +/* # include */ +# include +# include +#endif /* LIBSECCOMP and KERN_SECCOMP */ + #ifdef HAVE_DNSREGISTRATION -#include +# include DNSServiceRef mdns; #endif #ifdef HAVE_SETPGRP_0 -#define ntp_setpgrp(x, y) setpgrp() +# define ntp_setpgrp(x, y) setpgrp() #else -#define ntp_setpgrp(x, y) setpgrp(x, y) +# define ntp_setpgrp(x, y) setpgrp(x, y) #endif #ifdef HAVE_SOLARIS_PRIVS -#define LOWPRIVS "basic,sys_time,net_privaddr,proc_setid,!proc_info,!proc_session,!proc_exec" +# define LOWPRIVS "basic,sys_time,net_privaddr,proc_setid,!proc_info,!proc_session,!proc_exec" static priv_set_t *lowprivs = NULL; static priv_set_t *highprivs = NULL; #endif /* HAVE_SOLARIS_PRIVS */ @@ -1005,6 +1011,110 @@ getgroup: } /* if (droproot) */ # endif /* HAVE_DROPROOT */ +/* libssecomp sandboxing */ +#if defined (LIBSECCOMP) && (KERN_SECCOMP) + scmp_filter_ctx ctx; + + if ((ctx = seccomp_init(SCMP_ACT_KILL)) < 0) + msyslog(LOG_ERR, "%s: seccomp_init(SCMP_ACT_KILL) failed: %m", __func__); + else { + msyslog(LOG_DEBUG, "%s: seccomp_init(SCMP_ACT_KILL) succeeded", __func__); + } + +#ifdef __x86_64__ +int scmp_sc[] = { + SCMP_SYS(adjtimex), + SCMP_SYS(bind), + SCMP_SYS(brk), + SCMP_SYS(chdir), + SCMP_SYS(clock_gettime), + SCMP_SYS(clock_settime), + SCMP_SYS(close), + SCMP_SYS(connect), + SCMP_SYS(exit_group), + SCMP_SYS(fstat), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), + SCMP_SYS(getsockname), + SCMP_SYS(ioctl), + SCMP_SYS(lseek), + SCMP_SYS(madvise), + SCMP_SYS(mmap), + SCMP_SYS(munmap), + SCMP_SYS(open), + SCMP_SYS(poll), + SCMP_SYS(read), + SCMP_SYS(recvmsg), + SCMP_SYS(rename), + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigprocmask), + SCMP_SYS(rt_sigreturn), + SCMP_SYS(select), + SCMP_SYS(sendto), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), + SCMP_SYS(socket), + SCMP_SYS(stat), + SCMP_SYS(time), + SCMP_SYS(write), +}; +#endif +#ifdef __i386__ +int scmp_sc[] = { + SCMP_SYS(_newselect), + SCMP_SYS(adjtimex), + SCMP_SYS(brk), + SCMP_SYS(chdir), + SCMP_SYS(clock_gettime), + SCMP_SYS(clock_settime), + SCMP_SYS(close), + SCMP_SYS(exit_group), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), + SCMP_SYS(madvise), + SCMP_SYS(mmap), + SCMP_SYS(mmap2), + SCMP_SYS(munmap), + SCMP_SYS(open), + SCMP_SYS(poll), + SCMP_SYS(read), + SCMP_SYS(rename), + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigprocmask), + SCMP_SYS(select), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), + SCMP_SYS(sigprocmask), + SCMP_SYS(sigreturn), + SCMP_SYS(socketcall), + SCMP_SYS(stat64), + SCMP_SYS(time), + SCMP_SYS(write), +}; +#endif + { + int i; + + for (i = 0; i < COUNTOF(scmp_sc); i++) { + if (seccomp_rule_add(ctx, + SCMP_ACT_ALLOW, scmp_sc[i], 0) < 0) { + msyslog(LOG_ERR, + "%s: seccomp_rule_add() failed: %m", + __func__); + } + } + } + + if (seccomp_load(ctx) < 0) + msyslog(LOG_ERR, "%s: seccomp_load() failed: %m", + __func__); + else { + msyslog(LOG_DEBUG, "%s: seccomp_load() succeeded", __func__); + } +#endif /* LIBSECCOMP and KERN_SECCOMP */ + # ifdef HAVE_IO_COMPLETION_PORT for (;;) { @@ -1149,10 +1259,7 @@ finish( sig_desc = ""; msyslog(LOG_NOTICE, "%s exiting on signal %d (%s)", progname, sig, sig_desc); - if (HAVE_OPT( PIDFILE )) - if (-1 == unlink(OPT_ARG( PIDFILE ))) - msyslog(LOG_NOTICE, "unlink(\"%s\") failed: %m", - OPT_ARG( PIDFILE )); + /* See Bug 2513 and Bug 2522 re the unlink of PIDFILE */ # ifdef HAVE_DNSREGISTRATION if (mdns != NULL) DNSServiceRefDeallocate(mdns); diff --git a/external/bsd/ntp/dist/ntpd/ntpsim.c b/external/bsd/ntp/dist/ntpd/ntpsim.c index 1059b05a6b06..5822330e0927 100644 --- a/external/bsd/ntp/dist/ntpd/ntpsim.c +++ b/external/bsd/ntp/dist/ntpd/ntpsim.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpsim.c,v 1.1.1.2 2013/12/27 23:30:58 christos Exp $ */ +/* $NetBSD: ntpsim.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* ntpdsim.c * diff --git a/external/bsd/ntp/dist/ntpd/ppsapi_timepps.h b/external/bsd/ntp/dist/ntpd/ppsapi_timepps.h index a62e6b54b5f7..f130699d792f 100644 --- a/external/bsd/ntp/dist/ntpd/ppsapi_timepps.h +++ b/external/bsd/ntp/dist/ntpd/ppsapi_timepps.h @@ -1,4 +1,4 @@ -/* $NetBSD: ppsapi_timepps.h,v 1.1.1.1 2009/12/13 16:55:42 kardel Exp $ */ +/* $NetBSD: ppsapi_timepps.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* ppsapi_timepps.h */ diff --git a/external/bsd/ntp/dist/ntpd/refclock_acts.c b/external/bsd/ntp/dist/ntpd/refclock_acts.c index 87b6ffcb0d2f..6fa9c3709f66 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_acts.c +++ b/external/bsd/ntp/dist/ntpd/refclock_acts.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_acts.c,v 1.7 2014/01/01 19:52:58 christos Exp $ */ +/* $NetBSD: refclock_acts.c,v 1.8 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_acts - clock driver for the NIST/USNO/PTB/NPL Computer Time diff --git a/external/bsd/ntp/dist/ntpd/refclock_arbiter.c b/external/bsd/ntp/dist/ntpd/refclock_arbiter.c index df8613ec6075..6c7bbb19f054 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_arbiter.c +++ b/external/bsd/ntp/dist/ntpd/refclock_arbiter.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_arbiter.c,v 1.1.1.3 2013/12/27 23:30:56 christos Exp $ */ +/* $NetBSD: refclock_arbiter.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_arbiter - clock driver for Arbiter 1088A/B Satellite diff --git a/external/bsd/ntp/dist/ntpd/refclock_arc.c b/external/bsd/ntp/dist/ntpd/refclock_arc.c index 5311ba9ff983..fdb6caa92556 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_arc.c +++ b/external/bsd/ntp/dist/ntpd/refclock_arc.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_arc.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_arc.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_arc - clock driver for ARCRON MSF/DCF/WWVB receivers diff --git a/external/bsd/ntp/dist/ntpd/refclock_as2201.c b/external/bsd/ntp/dist/ntpd/refclock_as2201.c index d2151ec61073..eb17b1d59840 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_as2201.c +++ b/external/bsd/ntp/dist/ntpd/refclock_as2201.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_as2201.c,v 1.1.1.3 2013/12/27 23:30:53 christos Exp $ */ +/* $NetBSD: refclock_as2201.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_as2201 - clock driver for the Austron 2201A GPS diff --git a/external/bsd/ntp/dist/ntpd/refclock_atom.c b/external/bsd/ntp/dist/ntpd/refclock_atom.c index 0d26d7e733c2..7afd3ee26a9e 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_atom.c +++ b/external/bsd/ntp/dist/ntpd/refclock_atom.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_atom.c,v 1.1.1.3 2013/12/27 23:30:53 christos Exp $ */ +/* $NetBSD: refclock_atom.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_atom - clock driver for 1-pps signals diff --git a/external/bsd/ntp/dist/ntpd/refclock_bancomm.c b/external/bsd/ntp/dist/ntpd/refclock_bancomm.c index 2d0120a567ad..f45f73764160 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_bancomm.c +++ b/external/bsd/ntp/dist/ntpd/refclock_bancomm.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_bancomm.c,v 1.1.1.3 2013/12/27 23:30:58 christos Exp $ */ +/* $NetBSD: refclock_bancomm.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* refclock_bancomm.c - clock driver for the Datum/Bancomm bc635VME * Time and Frequency Processor. It requires the BANCOMM bc635VME/ diff --git a/external/bsd/ntp/dist/ntpd/refclock_chronolog.c b/external/bsd/ntp/dist/ntpd/refclock_chronolog.c index 97ef462be3ca..6cbb291bb857 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_chronolog.c +++ b/external/bsd/ntp/dist/ntpd/refclock_chronolog.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_chronolog.c,v 1.1.1.3 2013/12/27 23:30:52 christos Exp $ */ +/* $NetBSD: refclock_chronolog.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_chronolog - clock driver for Chronolog K-series WWVB receiver. diff --git a/external/bsd/ntp/dist/ntpd/refclock_chu.c b/external/bsd/ntp/dist/ntpd/refclock_chu.c index 76834ba28d73..b10a5d844671 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_chu.c +++ b/external/bsd/ntp/dist/ntpd/refclock_chu.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_chu.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_chu.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_chu - clock driver for Canadian CHU time/frequency station diff --git a/external/bsd/ntp/dist/ntpd/refclock_conf.c b/external/bsd/ntp/dist/ntpd/refclock_conf.c index c8fd5192ef57..b1d7103a9e45 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_conf.c +++ b/external/bsd/ntp/dist/ntpd/refclock_conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_conf.c,v 1.1.1.4 2014/12/19 20:37:41 christos Exp $ */ +/* $NetBSD: refclock_conf.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_conf.c - reference clock configuration diff --git a/external/bsd/ntp/dist/ntpd/refclock_datum.c b/external/bsd/ntp/dist/ntpd/refclock_datum.c index 628de40dbcfb..8703e755b5db 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_datum.c +++ b/external/bsd/ntp/dist/ntpd/refclock_datum.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_datum.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_datum.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* ** refclock_datum - clock driver for the Datum Programmable Time Server diff --git a/external/bsd/ntp/dist/ntpd/refclock_dumbclock.c b/external/bsd/ntp/dist/ntpd/refclock_dumbclock.c index 6ae1413cbf58..d41a10f70b11 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_dumbclock.c +++ b/external/bsd/ntp/dist/ntpd/refclock_dumbclock.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_dumbclock.c,v 1.1.1.3 2013/12/27 23:30:51 christos Exp $ */ +/* $NetBSD: refclock_dumbclock.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_dumbclock - clock driver for a unknown time distribution system diff --git a/external/bsd/ntp/dist/ntpd/refclock_fg.c b/external/bsd/ntp/dist/ntpd/refclock_fg.c index 8206e88713f2..dca0b57105be 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_fg.c +++ b/external/bsd/ntp/dist/ntpd/refclock_fg.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_fg.c,v 1.1.1.2 2013/12/27 23:31:02 christos Exp $ */ +/* $NetBSD: refclock_fg.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_fg - clock driver for the Forum Graphic GPS datating station diff --git a/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c b/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c index 0c4ba45c1ee7..e072a28faa22 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c +++ b/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_gpsdjson.c,v 1.1.1.1 2014/12/19 20:37:41 christos Exp $ */ +/* $NetBSD: refclock_gpsdjson.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_gpsdjson.c - clock driver as GPSD JSON client @@ -206,8 +206,8 @@ static int syslogok(clockprocT * const pp, gpsd_unitT * const up); * data and selecting the GPS device name we created from our unit * number. [Note: This is a format string!] */ -static const char * s_logon = - "?WATCH={\"enable\":true,\"json\":true,\"device\":\"%s\"};\r\n"; +#define s_logon \ + "?WATCH={\"enable\":true,\"json\":true,\"device\":\"%s\"};\r\n" /* We keep a static list of network addresses for 'localhost:gpsd', and * we try to connect to them in round-robin fashion. @@ -1272,7 +1272,7 @@ convert_ascii_time( ep = strptime(gps_time, "%Y-%m-%dT%H:%M:%S", &gd); if (*ep == '.') { dw = 100000000; - while (isdigit(*++ep)) { + while (isdigit((unsigned char)*++ep)) { ts.tv_nsec += (*ep - '0') * dw; dw /= 10; } diff --git a/external/bsd/ntp/dist/ntpd/refclock_gpsvme.c b/external/bsd/ntp/dist/ntpd/refclock_gpsvme.c index 28156265fee0..67c2d3e05923 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_gpsvme.c +++ b/external/bsd/ntp/dist/ntpd/refclock_gpsvme.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_gpsvme.c,v 1.1.1.3 2013/12/27 23:30:53 christos Exp $ */ +/* $NetBSD: refclock_gpsvme.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* refclock_psc.c: clock driver for Brandywine PCI-SyncClock32/HP-UX 11.X */ diff --git a/external/bsd/ntp/dist/ntpd/refclock_heath.c b/external/bsd/ntp/dist/ntpd/refclock_heath.c index 1a51a4d729ad..3aa5109f6cd7 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_heath.c +++ b/external/bsd/ntp/dist/ntpd/refclock_heath.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_heath.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_heath.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_heath - clock driver for Heath GC-1000 diff --git a/external/bsd/ntp/dist/ntpd/refclock_hopfpci.c b/external/bsd/ntp/dist/ntpd/refclock_hopfpci.c index 794e72f1ff04..b08933c1cd99 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_hopfpci.c +++ b/external/bsd/ntp/dist/ntpd/refclock_hopfpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_hopfpci.c,v 1.1.1.3 2013/12/27 23:31:00 christos Exp $ */ +/* $NetBSD: refclock_hopfpci.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_hopfpci.c diff --git a/external/bsd/ntp/dist/ntpd/refclock_hopfser.c b/external/bsd/ntp/dist/ntpd/refclock_hopfser.c index 273d21b9f765..f2292b77b566 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_hopfser.c +++ b/external/bsd/ntp/dist/ntpd/refclock_hopfser.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_hopfser.c,v 1.1.1.3 2013/12/27 23:31:01 christos Exp $ */ +/* $NetBSD: refclock_hopfser.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * diff --git a/external/bsd/ntp/dist/ntpd/refclock_hpgps.c b/external/bsd/ntp/dist/ntpd/refclock_hpgps.c index 47ea39b1ed9e..9a49cf64bf66 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_hpgps.c +++ b/external/bsd/ntp/dist/ntpd/refclock_hpgps.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_hpgps.c,v 1.1.1.4 2014/12/19 20:37:40 christos Exp $ */ +/* $NetBSD: refclock_hpgps.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_hpgps - clock driver for HP 58503A GPS receiver diff --git a/external/bsd/ntp/dist/ntpd/refclock_irig.c b/external/bsd/ntp/dist/ntpd/refclock_irig.c index a21b165b9300..5f3662389fe0 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_irig.c +++ b/external/bsd/ntp/dist/ntpd/refclock_irig.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_irig.c,v 1.4 2014/02/27 18:12:11 joerg Exp $ */ +/* $NetBSD: refclock_irig.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_irig - audio IRIG-B/E demodulator/decoder diff --git a/external/bsd/ntp/dist/ntpd/refclock_jjy.c b/external/bsd/ntp/dist/ntpd/refclock_jjy.c index 8364881494ee..d9ab74db877e 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_jjy.c +++ b/external/bsd/ntp/dist/ntpd/refclock_jjy.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_jjy.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_jjy.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_jjy - clock driver for JJY receivers diff --git a/external/bsd/ntp/dist/ntpd/refclock_jupiter.c b/external/bsd/ntp/dist/ntpd/refclock_jupiter.c index 582db0e43fb1..1f0985999509 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_jupiter.c +++ b/external/bsd/ntp/dist/ntpd/refclock_jupiter.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_jupiter.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_jupiter.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * Copyright (c) 1997, 1998, 2003 @@ -362,7 +362,7 @@ jupiter_ppsapi( "refclock_jupiter: time_pps_kcbind failed: %m"); return (0); } - pps_enable = 1; + hardpps_enable = 1; } /* instance->peer->precision = PPS_PRECISION; */ diff --git a/external/bsd/ntp/dist/ntpd/refclock_leitch.c b/external/bsd/ntp/dist/ntpd/refclock_leitch.c index 29fa6cd2ffcd..68c8273c3b32 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_leitch.c +++ b/external/bsd/ntp/dist/ntpd/refclock_leitch.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_leitch.c,v 1.1.1.3 2013/12/27 23:30:55 christos Exp $ */ +/* $NetBSD: refclock_leitch.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_leitch - clock driver for the Leitch CSD-5300 Master Clock diff --git a/external/bsd/ntp/dist/ntpd/refclock_local.c b/external/bsd/ntp/dist/ntpd/refclock_local.c index 6fdacfa09e6b..0f702b77ad96 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_local.c +++ b/external/bsd/ntp/dist/ntpd/refclock_local.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_local.c,v 1.1.1.1 2009/12/13 16:55:51 kardel Exp $ */ +/* $NetBSD: refclock_local.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* diff --git a/external/bsd/ntp/dist/ntpd/refclock_msfees.c b/external/bsd/ntp/dist/ntpd/refclock_msfees.c index 9dcee6e24e88..1e8b93377c36 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_msfees.c +++ b/external/bsd/ntp/dist/ntpd/refclock_msfees.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_msfees.c,v 1.1.1.3 2013/12/27 23:30:53 christos Exp $ */ +/* $NetBSD: refclock_msfees.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* refclock_ees - clock driver for the EES M201 receiver */ diff --git a/external/bsd/ntp/dist/ntpd/refclock_mx4200.c b/external/bsd/ntp/dist/ntpd/refclock_mx4200.c index 59dd7b540c77..e4645a971b3e 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_mx4200.c +++ b/external/bsd/ntp/dist/ntpd/refclock_mx4200.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_mx4200.c,v 1.1.1.3 2013/12/27 23:30:57 christos Exp $ */ +/* $NetBSD: refclock_mx4200.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * This software was developed by the Computer Systems Engineering group diff --git a/external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c b/external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c index a41ea9384677..651cd4373b35 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c +++ b/external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_neoclock4x.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_neoclock4x.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * diff --git a/external/bsd/ntp/dist/ntpd/refclock_nmea.c b/external/bsd/ntp/dist/ntpd/refclock_nmea.c index 6f6c1118f54d..4826716d21e3 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_nmea.c +++ b/external/bsd/ntp/dist/ntpd/refclock_nmea.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_nmea.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_nmea.c,v 1.6 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_nmea.c - clock driver for an NMEA GPS CLOCK @@ -90,7 +90,8 @@ #define NMEA_BAUDRATE_SHIFT 4 #define NMEA_DELAYMEAS_MASK 0x80 -#define NMEA_EXTLOG_MASK 0x01000000U +#define NMEA_EXTLOG_MASK 0x00010000U +#define NMEA_DATETRUST_MASK 0x02000000U #define NMEA_PROTO_IDLEN 5 /* tag name must be at least 5 chars */ #define NMEA_PROTO_MINLEN 6 /* min chars in sentence, excluding CS */ @@ -232,13 +233,15 @@ typedef struct { u_char gps_time; /* use GPS time, not UTC */ u_short century_cache; /* cached current century */ l_fp last_reftime; /* last processed reference stamp */ + short epoch_warp; /* last epoch warp, for logging */ /* tally stats, reset each poll cycle */ struct { u_int total; - u_int good; - u_int bad; - u_int filtered; + u_int accepted; + u_int rejected; /* GPS said not enough signal */ + u_int malformed; /* Bad checksum, invalid date or time */ + u_int filtered; /* mode bits, not GPZDG, same second */ u_int pps_used; } tally; @@ -279,6 +282,7 @@ typedef struct { /* * Function prototypes */ +static void nmea_init (void); static int nmea_start (int, struct peer *); static void nmea_shutdown (int, struct peer *); static void nmea_receive (struct recvbuf *); @@ -309,6 +313,8 @@ static int unfold_day (struct calendar * jd, u_int32 rec_ui); static int unfold_century (struct calendar * jd, u_int32 rec_ui); static int gpsfix_century (struct calendar * jd, const gps_weektm * wd, u_short * ccentury); +static l_fp eval_gps_time (struct peer * peer, const struct calendar * gpst, + const struct timespec * gpso, const l_fp * recv); static int nmead_open (const char * device); static void save_ltc (struct refclockproc * const, const char * const, @@ -329,6 +335,9 @@ extern int async_write(int, const void *, unsigned int); #endif /* NMEA_WRITE_SUPPORT */ +static int32_t g_gpsMinBase; +static int32_t g_gpsMinYear; + /* * ------------------------------------------------------------------- * Transfer vector @@ -339,11 +348,46 @@ struct refclock refclock_nmea = { nmea_shutdown, /* shut down driver */ nmea_poll, /* transmit poll message */ NMEA_CONTROL, /* fudge control */ - noentry, /* initialize driver */ + nmea_init, /* initialize driver */ noentry, /* buginfo */ nmea_timer /* called once per second */ }; +/* + * ------------------------------------------------------------------- + * nmea_init - initialise data + * + * calculates a few runtime constants that cannot be made compile time + * constants. + * ------------------------------------------------------------------- + */ +static void +nmea_init(void) +{ + struct calendar date; + + /* - calculate min. base value for GPS epoch & century unfolding + * This assumes that the build system was roughly in sync with + * the world, and that really synchronising to a time before the + * program was created would be unsafe or insane. If the build + * date cannot be stablished, at least use the start of GPS + * (1980-01-06) as minimum, because GPS can surely NOT + * synchronise beyond it's own big bang. We add a little safety + * margin for the fuzziness of the build date, which is in an + * undefined time zone. */ + if (ntpcal_get_build_date(&date)) + g_gpsMinBase = ntpcal_date_to_rd(&date) - 2; + else + g_gpsMinBase = 0; + + if (g_gpsMinBase < DAY_GPS_STARTS) + g_gpsMinBase = DAY_GPS_STARTS; + + ntpcal_rd_to_date(&date, g_gpsMinBase); + g_gpsMinYear = date.year; + g_gpsMinBase -= DAY_NTP_STARTS; +} + /* * ------------------------------------------------------------------- * nmea_start - open the GPS devices and initialize data for processing @@ -528,9 +572,19 @@ nmea_control( if (-1 == up->ppsapi_fd) up->ppsapi_fd = pp->io.fd; if (refclock_ppsapi(up->ppsapi_fd, &up->atom)) { - up->ppsapi_lit = TRUE; /* use the PPS API for our own purposes now. */ - refclock_params(pp->sloppyclockflag, &up->atom); + up->ppsapi_lit = refclock_params( + pp->sloppyclockflag, &up->atom); + if (!up->ppsapi_lit) { + /* failed to configure, drop PPS unit */ + time_pps_destroy(up->atom.handle); + msyslog(LOG_WARNING, + "%s set PPSAPI params fails", + refnumtoa(&peer->srcadr)); + } + /* note: the PPS I/O handle remains valid until + * flag1 is cleared or the clock is shut down. + */ } else { msyslog(LOG_WARNING, "%s flag1 1 but PPSAPI fails", @@ -850,7 +904,7 @@ nmea_receive( DPRINTF(1, ("%s checksum missing: '%s'\n", refnumtoa(&peer->srcadr), rd_lastcode)); refclock_report(peer, CEVNT_BADREPLY); - up->tally.bad++; + up->tally.malformed++; return; } @@ -937,21 +991,26 @@ nmea_receive( } /* Check sanity of time-of-day. */ - if (rc_time == 0) /* no time or conversion error? */ + if (rc_time == 0) { /* no time or conversion error? */ checkres = CEVNT_BADTIME; + up->tally.malformed++; + } /* Check sanity of date. */ - else if (rc_date == 0) /* no date or conversion error? */ + else if (rc_date == 0) {/* no date or conversion error? */ checkres = CEVNT_BADDATE; + up->tally.malformed++; + } /* check clock sanity; [bug 2143] */ - else if (pp->leap == LEAP_NOTINSYNC) /* no good status? */ + else if (pp->leap == LEAP_NOTINSYNC) { /* no good status? */ checkres = CEVNT_BADREPLY; + up->tally.rejected++; + } else checkres = -1; if (checkres != -1) { save_ltc(pp, rd_lastcode, rd_lencode); refclock_report(peer, checkres); - up->tally.bad++; return; } @@ -973,8 +1032,7 @@ nmea_receive( * timecode timestamp, but only if the PPS is not in control. * Discard sentence if reference time did not change. */ - rd_reftime = tspec_intv_to_lfp(tofs); - rd_reftime.l_ui += caltontp(&date); + rd_reftime = eval_gps_time(peer, &date, &tofs, &rd_timestamp); if (L_ISEQU(&up->last_reftime, &rd_reftime)) { /* Do not touch pp->a_lastcode on purpose! */ up->tally.filtered++; @@ -987,7 +1045,7 @@ nmea_receive( refnumtoa(&peer->srcadr), rd_lastcode)); /* Data will be accepted. Update stats & log data. */ - up->tally.good++; + up->tally.accepted++; save_ltc(pp, rd_lastcode, rd_lencode); pp->lastrec = rd_timestamp; @@ -1090,10 +1148,13 @@ nmea_poll( */ if (peer->ttl & NMEA_EXTLOG_MASK) { /* Log & reset counters with extended logging */ + const char *nmea = pp->a_lastcode; + if (*nmea == '\0') nmea = "(none)"; mprintf_clock_stats( - &peer->srcadr, "%s %u %u %u %u %u", - pp->a_lastcode, - up->tally.total, up->tally.good, up->tally.bad, + &peer->srcadr, "%s %u %u %u %u %u %u", + nmea, + up->tally.total, up->tally.accepted, + up->tally.rejected, up->tally.malformed, up->tally.filtered, up->tally.pps_used); } else { record_clock_stats(&peer->srcadr, pp->a_lastcode); @@ -1628,7 +1689,9 @@ unfold_century( int32 baseyear; ntpcal_ntp_to_date(&rec, rec_ui, NULL); - baseyear = (rec.year > 2000) ? (rec.year - 20) : 1980; + baseyear = rec.year - 20; + if (baseyear < g_gpsMinYear) + baseyear = g_gpsMinYear; jd->year = (u_short)ntpcal_periodic_extend(baseyear, jd->year, 100); @@ -1700,6 +1763,114 @@ gpsfix_century( return FALSE; /* match failed... */ } +/* + * ------------------------------------------------------------------- + * And now the final execise: Considering the fact that many (most?) + * GPS receivers cannot handle a GPS epoch wrap well, we try to + * compensate for that problem by unwrapping a GPS epoch around the + * receive stamp. Another execise in periodic unfolding, of course, + * but with enough points to take care of. + * + * Note: The integral part of 'tofs' is intended to handle small(!) + * systematic offsets, as -1 for handling $GPZDG, which gives the + * following second. (sigh...) The absolute value shall be less than a + * day (86400 seconds). + * ------------------------------------------------------------------- + */ +static l_fp +eval_gps_time( + struct peer * peer, /* for logging etc */ + const struct calendar * gpst, /* GPS time stamp */ + const struct timespec * tofs, /* GPS frac second & offset */ + const l_fp * recv /* receive time stamp */ + ) +{ + struct refclockproc * const pp = peer->procptr; + nmea_unit * const up = (nmea_unit *)pp->unitptr; + + l_fp retv; + + /* components of calculation */ + int32_t rcv_sec, rcv_day; /* receive ToD and day */ + int32_t gps_sec, gps_day; /* GPS ToD and day in NTP epoch */ + int32_t adj_day, weeks; /* adjusted GPS day and week shift */ + + /* some temporaries to shuffle data */ + vint64 vi64; + ntpcal_split rs64; + + /* evaluate time stamp from receiver. */ + gps_sec = ntpcal_date_to_daysec(gpst); + gps_day = ntpcal_date_to_rd(gpst) - DAY_NTP_STARTS; + + /* merge in fractional offset */ + retv = tspec_intv_to_lfp(*tofs); + gps_sec += retv.l_i; + + /* If we fully trust the GPS receiver, just combine days and + * seconds and be done. */ + if (peer->ttl & NMEA_DATETRUST_MASK) { + retv.l_ui = ntpcal_dayjoin(gps_day, gps_sec).D_s.lo; + return retv; + } + + /* So we do not trust the GPS receiver to deliver a correct date + * due to the GPS epoch changes. We map the date from the + * receiver into the +/-512 week interval around the receive + * time in that case. This would be a tad easier with 64bit + * calculations, but again, we restrict the code to 32bit ops + * when possible. */ + + /* - make sure the GPS fractional day is normalised + * Applying the offset value might have put us slightly over the + * edge of the allowed range for seconds-of-day. Doing a full + * division with floor correction is overkill here; a simple + * addition or subtraction step is sufficient. Using WHILE loops + * gives the right result even if the offset exceeds one day, + * which is NOT what it's intented for! */ + while (gps_sec >= SECSPERDAY) { + gps_sec -= SECSPERDAY; + gps_day += 1; + } + while (gps_sec < 0) { + gps_sec += SECSPERDAY; + gps_day -= 1; + } + + /* - get unfold base: day of full recv time - 512 weeks */ + vi64 = ntpcal_ntp_to_ntp(recv->l_ui, NULL); + rs64 = ntpcal_daysplit(&vi64); + rcv_sec = rs64.lo; + rcv_day = rs64.hi - 512 * 7; + + /* - take the fractional days into account + * If the fractional day of the GPS time is smaller than the + * fractional day of the receive time, we shift the base day for + * the unfold by 1. */ + if ( gps_sec < rcv_sec + || (gps_sec == rcv_sec && retv.l_uf < recv->l_uf)) + rcv_day += 1; + + /* - don't warp ahead of GPS invention! */ + if (rcv_day < g_gpsMinBase) + rcv_day = g_gpsMinBase; + + /* - let the magic happen: */ + adj_day = ntpcal_periodic_extend(rcv_day, gps_day, 1024*7); + + /* - check if we should log a GPS epoch warp */ + weeks = (adj_day - gps_day) / 7; + if (weeks != up->epoch_warp) { + up->epoch_warp = weeks; + LOGIF(CLOCKINFO, (LOG_INFO, + "%s Changed GPS epoch warp to %d weeks", + refnumtoa(&peer->srcadr), weeks)); + } + + /* - build result and be done */ + retv.l_ui = ntpcal_dayjoin(adj_day, gps_sec).D_s.lo; + return retv; +} /* * =================================================================== diff --git a/external/bsd/ntp/dist/ntpd/refclock_oncore.c b/external/bsd/ntp/dist/ntpd/refclock_oncore.c index 6e16156f49be..d5f75bf6a2b1 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_oncore.c +++ b/external/bsd/ntp/dist/ntpd/refclock_oncore.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_oncore.c,v 1.8 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_oncore.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ /* * ---------------------------------------------------------------------------- @@ -921,7 +921,7 @@ oncore_ppsapi( return (0); } - pps_enable = 1; + hardpps_enable = 1; } return(1); } @@ -3448,9 +3448,10 @@ oncore_check_leap_sec( else if (instance->count4++ > 5) { /* delay, waiting for Gj response */ instance->saw_Gj = -1; /* didnt see it, will use Bj */ instance->count4 = 0; - if ((instance->BEHa[4] == 6) || (instance->BEHa[4] == 12)) + if ((instance->BEHa[4] == 6) || (instance->BEHa[4] == 12)) { oncore_sendmsg(instance, oncore_cmd_Bj, sizeof(oncore_cmd_Bj)); oncore_sendmsg(instance, oncore_cmd_Bl, sizeof(oncore_cmd_Bl)); + } } } } diff --git a/external/bsd/ntp/dist/ntpd/refclock_palisade.c b/external/bsd/ntp/dist/ntpd/refclock_palisade.c index 7d3afad52b83..9c9299f8bb0e 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_palisade.c +++ b/external/bsd/ntp/dist/ntpd/refclock_palisade.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_palisade.c,v 1.1.1.3 2013/12/27 23:31:00 christos Exp $ */ +/* $NetBSD: refclock_palisade.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * This software was developed by the Software and Component Technologies diff --git a/external/bsd/ntp/dist/ntpd/refclock_palisade.h b/external/bsd/ntp/dist/ntpd/refclock_palisade.h index 3bed0a79de26..784ce0d5aeb0 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_palisade.h +++ b/external/bsd/ntp/dist/ntpd/refclock_palisade.h @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_palisade.h,v 1.1.1.2 2013/12/27 23:30:50 christos Exp $ */ +/* $NetBSD: refclock_palisade.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * This software was developed by the Software and Component Technologies diff --git a/external/bsd/ntp/dist/ntpd/refclock_parse.c b/external/bsd/ntp/dist/ntpd/refclock_parse.c index 11c5350202e8..f804823277c5 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_parse.c +++ b/external/bsd/ntp/dist/ntpd/refclock_parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_parse.c,v 1.12 2014/01/07 02:10:49 joerg Exp $ */ +/* $NetBSD: refclock_parse.c,v 1.13 2014/12/19 20:43:17 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A @@ -2868,7 +2868,7 @@ parse_hardpps( * tell the rest, that we have a kernel PPS source, iff we ever enable HARDPPS */ if (mode == PARSE_HARDPPS_ENABLE) - pps_enable = 1; + hardpps_enable = 1; } } @@ -6033,7 +6033,7 @@ NONEMPTY_TRANSLATION_UNIT * implement fast refclock startup * * Revision 4.50 2005/04/16 20:51:35 kardel - * set pps_enable = 1 when binding a kernel PPS source + * set hardpps_enable = 1 when binding a kernel PPS source * * Revision 4.49 2005/04/16 17:29:26 kardel * add non polling clock type 18 for just listenning to Meinberg clocks diff --git a/external/bsd/ntp/dist/ntpd/refclock_pcf.c b/external/bsd/ntp/dist/ntpd/refclock_pcf.c index bbc49d10719e..c034790684ef 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_pcf.c +++ b/external/bsd/ntp/dist/ntpd/refclock_pcf.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_pcf.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_pcf.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_pcf - clock driver for the Conrad parallel port radio clock diff --git a/external/bsd/ntp/dist/ntpd/refclock_pst.c b/external/bsd/ntp/dist/ntpd/refclock_pst.c index e41f06b6c516..5d4a20264940 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_pst.c +++ b/external/bsd/ntp/dist/ntpd/refclock_pst.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_pst.c,v 1.1.1.3 2013/12/27 23:30:51 christos Exp $ */ +/* $NetBSD: refclock_pst.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_pst - clock driver for PSTI/Traconex WWV/WWVH receivers diff --git a/external/bsd/ntp/dist/ntpd/refclock_ripencc.c b/external/bsd/ntp/dist/ntpd/refclock_ripencc.c index 1756bd9380b2..0d8b79594301 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_ripencc.c +++ b/external/bsd/ntp/dist/ntpd/refclock_ripencc.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_ripencc.c,v 1.1.1.4 2014/12/19 20:37:41 christos Exp $ */ +/* $NetBSD: refclock_ripencc.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * Id: refclock_ripencc.c,v 1.13 2002/06/18 14:20:55 marks Exp marks diff --git a/external/bsd/ntp/dist/ntpd/refclock_shm.c b/external/bsd/ntp/dist/ntpd/refclock_shm.c index f387bffcb814..f28a3b0b1e94 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_shm.c +++ b/external/bsd/ntp/dist/ntpd/refclock_shm.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_shm.c,v 1.2 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_shm.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_shm - clock driver for utc via shared memory @@ -43,9 +43,6 @@ * This driver supports a reference clock attached thru shared memory */ -/* Temp hack to simplify testing of the old mode. */ -#define OLDWAY 0 - /* * SHM interface definitions */ @@ -62,8 +59,10 @@ static int shm_start (int unit, struct peer *peer); static void shm_shutdown (int unit, struct peer *peer); static void shm_poll (int unit, struct peer *peer); static void shm_timer (int unit, struct peer *peer); - int shm_peek (int unit, struct peer *peer); - void shm_clockstats (int unit, struct peer *peer); +static void shm_peek (int unit, struct peer *peer); +static void shm_clockstats (int unit, struct peer *peer); +static void shm_control (int unit, const struct refclockstat * in_st, + struct refclockstat * out_st, struct peer *peer); /* * Transfer vector @@ -72,7 +71,7 @@ struct refclock refclock_shm = { shm_start, /* start up driver */ shm_shutdown, /* shut down driver */ shm_poll, /* transmit poll message */ - noentry, /* not used: control */ + shm_control, /* control settings */ noentry, /* not used: init */ noentry, /* not used: buginfo */ shm_timer, /* once per second */ @@ -110,6 +109,9 @@ struct shmunit { int notready; /* number of peeks without data ready */ int bad; /* number of invalid samples */ int clash; /* number of access clashes while reading */ + + time_t max_delta; /* difference limit */ + time_t max_delay; /* age/stale limit */ }; @@ -216,14 +218,50 @@ shm_start( up->shm->valid = 0; up->shm->nsamples = NSAMPLES; pp->clockdesc = DESCRIPTION; + /* items to be changed later in 'shm_control()': */ + up->max_delay = 5; + up->max_delta = 4*3600; return 1; } else { free(up); + pp->unitptr = NULL; return 0; } } +/* + * shm_control - configure flag1/time2 params + * + * These are not yet available during 'shm_start', so we have to do any + * pre-computations we want to avoid during regular poll/timer callbacks + * in this callback. + */ +static void +shm_control( + int unit, + const struct refclockstat * in_st, + struct refclockstat * out_st, + struct peer * peer + ) +{ + struct refclockproc *pp; + struct shmunit *up; + + pp = peer->procptr; + up = pp->unitptr; + + if (NULL == up) + return; + if (pp->sloppyclockflag & CLK_FLAG1) + up->max_delta = 0; + else if (pp->fudgetime2 < 1. || pp->fudgetime2 > 86400.) + up->max_delta = 4*3600; + else + up->max_delta = (time_t)floor(pp->fudgetime2 + 0.5); +} + + /* * shm_shutdown - shut down the clock */ @@ -257,9 +295,6 @@ shm_shutdown( static void shm_timer(int unit, struct peer *peer) { - if (OLDWAY) - return; - shm_peek(unit, peer); } @@ -274,41 +309,77 @@ shm_poll( ) { struct refclockproc *pp; - int ok; + struct shmunit *up; + int major_error; pp = peer->procptr; + up = pp->unitptr; - if (OLDWAY) { - ok = shm_peek(unit, peer); - if (!ok) - return; - } + pp->polls++; + + /* get dominant reason if we have no samples at all */ + major_error = max(up->notready, up->bad); + major_error = max(major_error, up->clash); /* - * Process median filter samples. If none received, declare a - * timeout and keep going. + * Process median filter samples. If none received, see what + * happened, tell the core and keep going. */ - if (pp->coderecv == pp->codeproc) { + if (pp->coderecv != pp->codeproc) { + /* have some samples, everything OK */ + pp->lastref = pp->lastrec; + refclock_receive(peer); + } else if (NULL == up->shm) { /* is this possible at all? */ + /* we're out of business without SHM access */ + refclock_report(peer, CEVNT_FAULT); + } else if (major_error == up->clash) { + /* too many collisions is like a bad signal */ + refclock_report(peer, CEVNT_PROP); + } else if (major_error == up->bad) { + /* too much stale/bad/garbled data */ + refclock_report(peer, CEVNT_BADREPLY); + } else { + /* in any other case assume it's just a timeout */ refclock_report(peer, CEVNT_TIMEOUT); - shm_clockstats(unit, peer); - return; } - pp->lastref = pp->lastrec; - refclock_receive(peer); + /* shm_clockstats() clears the tallies, so it must be last... */ shm_clockstats(unit, peer); } /* * shm_peek - try to grab a sample */ -int shm_peek( +static void +shm_peek( int unit, struct peer *peer ) { struct refclockproc *pp; struct shmunit *up; - struct shmTime *shm; + + /* access order is important for lock-free SHM access; we + ** enforce order by treating the whole structure volatile. + ** + ** IMPORTANT NOTE: This does not protect from reordering on CPU + ** level, and it does nothing for cache consistency and + ** visibility of changes by other cores. We need atomic and/or + ** fence instructions for that. + */ + volatile struct shmTime *shm; + + struct timespec tvr; + struct timespec tvt; + l_fp tsrcv; + l_fp tsref; + unsigned int c; + unsigned int cns_new, rns_new; + int cnt; + + /* for formatting 'a_lastcode': */ + struct calendar cd; + time_t tt, now; + vint64 ts; /* * This is the main routine. It snatches the time from the shm @@ -324,144 +395,175 @@ int shm_peek( } shm = up->shm; if (shm == 0) { - refclock_report(peer, CEVNT_FAULT); - return 0; + DPRINTF(1, ("%s: no SHM segment\n", + refnumtoa(&peer->srcadr))); + return; + } + if ( ! shm->valid) { + DPRINTF(1, ("%s: SHM not ready\n", + refnumtoa(&peer->srcadr))); + up->notready++; + return; } - if (shm->valid) { - struct timespec tvr; - struct timespec tvt; - struct tm *t; - char timestr[20]; /* "%Y-%m-%dT%H:%M:%S" + 1 */ - int c; - int ok = 1; - unsigned cns_new, rns_new; - int cnt; - tvr.tv_sec = 0; - tvr.tv_nsec = 0; - tvt.tv_sec = 0; - tvt.tv_nsec = 0; - switch (shm->mode) { - case 0: - tvr.tv_sec = shm->receiveTimeStampSec; - tvr.tv_nsec = shm->receiveTimeStampUSec * 1000; - rns_new = shm->receiveTimeStampNSec; - tvt.tv_sec = shm->clockTimeStampSec; - tvt.tv_nsec = shm->clockTimeStampUSec * 1000; - cns_new = shm->clockTimeStampNSec; + switch (shm->mode) { + case 0: + tvr.tv_sec = shm->receiveTimeStampSec; + tvr.tv_nsec = shm->receiveTimeStampUSec * 1000; + rns_new = shm->receiveTimeStampNSec; + tvt.tv_sec = shm->clockTimeStampSec; + tvt.tv_nsec = shm->clockTimeStampUSec * 1000; + cns_new = shm->clockTimeStampNSec; - /* Since these comparisons are between unsigned - ** variables they are always well defined, and any - ** (signed) underflow will turn into very large - ** unsigned values, well above the 1000 cutoff - */ - if ( ((cns_new - (unsigned)tvt.tv_nsec) < 1000) - && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) { - tvt.tv_nsec = cns_new; - tvr.tv_nsec = rns_new; - } - // At this point tvr and tvt contains valid ns-level - // timestamps, possibly generated by extending the - // old us-level timestamps - - break; - - case 1: - cnt = shm->count; - - tvr.tv_sec = shm->receiveTimeStampSec; - tvr.tv_nsec = shm->receiveTimeStampUSec * 1000; - rns_new = shm->receiveTimeStampNSec; - tvt.tv_sec = shm->clockTimeStampSec; - tvt.tv_nsec = shm->clockTimeStampUSec * 1000; - cns_new = shm->clockTimeStampNSec; - ok = (cnt == shm->count); - - /* Since these comparisons are between unsigned - ** variables they are always well defined, and any - ** (signed) underflow will turn into very large - ** unsigned values, well above the 1000 cutoff - */ - if ( ((cns_new - (unsigned)tvt.tv_nsec) < 1000) - && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) { - tvt.tv_nsec = cns_new; - tvr.tv_nsec = rns_new; - } - // At this point tvr and tvt contains valid ns-level - // timestamps, possibly generated by extending the - // old us-level timestamps - - break; - - default: - msyslog (LOG_ERR, "SHM: bad mode found in shared memory: %d",shm->mode); - return 0; + /* Since the following comparisons are between unsigned + ** variables they are always well defined, and any + ** (signed) underflow will turn into very large unsigned + ** values, well above the 1000 cutoff. + ** + ** Note: The usecs *must* be a *truncated* + ** representation of the nsecs. This code will fail for + ** *rounded* usecs, and the logic to deal with + ** wrap-arounds in the presence of rounded values is + ** much more convoluted. + */ + if ( ((cns_new - (unsigned)tvt.tv_nsec) < 1000) + && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) { + tvt.tv_nsec = cns_new; + tvr.tv_nsec = rns_new; } + /* At this point tvr and tvt contains valid ns-level + ** timestamps, possibly generated by extending the old + ** us-level timestamps + */ + DPRINTF(2, ("%s: SHM type 0 sample\n", + refnumtoa(&peer->srcadr))); + break; - /* XXX NetBSD has incompatible tv_sec */ - t = gmtime((const time_t *)&tvt.tv_sec); + case 1: + cnt = shm->count; - /* add ntpq -c cv timecode in ISO 8601 format */ - strftime(timestr, sizeof(timestr), "%Y-%m-%dT%H:%M:%S", t); - c = snprintf(pp->a_lastcode, sizeof(pp->a_lastcode), - "%s.%09ldZ", timestr, (long)tvt.tv_nsec); - pp->lencode = ((size_t)c < sizeof(pp->a_lastcode)) - ? c - : 0; - - shm->valid = 0; - if (ok) { - pp->lastrec = tspec_stamp_to_lfp(tvr); - pp->polls++; - pp->day = t->tm_yday+1; - pp->hour = t->tm_hour; - pp->minute = t->tm_min; - pp->second = t->tm_sec; - pp->nsec = tvt.tv_nsec; - peer->precision = shm->precision; - pp->leap = shm->leap; - } else { - refclock_report(peer, CEVNT_FAULT); + tvr.tv_sec = shm->receiveTimeStampSec; + tvr.tv_nsec = shm->receiveTimeStampUSec * 1000; + rns_new = shm->receiveTimeStampNSec; + tvt.tv_sec = shm->clockTimeStampSec; + tvt.tv_nsec = shm->clockTimeStampUSec * 1000; + cns_new = shm->clockTimeStampNSec; + if (cnt != shm->count) { + DPRINTF(1, ("%s: type 1 access clash\n", + refnumtoa(&peer->srcadr))); msyslog (LOG_NOTICE, "SHM: access clash in shared memory"); up->clash++; - return 0; + return; } - } else { - refclock_report(peer, CEVNT_TIMEOUT); - up->notready++; - return 0; - } - if (!refclock_process(pp)) { - refclock_report(peer, CEVNT_BADTIME); + + /* See the case above for an explanation of the + ** following test. + */ + if ( ((cns_new - (unsigned)tvt.tv_nsec) < 1000) + && ((rns_new - (unsigned)tvr.tv_nsec) < 1000)) { + tvt.tv_nsec = cns_new; + tvr.tv_nsec = rns_new; + } + /* At this point tvr and tvt contains valid ns-level + ** timestamps, possibly generated by extending the old + ** us-level timestamps + */ + DPRINTF(2, ("%s: SHM type 1 sample\n", + refnumtoa(&peer->srcadr))); + break; + + default: + DPRINTF(1, ("%s: SHM type blooper, mode=%d\n", + refnumtoa(&peer->srcadr), shm->mode)); up->bad++; - return 0; + msyslog (LOG_ERR, "SHM: bad mode found in shared memory: %d", + shm->mode); + return; } + shm->valid = 0; + + /* format the last time code in human-readable form into + * 'pp->a_lastcode'. Someone claimed: "NetBSD has incompatible + * tv_sec". I can't find a base for this claim, but we can work + * around that potential problem. BTW, simply casting a pointer + * is a receipe for disaster on some architectures. + */ + tt = (time_t)tvt.tv_sec; + ts = time_to_vint64(&tt); + ntpcal_time_to_date(&cd, &ts); + + /* add ntpq -c cv timecode in ISO 8601 format */ + c = snprintf(pp->a_lastcode, sizeof(pp->a_lastcode), + "%04u-%02u-%02uT%02u:%02u:%02u.%09ldZ", + cd.year, cd.month, cd.monthday, + cd.hour, cd.minute, cd.second, + (long)tvt.tv_nsec); + pp->lencode = (c < sizeof(pp->a_lastcode)) ? c : 0; + + /* check 1: age control of local time stamp */ + time(&now); + tt = now - tvr.tv_sec; + if (tt < 0 || tt > up->max_delay) { + DPRINTF(1, ("%s:SHM stale/bad receive time, delay=%llds\n", + refnumtoa(&peer->srcadr), (long long)tt)); + up->bad++; + msyslog (LOG_ERR, "SHM: stale/bad receive time, delay=%llds", + (long long)tt); + return; + } + + /* check 2: delta check */ + tt = tvr.tv_sec - tvt.tv_sec - (tvr.tv_nsec < tvt.tv_nsec); + if (tt < 0) + tt = -tt; + if (up->max_delta > 0 && tt > up->max_delta) { + DPRINTF(1, ("%s: SHM diff limit exceeded, delta=%llds\n", + refnumtoa(&peer->srcadr), (long long)tt)); + up->bad++; + msyslog (LOG_ERR, "SHM: difference limit exceeded, delta=%llds\n", + (long long)tt); + return; + } + + /* if we really made it to this point... we're winners! */ + DPRINTF(2, ("%s: SHM feeding data\n", + refnumtoa(&peer->srcadr))); + tsrcv = tspec_stamp_to_lfp(tvr); + tsref = tspec_stamp_to_lfp(tvt); + pp->leap = shm->leap; + peer->precision = shm->precision; + refclock_process_offset(pp, tsref, tsrcv, pp->fudgetime1); up->good++; - return 1; } /* * shm_clockstats - dump and reset counters */ -void shm_clockstats( +static void shm_clockstats( int unit, struct peer *peer ) { struct refclockproc *pp; struct shmunit *up; - char logbuf[256]; + char logbuf[64]; + unsigned int llen; pp = peer->procptr; up = pp->unitptr; - if (!(pp->sloppyclockflag & CLK_FLAG4)) - return; - - snprintf(logbuf, sizeof(logbuf), "%3d %3d %3d %3d %3d", - up->ticks, up->good, up->notready, up->bad, up->clash); - record_clock_stats(&peer->srcadr, logbuf); - + if (pp->sloppyclockflag & CLK_FLAG4) { + /* if snprintf() returns a negative values on errors + ** (some older ones do) make sure we are NUL + ** terminated. Using an unsigned result does the trick. + */ + llen = snprintf(logbuf, sizeof(logbuf), + "%3d %3d %3d %3d %3d", + up->ticks, up->good, up->notready, + up->bad, up->clash); + logbuf[min(llen, sizeof(logbuf)-1)] = '\0'; + record_clock_stats(&peer->srcadr, logbuf); + } up->ticks = up->good = up->notready = up->bad = up->clash = 0; } diff --git a/external/bsd/ntp/dist/ntpd/refclock_tpro.c b/external/bsd/ntp/dist/ntpd/refclock_tpro.c index 6012dc6e54b0..a9982251a6f1 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_tpro.c +++ b/external/bsd/ntp/dist/ntpd/refclock_tpro.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_tpro.c,v 1.1.1.3 2013/12/27 23:30:53 christos Exp $ */ +/* $NetBSD: refclock_tpro.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_tpro - clock driver for the KSI/Odetics TPRO-S IRIG-B reader diff --git a/external/bsd/ntp/dist/ntpd/refclock_true.c b/external/bsd/ntp/dist/ntpd/refclock_true.c index e2dc8b642bd6..1f9996c0cb73 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_true.c +++ b/external/bsd/ntp/dist/ntpd/refclock_true.c @@ -1,11 +1,10 @@ -/* $NetBSD: refclock_true.c,v 1.2 2014/01/02 21:35:50 joerg Exp $ */ +/* $NetBSD: refclock_true.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* - * refclock_true - clock driver for the Kinemetrics Truetime receivers + * refclock_true - clock driver for the Kinemetrics/TrueTime receivers * Receiver Version 3.0C - tested plain, with CLKLDISC - * Developement work being done: - * - Properly handle varying satellite positions (more acurately) - * - Integrate GPSTM and/or OMEGA and/or TRAK and/or ??? drivers + * Development work being done: + * - Support TL-3 WWV TOD receiver */ #ifdef HAVE_CONFIG_H @@ -52,10 +51,11 @@ extern int async_write(int, const void *, unsigned int); /* * Support for Kinemetrics Truetime Receivers - * GOES - * GPS/TM-TMD - * XL-DC (a 151-602-210, reported by the driver as a GPS/TM-TMD) - * GPS-800 TCU (an 805-957 with the RS232 Talker/Listener module) + * GOES: (468-DC, usable with GPS->GOES converting antenna) + * GPS/TM-TMD: + * XL-DC: (a 151-602-210, reported by the driver as a GPS/TM-TMD) + * GPS-800 TCU: (an 805-957 with the RS232 Talker/Listener module) + * TL-3: 3 channel WWV/H receiver w/ IRIG and RS-232 outputs * OM-DC: getting stale ("OMEGA") * * Most of this code is originally from refclock_wwvb.c with thanks. @@ -73,6 +73,9 @@ extern int async_write(int, const void *, unsigned int); * ? +/- 1 milliseconds # +/- 100 microseconds * * +/- 10 microseconds . +/- 1 microsecond * space less than 1 microsecond + * TL-3 Receiver: (default quality codes for TL-3) + * ? unknown quality (receiver is unlocked) + * space +/- 5 milliseconds * OM-DC OMEGA Receiver: (default quality codes for OMEGA) * WARNING OMEGA navigation system is no longer existent * > >+- 5 seconds @@ -105,16 +108,27 @@ extern int async_write(int, const void *, unsigned int); * This corrects the 4 milliseconds advance and 8 milliseconds retard * needed. The software will ask the clock which satellite it sees. * - * Ntp.conf parameters: - * time1 - offset applied to samples when reading WEST satellite (default = 0) - * time2 - offset applied to samples when reading EAST satellite (default = 0) - * val1 - stratum to assign to this clock (default = 0) - * val2 - refid assigned to this clock (default = "TRUE", see below) - * flag1 - will silence the clock side of ntpd, just reading the clock - * without trying to write to it. (default = 0) - * flag2 - generate a debug file /tmp/true%d. - * flag3 - enable ppsclock streams module - * flag4 - use the PCL-720 (BSD/OS only) + * Notes on the TrueTime TimeLink TL-3 WWV TOD receiver: + * + * This clock may be polled, or send one timecode per second. + * That mode may be toggled via the front panel ("C" mode), or controlled + * from the RS-232 port. Send the receiver "ST1" to turn it on, and + * "ST0" to turn it off. Send "QV" to get the firmware revision (useful + * for identifying this model.) + * + * Note that it can take several polling cycles, especially if the receiver + * was in the continuous timecode mode. (It can be slow to leave that mode.) + * + * ntp.conf parameters: + * time1 - offset applied to samples when reading WEST satellite (default = 0) + * time2 - offset applied to samples when reading EAST satellite (default = 0) + * stratum - stratum to assign to this clock (default = 0) + * refid - refid assigned to this clock (default = "TRUE", see below) + * flag1 - will silence the clock side of ntpd, just reading the clock + * without trying to write to it. (default = 0) + * flag2 - generate a debug file /tmp/true%d. + * flag3 - enable ppsclock streams module + * flag4 - use the PCL-720 (BSD/OS only) */ @@ -141,19 +155,19 @@ extern int async_write(int, const void *, unsigned int); * used by the state machine */ enum true_event {e_Init, e_Huh, e_F18, e_F50, e_F51, e_Satellite, - e_Poll, e_Location, e_TS, e_Max}; + e_TL3, e_Poll, e_Location, e_TS, e_Max}; const char *events[] = {"Init", "Huh", "F18", "F50", "F51", "Satellite", - "Poll", "Location", "TS"}; + "TL3", "Poll", "Location", "TS"}; #define eventStr(x) (((int)x<(int)e_Max) ? events[(int)x] : "?") enum true_state {s_Base, s_InqTM, s_InqTCU, s_InqOmega, s_InqGOES, - s_Init, s_F18, s_F50, s_Start, s_Auto, s_Max}; + s_InqTL3, s_Init, s_F18, s_F50, s_Start, s_Auto, s_Max}; const char *states[] = {"Base", "InqTM", "InqTCU", "InqOmega", "InqGOES", - "Init", "F18", "F50", "Start", "Auto"}; + "InqTL3", "Init", "F18", "F50", "Start", "Auto"}; #define stateStr(x) (((int)x<(int)s_Max) ? states[(int)x] : "?") -enum true_type {t_unknown, t_goes, t_tm, t_tcu, t_omega, t_Max}; -const char *types[] = {"unknown", "goes", "tm", "tcu", "omega"}; +enum true_type {t_unknown, t_goes, t_tm, t_tcu, t_omega, t_tl3, t_Max}; +const char *types[] = {"unknown", "goes", "tm", "tcu", "omega", "tl3"}; #define typeStr(x) (((int)x<(int)t_Max) ? types[(int)x] : "?") /* @@ -460,11 +474,24 @@ true_receive( return; } + /* + * Timecode: "VER xx.xx" + * (from a TL3 when sent "QV", so id's it during initialization.) + */ + if (pp->a_lastcode[0] == 'V' && pp->a_lastcode[1] == 'E' && + pp->a_lastcode[2] == 'R' && pp->a_lastcode[6] == '.') { + true_doevent(peer, e_TL3); + NLOG(NLOG_CLOCKSTATUS) { + msyslog(LOG_INFO, "TL3: %s", pp->a_lastcode); + } + return; + } + /* * Timecode: " TRUETIME Mk III" or " TRUETIME XL" * (from a TM/TMD/XL clock during initialization.) */ - if (strcmp(pp->a_lastcode, " TRUETIME Mk III") == 0 || + if (strncmp(pp->a_lastcode, " TRUETIME Mk III ", 17) == 0 || strncmp(pp->a_lastcode, " TRUETIME XL", 12) == 0) { true_doevent(peer, e_F18); NLOG(NLOG_CLOCKSTATUS) { @@ -563,7 +590,13 @@ true_receive( if (!up->polled) return; - true_doevent(peer, e_Poll); + /* We only call doevent if additional things need be done + * at poll interval. Currently, its only for GOES. We also + * call it for clock unknown so that it gets logged. + */ + if (up->type == t_goes || up->type == t_unknown) + true_doevent(peer, e_Poll); + if (!refclock_process(pp)) { refclock_report(peer, CEVNT_BADTIME); return; @@ -688,6 +721,19 @@ true_doevent( break; case e_F18: true_send(peer, "F50\r"); + /* + * Timecode: " TRUETIME Mk III" or " TRUETIME XL" + * (from a TM/TMD/XL clock during initialization.) + */ + if ( strcmp(pp->a_lastcode, " TRUETIME Mk III") == 0 || + strncmp(pp->a_lastcode, " TRUETIME XL", 12) == 0) { + true_doevent(peer, e_F18); + NLOG(NLOG_CLOCKSTATUS) { + msyslog(LOG_INFO, "TM/TMD/XL: %s", + pp->a_lastcode); + } + return; + } up->state = s_F18; break; case e_F50: @@ -728,7 +774,21 @@ true_doevent( break; } break; + case t_tl3: + switch (event) { + case e_Init: + true_send(peer, "ST1"); /* Turn on continuous stream */ + break; + case e_TS: + up->state = s_Auto; + break; + default: + break; + } + break; case t_unknown: + if (event == e_Poll) + break; switch (up->state) { case s_Base: if (event != e_Init) @@ -743,13 +803,37 @@ true_doevent( true_doevent(peer, e_Init); break; case e_Init: /*FALLTHROUGH*/ - case e_Huh: /*FALLTHROUGH*/ + case e_Huh: case e_TS: + true_send(peer, "ST0"); /* turn off TL3 auto */ + sleep(1); /* wait for it */ + up->state = s_InqTL3; + true_send(peer, "QV"); /* see if its a TL3 */ + break; + default: + abort(); + } + break; + case s_InqTL3: + switch (event) { + case e_TL3: + up->type = t_tl3; + up->state = s_Auto; /* Inq side-effect. */ + true_send(peer, "ST1"); /* Turn on 1/sec data */ + break; + case e_Init: /*FALLTHROUGH*/ + case e_Huh: up->state = s_InqOmega; true_send(peer, "C\r"); break; - default: - abort(); + case e_TS: + up->type = t_tl3; /* Already sending data */ + up->state = s_Auto; + break; + default: + msyslog(LOG_INFO, + "TRUE: TL3 init fellthrough! (%d)", event); + break; } break; case s_InqOmega: @@ -779,7 +863,9 @@ true_doevent( up->state = s_InqTCU; break; default: - abort(); + msyslog(LOG_INFO, + "TRUE: TM/TMD init fellthrough!"); + break; } break; case s_InqTCU: @@ -794,7 +880,9 @@ true_doevent( sleep(1); /* XXX */ break; default: - abort(); + msyslog(LOG_INFO, + "TRUE: TCU init fellthrough!"); + break; } break; /* @@ -812,7 +900,8 @@ true_doevent( } break; default: - abort(); + msyslog(LOG_INFO, "TRUE: cannot identify refclock!"); + abort(); /* NOTREACHED */ } diff --git a/external/bsd/ntp/dist/ntpd/refclock_tsyncpci.c b/external/bsd/ntp/dist/ntpd/refclock_tsyncpci.c index 82725a42f19f..1bcc8c19d209 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_tsyncpci.c +++ b/external/bsd/ntp/dist/ntpd/refclock_tsyncpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_tsyncpci.c,v 1.1.1.1 2013/12/27 23:30:52 christos Exp $ */ +/* $NetBSD: refclock_tsyncpci.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /******************************************************************************* * diff --git a/external/bsd/ntp/dist/ntpd/refclock_tt560.c b/external/bsd/ntp/dist/ntpd/refclock_tt560.c index 1596b3ecf8b0..a75d620ae08b 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_tt560.c +++ b/external/bsd/ntp/dist/ntpd/refclock_tt560.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_tt560.c,v 1.1.1.2 2013/12/27 23:31:02 christos Exp $ */ +/* $NetBSD: refclock_tt560.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_tt560 - clock driver for the TrueTime 560 IRIG-B decoder diff --git a/external/bsd/ntp/dist/ntpd/refclock_ulink.c b/external/bsd/ntp/dist/ntpd/refclock_ulink.c index 86afd4bcf8d1..5f8a0d932f02 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_ulink.c +++ b/external/bsd/ntp/dist/ntpd/refclock_ulink.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_ulink.c,v 1.1.1.2 2013/12/27 23:30:52 christos Exp $ */ +/* $NetBSD: refclock_ulink.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_ulink - clock driver for Ultralink WWVB receiver diff --git a/external/bsd/ntp/dist/ntpd/refclock_wwv.c b/external/bsd/ntp/dist/ntpd/refclock_wwv.c index 273deffaaaed..937466e1246f 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_wwv.c +++ b/external/bsd/ntp/dist/ntpd/refclock_wwv.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_wwv.c,v 1.2 2014/02/27 18:11:41 joerg Exp $ */ +/* $NetBSD: refclock_wwv.c,v 1.3 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_wwv - clock driver for NIST WWV/H time/frequency station diff --git a/external/bsd/ntp/dist/ntpd/refclock_wwvb.c b/external/bsd/ntp/dist/ntpd/refclock_wwvb.c index 6cba006f3c04..0f3a5f16e790 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_wwvb.c +++ b/external/bsd/ntp/dist/ntpd/refclock_wwvb.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_wwvb.c,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: refclock_wwvb.c,v 1.4 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_wwvb - clock driver for Spectracom WWVB and GPS receivers diff --git a/external/bsd/ntp/dist/ntpd/refclock_zyfer.c b/external/bsd/ntp/dist/ntpd/refclock_zyfer.c index 245c1aa0fea1..fdcee0d40455 100644 --- a/external/bsd/ntp/dist/ntpd/refclock_zyfer.c +++ b/external/bsd/ntp/dist/ntpd/refclock_zyfer.c @@ -1,4 +1,4 @@ -/* $NetBSD: refclock_zyfer.c,v 1.1.1.2 2013/12/27 23:30:56 christos Exp $ */ +/* $NetBSD: refclock_zyfer.c,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * refclock_zyfer - clock driver for the Zyfer GPSTarplus Clock diff --git a/external/bsd/ntp/dist/ntpdate/ntpdate.c b/external/bsd/ntp/dist/ntpdate/ntpdate.c index 176b5a5d5a55..6b7b49b4943f 100644 --- a/external/bsd/ntp/dist/ntpdate/ntpdate.c +++ b/external/bsd/ntp/dist/ntpdate/ntpdate.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdate.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpdate.c,v 1.5 2014/12/19 20:43:17 christos Exp $ */ /* * ntpdate - set the time of day by polling one or more NTP servers diff --git a/external/bsd/ntp/dist/ntpdate/ntpdate.h b/external/bsd/ntp/dist/ntpdate/ntpdate.h index dfad86bfa4ab..0eb2ad8408dd 100644 --- a/external/bsd/ntp/dist/ntpdate/ntpdate.h +++ b/external/bsd/ntp/dist/ntpdate/ntpdate.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdate.h,v 1.1.1.3 2013/12/27 23:31:03 christos Exp $ */ +/* $NetBSD: ntpdate.h,v 1.2 2014/12/19 20:43:17 christos Exp $ */ /* * ntpdate.h - declarations for the ntpdate and ntptimeset programs diff --git a/external/bsd/ntp/dist/ntpdc/nl_in.c b/external/bsd/ntp/dist/ntpdc/nl_in.c index 66d283794dd2..3329afd4d638 100644 --- a/external/bsd/ntp/dist/ntpdc/nl_in.c +++ b/external/bsd/ntp/dist/ntpdc/nl_in.c @@ -1,4 +1,4 @@ -/* $NetBSD: nl_in.c,v 1.1.1.1 2009/12/13 16:56:26 kardel Exp $ */ +/* $NetBSD: nl_in.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #include #include "ntpdc.h" diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc-layout.c b/external/bsd/ntp/dist/ntpdc/ntpdc-layout.c index 7af7768a306c..32f94a7cc67b 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc-layout.c +++ b/external/bsd/ntp/dist/ntpdc/ntpdc-layout.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc-layout.c,v 1.1.1.2 2013/12/27 23:31:04 christos Exp $ */ +/* $NetBSD: ntpdc-layout.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * ntpdc-layout - print layout of NTP mode 7 request/response packets diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c b/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c index cc526855043e..d640b8bbf986 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c +++ b/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc-opts.c,v 1.1.1.4 2014/12/19 20:37:42 christos Exp $ */ +/* $NetBSD: ntpdc-opts.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h b/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h index 02279308891b..78b6ff14900f 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h +++ b/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc-opts.h,v 1.1.1.4 2014/12/19 20:37:42 christos Exp $ */ +/* $NetBSD: ntpdc-opts.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc.c b/external/bsd/ntp/dist/ntpdc/ntpdc.c index 0c633421ea3d..af6bdd3723fd 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc.c +++ b/external/bsd/ntp/dist/ntpdc/ntpdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc.c,v 1.7 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpdc.c,v 1.8 2014/12/19 20:43:18 christos Exp $ */ /* * ntpdc - control and monitor your ntpd daemon diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc.h b/external/bsd/ntp/dist/ntpdc/ntpdc.h index d1d21b479ac3..a57a7d410993 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc.h +++ b/external/bsd/ntp/dist/ntpdc/ntpdc.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc.h,v 1.3 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpdc.h,v 1.4 2014/12/19 20:43:18 christos Exp $ */ /* * ntpdc.h - definitions of interest to ntpdc diff --git a/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c b/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c index eaa70e076b94..83e57c55f839 100644 --- a/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c +++ b/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc_ops.c,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpdc_ops.c,v 1.5 2014/12/19 20:43:18 christos Exp $ */ /* * ntpdc_ops.c - subroutines which are called to perform operations by diff --git a/external/bsd/ntp/dist/ntpq/libntpq.c b/external/bsd/ntp/dist/ntpq/libntpq.c index 05096a573ca1..a4e2f8a54c32 100644 --- a/external/bsd/ntp/dist/ntpq/libntpq.c +++ b/external/bsd/ntp/dist/ntpq/libntpq.c @@ -1,4 +1,4 @@ -/* $NetBSD: libntpq.c,v 1.1.1.3 2013/12/27 23:31:05 christos Exp $ */ +/* $NetBSD: libntpq.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/ntpq/libntpq.h b/external/bsd/ntp/dist/ntpq/libntpq.h index 165523dc641c..502232b72845 100644 --- a/external/bsd/ntp/dist/ntpq/libntpq.h +++ b/external/bsd/ntp/dist/ntpq/libntpq.h @@ -1,4 +1,4 @@ -/* $NetBSD: libntpq.h,v 1.1.1.3 2013/12/27 23:31:06 christos Exp $ */ +/* $NetBSD: libntpq.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/ntpq/libntpq_subs.c b/external/bsd/ntp/dist/ntpq/libntpq_subs.c index ff14abe35d65..89f89faa384c 100644 --- a/external/bsd/ntp/dist/ntpq/libntpq_subs.c +++ b/external/bsd/ntp/dist/ntpq/libntpq_subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: libntpq_subs.c,v 1.1.1.3 2013/12/27 23:31:05 christos Exp $ */ +/* $NetBSD: libntpq_subs.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/ntpq/ntpq-opts.c b/external/bsd/ntp/dist/ntpq/ntpq-opts.c index 13b4952cea36..1797b476f06e 100644 --- a/external/bsd/ntp/dist/ntpq/ntpq-opts.c +++ b/external/bsd/ntp/dist/ntpq/ntpq-opts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpq-opts.c,v 1.1.1.4 2014/12/19 20:37:42 christos Exp $ */ +/* $NetBSD: ntpq-opts.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) diff --git a/external/bsd/ntp/dist/ntpq/ntpq-opts.h b/external/bsd/ntp/dist/ntpq/ntpq-opts.h index 88d3dffc87cf..d9b285b36a6f 100644 --- a/external/bsd/ntp/dist/ntpq/ntpq-opts.h +++ b/external/bsd/ntp/dist/ntpq/ntpq-opts.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpq-opts.h,v 1.1.1.4 2014/12/19 20:37:42 christos Exp $ */ +/* $NetBSD: ntpq-opts.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) diff --git a/external/bsd/ntp/dist/ntpq/ntpq-subs.c b/external/bsd/ntp/dist/ntpq/ntpq-subs.c index f5abf7274c9e..fb6e02b0db0e 100644 --- a/external/bsd/ntp/dist/ntpq/ntpq-subs.c +++ b/external/bsd/ntp/dist/ntpq/ntpq-subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpq-subs.c,v 1.7 2014/01/03 20:26:45 joerg Exp $ */ +/* $NetBSD: ntpq-subs.c,v 1.8 2014/12/19 20:43:18 christos Exp $ */ /* * ntpq-subs.c - subroutines which are called to perform ntpq commands. @@ -212,7 +212,7 @@ struct xcmd opcmds[] = { * Variable list data space */ #define MAXLINE 512 /* maximum length of a line */ -#define MAXLIST 64 /* maximum variables in list */ +#define MAXLIST 128 /* maximum variables in list */ #define LENHOSTNAME 256 /* host name limit */ #define MRU_GOT_COUNT 0x1 @@ -279,6 +279,7 @@ struct varlist { * Imported from ntpq.c */ extern int showhostnames; +extern int wideremote; extern int rawmode; extern struct servent *server_entry; extern struct association *assoc_cache; @@ -539,8 +540,12 @@ makequerydata( else valuelen = strlen(vl->value); totallen = namelen + valuelen + (valuelen != 0) + (cp != data); - if (cp + totallen > cpend) - break; + if (cp + totallen > cpend) { + fprintf(stderr, + "***Ignoring variables starting with `%s'\n", + vl->name); + break; + } if (cp != data) *cp++ = ','; @@ -1028,8 +1033,8 @@ mreadvar( &from, &to, fp)) return; + ZERO(tmplist); if (pcmd->nargs >= 3) { - ZERO(tmplist); doaddvlist(tmplist, pcmd->argval[2].string); pvars = tmplist; } else { @@ -1767,7 +1772,10 @@ doprintpeers( if (!have_srchost) strlcpy(clock_name, nntohost(&srcadr), sizeof(clock_name)); - fprintf(fp, "%c%-15.15s ", c, clock_name); + if (wideremote && 15 < strlen(clock_name)) + fprintf(fp, "%c%s\n ", c, clock_name); + else + fprintf(fp, "%c%-15.15s ", c, clock_name); if (!have_da_rid) { drlen = 0; } else { diff --git a/external/bsd/ntp/dist/ntpq/ntpq.c b/external/bsd/ntp/dist/ntpq/ntpq.c index 7ead864bc9d4..e24c8d3e5936 100644 --- a/external/bsd/ntp/dist/ntpq/ntpq.c +++ b/external/bsd/ntp/dist/ntpq/ntpq.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpq.c,v 1.9 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpq.c,v 1.10 2014/12/19 20:43:18 christos Exp $ */ /* * ntpq - query an NTP server using mode 6 commands @@ -321,6 +321,7 @@ char currenthost[LENHOSTNAME]; /* current host name */ int currenthostisnum; /* is prior text from IP? */ struct sockaddr_in hostaddr; /* host address */ int showhostnames = 1; /* show host names by default */ +int wideremote = 0; /* show wide remote names? */ int ai_fam_templ; /* address family */ int ai_fam_default; /* default address family */ @@ -487,6 +488,9 @@ ntpqmain( if (HAVE_OPT(NUMERIC)) showhostnames = 0; + if (HAVE_OPT(WIDE)) + wideremote = 1; + old_rv = HAVE_OPT(OLD_RV); if (0 == argc) { @@ -1575,6 +1579,8 @@ tokenize( if (*ntok == 1 && tokens[0][0] == ':') { do { + if (sp - tspace >= MAXLINE) + goto toobig; *sp++ = *cp++; } while (!ISEOL(*cp)); } @@ -1585,19 +1591,33 @@ tokenize( else if (*cp == '\"') { ++cp; do { + if (sp - tspace >= MAXLINE) + goto toobig; *sp++ = *cp++; } while ((*cp != '\"') && !ISEOL(*cp)); /* HMS: a missing closing " should be an error */ } else { do { + if (sp - tspace >= MAXLINE) + goto toobig; *sp++ = *cp++; } while ((*cp != '\"') && !ISSPACE(*cp) && !ISEOL(*cp)); /* HMS: Why check for a " in the previous line? */ } + if (sp - tspace >= MAXLINE) + goto toobig; *sp++ = '\0'; } + return; + + toobig: + *ntok = 0; + fprintf(stderr, + "***Line `%s' is too big\n", + line); + return; } diff --git a/external/bsd/ntp/dist/ntpq/ntpq.h b/external/bsd/ntp/dist/ntpq/ntpq.h index 20f330e8b701..02fc0394898d 100644 --- a/external/bsd/ntp/dist/ntpq/ntpq.h +++ b/external/bsd/ntp/dist/ntpq/ntpq.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpq.h,v 1.4 2013/12/28 03:20:14 christos Exp $ */ +/* $NetBSD: ntpq.h,v 1.5 2014/12/19 20:43:18 christos Exp $ */ /* * ntpq.h - definitions of interest to ntpq diff --git a/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c b/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c index b7624b741713..894d34c2f6c6 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c +++ b/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c @@ -1,4 +1,4 @@ -/* $NetBSD: netsnmp_daemonize.c,v 1.1.1.3 2013/12/27 23:31:07 christos Exp $ */ +/* $NetBSD: netsnmp_daemonize.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * system.c diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c b/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c index d65c8eb5517b..118cd4e4e4d4 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c +++ b/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpSnmpSubagentObject.c,v 1.1.1.3 2013/12/27 23:31:07 christos Exp $ */ +/* $NetBSD: ntpSnmpSubagentObject.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h b/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h index e59868f184a8..f9053fcd0b68 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h +++ b/external/bsd/ntp/dist/ntpsnmpd/ntpSnmpSubagentObject.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpSnmpSubagentObject.h,v 1.1.1.2 2012/01/31 21:27:04 kardel Exp $ */ +/* $NetBSD: ntpSnmpSubagentObject.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h b/external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h index 3b9b84bbf17b..ebc91cb26dc8 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h +++ b/external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_snmp.h,v 1.1.1.1 2012/01/31 21:27:06 kardel Exp $ */ +/* $NetBSD: ntp_snmp.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * ntp_snmp.h -- common net-snmp header includes and workaround diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c index 87e5b06ee42a..d6d9950035f7 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c +++ b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpsnmpd-opts.c,v 1.1.1.4 2014/12/19 20:37:43 christos Exp $ */ +/* $NetBSD: ntpsnmpd-opts.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h index 3811b9dc2013..59f78719184d 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h +++ b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpsnmpd-opts.h,v 1.1.1.4 2014/12/19 20:37:43 christos Exp $ */ +/* $NetBSD: ntpsnmpd-opts.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) diff --git a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c index 28c6272ab502..d15f86b69f84 100644 --- a/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c +++ b/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntpsnmpd.c,v 1.1.1.3 2013/12/27 23:31:07 christos Exp $ */ +/* $NetBSD: ntpsnmpd.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /***************************************************************************** * diff --git a/external/bsd/ntp/dist/parseutil/dcfd.c b/external/bsd/ntp/dist/parseutil/dcfd.c index c42958d1d3e4..5cecbbdd4210 100644 --- a/external/bsd/ntp/dist/parseutil/dcfd.c +++ b/external/bsd/ntp/dist/parseutil/dcfd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dcfd.c,v 1.1.1.2 2013/12/27 23:31:07 christos Exp $ */ +/* $NetBSD: dcfd.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * /src/NTP/REPOSITORY/ntp4-dev/parseutil/dcfd.c,v 4.18 2005/10/07 22:08:18 kardel RELEASE_20051008_A diff --git a/external/bsd/ntp/dist/parseutil/testdcf.c b/external/bsd/ntp/dist/parseutil/testdcf.c index 1e64a0faa58a..6e7f73a57b5d 100644 --- a/external/bsd/ntp/dist/parseutil/testdcf.c +++ b/external/bsd/ntp/dist/parseutil/testdcf.c @@ -1,4 +1,4 @@ -/* $NetBSD: testdcf.c,v 1.1.1.2 2013/12/27 23:31:07 christos Exp $ */ +/* $NetBSD: testdcf.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * /src/NTP/ntp4-dev/parseutil/testdcf.c,v 4.10 2005/08/06 14:18:43 kardel RELEASE_20050806_A diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm b/external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm deleted file mode 100644 index 08db2fca2f5a..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Mdoc.pm +++ /dev/null @@ -1,515 +0,0 @@ -=head1 NAME - -Mdoc - perl module to parse Mdoc macros - -=head1 SYNOPSIS - - use Mdoc qw(ns pp soff son stoggle mapwords); - -See mdoc2man and mdoc2texi for code examples. - -=head1 FUNCTIONS - -=over 4 - -=item def_macro( NAME, CODE, [ raw => 1, greedy => 1, concat_until => '.Xx' ] ) - -Define new macro. The CODE reference will be called by call_macro(). You can -have two distinct definitions for and inline macro and for a standalone macro -(i. e. 'Pa' and '.Pa'). - -The CODE reference is passed a list of arguments and is expected to return list -of strings and control characters (see C). - -By default the surrouding "" from arguments to macros are removed, use C -to disable this. - -Normaly CODE reference is passed all arguments up to next nested macro. Set -C to to pass everything up to the end of the line. - -If the concat_until is present, the line is concated until the .Xx macro is -found. For example the following macro definition - - def_macro('.Oo', gen_encloser(qw([ ]), concat_until => '.Oc' } - def_macro('.Cm', sub { mapwords {'($_)'} @_ } } - -and the following input - - .Oo - .Cm foo | - .Cm bar | - .Oc - -results in [(foo) | (bar)] - -=item get_macro( NAME ) - -Returns a hash reference like: - - { run => CODE, raw => [1|0], greedy => [1|0] } - -Where C is the CODE reference used to define macro called C - -=item parse_line( INPUT, OUTPUT_CODE, PREPROCESS_CODE ) - -Parse a line from the C filehandle. If a macro was detected it returns a -list (MACRO_NAME, @MACRO_ARGS), otherwise it calls the C, giving -caller a chance to modify line before printing it. If C is -defined it calls it prior to passing argument to a macro, giving caller a -chance to alter them. if EOF was reached undef is returned. - -=item call_macro( MACRO, ARGS, ... ) - -Call macro C with C. The CODE reference for macro C is -called and for all the nested macros. Every called macro returns a list which -is appended to return value and returned when all nested macros are processed. -Use to_string() to produce a printable string from the list. - -=item to_string ( LIST ) - -Processes C returned from call_macro() and returns formatted string. - -=item mapwords BLOCK ARRAY - -This is like perl's map only it calls BLOCK only on elements which are not -punctuation or control characters. - -=item space ( ['on'|'off] ) - -Turn spacing on or off. If called without argument it returns the current state. - -=item gen_encloser ( START, END ) - -Helper function for generating macros that enclose their arguments. - gen_encloser(qw({ })); -returns - sub { '{', ns, @_, ns, pp('}')} - -=item set_Bl_callback( CODE , DEFS ) - -This module implements the Bl/El macros for you. Using set_Bl_callback you can -provide a macro definition that should be executed on a .Bl call. - -=item set_El_callback( CODE , DEFS ) - -This module implements the Bl/El macros for you. Using set_El_callback you can -provide a macro definition that should be executed on a .El call. - -=item set_Re_callback( CODE ) - -The C is called after a Rs/Re block is done. With a hash reference as a -parameter, describing the reference. - -=back - -=head1 CONSTANTS - -=over 4 - -=item ns - -Indicate 'no space' between to members of the list. - -=item pp ( STRING ) - -The string is 'punctuation point'. It means that every punctuation -preceeding that element is put behind it. - -=item soff - -Turn spacing off. - -=item son - -Turn spacing on. - -=item stoggle - -Toogle spacing. - -=item hs - -Print space no matter spacing mode. - -=back - -=head1 TODO - -* The concat_until only works with standalone macros. This means that - .Po blah Pc -will hang until .Pc in encountered. - -* Provide default macros for Bd/Ed - -* The reference implementation is uncomplete - -=cut - -package Mdoc; -use strict; -use warnings; -use List::Util qw(reduce); -use Text::ParseWords qw(quotewords); -use Carp; -use Exporter qw(import); -our @EXPORT_OK = qw(ns pp soff son stoggle hs mapwords gen_encloser nl); - -use constant { - ns => ['nospace'], - soff => ['spaceoff'], - son => ['spaceon'], - stoggle => ['spacetoggle'], - hs => ['hardspace'], -}; - -sub pp { - my $c = shift; - return ['pp', $c ]; -} -sub gen_encloser { - my ($o, $c) = @_; - return sub { ($o, ns, @_, ns, pp($c)) }; -} - -sub mapwords(&@) { - my ($f, @l) = @_; - my @res; - for my $el (@l) { - local $_ = $el; - push @res, $el =~ /^(?:[,\.\{\}\(\):;\[\]\|])$/ || ref $el eq 'ARRAY' ? - $el : $f->(); - } - return @res; -} - -my %macros; - -############################################################################### - -# Default macro definitions start - -############################################################################### - -def_macro('Xo', sub { @_ }, concat_until => '.Xc'); - -def_macro('.Ns', sub {ns, @_}); -def_macro('Ns', sub {ns, @_}); - -{ - my %reference; - def_macro('.Rs', sub { () } ); - def_macro('.%A', sub { - if ($reference{authors}) { - $reference{authors} .= " and @_" - } - else { - $reference{authors} = "@_"; - } - return (); - }); - def_macro('.%T', sub { $reference{title} = "@_"; () } ); - def_macro('.%O', sub { $reference{optional} = "@_"; () } ); - - sub set_Re_callback { - my ($sub) = @_; - croak 'Not a CODE reference' if not ref $sub eq 'CODE'; - def_macro('.Re', sub { - my @ret = $sub->(\%reference); - %reference = (); @ret - }); - return; - } -} - -def_macro('.Bl', sub { die '.Bl - no list callback set' }); -def_macro('.It', sub { die '.It called outside of list context' }); -def_macro('.El', sub { die '.El requires .Bl first' }); - - -{ - my $elcb = sub { () }; - - sub set_El_callback { - my ($sub) = @_; - croak 'Not a CODE reference' if ref $sub ne 'CODE'; - $elcb = $sub; - return; - } - - sub set_Bl_callback { - my ($blcb, %defs) = @_; - croak 'Not a CODE reference' if ref $blcb ne 'CODE'; - def_macro('.Bl', sub { - - my $orig_it = get_macro('.It'); - my $orig_el = get_macro('.El'); - my $orig_bl = get_macro('.Bl'); - my $orig_elcb = $elcb; - - # Restore previous .It and .El on each .El - def_macro('.El', sub { - def_macro('.El', delete $orig_el->{run}, %$orig_el); - def_macro('.It', delete $orig_it->{run}, %$orig_it); - def_macro('.Bl', delete $orig_bl->{run}, %$orig_bl); - my @ret = $elcb->(@_); - $elcb = $orig_elcb; - @ret - }); - $blcb->(@_) - }, %defs); - return; - } -} - -def_macro('.Sm', sub { - my ($arg) = @_; - if (defined $arg) { - space($arg); - } else { - space() eq 'off' ? - space('on') : - space('off'); - } - () -} ); -def_macro('Sm', do { my $off; sub { - my ($arg) = @_; - if (defined $arg && $arg =~ /^(on|off)$/) { - shift; - if ($arg eq 'off') { soff, @_; } - elsif ($arg eq 'on') { son, @_; } - } - else { - stoggle, @_; - } -}} ); - -############################################################################### - -# Default macro definitions end - -############################################################################### - -sub def_macro { - croak 'Odd number of elements for hash argument <'.(scalar @_).'>' if @_%2; - my ($macro, $sub, %def) = @_; - croak 'Not a CODE reference' if ref $sub ne 'CODE'; - - $macros{ $macro } = { - run => $sub, - greedy => delete $def{greedy} || 0, - raw => delete $def{raw} || 0, - concat_until => delete $def{concat_until}, - }; - if ($macros{ $macro }{concat_until}) { - $macros{ $macros{ $macro }{concat_until} } = { run => sub { @_ } }; - $macros{ $macro }{greedy} = 1; - } - return; -} - -sub get_macro { - my ($macro) = @_; - croak "Macro <$macro> not defined" if not exists $macros{ $macro }; - +{ %{ $macros{ $macro } } } -} - -#TODO: document this -sub parse_opts { - my %args; - my $last; - for (@_) { - if ($_ =~ /^\\?-/) { - s/^\\?-//; - $args{$_} = 1; - $last = _unquote($_); - } - else { - $args{$last} = _unquote($_) if $last; - undef $last; - } - } - return %args; -} - -sub _is_control { - my ($el, $expected) = @_; - if (defined $expected) { - ref $el eq 'ARRAY' and $el->[0] eq $expected; - } - else { - ref $el eq 'ARRAY'; - } -} - -{ - my $sep = ' '; - - sub to_string { - if (@_ > 0) { - # Handle punctunation - my ($in_brace, @punct) = ''; - my @new = map { - if (/^([\[\(])$/) { - ($in_brace = $1) =~ tr/([/)]/; - $_, ns - } - elsif (/^([\)\]])$/ && $in_brace eq $1) { - $in_brace = ''; - ns, $_ - } - elsif ($_ =~ /^[,\.;:\?\!\)\]]$/) { - push @punct, ns, $_; - (); - } - elsif (_is_control($_, 'pp')) { - $_->[1] - } - elsif (_is_control($_)) { - $_ - } - else { - splice (@punct), $_; - } - } @_; - push @new, @punct; - - # Produce string out of an array dealing with the special control characters - # space('off') must but one character delayed - my ($no_space, $space_off) = 1; - my $res = ''; - while (defined(my $el = shift @new)) { - if (_is_control($el, 'hardspace')) { $no_space = 1; $res .= ' ' } - elsif (_is_control($el, 'nospace')) { $no_space = 1; } - elsif (_is_control($el, 'spaceoff')) { $space_off = 1; } - elsif (_is_control($el, 'spaceon')) { space('on'); } - elsif (_is_control($el, 'spacetoggle')) { space() eq 'on' ? - $space_off = 1 : - space('on') } - else { - if ($no_space) { - $no_space = 0; - $res .= "$el" - } - else { - $res .= "$sep$el" - } - - if ($space_off) { space('off'); $space_off = 0; } - } - } - $res - } - else { - ''; - } - } - - sub space { - my ($arg) = @_; - if (defined $arg && $arg =~ /^(on|off)$/) { - $sep = ' ' if $arg eq 'on'; - $sep = '' if $arg eq 'off'; - return; - } - else { - return $sep eq '' ? 'off' : 'on'; - } - } -} - -sub _unquote { - my @args = @_; - $_ =~ s/^"([^"]+)"$/$1/g for @args; - wantarray ? @args : $args[0]; -} - -sub call_macro { - my ($macro, @args) = @_; - my @ret; - - my @newargs; - my $i = 0; - - @args = _unquote(@args) if (!$macros{ $macro }{raw}); - - # Call any callable macros in the argument list - for (@args) { - if ($_ =~ /^[A-Z][a-z]+$/ && exists $macros{ $_ }) { - push @ret, call_macro($_, @args[$i+1 .. $#args]); - last; - } else { - if ($macros{ $macro }{greedy}) { - push @ret, $_; - } - else { - push @newargs, $_; - } - } - $i++; - } - - if ($macros{ $macro }{concat_until}) { - my ($n_macro, @n_args) = (''); - while (1) { - die "EOF was reached and no $macros{ $macro }{concat_until} found" - if not defined $n_macro; - ($n_macro, @n_args) = parse_line(undef, sub { push @ret, shift }); - if ($n_macro eq $macros{ $macro }{concat_until}) { - push @ret, call_macro($n_macro, @n_args); - last; - } - else { - $n_macro =~ s/^\.//; - push @ret, call_macro($n_macro, @n_args) if exists $macros{ $n_macro }; - } - } - } - - if ($macros{ $macro }{greedy}) { - #print "MACROG $macro (", (join ', ', @ret), ")\n"; - return $macros{ $macro }{run}->(@ret); - } - else { - #print "MACRO $macro (", (join ', ', @newargs), ")".(join ', ', @ret)."\n"; - return $macros{ $macro }{run}->(@newargs), @ret; - } -} - -{ - my ($in_fh, $out_sub, $preprocess_sub); - sub parse_line { - $in_fh = $_[0] if defined $_[0] || !defined $in_fh; - $out_sub = $_[1] if defined $_[1] || !defined $out_sub; - $preprocess_sub = $_[2] if defined $_[2] || !defined $preprocess_sub; - - croak 'out_sub not a CODE reference' - if not ref $out_sub eq 'CODE'; - croak 'preprocess_sub not a CODE reference' - if defined $preprocess_sub && not ref $preprocess_sub eq 'CODE'; - - while (my $line = <$in_fh>) { - chomp $line; - if ($line =~ /^\.[A-z][a-z0-9]+/ || $line =~ /^\.%[A-Z]/ || - $line =~ /^\.\\"/) - { - $line =~ s/ +/ /g; - my ($macro, @args) = quotewords(' ', 1, $line); - @args = grep { defined $_ } @args; - $preprocess_sub->(@args) if defined $preprocess_sub; - if ($macro && exists $macros{ $macro }) { - return ($macro, @args); - } else { - $out_sub->($line); - } - } - else { - $out_sub->($line); - } - } - return; - } -} - -1; -__END__ diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agman-file.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/Old/agman-file.tpl deleted file mode 100644 index b2d15e1f12cb..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agman-file.tpl +++ /dev/null @@ -1,86 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template man - -## agman-file.tpl -- Template for file man pages -## -## Time-stamp: "2011-11-18 07:48:17 bkorb" -## -## This file is part of AutoOpts, a companion to AutoGen. -## AutoOpts is free software. -## Copyright (c) 1992-2012 Bruce Korb - all rights reserved -## -## AutoOpts is available under any one of two licenses. The license -## in use must be one of these two and the choice is under the control -## of the user of the license. -## -## The GNU Lesser General Public License, version 3 or later -## See the files "COPYING.lgplv3" and "COPYING.gplv3" -## -## The Modified Berkeley Software Distribution License -## See the file "COPYING.mbsd" -## -## These files have the following md5sums: -## -## 43b91e8ca915626ed3818ffb1b71248b COPYING.gplv3 -## 06a1a2e4760c90ea5e1dad8dfaac4d39 COPYING.lgplv3 -## 66a5cedaf62c4b2637025f049f9b826f COPYING.mbsd - -# Produce a man page for section 1, 5 or 8 commands. -# Which is selected via: -DMAN_SECTION=n -# passed to the autogen invocation. "n" may have a suffix, if desired. -# -:+][+: - -(define head-line (lambda() - (sprintf ".TH %s %s \"%s\" \"%s\" \"%s\"\n.\\\"\n" - (get "prog-name") man-sect - (shell "date '+%d %b %Y'") package-text section-name) )) - -(define man-page #t) - -:+][+: - -INCLUDE "cmd-doc.tlib" - -:+] -.\" -.SH NAME -[+: prog-name :+] \- [+: prog-title :+] -[+: - -(out-push-new) :+][+: - -INVOKE build-doc :+][+: - - (shell (string-append - "fn='" (find-file "mdoc2man") "'\n" - "test -f ${fn} || die mdoc2man not found from $PWD\n" - "${fn} <<\\_EndOfMdoc_ || die ${fn} failed in $PWD\n" - (out-pop #t) - "\n_EndOfMdoc_" )) - -:+][+: - -(out-move (string-append (get "prog-name") "." - man-sect)) :+][+: # - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" S Y N O P S I S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-synopsis :+][+: - (out-push-new file-name) \:+] -.SH SYNOPSIS -.B [+: file-path :+] -.PP [+: - -(if (exist? "explain") - (string-append "\n.PP\n" - (join "\n.PP\n" (stack "explain"))) ) :+][+: - -(out-pop) :+][+: - -ENDDEF mk-synopsis - -agman-file.tpl ends here :+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl deleted file mode 100644 index 9e5fc0bf8799..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agmdoc-file.tpl +++ /dev/null @@ -1,73 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template mdoc - -## agman-file.tpl -- Template for file mdoc pages -## -## Time-stamp: "2011-11-18 07:48:29 bkorb" -## -## This file is part of AutoOpts, a companion to AutoGen. -## AutoOpts is free software. -## AutoOpts is Copyright (c) 1992-2012 by Bruce Korb - all rights reserved -## -## AutoOpts is available under any one of two licenses. The license -## in use must be one of these two and the choice is under the control -## of the user of the license. -## -## The GNU Lesser General Public License, version 3 or later -## See the files "COPYING.lgplv3" and "COPYING.gplv3" -## -## The Modified Berkeley Software Distribution License -## See the file "COPYING.mbsd" -## -## These files have the following md5sums: -## -## 43b91e8ca915626ed3818ffb1b71248b COPYING.gplv3 -## 06a1a2e4760c90ea5e1dad8dfaac4d39 COPYING.lgplv3 -## 66a5cedaf62c4b2637025f049f9b826f COPYING.mbsd - -# Produce a man page for section 1, 5 or 8 commands. -# Which is selected via: -DMAN_SECTION=n -# passed to the autogen invocation. "n" may have a suffix, if desired. -# -:+][+: - -(define head-line (lambda() (string-append - ".Dd " (shell "date '+%B %e %Y' | sed 's/ */ /g'") - "\n.Dt " UP-PROG-NAME " " man-sect " " section-name - "\n.Os " (shell "uname -sr") "\n") )) - -(define man-page #f) - -:+][+: - -INCLUDE "cmd-doc.tlib" - -:+] -.Sh NAME -.Nm [+: prog-name :+] -.Nd [+: prog-title :+] -[+: INVOKE build-doc :+][+: - -(out-move (string-append (get "prog-name") "." - man-sect)) :+][+:# - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" S Y N O P S I S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-synopsis :+][+: - (out-push-new file-name) \:+] -.Sh SYNOPSIS -.Sy [+: file-path :+] -.Pp [+: - -FOR explain "\n.Pp\n" :+][+: - explain :+][+: -ENDFOR :+][+: - -(out-pop) :+][+: - -ENDDEF mk-synopsis - -agmdoc-file.tpl ends here :+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl deleted file mode 100644 index 61c57027ea88..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Old/agtexi-cmd.tpl +++ /dev/null @@ -1,884 +0,0 @@ -[= AutoGen5 template -*- Mode: texinfo -*- - -texi - -# Documentation template -# -# Time-stamp: "2012-08-11 08:33:08 bkorb" -# Author: Bruce Korb -# -# This file is part of AutoOpts, a companion to AutoGen. -# AutoOpts is free software. -# AutoOpts is Copyright (c) 1992-2012 by Bruce Korb - all rights reserved -# -# AutoOpts is available under any one of two licenses. The license -# in use must be one of these two and the choice is under the control -# of the user of the license. -# -# The GNU Lesser General Public License, version 3 or later -# See the files "COPYING.lgplv3" and "COPYING.gplv3" -# -# The Modified Berkeley Software Distribution License -# See the file "COPYING.mbsd" -# -# These files have the following md5sums: -# -# 43b91e8ca915626ed3818ffb1b71248b COPYING.gplv3 -# 06a1a2e4760c90ea5e1dad8dfaac4d39 COPYING.lgplv3 -# 66a5cedaf62c4b2637025f049f9b826f COPYING.mbsd - -=][= - -INVOKE initialization =][= - -(out-push-new (string-substitute (out-name) ".texi" ".menu")) - -(ag-fprintf 0 "* %-32s Invoking %s\n" - (string-append program-name " Invocation::") - program-name ) - -(out-pop) -(if (exist? "explain") - (emit (string-append "\n" (get "explain") "\n")) ) -(set! tmp-str (get "option-doc-format" "texi")) -(divert-convert tmp-str) - -=][= - -IF (match-value? == "doc-section.ds-type" "DESCRIPTION") =][= - - FOR doc-section =][= - IF (== (get "ds-type") "DESCRIPTION") =][= - (define cvt-fn (get "ds-format" "texi")) - (if (not (== cvt-fn "texi")) - (divert-convert cvt-fn) ) =][= - (emit (string-append "\n" (get "ds-text") "\n")) - =][= - BREAK =][= - - ENDIF =][= - ENDFOR =][= - -ELSE =][= - -(join "\n\n" - (if (exist? "prog-info-descrip") - (stack "prog-info-descrip") - (if (exist? "prog-man-descrip") - (stack "prog-man-descrip") - (if (exist? "prog-descrip") - (stack "prog-descrip") - (stack "detail") -) ) ) ) =][= - -ENDIF =][= - -(convert-divert) =] - -This [=(string-downcase doc-level)=] was generated by @strong{AutoGen}, -using the @code{agtexi-cmd} template and the option descriptions for the [=(. -coded-prog-name)=] program.[= (name-copyright) =] - -@menu -[= - (out-push-new) (out-suspend "menu") - (out-push-new) =][= - -INVOKE emit-usage-opt =][= - -;; FOR all options, ... -;; -(define opt-name "") -(define extra-ct 0) -(define extra-text "") -(define optname-from "A-Z_^") -(define optname-to "a-z--") -(define invalid-doc "* INVALID *") -(if (exist? "preserve-case") (begin - (set! optname-from "_^") - (set! optname-to "--") )) -(if (and have-doc-options (not (exist? "flag[].documentation"))) (begin - (ag-fprintf "menu" menu-entry-fmt - "base-options:: " "Base options") - (print-node opt-name "Base options") -) ) - -=][=# - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -FOR flag =][= - - (set! opt-name (string-tr! (get "name") optname-from optname-to)) - (if (exist? "documentation") - (begin - (set! label-str (string-append opt-name " options")) - (ag-fprintf "menu" menu-entry-fmt - (string-append opt-name ":: ") label-str) - (print-node opt-name label-str) - (ag-fprintf 0 "\n%s." (get "descrip")) - (set! tmp-str (get "documentation")) - (if (> (string-length tmp-str) 1) - (ag-fprintf 0 "\n%s" tmp-str)) - ) - (begin - (set! tmp-str (get "doc" invalid-doc)) - (if (< 0 (string-length tmp-str)) (begin - (set! label-str (string-append opt-name " option" - (if (exist? "value") - (string-append " (-" (get "value") ")") - "" ) )) - (if have-doc-options - (ag-fprintf 0 opt-node-fmt opt-name label-str) - (begin - (ag-fprintf "menu" menu-entry-fmt - (string-append opt-name ":: ") label-str) - (print-node opt-name label-str) - ) - ) - (ag-fprintf 0 "\n@cindex %s-%s" down-prog-name opt-name) - ) ) - ) - ) =][= - - IF (and (not (exist? "documentation")) - (< 0 (string-length tmp-str)) ) - =][= - IF (exist? "aliases") =][= - INVOKE emit-aliases =][= - ELSE =][= - INVOKE emit-opt-text =][= - ENDIF =][= - ENDIF =][= - -ENDFOR flag =][= - -IF - (define home-rc-files (exist? "homerc")) - (define environ-init (exist? "environrc")) - (or home-rc-files environ-init) - =][= - - INVOKE emit-presets =][= - -ENDIF =][= - -INVOKE emit-exit-status =][= -INVOKE emit-doc-sections =][= - -(out-suspend "opt-desc") -(out-resume "menu") -(emit (out-pop #t)) -(emit "@end menu\n") -(out-resume "opt-desc") -(out-pop #t) =][=# - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-doc-sections =][= - -FOR doc-section =][= - - IF (define opt-name (string-capitalize! (get "ds-type"))) - (or (== opt-name "Exit Status") - (== opt-name "Description") - (exist? "omit-texi")) =][= - CONTINUE =][= - ENDIF =][= - - (ag-fprintf "menu" menu-entry-fmt (string-append opt-name "::") opt-name) - (set! label-str (string-append - down-prog-name " " (string-capitalize opt-name))) - (print-node opt-name label-str) - (define cvt-fn (get "ds-format" "texi")) - (if (not (== cvt-fn "texi")) - (divert-convert cvt-fn) ) =][= - (emit (string-append "\n" (get "ds-text") "\n")) - (convert-divert) =][= - -ENDFOR doc-section =][= - -ENDDEF emit-doc-sections - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-exit-status =][= - (ag-fprintf "menu" menu-entry-fmt "exit status::" "exit status") - (print-node "exit status" (string-append program-name " exit status")) =] - -One of the following exit values will be returned: -@table @samp -@item 0 (EXIT_[= - (set! tmp-str (get "exit-name[0]" "SUCCESS")) - (string-upcase (string->c-name! tmp-str)) - =]) -[= - (define need-ex-noinput (exist? "homerc")) - (define need-ex-software #t) - (get "exit-desc[0]" "Successful program execution.")=] -@item 1 (EXIT_[= - - (set! tmp-str (get "exit-name[1]" "FAILURE")) - (string-upcase (string->c-name! tmp-str))=]) -[= (get "exit-desc[1]" - "The operation failed or the command syntax was not valid.") =][= - -FOR exit-desc (for-from 2) =][= - (if (= (for-index) 66) - (set! need-ex-noinput #f) - (if (= (for-index) 70) - (set! need-ex-software #f) )) - (set! tmp-str (get (sprintf "exit-name[%d]" (for-index)) "* unnamed *")) - (sprintf "\n@item %d (EXIT_%s)\n%s" (for-index) - (string-upcase (string->c-name! tmp-str)) - (get (sprintf "exit-desc[%d]" (for-index)))) - =][= -ENDFOR exit-desc =][= - -(if need-ex-noinput - (emit "\n@item 66 (EX_NOINPUT) -A specified configuration file could not be loaded.")) - -(if need-ex-noinput - (emit "\n@item 70 (EX_SOFTWARE) -libopts had an internal operational error. Please report -it to autogen-users@@lists.sourceforge.net. Thank you.")) -=] -@end table[= - -ENDDEF emit-exit-status - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-aliases =] - -This is an alias for the [= aliases =] option, -[= (sprintf "@pxref{%1$s %2$s, the %2$s option documentation}.\n" - down-prog-name (get "aliases")) =][= - -ENDDEF emit-aliases - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-opt-text =] - -This is the ``[=(string-downcase! (get "descrip"))=]'' option.[= - IF (exist? "arg-type") =] -This option takes an [= (if (exist? "arg-optional") "optional " "") - =]argument [= arg-type =][= -(if (exist? "arg-name") (string-append " @file{" - (string-substitute (get "arg-name") "@" "@@") "}")) - =].[= - ENDIF =][= - - (set! extra-ct 0) - (out-push-new) =][= - - IF (exist? "min") =]@item -is required to appear on the command line. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "max") =]@item -may appear [= - IF % max (== "%s" "NOLIMIT") - =]an unlimited number of times[= - ELSE - =]up to [=max=] times[= - ENDIF=]. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "enabled") =]@item -is enabled by default. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "ifdef") =]@item -must be compiled in by defining @code{[=(get "ifdef") - =]} during the compilation. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF =][= - - IF (exist? "ifndef") =]@item -must be compiled in by @strong{un}-defining @code{[=(get "ifndef") - =]} during the compilation. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "no_preset") =]@item -may not be preset with environment variables or configuration (rc/ini) files. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "equivalence") =]@item -is a member of the [=equivalence=] class of options. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "flags_must") =]@item -must appear in combination with the following options: -[= FOR flags_must ", " =][=flags_must=][= - ENDFOR=]. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (exist? "flags_cant") =]@item -must not appear in combination with any of the following options: -[= FOR flags_cant ", " =][=flags_cant=][= - ENDFOR=]. -[= (set! extra-ct (+ extra-ct 1)) =][= - ENDIF=][= - - IF (~* (get "arg-type") "key|set") =]@item -This option takes a keyword as its argument[= - - CASE arg-type =][= - =* key =][= (set! extra-ct (+ extra-ct 1)) =]. -The argument sets an enumeration value that can be tested by comparing[= - - =* set =][= (set! extra-ct (+ extra-ct 1)) =] list. -Each entry turns on or off membership bits. These bits can be tested -with bit tests against[= - ESAC arg-type =] the option value macro ([= -(string-upcase (string-append -(if (exist? "prefix") (string-append (get "prefix") "_") "") -"OPT_VALUE_" (get "name") )) =]). -The available keywords are: -@example -[= (shell (string-append - "${CLexe:-columns} -I4 --spread=1 -W50 <<\\" heredoc-marker - (join "\n" (stack "keyword") "\n") - heredoc-marker - ) ) =] -@end example -[= - - IF (=* (get "arg-type") "key") =] -or their numeric equivalent.[= - ENDIF =][= - - ENDIF key/set arg =][= - - IF (> extra-ct 0) =][= - (set! extra-text (out-pop #t)) =] - -@noindent -This option has some usage constraints. It: -@itemize @bullet -[=(. extra-text) -=]@end itemize -[= ELSE =][= - (out-pop) =][= - ENDIF =][= - -?% doc "\n%s" "\nThis option has no @samp{doc} documentation." =][= - IF (exist? "deprecated") =] - -@strong{NOTE: THIS OPTION IS DEPRECATED}[= - - ENDIF =][= - -ENDDEF emit-opt-text - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE set-home-rc-vars =][= - CASE homerc =][= - ==* '$@' =][= - (set! explain-pkgdatadir #t) - (set! cfg-file-name (string-substitute (get "homerc") - "$@" "$(pkgdatadir)")) =][= - - == '.' =][= - (set! cfg-file-name "$PWD") - (set! env-var-list (string-append env-var-list "PWD, ")) - =][= - - ==* './' =][= - (set! explain-pkgdatadir #t) - (set! env-var-list (string-append env-var-list "PWD, ")) - (set! cfg-file-name (string-append "$PWD" (substring (get "homerc") 1))) - =][= - - ~~* '\$[A-Za-z]' =][= - (set! cfg-file-name (get "homerc")) - (set! env-var-list (string-append env-var-list - (shellf "echo '%s' | sed 's/^.//;s#/.*##'" cfg-file-name) - ", " )) - =][= - - == "" =][= (set! cfg-file-name "") =][= - - * =][= - (set! cfg-file-name (get "homerc")) =][= - ESAC =][= - -ENDDEF set-home-rc-vars - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-multiple-rc \=] -[= - (define explain-pkgdatadir #f) - (define env-var-list "") - rc-count =] places for configuration files: -@itemize @bullet[= -FOR homerc =][= - INVOKE set-home-rc-vars =][= - (if (> (string-length cfg-file-name) 0) - (sprintf "\n@item\n%s" cfg-file-name )) - =][= - -ENDFOR homerc =] -@end itemize[= - (if explain-pkgdatadir (ag-fprintf 0 -"\nThe value for @code{$(pkgdatadir)} is recorded at package configure time -and replaced by @file{libopts} when @file{%s} runs." program-name)) - -(if (> (string-length env-var-list) 1) - (shell (string-append -"list='@code{'`echo '" env-var-list "' | \ - sed -e 's#, $##' \ - -e 's#, #}, @code{#g' \ - -e 's#, \\([^ ][^ ]*\\)$#, and \\1#'`\\} -echo -echo 'The environment variables' ${list} -echo 'are expanded and replaced when @file{" program-name "} runs.'" -)) ) =] -For any of these that are plain files, they are simply processed. -For any that are directories, then a file named @file{[= - (if (exist? "rcfile") (get "rcfile") - (string-append "." program-name "rc"))=]} is searched for -within that directory and processed. -[= - -ENDDEF emit-multiple-rc - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-one-rc-dir =][= - (define env-var-list "") - (define explain-pkgdatadir #f) =][= - INVOKE set-home-rc-vars - -=]@file{[=(. cfg-file-name) =]} for configuration (option) data.[= - IF (. explain-pkgdatadir) =] -The value for @code{$(pkgdatadir)} is recorded at package configure time -and replaced by @file{libopts} when @file{[=prog-name=]} runs. -[=ENDIF=][= -(if (> (string-length env-var-list) 1) - (sprintf -"\nThe environment variable @code{%s} is expanded and replaced when -the program runs" env-var-list)) =] -If this is a plain file, it is simply processed. -If it is a directory, then a file named @file{[= -(if (exist? "rcfile") (get "rcfile") - (string-append "." program-name "rc")) -=]} is searched for within that directory.[= - -ENDDEF emit-one-rc-dir - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-rc-file-info =] - -@noindent -@code{libopts} will search in [= - - IF (define rc-count (count "homerc")) - (define cfg-file-name "") - (> rc-count 1) =][= - - INVOKE emit-multiple-rc =][= - - ELSE =][= - INVOKE emit-one-rc-dir =][= - ENDIF (> rc-count 1) - -=] - -Configuration files may be in a wide variety of formats. -The basic format is an option name followed by a value (argument) on the -same line. Values may be separated from the option name with a colon, -equal sign or simply white space. Values may be continued across multiple -lines by escaping the newline with a backslash. - -Multiple programs may also share the same initialization file. -Common options are collected at the top, followed by program specific -segments. The segments are separated by lines like: -@example -[[=(. UP-PROG-NAME)=]] -@end example -@noindent -or by -@example - -@end example -@noindent -Do not mix these styles within one configuration file. - -Compound values and carefully constructed string values may also be -specified using XML syntax: -@example - - ...<...>... - -@end example -@noindent -yielding an @code{option-name.sub-opt} string value of -@example -"...<...>..." -@end example -@code{AutoOpts} does not track suboptions. You simply note that it is a -hierarchicly valued option. @code{AutoOpts} does provide a means for searching -the associated name/value pair list (see: optionFindValue).[= - -ENDDEF emit-rc-file-info - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-presets =] - -[= - (ag-fprintf "menu" menu-entry-fmt "config::" - (string-append "presetting/configuring " down-prog-name) ) - - (print-node "config" - (string-append "presetting/configuring " program-name) ) =] - -Any option that is not marked as @i{not presettable} may be preset by -loading values from [= - -IF - - (if home-rc-files (emit - "configuration (\"rc\" or \"ini\") files")) - - environ-init - - =][= - (if home-rc-files (emit ", and values from ")) - =]environment variables named @code{[=(. UP-PROG-NAME)=]} and @code{[= -(. UP-PROG-NAME)=]_}. @code{} must be one of -the options listed above in upper case and segmented with underscores. -The @code{[=(. UP-PROG-NAME)=]} variable will be tokenized and parsed like -the command line. The remaining variables are tested for existence and their -values are treated like option arguments[= - ENDIF have environment inits =]. -[= - - IF (. home-rc-files) =][= - INVOKE emit-rc-file-info =][= - ENDIF home-rc-files =] - -The command line options relating to configuration and/or usage help are: -[= - -IF (exist? "version") =] -@[= (. head-level) =] version[= (flag-string "version-value" "v") =] - -Print the program version to standard out, optionally with licensing -information, then exit 0. The optional argument specifies how much licensing -detail to provide. The default is to print [= -(if (exist? "gnu-usage") "the license name with the version" "just the version") -=]. The licensing infomation may be selected with an option argument. Only the -first letter of the argument is examined: - -@table @samp -@item version -Only print the version.[= -(if (not (exist? "gnu-usage")) " This is the default.")=] -@item copyright -Name the copyright usage licensing terms.[= -(if (exist? "gnu-usage") " This is the default.")=] -@item verbose -Print the full copyright usage licensing terms. -@end table -[= -ENDIF version =][= - -IF (exist? "usage-opt") =] -@[= (. head-level) =] usage[= (flag-string "usage-value" "u") =] - -Print abbreviated usage to standard out, then exit 0. -[= -ENDIF usage-opt =][= - -IF (exist? "vendor-opt") =] -@[= (. head-level) =] vendor-option (-W) - -Options that do not have flag values specified must be specified with -@code{-W} and the long option name. That long name is the argument to -this option. Any options so named that require an argument must have -that argument attached to the option name either with quoting or an -equal sign. -[= -ENDIF vendor-opt =][= - -IF (exist? "resettable") =] -@[= (. head-level) =] reset-option[= (flag-string "reset-value" "R") =] - -Resets the specified option to the compiled-in initial state. -This will undo anything that may have been set by configuration files. -The option argument may be either the option flag character or its long name. -[= -ENDIF resettable =][= - -IF (exist? "home-rc") =][= - IF (exist? "disable-save") =] -@[= (. head-level) =] save-opts[= (flag-string "save-opts-value" ">") =] - -Saves the final, configured option state to the specified file (the optional -option argument). If no file is specified, then it will be saved to the -highest priority (last named) @file{rc-file} in the search list. -[= - ENDIF disable-save =][= - - IF (exist? "disable-load") =] -@[= (. head-level) =] load-opts[= (flag-string "load-opts-value" "<") =] - -Loads the named configuration file. -[= - ENDIF disable-load =][= -ENDIF home-rc =][= - -ENDDEF emit-presets - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE header \=] -\input texinfo -@c -*-texinfo-*- -@c %**start of header -@setfilename [= (string-append down-prog-name ".info") =] -@settitle [= (sprintf (if (exist? "package") "%2$s - %1$s" "%s") - (get "package") (get "prog-title")) =] -@c %**end of header -@setchapternewpage off -@titlepage -@sp 10 -@comment The title is printed in a large font. -@center @titlefont{Sample Title} - -@c The following two commands start the copyright page. -@page -@vskip 0pt plus 1filll -[= (name-copyright) =][= -IF (exist? "copyright.type") =] -[= (license-full (get "copyright.type") program-name "" - (get "copyright.owner" (get "copyright.author" "")) - (get "copyright.date") ) =][= -ENDIF =] -@end titlepage -@node Top, [= prog-name =] usage, , (dir) -@top [= prog-title =] -[= - -ENDDEF header - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE emit-usage-opt =][= - - (define label-str (string-append - program-name " help/usage (@option{" help-opt "})")) - (ag-fprintf "menu" menu-entry-fmt "usage::" label-str) - (sprintf node-fmt "usage" label-str) =] -@cindex [=(. down-prog-name)=] help - -This is the automatically generated usage text for [= prog-name =]. - -The text printed is the same whether selected with the @code{help} option -(@option{[= (. help-opt) =]}) or the @code{more-help} option (@option{[= -(. more-help-opt) =]}). @code{more-help} will print -the usage text by passing it through a pager program. -@code{more-help} is disabled on platforms without a working -@code{fork(2)} function. The @code{PAGER} environment variable is -used to select the program, defaulting to @file{more}. Both will exit -with a status code of 0. - -@exampleindent 0 -@example -[= (out-push-new) =] -prog_name=[= (. program-name) =] -PROG=./${prog_name} -test -f ${PROG} || { - PROG=`echo $PROG | tr '[A-Z]' '[a-z]'` - test -f ${PROG} || PROG=`echo $PROG | tr x_ x-` -} -if [ ! -f ${PROG} ] -then - if [= (string-append program-name " " help-opt) =] > /dev/null 2>&1 - then PROG=`command -v ${prog_name}` - else PROG="echo ${prog_name} is unavailable - no " - fi -fi -${PROG} [=(. help-opt)=] 2>&1 | \ - sed -e "s/USAGE: lt-${prog_name} /USAGE: ${prog_name} /" \ - -e 's/@/@@/g;s/{/@{/g;s/}/@}/g' \ - -e 's/ / /g' -[= (shell (out-pop #t)) =] -@end example -@exampleindent 4 -[= - -ENDDEF emit-usage-opt - -@c = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =][= - -DEFINE initialization =][= - - - (shell "CLexe=${AGexe%/autogen}/columns") - - - ;; divert-convert divert text for conversion to .texi format - ;; convert-divert convert the diversion done with divert-convert - ;; - (define divert-convert (lambda (diversion-type) (begin - (set! was-diverted - (not (or (== diversion-type "texi") (== diversion-type "")))) - (if was-diverted (begin - (set! cvt-script - (find-file (string-append diversion-type "2texi"))) - (if (not (defined? 'cvt-script)) - (error (sprintf "unknown source format type: %s" diversion-type)) ) - (out-push-new) )) ))) - - (define heredoc-marker "_Unlikely_Here_Doc_Marker_\n") - (define convert-divert (lambda () - (if was-diverted (shell (string-append - cvt-script "<<\\" heredoc-marker (out-pop #t) "\n" heredoc-marker - )) ))) - - (define was-diverted #f) - (define diversion-type "") - (define cvt-script "") - (define tmp-str "") - - (define name-copyright (lambda () - (if (exist? "copyright") - (string-append "\nThis software is released under " - (license-name (get "copyright.type" "an unknown copyright")) - "." ) ) )) - - (make-tmp-dir) - (define program-name (get "prog-name")) - (define down-prog-name (string-downcase program-name)) - (define UP-PROG-NAME (string-upcase program-name)) - (shellf "export AG_DEF_PROG_NAME=%s" program-name) - (define doc-level (getenv "LEVEL")) - (if (not (string? doc-level)) - (set! doc-level "section")) - (define file-name (string-append down-prog-name ".texi")) - (define coded-prog-name (string-append "@code{" down-prog-name "}")) - - (define replace-prog-name (lambda (nm) - (string-substitute (get nm) down-prog-name coded-prog-name ) )) - - (define have-doc-options (exist? "flag.documentation")) - (define print-menu #t) - (define do-doc-nodes #f) - (define menu-entry-fmt (string-append - "* " down-prog-name " %-24s %s\n")) - (define emit-menu-entry (lambda (is-doc) (not is-doc))) - (if have-doc-options - (set! emit-menu-entry (lambda (is-doc) is-doc)) ) - (define chk-flag-val (exist? "flag.value")) - (define flag-string (lambda (v-nm v-df) (if (not chk-flag-val) "" - (string-append " (-" - (if (exist? v-nm) (get v-nm) v-df) - ")") ))) - - (define help-opt "") - (if (exist? "long-opts") - (set! help-opt "--help") - (if (not (exist? "flag.value")) - (set! help-opt "help") - (if (not (exist? "help-value")) - (set! help-opt "-?") - (begin - (set! tmp-str (get "help-value")) - (if (> (string-length tmp-str) 0) - (set! help-opt (string-append "-" tmp-str)) - (set! help-opt "--help") - ) ) - ))) - - (define more-help-opt "") - (if (exist? "long-opts") - (set! more-help-opt "--more-help") - (if (not (exist? "flag.value")) - (set! more-help-opt "more-help") - (if (not (exist? "more-help-value")) - (set! more-help-opt "-!") - (begin - (set! tmp-str (get "more-help-value")) - (if (> (string-length tmp-str) 0) - (set! help-opt (string-append "-" tmp-str)) - (set! help-opt "--more-help") - ) ) - ))) - - =][= - - CASE (. doc-level) =][= - == document =][= INVOKE header =][= - (define sub-level "chapter") - (define head-level "heading") =][= - == chapter =][= - (define sub-level "section") - (define head-level "subheading") =][= - == section =][= - (define sub-level "subsection") - (define head-level "subsubheading") =][= - == subsection =][= - (define sub-level "subsubsection") - (define head-level "subsubheading") =][= - - * =][=(error (sprintf "invalid doc level: %s\n" doc-level)) =][= - - ESAC doc level =][= - - (define node-fmt (string-append - "\n@node " down-prog-name " %s\n@" sub-level " %s")) - (define print-node (lambda (a b) (ag-fprintf 0 node-fmt a b) )) - - (define opt-node-fmt (if have-doc-options - (string-append "\n@" head-level - " %2$s.\n@anchor{" down-prog-name " %1$s}") - node-fmt - )) - - (define exit-sts-fmt "\n\n@node %1$s %2$s\n@%3$s %1$s %2$s\n") - =][= - - IF (not (== doc-level "document")) =][= - (set! file-name (string-append "invoke-" file-name)) - \=] -@node [= prog-name =] Invocation -@[=(. doc-level) =] Invoking [= prog-name =] -@pindex [= prog-name =] -@cindex [= prog-title =][= - -FOR concept =] -@cindex [= concept =][= -ENDFOR =][= - - ENDIF document component - -=] -@ignore -[= - -(out-move file-name) -(dne "# " "# ") - -=] -@end ignore -[= - -ENDDEF initialization - -@c agtexi-cmd.tpl ends here =] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib b/external/bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib deleted file mode 100644 index bcd858c37a7c..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Old/cmd-doc.tlib +++ /dev/null @@ -1,1003 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template man - -# cmd-doc.tlib -- Template for command line man/mdoc pages -# -# Time-stamp: "2012-05-12 20:52:33 bkorb" -# -# This file is part of AutoOpts, a companion to AutoGen. -# AutoOpts is free software. -# Copyright (c) 1992-2012 Bruce Korb - all rights reserved -# -# AutoOpts is available under any one of two licenses. The license -# in use must be one of these two and the choice is under the control -# of the user of the license. -# -# The GNU Lesser General Public License, version 3 or later -# See the files "COPYING.lgplv3" and "COPYING.gplv3" -# -# The Modified Berkeley Software Distribution License -# See the file "COPYING.mbsd" -# -# These files have the following md5sums: -# -# 43b91e8ca915626ed3818ffb1b71248b COPYING.gplv3 -# 06a1a2e4760c90ea5e1dad8dfaac4d39 COPYING.lgplv3 -# 66a5cedaf62c4b2637025f049f9b826f COPYING.mbsd - -# Produce a man page for section 1, 5, 6 or 8 commands. Which is -# selected via: -DMAN_SECTION=n. "n" may have a suffix, if desired. -# These sections have default section names that may be overridden -# with -DSECTIN_NAME=XX, also passed to the autogen invocation. -# -:+][+: - - - (shell "CLexe=${AGexe%/autogen}/columns") - - -(define down-prog-name (string-downcase! (get "prog-name"))) -(define UP-PROG-NAME (get-up-name "prog-name")) - -(define tmp-val (getenv "MAN_SECTION")) -(define man-sect (if (exist? "cmd-section") (get "cmd-section") "1")) -(define file-name "") -(define sect-name "") -(define macro-name "") -(define tmp-str "") -(define fname-line "") -(define use-flags (exist? "flag.value")) -(define named-mode (not (or use-flags (exist? "long-opts") ))) - -(if (defined? 'tmp-val) - (if (string? tmp-val) - (set! man-sect tmp-val))) - -(define section-name - (if (=* man-sect "1") "User Commands" - (if (=* man-sect "5") "File Formats" - (if (=* man-sect "6") "Games" - (if (=* man-sect "8") "System Management" - (error - "the agman-cmd template only produces section 1, 5, 6 and 8 man pages") -))))) -(set! tmp-val (getenv "SECTION_NAME")) -(if (defined? 'tmp-val) (if (string? tmp-val) - (set! section-name tmp-val) )) - -(define package-text "") -(define package+version (and (exist? "package") (exist? "version"))) - -(if (or (exist? "package") (exist? "version")) (begin - (set! package-text (string-append - (get "package") - (if package+version " (" "") - (get "version") - (if package+version ")" "") )) -) ) - -(define name-to-fname (lambda (nm) - (string-tr (string-downcase nm) " " "-") )) - -(define sect-line-fname (lambda () (begin - (out-push-new file-name) - (emit (string-append ".Sh \"" sect-name "\"\n")) - (string-append "mk-" macro-name) ))) - -(make-tmp-dir) - -(define home-rc-files (exist? "homerc")) -(define home-rc-text - "\nSee \\fBOPTION PRESETS\\fP for configuration files.") - -(if (=* man-sect "5") (set! home-rc-files #f)) -(if (=* man-sect "5") (set! home-rc-text "")) - -(define environ-init (exist? "environrc")) -(define environ-text - "\nSee \\fBOPTION PRESETS\\fP for configuration environment variables.") - -(set! tmp-str (find-file (if man-page "texi2man" "texi2mdoc"))) -(if (not (defined? 'tmp-str)) - (error (string-append "cannot locate " - (if man-page "texi2man" "texi2mdoc")))) -(shell (string-append "cvt_prog='" tmp-str - "'\ntest -x \"$cvt_prog\" || die 'no conversion program'" )) - -(define get-cvt (lambda (nm alt-txt) - (shell (string-append - "{\n${cvt_prog} || die ${cvt_prog} failed in $PWD\n" - "} <<\\_EndOfTexiSection_\n" - (get nm alt-txt) - "\n_EndOfTexiSection_" - )) -)) - -(emit (head-line)) -(dne ".\\\" ") :+][+: - -INCLUDE "tpl-config.tlib" :+][+:# - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" B U I L D D O C -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE build-doc :+][+: - -INVOKE doc-sections :+][+: -INVOKE ao-sections :+][+: - -(out-push-new (string-append tmp-dir "/.assemble")) \:+] - -cat_n_rm() { - test -f ${tmp_dir}/$1 || return 0 - [+:(. egrep-prog):+] -v '^[ ]*$' ${tmp_dir}/$1 - rm -f ${tmp_dir}/$1 -} - -#.\" Insert these sections first, in the prescribed order -# -for f in synopsis description options option-presets -do cat_n_rm $f ; done -test -f ${tmp_dir}/name && rm -f ${tmp_dir}/name - -#.\" These sections go last, in the prescribed order -# -for f in implementation-notes environment files examples exit-status errors \ - compatibility see-also conforming-to history authors copyright bugs notes -do cat_n_rm $f ; done > ${tmp_dir}/.fini - -#.\" Insert the contents of all remaining files in alphabetic order, -#.\" except remove any blank lines. -# -set XX ${tmp_dir}/* ; shift -test -f "$1" && cat $* | [+:(. egrep-prog):+] -v '^[ ]*$' - -#.\" Now insert the sections we squirreled away for the end. -# -cat ${tmp_dir}/.fini -[+: (out-pop) - (shell ". ${tmp_dir}/.assemble") :+][+: - -ENDDEF build-doc - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" D O C S E C T I O N S -.\" -.\" Emit the files for each section that was provided. -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE doc-sections :+][+: - -FOR doc-section :+][+: - - CASE - (define sec-type (string-upcase (get "ds-type"))) - (define sec-name (name-to-fname sec-type)) - (out-push-new (string-append tmp-dir "/" sec-name)) - (define cvt-fn (find-file (string-append - (get "ds-format" "man") "2mdoc"))) - (if (not (defined? 'cvt-fn)) - (error (sprintf "Cannot locate converter for %s" - (get "ds-format" "man")))) - sec-type :+][+: - == "" :+][+: (error "unnamed doc-section") :+][+: - *==* " " :+].Sh "[+: (. sec-type) :+]"[+: - * :+].Sh [+: (. sec-type) :+][+: - ESAC :+] -[+: - (shell (string-append - "fn='" cvt-fn "'\n" - "test -f ${fn} || die ${fn} not found from $PWD\n" - "${fn} <<\\_EndOfDocSection_ || die ${fn} failed in $PWD\n" - (get "ds-text") - "\n_EndOfDocSection_" - )) :+][+: - - CASE (. sec-type) :+][+: - == FILES :+][+: - (if home-rc-files (emit home-rc-text)) - (set! home-rc-files #f) :+][+: - - == ENVIRONMENT :+][+: - (if environ-init (emit environ-text)) - (set! environ-init #f) :+][+: - ESAC :+][+: - - (out-pop) - :+][+: - -ENDFOR doc-section :+][+: - -ENDDEF doc-sections - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" A O S E C T I O N S -.\" -.\" Emit the files for the sections that these templates augment, -.\" replace or conditionally replace -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE ao-sections :+][+: - -IF (=* man-sect "5") :+][+: -ELSE :+][+: - INVOKE cond-section sec = "OPTIONS" mode = "replace" :+][+: -ENDIF :+][+: -INVOKE cond-section sec = "SYNOPSIS" mode = "alt" :+][+: -INVOKE cond-section sec = "DESCRIPTION" mode = "append" :+][+: -IF (=* man-sect "5") :+][+: -ELSE :+][+: - INVOKE cond-section sec = "EXIT STATUS" mode = "insert" :+][+: -ENDIF :+][+: -INVOKE cond-section sec = "AUTHORS" mode = "alt" :+][+: -INVOKE cond-section sec = "BUGS" mode = "append" :+][+: -INVOKE cond-section sec = "NOTES" mode = "append" :+][+: - -IF (exist? "copyright") :+][+: - INVOKE cond-section sec = "COPYRIGHT" mode = "alt" :+][+: -ENDIF :+][+: - -IF (=* man-sect "5") :+][+: - INVOKE cond-section sec = "FILES" mode = "append" :+][+: -ELIF (or home-rc-files environ-init) :+][+: - INVOKE cond-section sec = "OPTION PRESETS" mode = "replace" :+][+: - - IF (. home-rc-files) :+][+: - INVOKE cond-section sec = "FILES" mode = "append" :+][+: - ENDIF :+][+: - - IF (. environ-init) :+][+: - INVOKE cond-section sec = "ENVIRONMENT" mode = "append" :+][+: - ENDIF :+][+: - -ENDIF :+][+: - -ENDDEF ao-sections - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" C O N D I T I O N A L S E C T I O N -.\" -.\" Figure out what to do for AutoOpts required sections, depending on "mode" -.\" In all cases, if the file does not exist, invoke the "mk" macro to create -.\" a new file. If it does exist, then: -.\" -.\" alt Alternate -- emit no text -.\" replace throw away any pre-existing file. -.\" append invoke the "append" macro to emit additional text -.\" insert save the current contents, replacing the .Sh line with .Pp. -.\" invoke the "mk" macro then emit the saved text -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE cond-section :+][+: - - IF - (set! sect-name (string-upcase! (string-substitute - (get "sec") "-" " " ))) - (set! macro-name (string-downcase! (string-substitute - sect-name " " "-" ))) - (set! file-name (string-append tmp-dir "/" macro-name)) - - (not (access? file-name R_OK)) :+][+: - - INVOKE (sect-line-fname) :+][+: - (out-pop) :+][+: - - ELSE file exists :+][+: - - CASE (get "mode") :+][+: - - == replace :+][+: - INVOKE (sect-line-fname) :+][+: - (out-pop) :+][+: - - == append :+][+: - (out-push-add file-name) :+][+: - INVOKE (string-append "append-" macro-name) :+][+: - (out-pop) :+][+: - - == insert :+][+: - (set! fname-line (shellf "sed '1s/.Sh .*/.Pp/' %s" file-name)) :+][+: - INVOKE (sect-line-fname) :+][+: - (emit fname-line) - (out-pop) :+][+: - - # * -- otherwise, do nothing :+][+: - - ESAC :+][+: - - ENDIF file existence/non-existence :+][+: -ENDDEF cond-section - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - D E S C R I P T I O N -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-description :+][+: - - (if (exist? "prog-man-descrip") - (stack-join "\n.Pp\n" "prog-man-descrip") - (if (exist? "detail") - (stack-join "\n.Pp\n" "detail") - "There is no description for this command." - ) ) :+] -[+: - INVOKE append-description :+][+: - -ENDDEF mk-description - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-description :+][+: - -IF (= (get "main.main-type") "for-each"):+][+: - - CASE main.handler-type :+][+: - ~* ^(name|file)|.*text \:+] -.Pp -This program will perform its function for every file named on the command -line or every file named in a list read from stdin. The arguments or input -names must be pre\-existing files. The input list may contain comments, -which[+: - - !E \:+] -.Pp -This program will perform its function for every command line argument -or every non\-comment line in a list read from stdin. -The input list comments[+: - - * :+][+: - (error "the 'for-each' main has in invalid handler-type.") :+][+: - ESAC \:+] - are blank lines or lines beginning with a '[+: - ?% comment-char "%s" "#" :+]' character. -[+: - -ENDIF - "main" exists :+][+: -ENDDEF append-description - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - O P T I O N S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-options - -:+][+: - -(define opt-arg "") -(define dis-name "") -(define opt-name "") -(define optname-from "A-Z_^") -(define optname-to "a-z--") -(define cvt-cmd "") -(define formatted-doc (exist? "option-doc-format")) - -(if formatted-doc (begin - (out-push-new) - (set! cvt-cmd (string-append (get "option-doc-format") "2mdoc")) -) ) - -(if (exist? "preserve-case") - (begin - (set! optname-from "_^") - (set! optname-to "--") -) ) - -(define fix-optname (lambda (o_nm) (begin - (set! o_nm (string-tr o_nm optname-from optname-to)) - (set! o_nm (string-substitute o_nm "-" "\\-" )) - o_nm ))) - -(if (exist? "option-info") - (string-append ".Pp\n" (get "option-info") "\n") ) -\:+] -.Bl -tag[+: - -FOR flag :+][+: - IF (not (exist? "documentation")) :+][+: - IF (exist? "aliases") :+][+: - INVOKE emit-alias-opt :+][+: - ELSE :+][+: - INVOKE emit-flag-text :+][+: - ENDIF :+][+: - - ELSE :+] -.Ss "[+: (get-cvt "descrip" "") :+]"[+: - - IF (set! tmp-str (get-cvt "documentation" "")) - (> (string-length tmp-str) 3) :+] -[+: (. tmp-str) :+] -[+: ENDIF :+][+: - - ENDIF :+][+: -ENDFOR flag - -.\" = = = = = = = = = = = = = = = = = -.\" help option -.\" = = = = = = = = = = = = = = = = = - -:+] -.It [+: - - IF (. use-flags) :+]\-[+: (get "help-value" "?") :+][+: - (if (exist? "long-opts") " , \" \\-\\-help\"") :+][+: - ELSE :+][+: - (if (exist? "long-opts") "\\-\\-") :+]help[+: - ENDIF :+] -Display usage information and exit.[+:# - -.\" = = = = = = = = = = = = = = = = = -.\" more-help option -.\" = = = = = = = = = = = = = = = = = :+][+: - - IF (not (exist? "no-libopts")) :+] -.It [+: - - IF (. use-flags) :+]\-[+: ?% more-help-value "%s" "!" :+][+: - IF (exist? "long-opts") :+] , " \-\-more-help"[+: ENDIF :+][+: - ELSE :+][+: - IF (exist? "long-opts") :+]\-\-[+: ENDIF :+]more-help[+: - ENDIF :+] -Pass the extended usage information through a pager.[+: - -ENDIF no no-libopts - -.\" = = = = = = = = = = = = = = = = = -.\" save and load configuration -.\" = = = = = = = = = = = = = = = = = :+][+: - -IF (exist? "homerc") :+] -.It [+: - - IF (. use-flags) :+]\-[+: ?% save-opts-value "%s" ">" - :+] " [\fIrcfile\fP][+: - IF (exist? "long-opts") :+]," " \-\-save-opts" "[=\fIrcfile\fP][+: - ENDIF :+]"[+: - ELSE :+][+: - IF (exist? "long-opts") :+]\-\-[+: - ENDIF :+]save-opts "[=\fIrcfile\fP]"[+: - ENDIF :+] -Save the option state to \fIrcfile\fP. The default is the \fIlast\fP -configuration file listed in the \fBOPTION PRESETS\fP section, below. -.It [+: - - IF (. use-flags) :+]\-[+: ?% load-opts-value "%s" "<" - :+] " \fIrcfile\fP[+: - IF (exist? "long-opts") - :+]," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts[+: - ENDIF :+]"[+: - ELSE :+][+: - IF (exist? "long-opts") :+]\-\-[+: - ENDIF :+]load-opts "=\fIrcfile\fP," " \-\-no-load-opts"[+: - ENDIF :+] -Load options from \fIrcfile\fP. -The \fIno-load-opts\fP form will disable the loading -of earlier RC/INI files. \fI\-\-no-load-opts\fP is handled early, -out of order.[+: -ENDIF (exist? "homerc") - -.\" = = = = = = = = = = = = = = = = = -.\" version -.\" = = = = = = = = = = = = = = = = = :+][+: - -IF (exist? "version") :+] -.It [+: - - IF (. use-flags) :+]\-[+: ?% version-value "%s" "v" - :+] " [{\fIv|c|n\fP}][+: - IF (exist? "long-opts") :+]," " \-\-version" "[=\fI{v|c|n}\fP][+: - ENDIF :+]"[+: - ELSE :+][+: - IF (exist? "long-opts") :+]\-\-[+: - ENDIF :+]version "[=\fI{v|c|n}\fP]"[+: - ENDIF :+] -Output version of program and exit. The default mode is `v', a simple -version. The `c' mode will print copyright information and `n' will -print the full copyright notice.[+: -ENDIF :+] -.El -[+: - -(if formatted-doc - (shell (string-append - "fn='" (find-file cvt-cmd) - "'\ntest -f ${fn} || die '" cvt-cmd " not found'\n" - "${fn} <<\\_EndOfMdoc_ || die ${fn} failed in $PWD\n" - (out-pop #t) - "\n_EndOfMdoc_" )) ) :+][+: - -ENDDEF mk-options - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - O P T I O N - P R E S E T S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-option-presets \:+] -Any option that is not marked as \fInot presettable\fP may be preset -by loading values from [+: - IF (. home-rc-files) - :+]configuration ("RC" or ".INI") file(s)[+: - IF (. environ-init) :+] and values from -[+: - ENDIF :+][+: - ENDIF :+][+: - IF (. environ-init) :+]environment variables named: -.nf - \fB[+: (. UP-PROG-NAME) :+]_\fP or \fB[+: (. UP-PROG-NAME) :+]\fP -.fi -.ad[+: - IF (. home-rc-files) :+] -The environmental presets take precedence (are processed later than) -the configuration files.[+: - ENDIF :+][+: - ELSE :+].[+: - ENDIF :+][+: - - CASE - (define rc-file - (get "rcfile" (string-append "." (get "prog-name") "rc")) ) - (count "homerc") :+][+: - - == "0" :+][+: - == "1" :+][+: - - CASE homerc :+][+: - ~~ '\.|\$HOME' :+] -The file "\fI[+: (string-append (get "homerc") "/" rc-file) -:+]\fP" will be used, if present.[+: - * :+] -The \fIhomerc\fP file is "\fI[+:homerc:+]\fP", unless that is a directory. -In that case, the file "\fI[+: (. rc-file) :+]\fP" -is searched for within that directory.[+: - ESAC :+][+: - - * :+] -The \fIhomerc\fP files are [+: - FOR homerc ", " :+][+: - IF (last-for?) :+]and [+: - ENDIF :+]"\fI[+: homerc :+]\fP"[+: ENDFOR :+]. -If any of these are directories, then the file \fI[+: (. rc-file) :+]\fP -is searched for within those directories.[+: - ESAC :+][+: - -ENDDEF mk-option-presets - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - E X I T - S T A T U S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-exit-status \:+] -One of the following exit values will be returned: -.Bl -tag -[+: -(ag-fprintf 0 ".It 0 \" (EXIT_%s)\"\n%s\n" - (string->c-name! (string-upcase (get "exit-name[0]" "SUCCESS"))) - (get-cvt "exit-desc[0]" "Successful program execution.") ) - -(define need-ex-noinput (exist? "homerc")) -(define need-ex-software #t) - -(ag-fprintf 0 ".It 1 \" (EXIT_%s)\"\n%s\n" - (string->c-name! (string-upcase (get "exit-name[1]" "FAILURE"))) - (get-cvt "exit-desc[1]" - "The operation failed or the command syntax was not valid.")) :+][+: - -FOR exit-desc (for-from 2) :+][+: - (if (= (for-index) 66) - (set! need-ex-noinput #f) - (if (= (for-index) 70) - (set! need-ex-software #f) )) - - (set! tmp-str (get (sprintf "exit-name[%d]" (for-index)) "* unnamed *")) - (sprintf ".It %d \" (EXIT_%s)\"\n%s\n" - (for-index) - (string-upcase (string->c-name! tmp-str)) - (get-cvt "exit-desc" "")) :+][+: -ENDFOR exit-desc :+][+: -(if need-ex-noinput - (emit ".It 66 \" (EX_NOINPUT)\" -A specified configuration file could not be loaded.\n")) - -(if need-ex-noinput - (emit ".It 70 \" (EX_SOFTWARE)\" -libopts had an internal operational error. Please report -it to autogen-users@lists.sourceforge.net. Thank you.\n")) - -(if (> (string-length fname-line) 1) - (emit fname-line)) :+] -.El -[+: - -ENDDEF exit-status - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - A U T H O R S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-authors :+][+: - - (define remove-authors #t) - - (set! tmp-val - (if (exist? "copyright.author") - (stack-join ",\n" "copyright.author") - (stack-join ",\n" "copyright.owner") )) - - (if (> (string-length tmp-val) 1) - (string-append tmp-val "\n") - (delete-file file-name)) - - :+][+: - -ENDDEF mk-authors - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - B U G S -.\" -.\" This section is guaranteed to be the last section in the man page -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-bugs :+][+: - - (set! tmp-val (get "copyright.eaddr" (get "eaddr"))) - (if (> (string-length tmp-val) 1) - (string-append "Please send bug reports to: " tmp-val "\n") - (delete-file file-name) ) - :+][+: - -ENDDEF mk-bugs :+][+: - -DEFINE append-bugs :+][+: - - (set! tmp-val (get "copyright.eaddr" (get "eaddr"))) - (if (> (string-length tmp-val) 1) - (string-append "Please send bug reports to: " tmp-val "\n") ) - :+][+: - -ENDDEF append-bugs - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - C O P Y R I G H T (+ licensing) -.\" -.\" This section is guaranteed to be the last section in the man page -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-copyright \:+] -Copyright (C) [+: copyright.date :+] [+: - (get "copyright.owner" (get "copyright.author" (get "copyright.eaddr"))) - :+] all rights reserved. -[+: CASE (get "copyright.type") :+][+: - = note :+][+: (get "copyright.text") :+][+: - == '' :+]This program has an unspecified license.[+: - - * :+][+: - (string-append "This program is released under the terms of " - (license-name (get "copyright.type")) ".") :+][+: - - ESAC :+] -[+: -ENDDEF mk-copyright - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - N O T E S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-notes \:+] -This manual page was \fIAutoGen\fP-erated from the \fB[+: prog-name :+]\fP -option definitions. -[+: - -ENDDEF mk-notes - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-notes \:+] - -.Pp -This manual page was \fIAutoGen\fP-erated from the \fB[+: prog-name :+]\fP -option definitions.[+: - -ENDDEF append-notes - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - E N V I R O N M E N T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-environment :+][+: - INVOKE append-environment :+][+: -ENDDEF mk-environment - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-environment :+][+: - (. environ-text) :+][+: -ENDDEF append-environment - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - F I L E S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-files :+][+: - INVOKE append-files :+][+: -ENDDEF mk-files - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-files :+][+: - (. home-rc-text) :+][+: -ENDDEF append-files - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" E M I T A L I A S O P T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE emit-alias-opt :+] -.It [+: - IF (exist? "value") :+][+: - IF (exist? "long-opts") \:+] - \-[+:value:+] ", " -\-[+: name :+][+: - ELSE \:+] - \-[+:value:+][+: - ENDIF (exist? "long-opts") :+][+: - - ELSE value does not exist -- named option only :+][+: - - IF (not (exist? "long-opts")) \:+] - [+: name :+][+: - ELSE \:+] - \-\-[+: (. opt-name) :+][+: - ENDIF :+][+: - ENDIF :+] -This is an alias for the [+: aliases :+] option.[+: -ENDDEF emit-alias-opt - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" E M I T F L A G T E X T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE emit-flag-text :+][+: - - (if (exist? "enable") - (set! opt-name (string-append (get "enable") "-" (get "name"))) - (set! opt-name (get "name")) ) - (if (exist? "disable") - (set! dis-name (string-append (get "disable") "-" (get "name"))) - (set! dis-name "") ) - - (set! opt-name (fix-optname opt-name)) - (if (> (string-length dis-name) 0) - (set! dis-name (fix-optname dis-name)) ) - - (if (not (exist? "arg-type")) - (set! opt-arg "") - (set! opt-arg (string-append "\\fI" - (fix-optname (if (exist? "arg-name") - (get "arg-name") - (string-downcase! (get "arg-type")) )) - "\\fP" )) - ) - -:+] -.It [+: - IF (exist? "value") :+][+: - IF (exist? "long-opts") :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option has a flag value (character) AND - * the program uses long options - * - \:+] - \-[+:value:+][+: - IF (not (exist? "arg-type")) :+] ", " -\-[+: - ELSE :+] " [+:(. opt-arg):+], " \-\-[+: - ENDIF :+][+: (. opt-name) :+][+: - IF (exist? "arg-type") :+][+: - ? arg-optional " [ =" ' "=" ' - :+][+: (. opt-arg) :+][+: - arg-optional " ]" :+][+: - ENDIF :+][+: - IF (exist? "disable") :+], " \fB\-\-[+:(. dis-name):+]\fP"[+: - ENDIF :+][+: - - ELSE :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option has a flag value (character) BUT - * the program does _NOT_ use long options - * - \:+] - \-[+:value:+][+: - IF (exist? "arg-type") :+][+: - arg-optional "[" :+] "[+:(. opt-arg):+][+: - arg-optional '"]"' :+][+: - ENDIF " :+][+: - ENDIF (exist? "long-opts") :+][+: - - - ELSE value does not exist -- named option only :+][+: - - IF (not (exist? "long-opts")) :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option does not have a flag value (character). - * The program does _NOT_ use long options either. - * Special magic: All arguments are named options. - * - \:+] - [+: (. opt-name) :+][+: - IF (exist? "arg-type") :+] [+: - ? arg-optional " [ =" ' "=" ' - :+][+:(. opt-arg) :+][+: - arg-optional "]" :+][+: - ENDIF:+][+: - IF (exist? "disable") :+], " \fB[+:(. dis-name):+]\fP"[+: - ENDIF :+][+: - - - ELSE :+][+: - # * * * * * * * * * * * * * * * * * * * * - * - * The option does not have a flag value (character). - * The program, instead, only accepts long options. - * - \:+] - \-\-[+: (. opt-name) :+][+: - - IF (exist? "arg-type") :+] "[+: #" :+][+: - arg-optional "[" :+]=[+:(. opt-arg):+][+: - arg-optional "]" :+]"[+: #" :+][+: - ENDIF :+][+: - - IF (exist? "disable") - :+], " \fB\-\-[+:(. dis-name):+]\fP"[+: - ENDIF :+][+: - ENDIF :+][+: - ENDIF :+] -[+: (get-cvt "descrip" "") :+].[+: - - IF (exist? "min") :+] -This option is required to appear.[+: - ENDIF :+][+: - - IF (exist? "max") :+] -This option may appear [+: - IF % max (= "%s" "NOLIMIT") - :+]an unlimited number of times[+:ELSE - :+]up to [+: max :+] times[+: - ENDIF:+].[+: - ENDIF:+][+: - - IF (exist? "disable") :+] -The \fI[+:(. dis-name):+]\fP form will [+: - IF (exist? "stack-arg") - :+]clear the list of option arguments[+: - ELSE :+]disable the option[+: - ENDIF :+].[+: - ENDIF:+][+: - - IF (exist? "enabled") :+] -This option is enabled by default.[+: - ENDIF :+][+: - - IF (exist? "no-preset") :+] -This option may not be preset with environment variables -or in initialization (rc) files.[+: - ENDIF :+][+: - - IF (and (exist? "default") named-mode) :+] -This option is the default option.[+: - ENDIF :+][+: - - IF (exist? "equivalence") :+] -This option is a member of the [+:equivalence:+] class of options.[+: - ENDIF :+][+: - - IF (exist? "flags-must") :+] -This option must appear in combination with the following options: -[+: FOR flags-must ", " :+][+:flags-must:+][+:ENDFOR:+].[+: - ENDIF :+][+: - - IF (exist? "flags-cant") :+] -This option must not appear in combination with any of the following options: -[+: FOR flags-cant ", " :+][+:flags-cant:+][+:ENDFOR:+].[+: - ENDIF :+][+: - - - IF (~* (get "arg-type") "key|set") :+] -This option takes a keyword as its argument[+: - - IF (=* (get "arg-type") "set") - -:+] list. Each entry turns on or off -membership bits. The bits are set by name or numeric value and cleared -by preceding the name or number with an exclamation character ('!'). -They can all be cleared with the magic name \fInone\fR and they can all be set -with -.IR all . -A single option will process a list of these values.[+: - - ELSE - -:+]. The argument sets an enumeration value that can -be tested by comparing them against the option value macro.[+: - - ENDIF - -:+] -The available keywords are: -.in +4 -.nf -.na -[+: (shellf "${CLexe} --indent='' --spread=1 -W50 <<_EOF_\n%s\n_EOF_" - (join "\n" (stack "keyword")) ) :+] -.fi -or their numeric equivalent. -.in -4[+: (if (exist? "arg-default") "\n.sp" ) :+][+: - - ELIF (=* (get "arg-type") "num") :+] -This option takes an integer number as its argument.[+: - - IF (exist? "arg-range") :+] -The value of [+:(. opt-arg):+] is constrained to being: -.in +4 -.nf -.na[+:FOR arg_range ", or" :+] -[+: (shellf " -range='%s' - -case \"X${range}\" in -X'->'?* ) - echo \"less than or equal to\" ` - echo $range | sed 's/->//' ` ;; - -X?*'->' ) - echo \"greater than or equal to\" ` - echo $range | sed 's/->.*//' ` ;; - -X?*'->'?* ) - echo \"in the range \" ` - echo $range | sed 's/->/ through /' ` ;; - -X?* ) - echo exactly $range ;; - -X* ) echo $range is indeterminate -esac" - -(get "arg-range") ) -:+][+: - ENDFOR arg-range :+] -.fi -.in -4[+: - - ENDIF arg-range exists :+][+: - - ENDIF arg-type key/set/num :+][+: - - IF (exist? "arg-default") :+] -The default [+: (. opt-arg) :+] for this option is: -.ti +4 - [+: (join " + " (stack "arg-default" )) :+][+: - ENDIF :+] -.sp -[+: - (if (exist? "doc") - (get-cvt "doc" "") - "This option has not been fully documented." ) :+][+: - IF (exist? "deprecated") :+] -.sp -.B -NOTE: THIS OPTION IS DEPRECATED -.R[+: - ENDIF :+][+: - -ENDDEF emit-flag-text - -.\" cmd-doc.tlib ends here \:+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man b/external/bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man deleted file mode 100755 index 406cdd9ee220..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/Old/mdoc2man +++ /dev/null @@ -1,308 +0,0 @@ -#! /bin/bash - -## mdoc2man.sh -- script to convert mdoc-isms to man-isms -## -## Time-stamp: "2012-04-15 07:38:27 bkorb" -## -## This file is part of AutoOpts, a companion to AutoGen. -## AutoOpts is free software. -## AutoOpts is Copyright (c) 1992-2012 Bruce Korb - all rights reserved -## -## AutoOpts is available under any one of two licenses. The license -## in use must be one of these two and the choice is under the control -## of the user of the license. -## -## The GNU Lesser General Public License, version 3 or later -## See the files "COPYING.lgplv3" and "COPYING.gplv3" -## -## The Modified Berkeley Software Distribution License -## See the file "COPYING.mbsd" -## -## These files have the following md5sums: -## -## 43b91e8ca915626ed3818ffb1b71248b COPYING.gplv3 -## 06a1a2e4760c90ea5e1dad8dfaac4d39 COPYING.lgplv3 -## 66a5cedaf62c4b2637025f049f9b826f COPYING.mbsd - -## This "library" converts mdoc-isms into man-isms. It gets included -## by the man page template at the point where mdoc-isms might start appearing -## and then "emit-man-text" is invoked when all the text has been assembled. -## -## Display the command line prototype, -## based only on the argument processing type. -## -## And run the entire output through "sed" to convert mdoc-isms - -# /bin/sh on Solaris is too horrible for words -# -case "$0" in -/bin/sh ) test -x /usr/xpg4/bin/sh && exec /usr/xpg4/bin/sh ${1+"$@"} ;; -esac - -parent_pid=$$ -prog=`basename $0 .sh` -NmName= - -die() { - echo "$prog error: $*" >&2 - ps -p ${AG_pid:-999999999} >/dev/null 2>&1 && \ - kill -TERM ${AG_pid} - kill -TERM $parent_pid - sleep 1 - kill -9 $parent_pid - sleep 1 - exit 1 -} - -had_no_arg() { - die "'$1' command had no argument: <$line>" -} - -# One function for each mdoc structure. -# -do_nest_enum() { - do_enum -} - -do_enum() { - echo '.in +4' - local ix=1 - - while IFS='' read -r line - do - case "${line}" in - .It* ) printf '.ti -4\n%d\n\t' $ix - ix=`expr $ix + 1` - ;; - - .Bl' '*enum* ) do_nest_enum ;; - .Bl' '*tag* ) do_nest_tag ;; - .Bl' '*bullet* ) do_nest_bullet ;; - .Bd' '* ) do_nest_block ;; - .Op' '* ) do_nest_optional ;; - .Fl' '* ) do_nest_flag ;; - .Ar' '* ) do_nest_arg ;; - - .El* ) echo '.in -4' - return 0 ;; - - * ) echo "$line" ;; - esac - done - die "EOF reached processing '.Bl -enum'" -} - -do_nest_tag() { - echo '.in +4' - while IFS='' read -r line - do - case "${line}" in - .It* ) printf '.ti -4\n.IR ' - echo ${line#.It} ;; - - .Bl' '*enum* ) do_nest_enum ;; - .Bl' '*tag* ) do_nest_tag ;; - .Bl' '*bullet* ) do_nest_bullet ;; - .Bd' '* ) do_nest_block ;; - .Op' '* ) do_nest_optional ;; - .Fl' '* ) do_nest_flag ;; - .Ar' '* ) do_nest_arg ;; - - .El* ) echo '.in -4' - return 0 ;; - - * ) echo "$line" ;; - esac - done - die "EOF reached processing '.Bl -tag'" -} - -do_tag() { - while IFS='' read -r line - do - case "${line}" in - .It* ) printf '.TP\n.BR ' - echo ${line#.It} ;; - - .Bl' '*enum* ) do_nest_enum ;; - .Bl' '*tag* ) do_nest_tag ;; - .Bl' '*bullet* ) do_nest_bullet ;; - .Bd' '* ) do_nest_block ;; - .Op' '* ) do_nest_optional ;; - .Fl' '* ) do_nest_flag ;; - .Ar' '* ) do_nest_arg ;; - .El* ) return 0 ;; - * ) echo "$line" ;; - esac - done - die "EOF reached processing '.Bl -tag'" -} - -do_nest_bullet() { - do_bullet -} - -do_bullet() { - echo '.in +4' - while IFS='' read -r line - do - case "${line}" in - .It* ) printf '.ti -4\n\\fB*\\fP\n' - echo ${line#.It} - ;; - - .Bl' '*enum* ) do_nest_enum ;; - .Bl' '*tag* ) do_nest_tag ;; - .Bl' '*bullet* ) do_nest_bullet ;; - .Bd' '* ) do_nest_block ;; - .Op' '* ) do_nest_optional ;; - .Fl' '* ) do_nest_flag ;; - .Ar' '* ) do_nest_arg ;; - - .El* ) echo '.in -4' - return 0 ;; - - * ) echo "$line" ;; - esac - done - die "EOF reached processing '.Bl -bullet'" -} - -do_nest_block() { - do_block -} - -do_block() { - printf '.br\n.in +4\n.nf\n' - while IFS='' read -r line - do - case "${line}" in - .B* ) die ".Bx command nested within .Bd" ;; - - .Ed* ) echo .in -4 - echo .fi - return 0 ;; - - * ) echo "$line" ;; - esac - done - die "EOF reached processing '.Bd'" -} - -do_nest_optional() { - do_optional -} - -do_optional() { - set -- $line - shift - local text='[' - while test $# -gt 0 - do - # Ns may be fun... - m1="$1" - case "X$1" in - # The general escape sequence is: \& - X\\\& ) - text="${text} ${1}" - shift - ;; - # This one should be a generic punctuation check - # Punctuation is any of the 10 chars: .,:;()[]?! - # (but more are actually used and accepted) - # and is output in the default font. - X[!0-9a-zA-Z]* ) - text="${text} ${1}" - shift - ;; - XAr | XCm ) - text=${text}' "\fI'${2}'\fR"' - shift 2 || had_no_arg "$m1" - ;; - XFl ) - text=${text}' \fB-'${2}'\fR' - shift 2 || had_no_arg "$m1" - ;; - * ) # Grab subsequent non-keywords and punctuation, too - text="${text} $1" - shift - ;; - esac - done - echo "${text} ]" -} - -do_nest_flag() { - do_flag -} - -do_flag() { - echo ${line#.Fl} -} - -do_nest_arg() { - do_arg -} - -do_arg() { - line=`echo ${line#.Ar}` - echo "\\fI${line}\\fR" -} - -do_NmName() { - # do we want to downcase the line first? Yes... - set -- `echo ${line#.Nm} | \ - sed -e 's/-/\\-/g' \ - -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - NmNameSfx= - - if test $# -gt 0 - then case "$1" in - [A-Za-z]* ) - NmName=$1 - shift - ;; - esac - - test $# -gt 0 && NmNameSfx=" $*" - fi - echo ".B $NmName$NmNameSfx" -} - -do_line() { - case "${line}" in - .Bl' '*enum* ) do_enum ;; - .Bl' '*tag* ) do_tag ;; - .Bl' '*bullet* ) do_bullet ;; - .Bd' '* ) do_block ;; - .Op' '* ) do_optional ;; - .Fl' '* ) do_flag ;; - .Ar' '* ) do_arg ;; - .Nm' '* ) do_NmName ;; - .Nm ) do_NmName ;; - * ) echo "$line" ;; - esac - return 0 -} - - - -easy_fixes=' -s/^\.Sh/.SH/ -s/^\.Ss/.SS/ -s/^\.Em/.I/ -s/^\.Pp/.PP/ -s/^.in *\\-/.in -/ -' - -readonly easy_fixes -set -f - -{ - while IFS='' read -r line - do - do_line - done -} | sed "${easy_fixes}" - -exit 0 diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl deleted file mode 100644 index 6d937e4687b1..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/agman-cmd.tpl +++ /dev/null @@ -1,58 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template man - -## agman-cmd.tpl -- Template for command line man pages -## -## This file is part of AutoOpts, a companion to AutoGen. -## AutoOpts is free software. -## Copyright (C) 1992-2013 Bruce Korb - all rights reserved -## -## AutoOpts is available under any one of two licenses. The license -## in use must be one of these two and the choice is under the control -## of the user of the license. -## -## The GNU Lesser General Public License, version 3 or later -## See the files "COPYING.lgplv3" and "COPYING.gplv3" -## -## The Modified Berkeley Software Distribution License -## See the file "COPYING.mbsd" -## -## These files have the following sha256 sums: -## -## 8584710e9b04216a394078dc156b781d0b47e1729104d666658aecef8ee32e95 COPYING.gplv3 -## 4379e7444a0e2ce2b12dd6f5a52a27a4d02d39d247901d3285c88cf0d37f477b COPYING.lgplv3 -## 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.mbsd - -# Produce a man page for section 1, 5 or 8 commands. -# Which is selected via: -DMAN_SECTION=n -# passed to the autogen invocation. "n" may have a suffix, if desired. -# -:+][+: - -(define head-line (lambda() - (sprintf ".TH %s %s \"%s\" \"%s\" \"%s\"\n.\\\"\n" - (get "prog-name") man-sect - (shell "date '+%d %b %Y'") package-text section-name) )) - -(define man-page #t) -(out-push-new) :+][+: - -INCLUDE "mdoc-synopsis.tlib" :+][+: -INCLUDE "cmd-doc.tlib" :+][+: - -INVOKE build-doc :+][+: - - (shell (string-append - "fn='" (find-file "mdoc2man") "'\n" - "test -f ${fn} || die mdoc2man not found from $PWD\n" - "${fn} <<\\_EndOfMdoc_ || die ${fn} failed in $PWD\n" - (out-pop #t) - "\n_EndOfMdoc_" )) - -:+][+: - -(out-move (string-append (get "prog-name") "." - man-sect)) :+][+: - -agman-cmd.tpl ends here :+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl deleted file mode 100644 index bb605fb7976d..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/agmdoc-cmd.tpl +++ /dev/null @@ -1,46 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template mdoc - -## agman-cmd.tpl -- Template for command line mdoc pages -## -## This file is part of AutoOpts, a companion to AutoGen. -## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved -## -## AutoOpts is available under any one of two licenses. The license -## in use must be one of these two and the choice is under the control -## of the user of the license. -## -## The GNU Lesser General Public License, version 3 or later -## See the files "COPYING.lgplv3" and "COPYING.gplv3" -## -## The Modified Berkeley Software Distribution License -## See the file "COPYING.mbsd" -## -## These files have the following sha256 sums: -## -## 8584710e9b04216a394078dc156b781d0b47e1729104d666658aecef8ee32e95 COPYING.gplv3 -## 4379e7444a0e2ce2b12dd6f5a52a27a4d02d39d247901d3285c88cf0d37f477b COPYING.lgplv3 -## 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.mbsd - -# Produce a man page for section 1, 5 or 8 commands. -# Which is selected via: -DMAN_SECTION=n -# passed to the autogen invocation. "n" may have a suffix, if desired. -# -:+][+: - -(define head-line (lambda() (string-append - ".Dd " (shell "date '+%B %e %Y' | sed 's/ */ /g'") - "\n.Dt " UP-PROG-NAME " " man-sect " " section-name - "\n.Os " (shell "uname -sr") "\n") )) - -(define man-page #f) :+][+: - -INCLUDE "mdoc-synopsis.tlib" :+][+: -INCLUDE "cmd-doc.tlib" :+][+: -INVOKE build-doc :+][+: - -(out-move (string-append - (get "prog-name") "." man-sect)) :+][+: -agmdoc-cmd.tpl ends here :+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib b/external/bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib deleted file mode 100644 index 0f4c50c10a38..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/cmd-doc.tlib +++ /dev/null @@ -1,1079 +0,0 @@ -[+: -*- Mode: nroff -*- - - AutoGen5 template man - -# cmd-doc.tlib -- Template for command line man/mdoc pages -# -# This file is part of AutoOpts, a companion to AutoGen. -# AutoOpts is free software. -# Copyright (C) 1992-2013 Bruce Korb - all rights reserved -# -# AutoOpts is available under any one of two licenses. The license -# in use must be one of these two and the choice is under the control -# of the user of the license. -# -# The GNU Lesser General Public License, version 3 or later -# See the files "COPYING.lgplv3" and "COPYING.gplv3" -# -# The Modified Berkeley Software Distribution License -# See the file "COPYING.mbsd" -# -# These files have the following sha256 sums: -# -# 8584710e9b04216a394078dc156b781d0b47e1729104d666658aecef8ee32e95 COPYING.gplv3 -# 4379e7444a0e2ce2b12dd6f5a52a27a4d02d39d247901d3285c88cf0d37f477b COPYING.lgplv3 -# 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.mbsd - -# Produce a man page for section 1, 5, 6 or 8 commands. Which is -# selected via: -DMAN_SECTION=n. "n" may have a suffix, if desired. -# These sections have default section names that may be overridden -# with -DSECTIN_NAME=XX, also passed to the autogen invocation. -# -:+][+: - - ;;# START-BUILDTREE-ISMS - ;; - (shell "CLexe=${AGexe%/agen5/*}/columns/columns - test -x \"${CLexe}\" || { - CLexe=${AGexe%/autogen}/columns - test -x \"${CLexe}\" || die 'columns program is not findable' - }") - -:+][+: # END-BUILDTREE-ISMS - -(shell "CLexe=`echo ${AGexe} | sed 's@/autogen@/columns@'` - test -x \"${CLexe}\" || CLexe=`which columns`") - -# END-INSTALL-ONLY-CODE :+][+: - -(define down-prog-name (string-downcase! (get "prog-name"))) -(define UP-PROG-NAME (get-up-name "prog-name")) - -(define command-doc #t) -(define tmp-val (getenv "MAN_SECTION")) -(define man-sect (if (exist? "cmd-section") (get "cmd-section") "1")) -(define file-name "") -(define sect-name "") -(define macro-name "") -(define tmp-str "") -(define fname-line "") -(define use-flags (exist? "flag.value")) -(define named-mode (not (or use-flags (exist? "long-opts") ))) - -(if (defined? 'tmp-val) - (if (string? tmp-val) - (set! man-sect tmp-val))) - -(define section-name - (if (=* man-sect "1") "User Commands" - (if (=* man-sect "5") "File Formats" - (if (=* man-sect "6") "Games" - (if (=* man-sect "8") "System Management" - (error - "the agman-cmd template only produces section 1, 5, 6 and 8 man pages") -))))) -(set! tmp-val (getenv "SECTION_NAME")) -(if (defined? 'tmp-val) (if (string? tmp-val) - (set! section-name tmp-val) )) - -(define package-text "") -(define package+version (and (exist? "package") (exist? "version"))) - -(if (or (exist? "package") (exist? "version")) (begin - (set! package-text (string-append - (get "package") - (if package+version " (" "") - (get "version") - (if package+version ")" "") )) -) ) - -(define name-to-fname (lambda (nm) - (string-tr (string-downcase nm) " " "-") )) - -(define sect-line-fname (lambda () (begin - (out-push-new file-name) - (emit (string-append ".Sh \"" sect-name "\"\n")) - (string-append "mk-" macro-name) ))) - -(make-tmp-dir) - -(define home-rc-files (exist? "homerc")) -(define home-rc-text - "\nSee \\fBOPTION PRESETS\\fP for configuration files.") - -(define environ-init (exist? "environrc")) -(define environ-text - "\nSee \\fBOPTION PRESETS\\fP for configuration environment variables.") - -(emit (head-line)) -(dne ".\\\" ") :+] -.Sh NAME -.Nm [+: prog-name :+] -.Nd [+: prog-title :+] -[+: INCLUDE "tpl-config.tlib" :+][+:# - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" B U I L D D O C -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE build-doc :+][+: - -(if (not command-doc) (begin - (set! home-rc-files #f) - (set! home-rc-text "") -) ) :+][+: - -INVOKE doc-sections :+][+: -INVOKE ao-sections :+][+: -INVOKE assemble-sections :+][+: - -ENDDEF build-doc - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" A S S E M B L E S E C T I O N S -.\" -.\" Emit the files for each section that was provided, and do conversions -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE assemble-sections :+][+: - -(out-push-new) - -:+][+: -#.\" Insert the sections in the prescribed order -#.\" Ensure a newline between them all. We strip blank lines, -#.\" so extra blank lines get removed. -#:+] -cvt_prog='[+: - - (define target-form (if man-page "man" "mdoc")) - (define source-form (get "option-format" "texi")) - (define converter (string-append source-form "2" target-form )) - (set! tmp-str (find-file converter)) - - (if (not (defined? 'tmp-str)) - (error (string-append "cannot locate " converter))) - tmp-str -:+]' -cvt_prog=`cd \`dirname "$cvt_prog"\` >/dev/null && pwd - `/`basename "$cvt_prog"` -cd $tmp_dir -test -x "$cvt_prog" || die "'$cvt_prog' is not executable" -{ - list='synopsis description options option-presets' - for f in $list ; do cat $f ; echo ; done - rm -f $list name - list='implementation-notes environment files examples exit-status errors - compatibility see-also conforming-to history authors copyright bugs - notes' - for f in $list ; do cat $f ; echo ; done > .end-doc - rm -f $list - list=`ls -1 *`' .end-doc' - for f in $list ; do cat $f ; echo ; done - rm -f $list -} 1>.doc 2>/dev/null -[+: -IF (exist? "doc-sub") :+][+: - (out-push-new (string-append tmp-dir "/.cmds")) :+][+: - FOR doc-sub :+][+: - - IF (define field-name (get "sub-type" target-form)) - (~~ target-form field-name) :+][+: - - (set! field-name (get "sub-name")) - (define rep-string (string-append "<<" field-name ">>")) - (emit (string-substitute (get "sub-text") rep-string (get field-name))) - "\n" - - :+][+: ENDIF :+][+: - - ENDFOR doc-sub :+][+: - - (out-pop) - (define post-proc-cmd (string-append - (get "doc-sub-cmd" "sed -f %s %s") " | " - egrep-prog " -v '^[ ]*$' | $cvt_prog")) - (sprintf post-proc-cmd ".cmds" ".doc") - :+][+: -ELSE \:+] -[+:(. egrep-prog):+] -v '^[ ]*$' .doc | $cvt_prog[+: -ENDIF doc-sub exists :+][+: - -(shell (out-pop #t)) :+][+: - -ENDDEF assemble-sections - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" D O C S E C T I O N S -.\" -.\" Emit the files for each section that was provided. -.\" If multiple sections exist, they get glued together with ".Pp" -.\" between them. -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE doc-sections :+][+: - -FOR doc-section :+][+: - IF - (define sec-type (string-upcase (get "ds-type"))) - (define sec-name (name-to-fname sec-type)) - (define cvt-fn (find-file (string-append - (get "ds-format" "man") "2mdoc"))) - (if (not (defined? 'cvt-fn)) - (error (sprintf "Cannot locate converter for %s" - (get "ds-format" "man")))) - - (define sec-file (string-append tmp-dir "/" sec-name)) - (access? sec-file R_OK) :+][+: - (out-push-add sec-file) - (emit ".Pp\n") :+][+: - - ELSE :+][+: CASE - (out-push-new sec-file) - sec-type :+][+: - - == "" :+][+: (error "unnamed doc-section") :+][+: - *==* " " :+].Sh "[+: (. sec-type) :+]"[+: - * :+].Sh [+: (. sec-type) :+][+: - ESAC :+][+: - ENDIF :+] -[+: - (shell (string-append - "fn='" cvt-fn "'\n" - "test -f ${fn} || die ${fn} not found from $PWD\n" - "${fn} <<\\_EndOfDocSection_ || die ${fn} failed in $PWD\n" - (get "ds-text") - "\n_EndOfDocSection_" - )) :+][+: - - CASE (emit "\n") sec-type :+][+: - == FILES :+][+: - (if home-rc-files (emit home-rc-text)) - (set! home-rc-files #f) :+][+: - - == ENVIRONMENT :+][+: - (if environ-init (emit environ-text)) - (set! environ-init #f) :+][+: - ESAC :+][+: - - (out-pop) - :+][+: - -ENDFOR doc-section :+][+: - -ENDDEF doc-sections - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" A O S E C T I O N S -.\" -.\" Emit the files for the sections that these templates augment, -.\" replace or conditionally replace -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE ao-sections :+][+: - IF (. command-doc) :+][+: - INVOKE cond-section sec = "OPTIONS" mode = "replace" :+][+: - INVOKE cond-section sec = "EXIT STATUS" mode = "insert" :+][+: - - IF (or home-rc-files environ-init) :+][+: - INVOKE cond-section sec = "OPTION PRESETS" mode = "replace" :+][+: - - IF (. home-rc-files) :+][+: - INVOKE cond-section sec = "FILES" mode = "append" :+][+: - ENDIF :+][+: - - IF (. environ-init) :+][+: - INVOKE cond-section sec = "ENVIRONMENT" mode = "append" :+][+: - ENDIF :+][+: - ENDIF :+][+: - - ELSE section 5, not command :+][+: - INVOKE cond-section sec = "FILES" mode = "append" :+][+: - ENDIF section 5/not :+][+: - - INVOKE cond-section sec = "SYNOPSIS" mode = "alt" :+][+: - INVOKE cond-section sec = "DESCRIPTION" mode = "append" :+][+: - INVOKE cond-section sec = "AUTHORS" mode = "alt" :+][+: - INVOKE cond-section sec = "BUGS" mode = "append" :+][+: - INVOKE cond-section sec = "NOTES" mode = "append" :+][+: - -IF (exist? "copyright") :+][+: - INVOKE cond-section sec = "COPYRIGHT" mode = "alt" :+][+: -ENDIF :+][+: - -ENDDEF ao-sections - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" C O N D I T I O N A L S E C T I O N -.\" -.\" Figure out what to do for AutoOpts required sections, depending on "mode" -.\" In all cases, if the file does not exist, invoke the "mk" macro to create -.\" a new file. If it does exist, then: -.\" -.\" alt Alternate -- emit no text -.\" replace throw away any pre-existing file. -.\" append invoke the "append" macro to emit additional text -.\" insert save the current contents, replacing the .Sh line with .Pp. -.\" invoke the "mk" macro then emit the saved text -.\" -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE cond-section :+][+: - - IF - (set! sect-name (string-upcase! (string-substitute - (get "sec") "-" " " ))) - (set! macro-name (string-downcase! (string-substitute - sect-name " " "-" ))) - (set! file-name (string-append tmp-dir "/" macro-name)) - - (not (access? file-name R_OK)) :+][+: - - INVOKE (sect-line-fname) :+][+: - - ELSE file exists :+][+: - - CASE (get "mode") :+][+: - - == replace :+][+: - INVOKE (sect-line-fname) :+][+: - - == append :+][+: - (out-push-add file-name) :+][+: - INVOKE (string-append "append-" macro-name) :+][+: - - == insert :+][+: - (set! fname-line (shellf - "sed '1s/.Sh .*/.Pp/' %1$s ; rm -f %1$s" file-name)) :+][+: - INVOKE (sect-line-fname) :+][+: - - == alt :+][+: - (out-push-new) :+][+: - - * :+][+: - (error (sprintf "invalid section type: %s" (get "mode"))) - - :+][+: - ESAC :+][+: - - ENDIF file existence/non-existence :+][+: - (out-pop) :+][+: # All paths open out :+][+: -ENDDEF cond-section - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - D E S C R I P T I O N -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-description :+][+: - - (out-push-new) - (emit - (if (exist? "prog-man-descrip") - (stack-join "\n.Pp\n" "prog-man-descrip") - (if (exist? "detail") - (stack-join "\n.Pp\n" "detail") - "There is no description for this command." - ) ) ) - (shell "sed 's/^$/.sp/' <<\\_EODesc_\n" (out-pop #t) "\n_EODesc_") - - :+][+: - INVOKE append-description :+][+: - -ENDDEF mk-description - -.\" = = = = = = = = = = = = = = = = = = -.\" A P P E N D - D E S C R I P T I O N -.\" = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE append-description :+][+: - -IF (= (get "main.main-type") "for-each"):+][+: - - CASE main.handler-type :+][+: - ~* ^(name|file)|.*text \:+] -.Pp -This program will perform its function for every file named on the command -line or every file named in a list read from stdin. The arguments or input -names must be pre\-existing files. The input list may contain comments, -which[+: - - !E \:+] -.Pp -This program will perform its function for every command line argument -or every non\-comment line in a list read from stdin. -The input list comments[+: - - * :+][+: - (error "the 'for-each' main has in invalid handler-type.") :+][+: - ESAC \:+] - are blank lines or lines beginning with a '[+: - ?% comment-char "%s" "#" :+]' character. -[+: - -ENDIF - "main" is of "for-each" type :+][+: - -ENDDEF append-description - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - O P T I O N S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-options - -:+][+: - -(define opt-arg "") -(define dis-name "") -(define opt-name "") -(define optname-from "A-Z_^") -(define optname-to "a-z--") -(define cvt-cmd "") -(define formatted-doc (exist? "option-format")) - -(if formatted-doc (begin - (out-push-new) - (set! cvt-cmd (string-append (get "option-format") "2mdoc")) -) ) - -(if (exist? "preserve-case") - (begin - (set! optname-from "_^") - (set! optname-to "--") -) ) - -(define fix-optname (lambda (o_nm) (begin - (set! o_nm (string-tr o_nm optname-from optname-to)) - (set! o_nm (string-substitute o_nm "-" "\\-" )) - o_nm ))) - -(if (exist? "option-info") - (string-append ".Pp\n" (get "option-info") "\n") ) -\:+] -.Bl -tag[+: - -FOR flag :+][+: - IF (not (exist? "documentation")) :+][+: - IF (exist? "aliases") :+][+: - INVOKE emit-alias-opt :+][+: - ELSE :+][+: - INVOKE emit-flag-text :+][+: - ENDIF :+][+: - - ELSE :+] -.Ss "[+: (get "descrip" "") :+]"[+: -(set! tmp-str (get "documentation" "")) -(if (> (string-length tmp-str) 3) (string-append - "\n" tmp-str "\n" )) :+][+: - - ENDIF :+][+: -ENDFOR flag - -.\" = = = = = = = = = = = = = = = = = -.\" help option -.\" = = = = = = = = = = = = = = = = = - -:+] -.It [+: - (define tmp-val (get "help-value" "\\&?")) - (if (and use-flags (> (string-length tmp-val) 0)) - (string-append "Fl " tmp-val - (if (exist? "long-opts") " , Fl -help" "") ) - (string-append (if (exist? "long-opts") "Fl -" "") "help" ) - ) \:+] - -Display usage information and exit.[+:# - -.\" = = = = = = = = = = = = = = = = = -.\" more-help option -.\" = = = = = = = = = = = = = = = = = :+][+: - - IF (not (exist? "no-libopts")) :+] -.It [+: - (define tmp-val (get "more-help-value" "\\&!")) - (if (and use-flags (> (string-length tmp-val) 0)) - (string-append "Fl " tmp-val - (if (exist? "long-opts") " , Fl -more-help" "") ) - (string-append (if (exist? "long-opts") "Fl -" "") "more-help" ) - ) \:+] - -Pass the extended usage information through a pager.[+: - -ENDIF no no-libopts - -.\" = = = = = = = = = = = = = = = = = -.\" save and load configuration -.\" = = = = = = = = = = = = = = = = = :+][+: - -IF (exist? "homerc") :+] -.It [+: - - IF (not (exist? "disable-save")) :+][+: - - (define tmp-val (get "save-opts-value" ">")) - (if (and use-flags (> (string-length tmp-val) 0)) - (string-append "Fl " tmp-val " Oo Ar cfgfile Oc" - (if (exist? "long-opts") - " , Fl -save-opts Oo Ns = Ns Ar cfgfile Oc" ) "") - (string-append (if (exist? "long-opts") "Fl -" "") - "save-opts Oo Ns = Ns Ar cfgfile Oc" ) - ) \:+] - -Save the option state to \fIcfgfile\fP. The default is the \fIlast\fP -configuration file listed in the \fBOPTION PRESETS\fP section, below. -The command will exit after updating the config file. -.It [+: - ENDIF saving not disabled :+][+: - - (define tmp-val (get "load-opts-value" "<")) - (define tmp-str (if (exist? "long-opts") "Fl -" "")) - - (if (and use-flags (> (string-length tmp-val) 0)) - (string-append "Fl " tmp-val " Ar cfgfile" - (if (exist? "long-opts") - (string-append " , " tmp-str "load-opts Ns = Ns Ar cfgfile" - " , " tmp-str "no-load-opts" ) - "") ) - (string-append tmp-str "load-opts Ns = Ns Ar cfgfile , " - tmp-str "no-load-opts" ) - ) \:+] - -Load options from \fIcfgfile\fP. -The \fIno-load-opts\fP form will disable the loading -of earlier config/rc/ini files. \fI\-\-no-load-opts\fP is handled early, -out of order.[+: - -ENDIF (exist? "homerc") - -.\" = = = = = = = = = = = = = = = = = -.\" version -.\" = = = = = = = = = = = = = = = = = :+][+: - -IF (exist? "version") :+] -.It [+: - - (define tmp-val (get "version-value" "v")) - (if (and use-flags (> (string-length tmp-val) 0)) - (string-append "Fl " tmp-val " Op Brq Ar v|c|n" - (if (exist? "long-opts") - " Fl -version Op Brq Ar v|c|n" ) "") - (string-append (if (exist? "long-opts") "Fl -" "") - "version Op Brq Ar v|c|n" ) - ) \:+] - -Output version of program and exit. The default mode is `v', a simple -version. The `c' mode will print copyright information and `n' will -print the full copyright notice.[+: -ENDIF :+] -.El -[+: - -(if formatted-doc - (shell (string-append - "fn='" (find-file cvt-cmd) - "'\ntest -f ${fn} || die '" cvt-cmd " not found'\n" - "${fn} <<\\_EndOfMdoc_ || die ${fn} failed in $PWD\n" - (out-pop #t) - "\n_EndOfMdoc_" )) ) :+][+: - -ENDDEF mk-options - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - O P T I O N - P R E S E T S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-option-presets \:+] -Any option that is not marked as \fInot presettable\fP may be preset -by loading values from [+: - IF (. home-rc-files) - :+]configuration ("RC" or ".INI") file(s)[+: - IF (. environ-init) :+] and values from -[+: - ENDIF :+][+: - ENDIF :+][+: - IF (. environ-init) :+]environment variables named: -.nf - \fB[+:(. UP-PROG-NAME):+]_\fP or \fB[+:(. UP-PROG-NAME):+]\fP -.fi -.ad[+: - IF (. home-rc-files) :+] -The environmental presets take precedence (are processed later than) -the configuration files.[+: - ENDIF :+][+: - ELSE :+].[+: - ENDIF :+][+: - - CASE - (define rc-file - (get "rcfile" (string-append "." (get "prog-name") "rc")) ) - (count "homerc") :+][+: - - == "0" :+][+: - == "1" :+][+: - - CASE homerc :+][+: - ~~ '\.|\$HOME' :+] -The file "\fI[+: (string-append (get "homerc") "/" rc-file) -:+]\fP" will be used, if present.[+: - - == "" :+][+: - - * :+] -The \fIhomerc\fP file is "\fI[+:homerc:+]\fP", unless that is a directory. -In that case, the file "\fI[+: (. rc-file) :+]\fP" -is searched for within that directory.[+: - ESAC :+][+: - - * :+] -The \fIhomerc\fP files are [+: - FOR homerc ", " :+][+: - IF (last-for?) :+]and [+: - ENDIF :+]"\fI[+: homerc :+]\fP"[+: ENDFOR :+]. -If any of these are directories, then the file \fI[+: (. rc-file) :+]\fP -is searched for within those directories.[+: - ESAC :+][+: - -ENDDEF mk-option-presets - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - E X I T - S T A T U S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-exit-status \:+] -One of the following exit values will be returned: -.Bl -tag -[+: -(ag-fprintf 0 ".It 0 \" (EXIT_%s)\"\n%s\n" - (string->c-name! (string-upcase (get "exit-name[0]" "SUCCESS"))) - (get "exit-desc[0]" "Successful program execution.") ) - -(define need-ex-noinput (exist? "homerc")) -(define need-ex-software #t) - -(ag-fprintf 0 ".It 1 \" (EXIT_%s)\"\n%s\n" - (string->c-name! (string-upcase (get "exit-name[1]" "FAILURE"))) - (get "exit-desc[1]" - "The operation failed or the command syntax was not valid.")) :+][+: - -FOR exit-desc (for-from 2) :+][+: - (if (= (for-index) 66) - (set! need-ex-noinput #f) - (if (= (for-index) 70) - (set! need-ex-software #f) )) - - (set! tmp-str (get (sprintf "exit-name[%d]" (for-index)) "* unnamed *")) - (sprintf ".It %d \" (EXIT_%s)\"\n%s\n" - (for-index) - (string-upcase (string->c-name! tmp-str)) - (get "exit-desc" "")) :+][+: -ENDFOR exit-desc :+][+: -(if need-ex-noinput - (emit ".It 66 \" (EX_NOINPUT)\" -A specified configuration file could not be loaded.\n")) - -(if need-ex-software - (emit ".It 70 \" (EX_SOFTWARE)\" -libopts had an internal operational error. Please report -it to autogen-users@lists.sourceforge.net. Thank you.\n")) - -(if (> (string-length fname-line) 1) - (emit fname-line)) :+] -.El -[+: - -ENDDEF mk-exit-status - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - A U T H O R S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-authors :+][+: - - (define remove-authors #t) - - (set! tmp-val - (if (exist? "copyright.author") - (stack-join ",\n" "copyright.author") - (stack-join ",\n" "copyright.owner") )) - - (if (> (string-length tmp-val) 1) - (string-append tmp-val "\n") - (delete-file file-name)) - - :+][+: - -ENDDEF mk-authors - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - B U G S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-bugs :+][+: - - (set! tmp-val (get "copyright.eaddr" (get "eaddr"))) - (if (> (string-length tmp-val) 1) - (string-append "Please send bug reports to: " tmp-val "\n") - (delete-file file-name) ) - :+][+: - -ENDDEF mk-bugs :+][+: - -DEFINE append-bugs :+][+: - - (set! tmp-val (get "copyright.eaddr" (get "eaddr"))) - (if (> (string-length tmp-val) 1) - (string-append "\n.Pp\nPlease send bug reports to: " tmp-val "\n") ) - :+][+: - -ENDDEF append-bugs - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - C O P Y R I G H T (+ licensing) -.\" -.\" This section is guaranteed to be the last section in the man page -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-copyright \:+] -Copyright (C) [+: copyright.date :+] [+: - (get "copyright.owner" (get "copyright.author" (get "copyright.eaddr"))) - :+] all rights reserved. -[+: CASE (get "copyright.type") :+][+: - = note :+][+: (get "copyright.text") :+][+: - == '' :+]This program has an unspecified license.[+: - - * :+][+: - (string-append "This program is released under the terms of " - (license-name (get "copyright.type")) ".") :+][+: - - ESAC :+] -[+: -ENDDEF mk-copyright - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - N O T E S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-notes \:+] -This manual page was \fIAutoGen\fP-erated from the \fB[+: prog-name :+]\fP -option definitions. -[+: - -ENDDEF mk-notes - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-notes :+] -.Pp -This manual page was \fIAutoGen\fP-erated from the \fB[+: prog-name :+]\fP -option definitions.[+: - -ENDDEF append-notes - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - E N V I R O N M E N T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-environment :+][+: - INVOKE append-environment :+][+: -ENDDEF mk-environment - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-environment :+] -[+:(. environ-text) :+][+: -ENDDEF append-environment - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" M K - F I L E S -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE mk-files :+][+: - INVOKE append-files :+][+: -ENDDEF mk-files - -.\" = = = = = APPEND TO IT: :+][+: - -DEFINE append-files :+] -[+:(. home-rc-text) :+][+: -ENDDEF append-files - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" E M I T A L I A S O P T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE emit-alias-opt :+] -.It [+: - IF (exist? "value") :+][+: - IF (exist? "long-opts") \:+] - Fl [+:value:+] , Fl \-[+: name :+][+: - ELSE \:+] - Fl [+:value:+][+: - ENDIF (exist? "long-opts") :+][+: - - ELSE value does not exist -- named option only :+][+: - - IF (not (exist? "long-opts")) \:+] - [+: name :+][+: - ELSE \:+] - Fl \-[+: (get "name") :+][+: - ENDIF :+][+: - ENDIF :+] -This is an alias for the \fI--[+: aliases :+]\fR option.[+: - IF (exist? "deprecated") :+] -.sp -.B -NOTE: THIS OPTION IS DEPRECATED -[+: - ENDIF :+][+: -ENDDEF emit-alias-opt - -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -.\" E M I T F L A G T E X T -.\" = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = :+][+: - -DEFINE emit-flag-text :+][+: - - (if (exist? "enable") - (set! opt-name (string-append (get "enable") "-" (get "name"))) - (set! opt-name (get "name")) ) - (if (exist? "disable") - (set! dis-name (string-append (get "disable") "-" (get "name"))) - (set! dis-name "") ) - - (set! opt-name (fix-optname opt-name)) - (if (> (string-length dis-name) 0) - (set! dis-name (fix-optname dis-name)) ) - - (if (not (exist? "arg-type")) - (set! opt-arg "") - (set! opt-arg (string-append "Ar " - (fix-optname (if (exist? "arg-name") - (get "arg-name") - (string-downcase! (get "arg-type")) )) - )) - ) - -:+] -.It [+: - IF (exist? "value") :+][+: - IF (exist? "long-opts") :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option has a flag value (character) AND - * the program uses long options - * - \:+] - Fl [+:value:+][+: - IF (not (exist? "arg-type")) :+] , Fl -[+: - ELSE :+] [+:(. opt-arg):+] , Fl -[+: - ENDIF :+][+: (. opt-name) :+] [+: - IF (exist? "arg-type") :+][+: - ? arg-optional Oo Ns = Ns - :+] [+: (. opt-arg) :+] [+: - arg-optional Oc :+][+: - ENDIF :+][+: - IF (exist? "disable") :+] , Fl -[+:(. dis-name):+][+: - ENDIF :+][+: - - ELSE :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option has a flag value (character) BUT - * the program does _NOT_ use long options - * - \:+] - Fl [+:value:+] [+: - IF (exist? "arg-type") :+][+: - arg-optional Oo :+] [+:(. opt-arg):+] [+: - arg-optional Oc :+] [+: - ENDIF " :+][+: - ENDIF (exist? "long-opts") :+][+: - - - ELSE value does not exist -- named option only :+][+: - - IF (not (exist? "long-opts")) :+][+: - - # * * * * * * * * * * * * * * * * * * * * - * - * The option does not have a flag value (character). - * The program does _NOT_ use long options either. - * Special magic: All arguments are named options. - * - \:+] - [+: (. opt-name) :+] [+: - IF (exist? "arg-type") :+] [+: - ? arg-optional ' Oo = Ns' ' Ns = Ns ' - :+] [+:(. opt-arg) :+] [+: - arg-optional Oc :+] [+: - ENDIF:+][+: - IF (exist? "disable") :+] , Fl -[+:(. dis-name):+][+: - ENDIF :+][+: - - - ELSE :+][+: - # * * * * * * * * * * * * * * * * * * * * - * - * The option does not have a flag value (character). - * The program, instead, only accepts long options. - * - \:+] - Fl -[+: (. opt-name) :+] [+: - - IF (exist? "arg-type") :+][+: - arg-optional Oo :+] Ns = Ns [+:(. opt-arg):+] [+: - arg-optional Oc :+][+: - ENDIF :+][+: - - IF (exist? "disable") - :+], " Fl \-[+:(. dis-name):+]"[+: - ENDIF :+][+: - ENDIF :+][+: - ENDIF :+] -[+: (get "descrip" "") :+].[+: - - IF (exist? "min") :+] -This option is required to appear.[+: - ENDIF :+][+: - - IF (exist? "max") :+] -This option may appear [+: - IF % max (= "%s" "NOLIMIT") - :+]an unlimited number of times[+:ELSE - :+]up to [+: max :+] times[+: - ENDIF:+].[+: - ENDIF:+][+: - - IF (exist? "disable") :+] -The \fI[+:(. dis-name):+]\fP form will [+: - IF (exist? "stack-arg") - :+]clear the list of option arguments[+: - ELSE :+]disable the option[+: - ENDIF :+].[+: - ENDIF:+][+: - - IF (exist? "enabled") :+] -This option is enabled by default.[+: - ENDIF :+][+: - - IF (exist? "no-preset") :+] -This option may not be preset with environment variables -or in initialization (rc) files.[+: - ENDIF :+][+: - - IF (and (exist? "default") named-mode) :+] -This option is the default option.[+: - ENDIF :+][+: - - IF (exist? "equivalence") :+] -This option is a member of the [+:equivalence:+] class of options.[+: - ENDIF :+][+: - - IF (exist? "flags-must") :+] -This option must appear in combination with the following options: -[+: FOR flags-must ", " :+][+:flags-must:+][+:ENDFOR:+].[+: - ENDIF :+][+: - - IF (exist? "flags-cant") :+] -This option must not appear in combination with any of the following options: -[+: FOR flags-cant ", " :+][+:flags-cant:+][+:ENDFOR:+].[+: - ENDIF :+][+: - - - IF (~* (get "arg-type") "key|set") :+] -This option takes a keyword as its argument[+: - - IF (=* (get "arg-type") "set") - -:+] list. Each entry turns on or off -membership bits. The bits are set by name or numeric value and cleared -by preceding the name or number with an exclamation character ('!'). -They can all be cleared with the magic name \fInone\fR and they can all be set -with -.IR all . -A single option will process a list of these values.[+: - - ELSE - -:+]. The argument sets an enumeration value that can -be tested by comparing them against the option value macro.[+: - - ENDIF - -:+] -The available keywords are: -.in +4 -.nf -.na -[+: (shellf "${CLexe} --indent='' --spread=1 -W50 <<_EOF_\n%s\n_EOF_" - (join "\n" (stack "keyword")) ) :+] -.fi -or their numeric equivalent. -.in -4[+: (if (exist? "arg-default") "\n.sp" ) :+][+: - - ELIF (=* (get "arg-type") "num") :+] -This option takes an integer number as its argument.[+: - - IF (exist? "arg-range") :+] -The value of -.[+:(. opt-arg):+] -is constrained to being: -.in +4 -.nf -.na[+:FOR arg_range ", or" :+] -[+: (shellf " -range='%s' - -case \"X${range}\" in -X'->'?* ) - echo \"less than or equal to\" ` - echo $range | sed 's/->//' ` ;; - -X?*'->' ) - echo \"greater than or equal to\" ` - echo $range | sed 's/->.*//' ` ;; - -X?*'->'?* ) - echo \"in the range \" ` - echo $range | sed 's/->/ through /' ` ;; - -X?* ) - echo exactly $range ;; - -X* ) echo $range is indeterminate -esac" - -(get "arg-range") ) -:+][+: - ENDFOR arg-range :+] -.fi -.in -4[+: - - ENDIF arg-range exists :+][+: - - ENDIF arg-type key/set/num :+][+: - - IF (exist? "arg-default") :+] -The default -.[+: (. opt-arg) :+] -for this option is: -.ti +4 - [+: (join " + " (stack "arg-default" )) :+][+: - ENDIF :+] -.sp -[+: - (if (exist? "doc") (string-substitute (get "doc" "") "\n\n" "\n.sp\n") - "This option has not been fully documented." ) :+][+: - IF (exist? "deprecated") :+] -.sp -.B -NOTE: THIS OPTION IS DEPRECATED -[+: - ENDIF :+][+: - -ENDDEF emit-flag-text - -.\" cmd-doc.tlib ends here \:+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib b/external/bsd/ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib deleted file mode 100644 index 35fe05bbdbdb..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc-synopsis.tlib +++ /dev/null @@ -1,92 +0,0 @@ -[+: autogen5 template man :+][+: -DEFINE mk-synopsis :+][+: - (out-push-new file-name) \:+] -.Sh SYNOPSIS -.Nm[+: - - IF (. use-flags) :+][+: - IF (exist? "long-opts") :+] -.\" Mixture of short (flag) options and long options -.Op Fl flags -.Op Fl flag Op Ar value -.Op Fl \-option-name Ns Oo Oo Ns "=| " Oc Ns Ar value Oc -[+: ELSE no long options: :+] -.Op Fl flags -.Op Fl flag Op Ar value -[+: ENDIF - :+][+: - ELIF (exist? "long-opts") - :+] -.Op Fl \-option-name -.Op Fl \-option-name Ar value -[+: - - ELIF (not (exist? "argument")) :+] -.Op Ar option\-name Ar value -.Pp -All arguments are named options. -[+: - ENDIF :+][+: - - IF (exist? "argument") :+][+: - argument :+][+: - - IF (exist? "reorder-args") :+] -.Pp -Operands and options may be intermixed. They will be reordered. -[+: ENDIF :+][+: - - ELIF (or (exist? "long-opts") use-flags) - -:+] -.Pp -All arguments must be options. -[+: - - ENDIF :+][+: - - IF (exist? "main") :+][+: - CASE main.main-type :+][+: - == shell-process :+] -.Pp -This program will emit text that is expected to be evaluated by -a Bourne-compatible shell, thus digesting the options for the script.[+: - - == shell-parser :+] -.Pp -This program is designed to produce output suitable for inclusion -into a shell script that will parse the options described.[+: - - == for-each :+] -.Pp -The operands that this program operates on may be specified either -on the command line or read from standard input, one per line. -In that input, leading and trailing white space is stripped, -blank lines are ignored[+: - - IF (define comment-char (get "comment-char" "#")) - (> (string-length comment-char) 1) \:+] - and lines beginning with the character -.I [+: (substring comment-char 1 0):+] -are treated as comments[+: - ENDIF :+].[+: - - IF (exist? "interleaved") :+] -Options may be interleaved with operands both on the command -line and when operands are read from standard input.[+: - ENDIF interleaved - -:+] -Standard input may not be a terminal.[+: - - ESAC main-type :+][+: - ENDIF main exists :+] -.Pp -[+: - -FOR explain "\n.Pp\n" :+][+: - (get "explain" "") :+][+: -ENDFOR :+][+: - -(out-pop) :+][+: -ENDDEF mk-synopsis :+] diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man b/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man deleted file mode 100755 index a3041eed3af7..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2man +++ /dev/null @@ -1,181 +0,0 @@ -#!/usr/bin/perl -package mdoc2man; -use strict; -use warnings; -use File::Basename; -use lib dirname(__FILE__); -use Mdoc qw(hs ns pp mapwords son soff stoggle gen_encloser); - -######## -## Basic -######## - -Mdoc::def_macro( '.Sh', sub { '.SH', hs, @_ }, raw => 1); -Mdoc::def_macro( '.Ss', sub { '.SS', hs, @_ }, raw => 1); -Mdoc::def_macro( '.Pp', sub { ".sp \\n(Ppu\n.ne 2\n" } ); -Mdoc::def_macro( '.Nd', sub { "\\- @_" } ); - -# Macros that enclose things -Mdoc::def_macro( '.Brq', gen_encloser(qw({ })) , greedy => 1 ); -Mdoc::def_macro( '.Op' , gen_encloser(qw([ ])) , greedy => 1 ); -Mdoc::def_macro( '.Qq' , gen_encloser(qw(" ")) , greedy => 1 ); -Mdoc::def_macro( '.Dq' , gen_encloser(qw(\*[Lq] \*[Rq])), greedy => 1 ); -Mdoc::def_macro( '.Ql' , gen_encloser(qw(\[oq] \[cq])) , greedy => 1 ); -Mdoc::def_macro( '.Sq' , gen_encloser(qw(\[oq] \[cq])) , greedy => 1 ); -Mdoc::def_macro( '.Pq' , gen_encloser(qw/( )/) , greedy => 1 ); -Mdoc::def_macro( '.D1' , sub { ".in +4\n", ns, @_ , ns , "\n.in -4" } , greedy => 1); - -Mdoc::def_macro( 'Oo', sub { '[', @_ } ); -Mdoc::def_macro( 'Oc', sub { ']', @_ } ); - -Mdoc::def_macro( 'Po', sub { '(', @_} ); -Mdoc::def_macro( 'Pc', sub { ')', @_ } ); - -Mdoc::def_macro( 'Bro', sub { '{', ns, @_ } ); -Mdoc::def_macro( 'Brc', sub { '}', @_ } ); - -Mdoc::def_macro( '.Oo', gen_encloser(qw([ ])), concat_until => '.Oc' ); -Mdoc::def_macro( '.Bro', gen_encloser(qw({ })), concat_until => '.Brc' ); -Mdoc::def_macro( '.Po', gen_encloser(qw/( )/), concat_until => '.Pc' ); - -Mdoc::def_macro( '.Ev', sub { @_ } ); -Mdoc::def_macro( '.An', sub { ".NOP ", @_, "\n.br" }, raw => 1 ); -Mdoc::def_macro( '.Li', sub { mapwords {"\\f[C]$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Cm', sub { mapwords {"\\f\\*[B-Font]$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Ic', sub { mapwords {"\\f\\*[B-Font]$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Fl', sub { mapwords {"\\f\\*[B-Font]\\-$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Ar', sub { mapwords {"\\f\\*[I-Font]$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Em', sub { mapwords {"\\fI$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Va', sub { mapwords {"\\fI$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Sx', sub { mapwords {"\\fI$_\\f[]"} @_ } ); -Mdoc::def_macro( '.Xr', sub { "\\fC".(shift)."\\fR(".(shift).")\\f[]", @_ } ); -Mdoc::def_macro( '.Fn', sub { "\\f\\*[B-Font]".(shift)."\\fR()\\f[]" } ); -Mdoc::def_macro( '.Fn', sub { "\\fB".(shift)."\\fR()\\f[]" } ); -Mdoc::def_macro( '.Fx', sub { "FreeBSD", @_ } ); -Mdoc::def_macro( '.Ux', sub { "UNIX", @_ } ); - -Mdoc::def_macro( '.No', sub { ".NOP", map { ($_, ns) } @_ } ); -Mdoc::def_macro( '.Pa', sub { mapwords {"\\fI$_\\f[]"} @_; } ); -{ - my $name; - Mdoc::def_macro('.Nm', sub { - $name = shift if (!$name); - "\\f\\*[B-Font]$name\\fP", @_ - } ); -} - -######## -## lists -######## - -my %lists = ( - bullet => sub { - Mdoc::def_macro('.It', sub { '.IP \fB\(bu\fP 2' }); - }, - - tag => sub { - my (%opts) = @_; - - my $width = ''; - - if (exists $opts{width}) { - $width = ' '.((length $opts{width})+1); - } - - if (exists $opts{compact}) { - my $dobrns = 0; - Mdoc::def_macro('.It', sub { - my @ret = (".TP$width\n.NOP", hs); - if ($dobrns) { - ".br\n.ns\n", ns, @ret, @_; - } - else { - $dobrns = 1; - @ret, @_; - } - }, raw => 1); - } - else { - Mdoc::def_macro('.It', sub { - ".TP$width\n.NOP", hs, @_ - }, raw => 1); - } - }, -); - -Mdoc::set_Bl_callback(do { my $nested = 0; sub { - my $type = shift; - my %opts = Mdoc::parse_opts(@_); - if (defined $type && $type =~ /-(\w+)/ && exists $lists{$1}) { - - # Wrap nested lists with .RS and .RE - Mdoc::set_El_callback(sub { - return '.RE' if $nested-- > 1; - return '.PP'; - }); - - $lists{$1}->(%opts); - - if ($nested++) { - return ".RS"; - } - else { - return (); - } - } - else { - die "Invalid list type <$type>"; - } -}}, raw => 1); - -# don't bother with arguments for now and do what mdoc2man'.sh' did - -Mdoc::def_macro('.Bd', sub { ".br\n.in +4\n.nf" } ); -Mdoc::def_macro('.Ed', sub { ".in -4\n.fi" } ); - -Mdoc::set_Re_callback(sub { - my ($reference) = @_; - <<"REF"; -$reference->{authors}, -\\fI$reference->{title}\\fR, -$reference->{optional}\n.PP -REF -}); - -# Define all macros which have the same sub for inline and standalone macro -for (qw(Xr Em Ar Fl Ic Cm Qq Op Nm Pa Sq Li Va Brq Pq Fx Ux)) { - my $m = Mdoc::get_macro(".$_"); - Mdoc::def_macro($_, delete $m->{run}, %$m); -} - -sub print_line { - print shift."\n"; -} - -sub run { - print <<'DEFS'; -.de1 NOP -. it 1 an-trap -. if \\n[.$] \,\\$*\/ -.. -.ie t \ -.ds B-Font [CB] -.ds I-Font [CI] -.ds R-Font [CR] -.el \ -.ds B-Font B -.ds I-Font I -.ds R-Font R -DEFS - - while (my ($macro, @args) = Mdoc::parse_line(\*STDIN, \&print_line)) { - my @ret = Mdoc::call_macro($macro, @args); - print_line(Mdoc::to_string(@ret)) if @ret; - } - return 0; -} - -exit run(@ARGV) unless caller; - -1; -__END__ diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi b/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi deleted file mode 100755 index b5e96f5a1145..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/mdoc2texi +++ /dev/null @@ -1,150 +0,0 @@ -#! /usr/bin/perl -package mdoc2texi; -use strict; -use warnings; -use File::Basename qw(dirname); -use lib dirname(__FILE__); -use Mdoc qw(ns pp hs mapwords gen_encloser nl); - -# Ignore commments -Mdoc::def_macro( '.\"', sub { () } ); - -# Enclosers -Mdoc::def_macro( '.An', sub { @_, ns, '@*' } ); -Mdoc::def_macro( '.Aq', gen_encloser(qw(< >)), greedy => 1); -Mdoc::def_macro( '.Bq', gen_encloser(qw([ ])), greedy => 1); -Mdoc::def_macro( '.Brq', gen_encloser(qw(@{ @})), greedy => 1); -Mdoc::def_macro( '.Pq', gen_encloser(qw/( )/), greedy => 1); -Mdoc::def_macro( '.Qq', gen_encloser(qw(" ")), greedy => 1); -Mdoc::def_macro( '.Op', gen_encloser(qw(@code{[ ]})), greedy => 1); -Mdoc::def_macro( '.Ql', gen_encloser(qw(@quoteleft{} @quoteright{})), - greedy => 1); -Mdoc::def_macro( '.Sq', gen_encloser(qw(@quoteleft{} @quoteright{})), - greedy => 1); -Mdoc::def_macro( '.Dq', gen_encloser(qw(@quotedblleft{} @quotedblright{})), - greedy => 1); -Mdoc::def_macro( '.Eq', sub { - my ($o, $c) = (shift, pop); - gen_encloser($o, $c)->(@_) -}, greedy => 1); -Mdoc::def_macro( '.D1', sub { "\@example\n", ns, @_, ns, "\n\@end example" }, - greedy => 1); -Mdoc::def_macro( '.Dl', sub { "\@example\n", ns, @_, ns, "\n\@end example" }, - greedy => 1); - -Mdoc::def_macro( '.Oo', gen_encloser(qw(@code{[ ]})), concat_until => '.Oc'); -Mdoc::def_macro( 'Oo', sub { '@code{[', ns, @_ } ); -Mdoc::def_macro( 'Oc', sub { @_, ns, pp(']}') } ); - -Mdoc::def_macro( '.Bro', gen_encloser(qw(@code{@{ @}})), concat_until => '.Brc'); -Mdoc::def_macro( 'Bro', sub { '@code{@{', ns, @_ } ); -Mdoc::def_macro( 'Brc', sub { @_, ns, pp('@}}') } ); - -Mdoc::def_macro( '.Po', gen_encloser(qw/( )/), concat_until => '.Pc'); -Mdoc::def_macro( 'Po', sub { '(', @_ } ); -Mdoc::def_macro( 'Pc', sub { @_, ')' } ); - -Mdoc::def_macro( '.Ar', sub { mapwords {"\@kbd{$_}"} @_ } ); -Mdoc::def_macro( '.Fl', sub { mapwords {"\@code{-$_}"} @_ } ); -Mdoc::def_macro( '.Cm', sub { mapwords {"\@code{-$_}"} @_ } ); -Mdoc::def_macro( '.Ic', sub { mapwords {"\@code{$_}"} @_ } ); -Mdoc::def_macro( '.Cm', sub { mapwords {"\@code{$_}"} @_ } ); -Mdoc::def_macro( '.Li', sub { mapwords {"\@code{$_}"} @_ } ); -Mdoc::def_macro( '.Va', sub { mapwords {"\@code{$_}"} @_ } ); -Mdoc::def_macro( '.Em', sub { mapwords {"\@emph{$_}"} @_ } ); -Mdoc::def_macro( '.Fn', sub { '@code{'.(shift).'()}' } ); -Mdoc::def_macro( '.Ss', sub { "\@subsubsection", hs, @_ }); -Mdoc::def_macro( '.Sh', sub { - my $name = "@_"; - "\@node", hs, "$name\n", ns, "\@subsection", hs, $name - }); -Mdoc::def_macro( '.Ss', sub { "\@subsubsection", hs, @_ }); -Mdoc::def_macro( '.Xr', sub { '@code{'.(shift).'('.(shift).')}', @_ } ); -Mdoc::def_macro( '.Sx', gen_encloser(qw(@ref{ })) ); -Mdoc::def_macro( '.Ux', sub { '@sc{unix}', @_ } ); -Mdoc::def_macro( '.Fx', sub { '@sc{freebsd}', @_ } ); -{ - my $name; - Mdoc::def_macro('.Nm', sub { - $name = shift || $ENV{AG_DEF_PROG_NAME} || 'XXX' if (!$name); - "\@code{$name}" - } ); -} -Mdoc::def_macro( '.Pa', sub { mapwords {"\@file{$_}"} @_ } ); -Mdoc::def_macro( '.Pp', sub { '' } ); - -# Setup references - -Mdoc::def_macro( '.Rs', sub { "\@*\n", @_ } ); -Mdoc::set_Re_callback(sub { - my ($reference) = @_; - "@*\n", ns, $reference->{authors}, ',', "\@emph{$reference->{title}}", - ',', $reference->{optional} - }); - -# Set up Bd/Ed - -my %displays = ( - literal => [ '@verbatim', '@end verbatim' ], -); - -Mdoc::def_macro( '.Bd', sub { - (my $type = shift) =~ s/^-//; - die "Not supported display type <$type>" - if not exists $displays{ $type }; - - my $orig_ed = Mdoc::get_macro('.Ed'); - Mdoc::def_macro('.Ed', sub { - Mdoc::def_macro('.Ed', delete $orig_ed->{run}, %$orig_ed); - $displays{ $type }[1]; - }); - $displays{ $type }[0] - }); -Mdoc::def_macro('.Ed', sub { die '.Ed used but .Bd was not seen' }); - -# Set up Bl/El - -my %lists = ( - bullet => [ '@itemize @bullet', '@end itemize' ], - tag => [ '@table @asis', '@end table' ], -); - -Mdoc::set_Bl_callback(sub { - my $type = shift; - die "Specify a list type" if not defined $type; - $type =~ s/^-//; - die "Not supported list type <$type>" if not exists $lists{ $type }; - Mdoc::set_El_callback(sub { $lists{ $type }[1] }); - $lists{ $type }[0] - }); -Mdoc::def_macro('.It', sub { '@item', hs, @_ }); - -for (qw(Aq Bq Brq Pq Qq Ql Sq Dq Eq Ar Fl Ic Pa Op Cm Li Fx Ux Va)) { - my $m = Mdoc::get_macro(".$_"); - Mdoc::def_macro($_, delete $m->{run}, %$m); -} - -sub print_line { - my $s = shift; - $s =~ s/\\&//g; - print "$s\n"; -} - -sub preprocess_args { - $_ =~ s/([{}])/\@$1/g for @_; -} - -sub run { - while (my ($macro, @args) = Mdoc::parse_line(\*STDIN, \&print_line, - \&preprocess_args) - ) { - my @ret = Mdoc::call_macro($macro, @args); - if (@ret) { - my $s = Mdoc::to_string(@ret); - print_line($s); - } - } - return 0; -} - -exit run(@ARGV) unless caller; diff --git a/external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl b/external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl deleted file mode 100644 index 476e4c30e5ab..000000000000 --- a/external/bsd/ntp/dist/sntp/ag-tpl/perlopt.tpl +++ /dev/null @@ -1,176 +0,0 @@ -[= AutoGen5 template foo=(base-name) =] -[= - ;;(use-modules (ice-9 regex)) - ;;(define script-name (regexp-substitute/global #f "(-opts)" (base-name) 'pre "")) - ;;(shellf "cat %s" script-name) -=] -# DO NOT EDIT THE FOLLOWING -# -# It's auto generated option handling code [= -(if (not (and (exist? "prog-name") (exist? "prog-title"))) - (error "prog-name and prog-title are required")) -(define prog-name (get "prog-name")) -(if (> (string-length prog-name) 16) - (error (sprintf "prog-name limited to 16 characters: %s" - prog-name)) ) -(if (not (exist? "long-opts")) - (error "long-opts is required")) - -;; perl list containing string to initialize the option hash -(define perl_opts "") -;; perl list containing option definitions for Getopt::Long -(define perl_defs " ") -;; usage string -(define perl_usage "") - -(define optname-from "A-Z_^") -(define optname-to "a-z--") -(define counter 0) - -(define q (lambda (s) (string-append "'" s "'"))) -(define qp (lambda (s) (string-append "q{" s "}"))) - -=] [= FOR flag =][= - -(define optarg "") ;; the option argument for Getopt::Long -(define opttarget "''") ;; the value of a hash key that represents option -(define optargname "") -(define optisarray #f) -(define optname (string-tr! (get "name") optname-from optname-to)) - -=][= -;; since autoopts doesn't support float we take the combination arg-name = -;; float and arg-type = string as float -=][= -IF arg-type =][= - CASE arg-type =][= - =* num =][= (set! optarg "=i") =][= - =* str =][= - (if (and (exist? "arg-name") (== (get "arg-name") "float")) - (set! optarg "=f") - (set! optarg "=s") - ) - =][= - * =][= - (error (string-append "unknown arg type '" - (get "arg-type") "' for " (get "name"))) =][= - ESAC arg-type =][= -ENDIF =][= - -(if (exist? "stack-arg") - ;; set optarget to array reference if can take more than one value - (if (and (exist? "max") (== (get "max") "NOLIMIT")) - (begin - (set! opttarget (string-append - "[" - (if (exist? "arg-default") (q (get "arg-default")) "") - "]" - ) - ) - (set! optisarray #t) - ) - (error "If stack-arg then max has to be NOLIMIT") - ) - ;; just scalar otherwise - (if (exist? "arg-default") (set! opttarget (q (get "arg-default")))) -) - -(set! perl_opts (string-append - perl_opts "'" (get "name") "' => " opttarget ",\n ")) - -(define def_add (string-append "'" optname (if (exist? "value") - (string-append "|" (get "value")) "") optarg "',")) - -(define add_len (+ (string-length def_add) counter)) -(if (> add_len 80) - (begin - (set! perl_defs (string-append perl_defs "\n " def_add)) - (set! counter 8) - ) - (begin - (set! perl_defs (string-append perl_defs " " def_add)) - (set! counter (+ counter add_len)) - ) -) - -(if (exist? "arg-type") - (if (and (exist? "arg-name") (== (get "arg-name") "float")) - (set! optargname "=float") - (set! optargname (string-append "=" (substring (get "arg-type") 0 3))) - ) - (set! optargname " ") -) - -(if (not (exist? "deprecated")) -(set! perl_usage (string-append perl_usage - (sprintf "\n %-28s %s" - (string-append (if (exist? "value") (string-append "-" (get "value")) " ") ", --" (get "name") optargname) - (get "descrip"))))) -(if optisarray - (set! perl_usage (string-append perl_usage - "\n - may appear multiple times")) -) - -=][= ENDFOR =] - -use Getopt::Long qw(GetOptionsFromArray); -Getopt::Long::Configure(qw(no_auto_abbrev no_ignore_case_always)); - -my $usage; - -sub usage { - my ($ret) = @_; - print STDERR $usage; - exit $ret; -} - -sub paged_usage { - my ($ret) = @_; - my $pager = $ENV{PAGER} || '(less || more)'; - - open STDOUT, "| $pager" or die "Can't fork a pager: $!"; - print $usage; - - exit $ret; -} - -sub processOptions { - my $args = shift; - - my $opts = { - [= (emit perl_opts) =]'help' => '', 'more-help' => '' - }; - my $argument = '[= argument =]'; - my $ret = GetOptionsFromArray($args, $opts, ( -[= (emit perl_defs) =] - 'help|?', 'more-help')); - - $usage = <<'USAGE'; -[= prog-name =] - [= prog-title =] -USAGE: [= prog-name =] [ - [] | --[{=| }] ]... [= argument =] -[= (emit perl_usage ) =] - -?, --help Display usage information and exit - , --more-help Pass the extended usage information through a pager - -Options are specified by doubled hyphens and their name or by a single -hyphen and the flag character. -USAGE - - usage(0) if $opts->{'help'}; - paged_usage(0) if $opts->{'more-help'};[= - IF (exist? "argument") =] - - if ($argument && $argument =~ /^[^\[]/ && !@$args) { - print STDERR "Not enough arguments supplied (See --help/-?)\n"; - exit 1; - }[= - ENDIF - =] - $_[0] = $opts; - return $ret; -} - -END { close STDOUT }; -[= -;;(shellf "mv %s.new %s" (base-name) script-name ) -=] diff --git a/external/bsd/ntp/dist/sntp/crypto.c b/external/bsd/ntp/dist/sntp/crypto.c index dc4099cae208..5e93a0335b70 100644 --- a/external/bsd/ntp/dist/sntp/crypto.c +++ b/external/bsd/ntp/dist/sntp/crypto.c @@ -1,4 +1,4 @@ -/* $NetBSD: crypto.c,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: crypto.c,v 1.6 2014/12/19 20:43:18 christos Exp $ */ #include #include "crypto.h" diff --git a/external/bsd/ntp/dist/sntp/crypto.h b/external/bsd/ntp/dist/sntp/crypto.h index 1bd2e54c7cb9..63b7d6b2747a 100644 --- a/external/bsd/ntp/dist/sntp/crypto.h +++ b/external/bsd/ntp/dist/sntp/crypto.h @@ -1,4 +1,4 @@ -/* $NetBSD: crypto.h,v 1.1.1.3 2013/12/27 23:31:14 christos Exp $ */ +/* $NetBSD: crypto.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef CRYPTO_H #define CRYPTO_H diff --git a/external/bsd/ntp/dist/sntp/data_formats.h b/external/bsd/ntp/dist/sntp/data_formats.h index ef575e6a0c02..d1b8512586ce 100644 --- a/external/bsd/ntp/dist/sntp/data_formats.h +++ b/external/bsd/ntp/dist/sntp/data_formats.h @@ -1,4 +1,4 @@ -/* $NetBSD: data_formats.h,v 1.1.1.1 2009/12/13 16:56:41 kardel Exp $ */ +/* $NetBSD: data_formats.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef DATA_FORMATS_H #define DATA_FORMATS_H diff --git a/external/bsd/ntp/dist/sntp/kod_management.c b/external/bsd/ntp/dist/sntp/kod_management.c index 78868cb831f4..68289d1b0ce0 100644 --- a/external/bsd/ntp/dist/sntp/kod_management.c +++ b/external/bsd/ntp/dist/sntp/kod_management.c @@ -1,4 +1,4 @@ -/* $NetBSD: kod_management.c,v 1.4 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: kod_management.c,v 1.5 2014/12/19 20:43:18 christos Exp $ */ #include #include diff --git a/external/bsd/ntp/dist/sntp/kod_management.h b/external/bsd/ntp/dist/sntp/kod_management.h index 39b3f7585d23..59c244017230 100644 --- a/external/bsd/ntp/dist/sntp/kod_management.h +++ b/external/bsd/ntp/dist/sntp/kod_management.h @@ -1,4 +1,4 @@ -/* $NetBSD: kod_management.h,v 1.1.1.2 2013/12/27 23:31:14 christos Exp $ */ +/* $NetBSD: kod_management.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef KOD_MANAGEMENT_H #define KOD_MANAGEMENT_H diff --git a/external/bsd/ntp/dist/sntp/libevent/CommitLog b/external/bsd/ntp/dist/sntp/libevent/CommitLog deleted file mode 100644 index 97a326206b4b..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/CommitLog +++ /dev/null @@ -1,18291 +0,0 @@ -commit d28fc52815023113840fb9e108ada0126964a799 -Merge: bfdda26 2e9f665 -Author: Nick Mathewson -Date: Thu Apr 14 14:20:09 2011 -0400 - - Merge remote-tracking branch 'origin/patches-2.0' - -commit 2e9f66554897279f9aae2ce5a3933b99b6e08e38 -Author: Nick Mathewson -Date: Thu Apr 14 14:15:13 2011 -0400 - - Fix a couple of memory leaks in samples/http-server.c. Found by Dave Hart. - -commit 3417f6808d4c86b02148cde4f7a32b18d8d260b4 -Author: Nick Mathewson -Date: Wed Apr 13 11:20:30 2011 -0400 - - Avoid a free(NULL) if out-of-memory in evdns_getaddrinfo. Found by Dave Hart - -commit bfdda26534ea66b847760720260a4b4d8fcefe58 -Merge: d7c0ffa 1a21d7b -Author: Nick Mathewson -Date: Tue Apr 5 17:22:36 2011 -0400 - - Merge remote-tracking branch 'origin/patches-2.0' - -commit 1a21d7b840ea1011d4bef1675ee3c7309d48ab3e -Author: Nick Mathewson -Date: Tue Apr 5 17:21:12 2011 -0400 - - Fix the check for multicast or broadcast addresses in evutil_check_interfaces - - First of all, it is totally okay to have an address end with .255, - depending on what your netmask is, so we shouldn't reject a local - address if it ends with .255. - - Second, our check for ending with .255 was broken. So was our check - for class-d addresses. - - Found by Dave Hart. - -commit d7c0ffa1c06cf8aa2b1caf99332f2669d30fcc74 -Merge: ddcca17 fc7f34b -Author: Nick Mathewson -Date: Tue Apr 5 17:19:00 2011 -0400 - - Merge remote-tracking branch 'origin/patches-2.0' - -commit fc7f34bd4dac0738a16e4d3732e997c83fd8f88c -Merge: 0d6622e 637d17a -Author: Nick Mathewson -Date: Tue Apr 5 17:17:51 2011 -0400 - - Merge branch '20_socktype_protocol_nomem' into patches-2.0 - -commit 637d17a1b975ad33334c64c5ce8d0a19898e5c14 -Author: Nick Mathewson -Date: Tue Apr 5 16:32:39 2011 -0400 - - Check for allocation failures in apply_socktype_protocol_hack - -commit ddcca1760f7ef0fc9c4abf09a2af8aff6dec702e -Merge: 7a91f73 0d6622e -Author: Nick Mathewson -Date: Mon Apr 4 15:09:47 2011 -0400 - - Merge remote-tracking branch 'origin/patches-2.0' - -commit 0d6622e26a83c1efac4a26a5b98e86ca61dc0a7f -Author: Tomash Brechko -Date: Thu Mar 31 19:11:10 2011 +0400 - - Fix the case when failed evhttp_make_request() leaved request in the queue. - -commit 218cf19743e3671924ec01edc9dc26be8b6f1ae8 -Author: Tomash Brechko -Date: Thu Mar 24 15:52:34 2011 +0300 - - Fix subtle recursion in evhttp_connection_cb_cleanup(). - -commit 272823f8b0fb3c5f752ea5ff79b9b223b4d1b453 -Author: Tomash Brechko -Date: Wed Mar 23 12:05:33 2011 +0300 - - Reset outgoing connection when read data in idle state. - - Imagine server side is buggy and miscalculates Content-Length: in the - reply. Data arriving in idle state shouldn't make us crash, instead we - can just reset the connection. - -commit 7a91f732beb72af5a7d8c6084e7a59ed5224c189 -Merge: 4ab2a89 c621359 -Author: Nick Mathewson -Date: Wed Mar 23 16:34:58 2011 -0400 - - Merge remote branch 'origin/patches-2.0' - -commit c621359122c0b86f917407c6c544d51c4b49cd1b -Author: Nick Mathewson -Date: Wed Mar 23 16:32:42 2011 -0400 - - Add comment to configure.in to explain gc-sections test logic - - (Basically, we need access to conftest.err for the test to work properly.) - -commit 6bb23e4bb17701ccc319c76797e4673897db8f77 -Author: Dave Hart -Date: Wed Mar 23 16:22:57 2011 -0400 - - Fix for --gc-sections on NetBSD - - This patch fixes http://bugs.ntp.org/1844, works around - http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=40401, by - improving the test for support of --gc-sections to run a program which - reads a file using stdio built with --gc-sections, instead of simply - link the binary. This catches the buggy linker as the garbage - collection removes a tag NetBSD uses to distinguish its own elf - binaries from Linux ones, causing it to treat conftest as a Linux - binary and run it with the wrong syscall table. - -commit b5a1f9f74bd4ffa342e388897de895611d6ea9ca -Author: Dave Hart -Date: Wed Mar 23 16:22:24 2011 -0400 - - Fix make distcheck & installation of libevent 1 headers - - libevent/Makefile.am corrects a typo (thanks to Harlan for spotting it - once we realized make distcheck was broken when building the libevent - tearoff). The result was the include/ev*.h were not distributed nor - installed whether or not --disable-libevent-install was used. This - was introduced with the final round (3/3) of - --disable-libevent-install patch from me. - -commit 4ab2a89dc73202f90a266979fadbb154df7dcd65 -Merge: f28084d 4b8f02f -Author: Nick Mathewson -Date: Sat Mar 12 12:12:35 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 4b8f02f14751c6c2d53cad3597a711a1a008e07f -Author: Christophe Fillot -Date: Sat Mar 12 12:08:19 2011 -0500 - - Fix incorrect assertions and possible use-after-free in evrpc_free() - - Original description: - - The following patch fixes incorrect assertions in evrpc_free(): - evrpc_unregister_rpc() and evrpc_remove_hook() return 0 for success. - - Also, in evrpc_unregister_rpc(), it is better to free RPC structure - at the end: evrpc_free() uses rpc->uri as "name" parameter when - calling evrpc_unregister_rpc(), then rpc->uri is freed, but we have - "registered_uri = evrpc_construct_uri(name)". So at this time "name" - is invalid. - -commit f28084ddda02886a97943e36099c4a523f72af0b -Author: Nick Mathewson -Date: Mon Mar 7 23:18:07 2011 -0500 - - munge the debug_lock signature before freeing it: it might help us catch use-after-free - -commit b4a29c0a0fbd25a2de8a16b3049677fb2b8e1645 -Author: Dave Hart -Date: Mon Mar 7 23:08:42 2011 -0500 - - Add a magic number to debug_locks to better catch lock-coding errors. - - Original description by Dave Hart: - - [This patch contains] the addition of a signature field to debug_lock - initialized by the alloc routine and verified by the rest, to catch - invalid lock pointers sooner. That helped me track down a nasty - problem I had before adding the time.h include to - libevent-internal.h, where different .c files had different ideas of - whether event_base had a tod_tv_cache member depending on which - included time.h before libevent-internal.h. - -commit 2a83ecc8496c1470c8a29fad5df1e89a9d1d9864 -Author: Nick Mathewson -Date: Mon Mar 7 23:01:54 2011 -0500 - - In the 2.1 branch, let's try out lazy gettimeofday/clock_gettime comparison - - For now, we'll only check for gettimeofday jumps once every 5 seconds. - Let's see how that works. - - This reverts commit 5209fadfd07af3f3379ac607582c37933b33e044. - -commit 4560b31bdf1ed633518ebbdd0b3e11ffa1272cf5 -Merge: c538959 5209fad -Author: Nick Mathewson -Date: Mon Mar 7 23:00:45 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - - Conflicts: - event-internal.h - -commit 5209fadfd07af3f3379ac607582c37933b33e044 -Author: Nick Mathewson -Date: Mon Mar 7 22:59:19 2011 -0500 - - Disable lazy gettimeofday/clock_gettime comparison for now - -commit 9193dc4ecd12be779654e045a14ab32e1e616ddd -Merge: c8baac9 a459ef7 -Author: Nick Mathewson -Date: Mon Mar 7 22:45:10 2011 -0500 - - Merge branch '20_timescale' into patches-2.0 - -commit c53895944dfefd0f8586d2639d400e0ffe956562 -Merge: 74bf57a c8baac9 -Author: Nick Mathewson -Date: Mon Mar 7 21:59:47 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit c8baac90231ab3dc4179b302568c640ab4ae05c8 -Author: Nick Mathewson -Date: Mon Mar 7 21:55:47 2011 -0500 - - Followup for Tomash Brechko's http patch - - This patch makes bufferevent_disable_hard() non-public, and - adds a comment about what it's for and why it's used. - -commit 5dc566284d736cb692f88685a3bcec70595a7689 -Author: Tomash Brechko -Date: Thu Feb 24 12:30:40 2011 +0300 - - Workaround libevent bug - https://sourceforge.net/tracker/index.php?func=detail&aid=3078187&group_id=50884&atid=461324 - - The problem is that bufferevent_disable() doesn't disable EV_WRITE - when 'connecting' flag is set. However from evhttp_connection_reset() - we want to disable EV_WRITE for sure (we are closing the socket next). - So we add bufferevent_disable_hard(), which acts like - bufferevent_disable(), but resets 'connecting' flag before the call to - the actual handler. - - TODO: bufferevent_disable_hard() shouldn't be public, remove it from - event2/bufferevent.h. - -commit a459ef70ec82eaa07680b0a4bc25e5d05efcc6fb -Author: Nick Mathewson -Date: Thu Mar 3 15:34:22 2011 -0500 - - Have event_base_gettimeofday_cached() always return wall-clock time - - Based on code by Dave Hart - -commit 74bf57a63ed5ae48d903b11235803984cefd6962 -Merge: 83fb674 ab008c7 -Author: Nick Mathewson -Date: Thu Mar 3 12:58:06 2011 -0500 - - Merge remote-tracking branch 'origin/patches-2.0' - -commit ab008c7d0588887e88dffd35986005150e5a53e6 -Author: Dave Hart -Date: Thu Mar 3 12:57:17 2011 -0500 - - Make --no-libevent-install apply to event1 headers too - -commit 83fb674a75653adae863e1451d2327db58ff8a5f -Merge: 975eaca b5ab955 -Author: Nick Mathewson -Date: Fri Feb 25 10:42:58 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit b5ab955531c2008d33e46437ec926f5e0f0df3cd -Author: Dave Hart -Date: Fri Feb 25 10:35:12 2011 -0500 - - Make --no-libevent-install apply to headers too - -commit 975eacad363aea1781f563b55d6a4e9aaf95f456 -Merge: e2e3c32 3f79a3a -Author: Nick Mathewson -Date: Wed Feb 23 11:25:09 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 3f79a3a01a4a39fcaf24486f828a2b115b0542c0 -Author: Sebastian Hahn -Date: Wed Feb 23 09:19:08 2011 +0100 - - Continue AM_CFLAGS to AM_CPPFLAGS correction - - 9c469db300e1b270a93c6b04c1709ac0f7751136 had started with the conversion - but left out another instance of incorrectly used AM_CFLAGS. - - Dave Hart provided the suggestion for this fix. - -commit e2e3c3223937aaa0fadbe52c95b06ccbe4c421a6 -Merge: 6350e6c 5dc200b -Author: Nick Mathewson -Date: Tue Feb 22 18:55:05 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 5dc200b7c840188288facc7e9803f51d6396697f -Merge: 2fba21d 95060b5 -Author: Nick Mathewson -Date: Tue Feb 22 18:53:55 2011 -0500 - - Merge branch '20_uri_nonconformant' into patches-2.0 - -commit 6350e6c4c5fab254d67e86e85a5ade70e2e32c36 -Author: Constantine Verutin -Date: Tue Feb 22 17:52:50 2011 -0500 - - Add new evhttp_{connection_}set_timeout_tv() functions to set finger-grained http timeouts - -commit a11c30b5feda088ad79b5fb71370616a7c3a4f30 -Merge: 8f5cca4 2fba21d -Author: Nick Mathewson -Date: Tue Feb 22 17:41:27 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - - This branch is the big one that merges all the ntp folks' changes - - Conflicts: - configure.in - -commit 2fba21d8676f941b0b7d61850f440b12f0fb61cc -Author: Nick Mathewson -Date: Tue Feb 22 16:20:42 2011 -0500 - - Make -ffunction-sections off-by-default in 2.0.x - - I don't see how this can burn anybody, but I don't want to take - chances: new build options are something that should be done in an - alpha. To turn -ffunction-sections on, pass - --enable-function-sections to configure. - -commit 7d913f4c8e98a22e75ab2ddea6587f00ef050dbf -Author: Nick Mathewson -Date: Tue Feb 22 16:14:16 2011 -0500 - - Remove nonfunctional enable_libevent_(install|regress)_def variables - -commit 15b2408c9bc4f2b307df8fdecf3ef5a7401f60d2 -Author: Nick Mathewson -Date: Tue Feb 22 16:13:49 2011 -0500 - - Use $(), not @@, for LIBEVENT_GC_SECTIONS - -commit f95bafb60854d07dd8af5033d55656bc371c43f7 -Author: Nick Mathewson -Date: Tue Feb 22 00:34:49 2011 -0500 - - Be explicit about how long event loops run in event.h documentation - -commit 039b9bd0e3ab6e02cd9709d213f1abf32dbd13f0 -Author: Nick Mathewson -Date: Tue Feb 22 00:31:56 2011 -0500 - - Use %s with printf in test.sh - -commit 9c469db300e1b270a93c6b04c1709ac0f7751136 -Author: Dave Hart -Date: Sun Feb 13 02:27:42 2011 -0500 - - Correct an AM_CFLAGS to an AM_CPPFLAGS in test/Makefile.am - -commit 49e9bb7fb014a84de677f265cedac58f4d8a8ad5 -Author: Dave Hart -Date: Sun Feb 13 02:05:04 2011 -0500 - - Add configure options to disable installation, regression tests - - The main reason for disabling installation is if you're building - libevent as a subpackage for embedding: you want to have your main - package's "make all" build libevent, but you don't want your main - package's "make install" to install libevent. - -commit 0b334799d6c48a5830774ee1f62fc2540810051e -Author: Harlan Stenn -Date: Sun Feb 13 02:00:10 2011 -0500 - - Add -D_OSF_SOURCE to fix hpux builds - -commit 0965c563568e49448955aea30bd43df30e544b92 -Author: Dave Hart -Date: Sun Feb 13 01:50:40 2011 -0500 - - Use the gcc -ffunction-segments feature to allow gc when linking with static libevent - -commit af08a94085e49e6942835b4c6b50a774536d5b5b -Author: Harlan Stenn -Date: Sun Feb 13 01:42:58 2011 -0500 - - Check for getservbyname even if not on win32. - -commit 833e5e9fcd3d06adfbd7c47d4f1fe42f46fbb26b -Author: Harlan Stenn -Date: Sun Feb 13 01:39:10 2011 -0500 - - Fix autoconf bracket issues; make check for getaddrinfo include netdb.h - -commit a317c068fe573050677599736a59b0b101bfa07c -Author: Harlan Stenn -Date: Sun Feb 13 01:34:40 2011 -0500 - - Skip check for zlib if we have no zlib.h - -commit 05a2c22fee8821e7d36837e1b3cba3b105dd5dfc -Author: Harlan Stenn -Date: Sun Feb 13 01:30:37 2011 -0500 - - Make test-eof fail with a timeout if we never get an eof. - - Previously, it would just wait forever. - -commit 4eb281c8a96e246b7493570a89686f8c56c75853 -Author: Nick Mathewson -Date: Sun Feb 13 01:29:54 2011 -0500 - - FIX: comment internal headers used in sample code. - -commit eb692be9c8ea2d52e28a0b7b8258bd76483c3f3c -Author: Nick Mathewson -Date: Sun Feb 13 01:27:06 2011 -0500 - - NM: Fix sample/http-server ipv6 fixes - - Fix 1: Use #include "../xyz" rather than #include <../xyz> - - Fix 2: util-internal.h includes ipv6-internal.h, which in turn defines - a replacement AF_INET6 on platforms that don't have it. As such, - the AF_INET6 checks shouldn't be needed. (right?) - -commit bbf55150b65a5de2edf7c77e3acd1c52caf364a9 -Author: Harlan Stenn -Date: Sun Feb 13 01:25:33 2011 -0500 - - Include util-internal.h as needed to build on platforms with no sockaddr_storage - -commit 10c834c4dfda193c031a6bab9e86e0dcb818a061 -Author: Harlan Stenn -Date: Sun Feb 13 01:22:25 2011 -0500 - - Include arpa/inet.h as needed on HPUX - -commit 8f5cca47dd6a74e13e358a911ff580d0ba94fb46 -Merge: 9f5bf66 63a715e -Author: Nick Mathewson -Date: Mon Feb 21 23:27:23 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 63a715e125cd6ad24b672411b10946ff89d113fe -Author: Nick Mathewson -Date: Mon Feb 21 23:25:13 2011 -0500 - - Correctly detect and stop non-chunked http requests when the body is too long - - Based on analysis and code from Bas Verhoeven and from - Constantine Verutin. - -commit deb2f73879102b4a65df772972910f62e3a64649 -Author: Nick Mathewson -Date: Fri Feb 18 16:17:22 2011 -0500 - - fix spelling mistake in whatsnew-2.0.txt - -commit f665924649b3d6306eb3c24df8f77c3671b7a082 -Author: Nick Mathewson -Date: Tue Feb 15 11:33:40 2011 -0500 - - Correct evhttp_del_accept_socket documentation on whether socket is closed - - Thanks to Constantine Verutin for pointing this out. - -commit 0c9be76804608dbff0bd8d4b96c633f4780437cf -Merge: 926f816 b42ce4b -Author: Nick Mathewson -Date: Sun Feb 13 02:51:27 2011 -0500 - - Merge branch '20_evport_pollhup' into patches-2.0 - -commit 926f8165a72f58f59583d21a091ffaf6bfd307b6 -Author: Nick Mathewson -Date: Sun Feb 13 00:54:21 2011 -0500 - - Clarify event_set_mem_functions doc - -commit 95060b54fe9dba5ec5e22bee3454a1e83b888d48 -Author: Nick Mathewson -Date: Sun Feb 13 00:41:22 2011 -0500 - - Make URI parser able to tolerate nonconformant URIs. - - If the EVHTTP_URI_NONCONFORMANT flag is passed in (which it is when - parsing URIs we get over the wire), then we relax our checks a lot. - Specifically, we do nothing to check for correct characters in the - path, query, and fragment parts of such a URI. - - We could do much more here: we could relax our hostname requirements, - deal with spaces differently/better, trap some errors but not others, - etc. But this should solve the worst user-agent compatibility issues - for now; the other issues can wait for a later release. - -commit 9f5bf6639625f66055c1858551dd6d2208809ce6 -Merge: 4cb3f53 f736198 -Author: Nick Mathewson -Date: Tue Feb 8 22:24:51 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit f73619808622c6267aee1ee6cbeb35e2d02c460f -Author: Nick Mathewson -Date: Tue Feb 8 22:24:06 2011 -0500 - - Fix a type error in our (unused) arc4random_stir() - -commit 4cb3f53a6bb26376e547ad14bf4fb17c7731a309 -Merge: 86f02d7 f663112 -Author: Nick Mathewson -Date: Thu Feb 3 14:04:25 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit f663112fa238a3f5a1bdfddfd26c17e625e182df -Author: Sebastian Hahn -Date: Thu Oct 14 20:15:04 2010 +0200 - - Fix warnings about AC_LANG_PROGRAM usage - - Autoconf 2.68 introduced some new warnings that were triggered during - autogen.sh. Fix those. - -commit 86f02d75335ab0b6238865fcbabc414273efbb7c -Merge: 2284588 b4f89b6 -Author: Nick Mathewson -Date: Tue Feb 1 02:12:46 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit b4f89b608acfdaafb3c14d753a5055ca9f291182 -Author: Dave Hart -Date: Tue Feb 1 01:15:48 2011 -0500 - - Fix test.sh output on solaris - - Solaris echo -n doesn't omit newlines, but printf omits newlines in - more places. - -commit c1260b0e7ccda55b1ab20f59e9c271e8f4576d40 -Author: Nick Mathewson -Date: Mon Jan 31 17:36:49 2011 -0500 - - Do not check for gethostbyname_r versions if we have getaddrinfo - -commit 22845886c6561c26b9aa29cfc01859946d39d811 -Merge: da13d64 3c8f4e7 -Author: Nick Mathewson -Date: Mon Jan 31 16:45:23 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 3c8f4e758e5a636e79f518b70319b115c39b1f23 -Author: Nick Mathewson -Date: Mon Jan 31 16:44:06 2011 -0500 - - Add compile-time check for AF_UNSPEC==PF_UNSPEC - -commit 6092f1265f956f1968185bf669b8730edd7e3eaa -Author: Nick Mathewson -Date: Mon Jan 31 16:37:27 2011 -0500 - - Fix http unit test on non-windows platforms without getaddrinfo - -commit cb921139790bed29427fdd5c07e804f26ea4c334 -Author: Nick Mathewson -Date: Mon Jan 31 16:32:05 2011 -0500 - - Build on systems without AI_PASSIVE - -commit 713c254d21449e73b2877d6f69ee6c41aa56f182 -Author: Nick Mathewson -Date: Mon Jan 24 18:55:10 2011 -0500 - - Try to build correctly on platforms with no IPv6 support - -commit 9184563e49562f07efdfcb76618b74822f03e273 -Author: Nick Mathewson -Date: Mon Jan 24 18:29:20 2011 -0500 - - Build correctly on platforms without sockaddr_storage - -commit 453317b28cf8286a6bb849ab425fcce74d4148f3 -Author: Nick Mathewson -Date: Mon Jan 24 18:22:32 2011 -0500 - - Fall back to sscanf if we have no other way to implement strtoll - -commit da13d64486b6888465dae8df2edacf101a593f26 -Merge: f1f8514 3267703 -Author: Nick Mathewson -Date: Mon Jan 24 18:02:11 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 3267703658799e76ee661d5354bc5cff69b75863 -Author: Nick Mathewson -Date: Mon Jan 24 17:42:23 2011 -0500 - - Make --enable-gcc-warnings a no-op if not using gcc - -commit f1f85147f364628d27c506774168482156cbcf17 -Author: Dave Hart -Date: Mon Jan 24 15:50:25 2011 -0500 - - Allow use of --enable-silent-rules for quieter compilation with automake 1.11 - -commit 8b0afe96eb3436bfa286a1fb2059f137458139b7 -Merge: b647e0b 0c0ec0b -Author: Nick Mathewson -Date: Wed Jan 12 21:41:58 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 0c0ec0be2ba977b8133294e27b076a65a2d65711 -Author: Nick Mathewson -Date: Wed Jan 12 20:28:47 2011 -0500 - - Correctly free selectop fields when select_resize fails in select_init - -commit 83e805a41554a9e69ab7d2d75e56c30f3147ffa6 -Author: Nick Mathewson -Date: Fri Jan 7 13:18:09 2011 -0500 - - Handle resize failures in the select backend better. - -commit 3f8d22a123aef2698ce2e7d6ca1ad96d13760cef -Author: Jardel Weyrich -Date: Sat Dec 18 02:40:22 2010 -0200 - - Use event_err() only if the failure is truly unrecoverable. - -commit 666b09669187daad7107b340dd7dde50070a2feb -Author: Jardel Weyrich -Date: Sat Dec 18 01:07:27 2010 -0200 - - Detect and handle more allocation failures. - -commit b647e0bc94a6c1a32767f00b6c19a22483720c4f -Merge: f1e9a7e ded0a09 -Author: Nick Mathewson -Date: Fri Jan 7 12:31:30 2011 -0500 - - Merge remote branch 'kev009/21_ac_use_system_extensions' - -commit ded0a0907b5b49ba2ae4783edc24a465f1b66418 -Author: Kevin Bowling -Date: Fri Jan 7 00:41:37 2011 -0700 - - Add evconfig-private to remaining files - -commit fd7b5a81eb635dee2f48600fe3e96698b358c077 -Author: Kevin Bowling -Date: Fri Jan 7 00:37:05 2011 -0700 - - Shell hack for weird mkdir -p commands - -commit c13e18591457ed8ea2042d8c92bca5e340cfd5df -Author: Kevin Bowling -Date: Fri Jan 7 00:34:22 2011 -0700 - - Remove use and reference to event-private.h - -commit f1e9a7e7e442f80b61a2dd6f0c8f1f5ce456b033 -Merge: ac69042 0144886 -Author: Nick Mathewson -Date: Thu Jan 6 12:44:45 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit 0144886e7e9fdfb5dc630dcf0567846b952994bd -Author: Trond Norbye -Date: Sun Jan 2 10:17:15 2011 +0100 - - Check for POLLERR, POLLHUP and POLLNVAL for Solaris event ports - -commit f964b7215ac2a3dc0edaef6c130f67e31576f738 -Author: Kevin Bowling -Date: Mon Jan 3 15:44:26 2011 -0700 - - Prefer the ./configure evconfig-private.h in MinGW, just in case. - -commit ad03952edfc2e08e2743c09389840412fcf81958 -Author: Kevin Bowling -Date: Mon Jan 3 15:09:21 2011 -0700 - - Backport libevent to vanilla Autoconf 2.59 (as used in RHEL5) - -commit b3651d1576606ceb2dd27ec5fcd99beaa8e312c8 -Author: Kevin Bowling -Date: Sun Jan 2 08:48:12 2011 -0700 - - Add an evconfig-private.h stub for Win32. - -commit dc628c030469f8671943b5cb86ff8ec179f1a7b7 -Author: Kevin Bowling -Date: Sun Jan 2 08:47:46 2011 -0700 - - Add an include guard - -commit 0915ca0aa64edac92b05c2dfcf6b11d1b1753321 -Author: Kevin Bowling -Date: Sun Jan 2 08:43:45 2011 -0700 - - Include evconfig-private.h in internal files for great good. - -commit f6d66bc7167a5b1249cf5a82196547ebe1077d83 -Author: Kevin Bowling -Date: Sun Jan 2 08:05:33 2011 -0700 - - Fix a comment warning and add evconfig-private.h to .gitignore - -commit 9b27b30720935d1bdc911d7f7823a4cebd359eef -Author: Kevin Bowling -Date: Sun Jan 2 08:04:12 2011 -0700 - - Remove event-private.h and switch to evconfig-private.h - -commit 868f88874ff0c14530368a3077462a92a47eae9f -Author: Kevin Bowling -Date: Sun Jan 2 07:51:23 2011 -0700 - - Use a Configuration Header Template for evconfig-private.h - -commit edf62dddbc3b9ced06d10de041d682c18965413e -Author: Kevin Bowling -Date: Sun Jan 2 07:29:45 2011 -0700 - - Revert "evconfig-private.h with recusive configure subdirs" - - This reverts commit ed53d5ef8053af08186ef80dfc1647cff769fac8. - -commit ed53d5ef8053af08186ef80dfc1647cff769fac8 -Author: Kevin Bowling -Date: Sun Jan 2 06:35:05 2011 -0700 - - evconfig-private.h with recusive configure subdirs - -commit ea8fa4cb231a674797ea8efe23f68951db505159 -Author: Kevin Bowling -Date: Sun Jan 2 05:14:41 2011 -0700 - - Add AC_GNU_SOURCE to the fallback case. - -commit ac6904241be9bf56e1de7d6e1f780134359dbd2e -Merge: 41bb1ca cb8059d -Author: Nick Mathewson -Date: Sun Jan 2 00:59:20 2011 -0500 - - Merge remote branch 'origin/patches-2.0' - -commit cb8059d2d399a2db5f3de1e911b5b9947d6c7339 -Author: Nick Mathewson -Date: Sat Jan 1 21:37:21 2011 -0500 - - Fix compilation on Windows with NDEBUG - - Dongsheng Song reports that when building on windows with NDEBUG, you - run into an attempt to do EVUTIL_ASSERT(x) where x is a bitfield, - which turns into _EVUTIL_NIL_CONDITION(x), which takes sizeof(x), - which is illegal. This patch fixes _EVUTIL_NIL_CONDITION to work on - bitfields too. - -commit b42ce4bf08c8e70bf6b357d4e2e95885fff0d530 -Author: Nick Mathewson -Date: Sat Jan 1 21:17:31 2011 -0500 - - Fix evport handling of POLLHUP and POLLERR - - In other backends, they make _all_ events trigger; with evport they - previously triggered nothing. Found by Phua Keat Yee. - -commit c51ef9307ad04d8e98487d1331f1910941e50390 -Author: Kevin Bowling -Date: Wed Dec 22 23:24:01 2010 -0700 - - Eliminate a couple more manual internal _GNU_SOURCE defines - -commit 3b265412b7fce5e2e56bf130224c38cfc6d3bed2 -Author: Kevin Bowling -Date: Wed Dec 22 23:08:10 2010 -0700 - - Remove internal usage of _GNU_SOURCE - -commit 2c5566a9c720e49a0c49ab5eded26bebb330783e -Author: Kevin Bowling -Date: Wed Dec 22 23:00:59 2010 -0700 - - Add event-private.h to noinst_HEADERS - -commit 321b558793db13ed3e57bb615d7811add6e10d6a -Author: Kevin Bowling -Date: Wed Dec 22 22:53:03 2010 -0700 - - Filter '# define' statements from autoconf and generate event-private.h - -commit 1fa7dbe1e84f659f295652858b1a9d76cb4c074a -Author: Kevin Bowling -Date: Wed Dec 22 22:11:26 2010 -0700 - - Add AC_USE_SYSTEM_EXTENSIONS to configure.in. - Requires follow on patches for correctness and robustness. - -commit 41bb1cae794b6484242c841f17084cb9cfa06da6 -Merge: 076680a 0aad014 -Author: Nick Mathewson -Date: Mon Dec 20 19:30:13 2010 -0500 - - Merge branch 'file_offset_v2' - -commit 0aad01436af27c5807d48701028020bb51cba387 -Author: Nick Mathewson -Date: Mon Dec 20 18:40:03 2010 -0500 - - Refactor addfile tests; add test for big files and for offsets - -commit 3f405d2d4b583a4211a685e6425b1d7fc5797538 -Author: Nick Mathewson -Date: Mon Oct 25 12:29:39 2010 -0400 - - Add CreateFileMapping file_segment implementation for win32 - -commit c2d9884a6adbfcb2c95421671817cd00c5f4d8e5 -Author: Nick Mathewson -Date: Mon Oct 25 12:10:10 2010 -0400 - - Add support for mmaps with nonzero offset values. Needs testing. - -commit e72afae068c31c62fa125f99b9c5102ba2e7ec7c -Author: Nick Mathewson -Date: Thu Oct 21 19:45:49 2010 -0400 - - Add evbuffer_add_file_segment() so one fd can be used efficiently in more than one evbuffer_add_file at a time - -commit 076680abe495dc17a330534e45c4cc6d985a7d50 -Merge: b8b8aa5 d4970d4 -Author: Nick Mathewson -Date: Thu Dec 16 14:37:15 2010 -0500 - - Merge branch 'epoll_table_v2' - -commit d4970d4edde9ebf985e7272c8e932e570fcb10de -Author: Nick Mathewson -Date: Thu Dec 16 14:36:09 2010 -0500 - - Reindent epoll_apply_one_change() - -commit 2d55a190e128cf9277334249de431facb6343866 -Author: Nick Mathewson -Date: Thu Dec 16 14:25:04 2010 -0500 - - Clean up error handling in epoll_apply_one_change() a little - - The old code was more or less: - if (op == X && errno == FOO) { - ... - } else if (op == Y && errno == BAR) { - ... - } - but really we wanted to do a switch (op) to avoid needless checks - and branches. - - This patch leaves the indentation a little weird so as to make it - easier to see what changed; the next patch will fix the indentation. - -commit 8c83eb6948e3461aa7493a0e29468eec6ccea7b6 -Author: Nick Mathewson -Date: Sun Oct 24 12:53:52 2010 -0400 - - Replace big chain of if/thens in epoll.c with a table lookup - - This should save a bunch of branches by doing instead a lookup in a - nice static table. - - To ensure correctness, the table is generated from a Python script, - included with this commit. - -commit b8b8aa560c038c6f0c22a574d99d314a1f4a3b7a -Author: Nick Mathewson -Date: Thu Sep 2 17:52:20 2010 -0400 - - Use GetSystemTimeAsFileTime to implement gettimeofday on win32. - - It is (in my benchmarks) way faster than _ftime, though the - conversion process is not so straightforward. In theory, it can - have a better granularity too, though in practice who knows what - you're getting. - -commit 04ba27ebf252746a3fdb79422cccd36f1af4be82 -Author: Mike Smellie -Date: Mon Jul 19 14:18:31 2010 +1200 - - Use current event set rather than current pending change when deciding whether to no-op a del - - This alters event_changelist_del to quash deletion of events that - didn't exist in the first place. - - As far as I can see, the add,delete, dispatch case described in the - original comment will never happen. The recorded change is a single - operation, not a queue. This seems to leave actions to delete - events that never existed as the real targets for no-oping - -commit 2570ae50d3ecd6c9ba5304c20b8f204627162243 -Author: Nick Mathewson -Date: Thu Dec 16 12:59:22 2010 -0500 - - Bump version in master to 2.1.0-alpha-dev - -commit 05f0195dd94fa8a84a2006bda8900f5f6b30cd40 -Author: Nick Mathewson -Date: Thu Dec 16 12:57:23 2010 -0500 - - Bump version to 2.0.10-stable-dev - -commit 5a12d8359727e8f10d08f8cd2b36c9f78747908f -Author: Nick Mathewson -Date: Wed Dec 15 14:31:08 2010 -0500 - - Add changelog for 2.0.10-stable - -commit d34d21d959974682e2d163f0143806890b5c123a -Author: Nick Mathewson -Date: Wed Dec 15 14:30:04 2010 -0500 - - Add more acknowledgements to the readme for 2.0.10-stable - -commit bffc411ed64313d04b01248fbbdb92b4ce78d995 -Author: Nick Mathewson -Date: Wed Dec 15 14:29:50 2010 -0500 - - Set the version to 2.0.10-stable - -commit b63ab1776b3bbf3fe47406d0ca9639b299c4348d -Author: Evan Jones -Date: Mon Dec 6 14:17:44 2010 -0500 - - EVUTIL_ASSERT: Use sizeof() to avoid "unused variable" warnings. - -commit 18adc3f0159949a628b4e77dfeed857cc4b924a4 -Author: Nick Mathewson -Date: Thu Dec 9 12:17:58 2010 -0500 - - Add stuff to whatsnew based on reading include changes since August. - -commit 57689c4484ba3fd098739bcea1557c329a8fa16b -Author: Nick Mathewson -Date: Thu Dec 9 12:17:11 2010 -0500 - - Document that the cpu_hint is only used on Windows with IOCP for now - -commit bb0d2b4e85dcb674ecee0e4cb4db18d03f64d4d9 -Author: Nick Mathewson -Date: Thu Dec 9 11:47:54 2010 -0500 - - Consistentize tabs - -commit 22f4af6580bb330c073350580fc7e49d1051a8cf -Author: Nick Mathewson -Date: Thu Dec 9 11:43:12 2010 -0500 - - Remove end-of-line whitespace - -commit 74f75758cbc942b748b4aff271871e51def93f89 -Author: Nick Mathewson -Date: Thu Dec 9 11:40:35 2010 -0500 - - tweak readme, whatsnew - -commit 7011f9ec1f96f8fa2939beec685e292c57e5addf -Author: Nick Mathewson -Date: Tue Dec 7 11:45:14 2010 -0500 - - Fix a signed/unsigned comparison in the last commit - -commit d23839fc6e30e265e139d763d7155b14934bab0a -Author: Constantine Verutin -Date: Tue Dec 7 11:43:52 2010 -0500 - - Reject overlong http requests early when Expect:100-continue is set - -commit c0bf63cecbaa8ce061bd3f64978445fdf90e82e6 -Author: Evan Jones -Date: Thu Dec 2 14:13:33 2010 -0500 - - tests: Use relative includes ("") instead of system includes (<>) - -commit 4f332091c38ac73a05e3d2b148cd9975799afbcf -Author: Evan Jones -Date: Thu Dec 2 14:09:52 2010 -0500 - - tests: Use new event2 headers instead of old compatibility headers. - -commit fbe64f216cbcf3980e436ca6bb708416c4d856a4 -Author: Evan Jones -Date: Thu Dec 2 10:26:12 2010 -0500 - - Use relative includes instead of system includes consistently. - -commit ef5e65a484406586c161f3e7bf7eafc162ee858e -Author: Evan Jones -Date: Thu Dec 2 10:27:06 2010 -0500 - - bufferevent-internal.h: Use the new event2/util.h header, not evutil.h - -commit 5beeec9d43cbf7de700a9a0fd7d144a341e102c2 -Author: Nick Mathewson -Date: Wed Dec 1 21:28:03 2010 -0500 - - Correctly notify the main thread when activating an event from a subthread - -commit 2599b2d5f55cdb36e0601c41cea0f3b0ecd9dc52 -Author: Kelly Brock -Date: Tue Nov 30 11:34:26 2010 -0500 - - Minor fix for IOCP shutdown handling fix - - Call setsockopt() on the actual new socket, not on as->s, which was - set to INVALID_SOCKET. - -commit 2b0b06d7a3f5dacff55df382094f32cc8b9516f7 -Author: Nick Mathewson -Date: Tue Nov 30 02:19:25 2010 -0500 - - Increment version to 2.0.9-rc-dev - -commit ce46db99b94389a8fed0248f64f88d047cdac416 -Author: Nick Mathewson -Date: Tue Nov 30 01:21:00 2010 -0500 - - Give the correct date for 2.0.9-rc in the changelog - -commit 9ce4cc4ed9a580f131bf857e69a820eaa818a2af -Author: Nick Mathewson -Date: Tue Nov 23 11:17:24 2010 -0500 - - Increment version to 2.0.9-rc - -commit 79957b89d6dd446add398de269f5507e607aaa9d -Author: Nick Mathewson -Date: Tue Nov 23 11:17:06 2010 -0500 - - Bump VERSION_INFO to 5:0:0 - -commit 0c54f17605c1637b5c24ab6c0a8354bdc9fab482 -Author: Nick Mathewson -Date: Tue Nov 23 11:08:30 2010 -0500 - - Changelog and acknowledgments for 2.0.9-rc - -commit 13fd242ddba16bc02c1e54c7209b4be4d85ac906 -Author: Nick Mathewson -Date: Tue Nov 30 00:53:16 2010 -0500 - - Fix win32 build of http-server.c with unicode enabled - -commit 04861d5e62d42e9626c08d74c43b1050e28c8858 -Author: Nick Mathewson -Date: Tue Nov 30 00:05:54 2010 -0500 - - Correctly detect timeouts during http connects - -commit 0faaa395921e3da1da5202befd849614c6e9c37c -Author: Nick Mathewson -Date: Mon Nov 29 22:44:18 2010 -0500 - - Try to fix an assertion failure related to close detection - - f700566c removed a line from evhttp_connection_stop_detectclose that - cleared the EVHTTP_CON_CLOSEDETECT flag. I think this was an - accident, and suspect that it may be the cause of bug 3069555. - -commit 29f7623c82207914b1ff3123bb1eec3745e3dab2 -Author: Nick Mathewson -Date: Mon Nov 29 22:14:54 2010 -0500 - - Possible crash fix when freeing an underlying bufferevent of an openssl bufferevent - -commit 0c4d54598b12ce08ba438b14861984a2501b7dde -Merge: 18d0327 fa9305f -Author: Nick Mathewson -Date: Mon Nov 29 21:56:23 2010 -0500 - - Merge remote branch 'chrisd/http_continue' - -commit fa9305f8f5a9641bf7edf7577b186455b6c43ac6 -Author: Christopher Davis -Date: Mon Nov 29 18:25:04 2010 -0800 - - Preliminary support for Continue expectation in evhttp. - -commit 18d0327666a6d92bd045eacf91b538bf90e82a04 -Author: Nick Mathewson -Date: Mon Nov 29 20:39:09 2010 -0500 - - make http-server example code build on win32 - -commit ad66dfd064d8e246f699c9512f9c3c6a5a0b2b69 -Author: Nick Mathewson -Date: Mon Nov 29 20:13:19 2010 -0500 - - Fix http-server.c compilation on freebsd - -commit a12839b0838cb6b24f6993b17b2a284a3944d1c5 -Merge: 026ac5d 4feedef -Author: Nick Mathewson -Date: Mon Nov 29 14:25:33 2010 -0500 - - Merge remote branch 'chrisd/http_fixes2' - -commit 4feedef94b254f5aaf8e7cf7cd104ddfffd8496a -Author: Christopher Davis -Date: Mon Nov 29 07:18:32 2010 -0800 - - Add a few more comments. - -commit 026ac5d5ada4a5d2f107e652916b50ebd17c8609 -Author: Nick Mathewson -Date: Fri Nov 26 13:29:56 2010 -0500 - - add http-server to gitignore - -commit 4881778c5c898577bcb756c2b23ed15003c4a0bc -Author: Nick Mathewson -Date: Fri Nov 26 13:28:48 2010 -0500 - - Fix a misplaced ) in http_server.c - -commit d40aa673c23c4120fc1bab7a51d0a23c7fbb9463 -Merge: 4e794d5 ec5c5ae -Author: Nick Mathewson -Date: Fri Nov 26 12:59:02 2010 -0500 - - Merge branch '20_empty_body' - -commit 4e794d5d3910c053aed7aa1d7900531894ed0dd7 -Author: Nick Mathewson -Date: Mon Oct 18 13:44:05 2010 -0400 - - Add a basic example of how to write a static HTTP server. - -commit aab8c38b768597274104bc5ecdf267de4ff3c7c9 -Author: Christopher Davis -Date: Fri Nov 5 11:17:07 2010 -0700 - - Add evhttp server alias interface, correct flagging of proxy requests. - - evhttp needs to be mindful of all hostnames and addresses that clients - use to contact the main server and vhosts to know the difference between - proxy requests and non-proxy requests. - -commit 2e5a175bf387bd5c80b88f276b4ba7dcf9eaaf08 -Merge: 3239073 057a514 -Author: Nick Mathewson -Date: Thu Nov 25 23:03:46 2010 -0500 - - Merge remote branch 'github/20_once_fixes' - -commit 32390732d75d1d4680a562404ef4298869f37b12 -Author: Kevin Bowling -Date: Tue Nov 23 19:40:23 2010 -0700 - - Fix snprintf related failures on IRIX. - -commit 1cd45e56608b50b594a629433ca48368dc1a9074 -Author: Kevin Bowling -Date: Tue Nov 23 19:26:34 2010 -0700 - - If not WIN32, include in event2/util.h. - -commit c2e5e22c4c47073fecf0acc300d8d73aaccdab2d -Author: Kevin Bowling -Date: Tue Nov 23 14:09:03 2010 -0700 - - xlC doesn't obey C99 comments here. autoconf isn't invoking full C99 - mode. - -commit c4dc3353412733345010114220378f45f1951bb1 -Author: Kevin Bowling -Date: Tue Nov 23 00:22:01 2010 -0700 - - Add some checks since lack of TAILQ_FOREACH doesn't imply lack of FIRST, - END, NEXT, or INSERT_BEFORE. Quiet some warnings in XL C. - -commit 2e2a3d7bb6c7a7d6e8f0ccd7282c65308c6226f7 -Author: Kevin Bowling -Date: Tue Nov 23 19:09:08 2010 -0700 - - Reworked AIX __ss_family workaround to use AC_STRUCT_MEMBER. - -commit a3a9f6b2d9fbc853e9f54f1af3132adce760e9bb -Author: Kevin Bowling -Date: Mon Nov 22 20:44:10 2010 -0700 - - select comes from according to POSIX.1-2001, or from a - variety of other standard headers on older systems, but not . - AIX build fix. - -commit ec5c5aec6d5373e47936891c6b8111716d16f3e6 -Author: Nick Mathewson -Date: Tue Nov 23 20:31:28 2010 -0500 - - Handle evhttp PUT/POST requests with an empty body - - When we call evhttp_get_bodylen() [when transfer-encoding isn't set], - having req->ntoread == -1 means that we have no content-length. But a - request with no content-length has no body! We were treating the - absent content-length as meaning "read till closed", which only holds - for replies, not requests. - - This patch also allows PATCH requests to have a body. - -commit 652024b6b1c43a4898f7c3f13aeff5d3736f4ce5 -Author: Nick Mathewson -Date: Tue Nov 23 13:08:07 2010 -0500 - - Remove _event_initialized(); make event_initialized() a function(); make it consistent on windows and non-windows - -commit 88be27dc0613eb15f6f5499ea18b8253631ad92e -Author: Nick Mathewson -Date: Tue Nov 23 12:26:46 2010 -0500 - - Document event_get_assignment - -commit e431bcd6861fd75051ea6dca8af8db966eb7f636 -Author: Nick Mathewson -Date: Tue Nov 23 12:26:34 2010 -0500 - - Note that reentrant calls to libevent from logging cbs may fail badly - -commit 7bcace2d549f5afc65665a9be6cbb4daf7360273 -Author: Nick Mathewson -Date: Mon Nov 22 21:02:34 2010 -0500 - - Fix some irix compilation warnings spotted by Kevin Bowling - -commit 150d7d0a497b52968e2223178c8ed6e4cd8659b0 -Merge: 26049c2 e874982 -Author: Nick Mathewson -Date: Mon Nov 22 20:24:03 2010 -0500 - - Merge remote branch 'kev009/master' - -commit e87498231c5f1d0cbda6e16f6a9f721d96affd6f -Author: Kevin Bowling -Date: Mon Nov 22 16:40:31 2010 -0700 - - Fix IRIX build. sa_family collides with a #define in sys/socket.h on IRIX. - -commit 26049c2f93e3266819d8456cb7481521b7b255fa -Merge: 568ac4f da1bf52 -Author: Nick Mathewson -Date: Mon Nov 22 16:24:52 2010 -0500 - - Merge remote branch 'github/20_getaddrinfo_cancel_v2' - -commit da1bf528110d2676ab9a32c3a92d50ec5665e926 -Author: Nick Mathewson -Date: Mon Nov 22 16:24:09 2010 -0500 - - Add a stress test for getaddrinfo_cancel - -commit 568ac4fd1b5e325c21ca2d30f2c17b452b622985 -Merge: ece974f 4f228a1 3ab578f -Author: Nick Mathewson -Date: Mon Nov 22 15:52:34 2010 -0500 - - Merge remote branches 'github/20_epoll_nochangelist_v4', 'github/20_openssl_closeonfree' and 'github/20_cloexec' - -commit ece974fbba32db1b21a411adfdfce6f37f63ab59 -Author: Nick Mathewson -Date: Mon Nov 22 14:13:24 2010 -0500 - - Reorder backends in test.sh to match preference order in event.c - -commit aed7e02979886ec07bad56daa0d7bdda290bc509 -Author: Nick Mathewson -Date: Mon Nov 22 14:10:01 2010 -0500 - - Make unit tests for epoll-with-changelist pass - - The only changes needed were to handle the fact that the methodname - "epoll (with changelist)" matches the environment variable - EVENT_NOEPOLL rather than the imaginary "EVENT_EPOLL (WITH CHANGELIST)". - -commit 9531763ab0b57e8d4249db58ef162800c6fb116b -Author: Nick Mathewson -Date: Sun Nov 14 17:52:16 2010 -0500 - - Disable changelist for epoll by default because of Linux dup() bug; add an option and/or an envvar to reenable it for speed. - - Rename option to control epoll changelist; make epoll changelist off by default - -commit 3ab578f848b024da14a5cdf3dff24d666275bada -Author: Nick Mathewson -Date: Sat Nov 20 01:41:34 2010 -0500 - - Make sure the CLOEXEC flag is set on fds we open for base notification - -commit 3a67d0bf42c69423fca36d001023d563b0326399 -Author: Nick Mathewson -Date: Fri Nov 19 17:09:30 2010 -0500 - - Resolve an evport bug in the thread/forking test - -commit d51b2fc6556de1ad086683ce1d0201910f7c6e00 -Author: Nick Mathewson -Date: Fri Nov 19 12:14:18 2010 -0500 - - Make evdns_getaddrinfo_cancel threadsafe - -commit c7cfbcf466780755c40a9889fd15a3c571799ca3 -Author: Nick Mathewson -Date: Fri Nov 19 12:01:05 2010 -0500 - - Fix some more cancel-related bugs in getaddrinfo_async - - Also imposed a new rule to make this much much simpler: no freeing - the getaddrinfo request until both dns callbacks have been invoked. - -commit abf01ed13af22637ceeb4c5732c2347fd25a8c03 -Author: Nick Mathewson -Date: Fri Nov 19 11:33:48 2010 -0500 - - Avoid double-invocation of user callback with EVUTIL_EAI_CANCEL - -commit 494186129fdec5d47db0bd0b582922c1b37abe0f -Author: Nick Mathewson -Date: Tue Nov 16 12:55:10 2010 -0500 - - Use the US-English "canceled", not the UK "cancelled". - -commit 8faf223ac593a2c8a93a9bb16eb314f858fce59b -Author: Nick Mathewson -Date: Wed Nov 17 00:09:10 2010 -0500 - - Fix a memory leak in evhttp_uri_free. - -commit 4f228a1fc1569cb26c9ae7dde4a1b79ca25cb0ce -Author: Nick Mathewson -Date: Sun Nov 14 19:52:18 2010 -0500 - - Fix bug in bufferevent_connect on an openssl bufferevent that already had an fd - - The problem was that we were using openssl's BIO code's shutdown flag - whenever BEV_OPT_CLOSE_ON_FREE was set. This made the BIO close the - socket when it was freed... but it would be freed whenever we did a - setfd on the bufferevent_openssl, even the no-op setfd in - bufferevent_connect. - - So instead, we just set the shutdown flag to 0, and handle closing the - fd ourselves. - - Spotted by Linus Nordberg - -commit 057a51468e1368384478788800f66c6d82e2bce3 -Author: Nick Mathewson -Date: Sun Nov 14 19:34:49 2010 -0500 - - Clarify EVLOOP_* documentation to be more precise. - -commit 2d5e1bd0be546efb848006652b8df612d6d3d681 -Author: Nick Mathewson -Date: Sun Nov 14 19:32:13 2010 -0500 - - Do not let EVLOOP_ONCE exit the loop until all deferred callbacks have run - -commit 0617a818204397790e5e4c9bcb9e91ae5ea7817a -Author: Nick Mathewson -Date: Sun Nov 14 19:25:54 2010 -0500 - - Make EVLOOP_ONCE ignore internal events - - Merely getting an internal notification event from having an event - added or deleted from another thread should not cause - event_base_loop(base, EVLOOP_ONCE) to exit; previously, it did. - -commit 1ac5b2303aab11dee3d2030a2c9bee466f002772 -Author: Nick Mathewson -Date: Tue Nov 9 15:18:59 2010 -0500 - - Only clear underlying callbacks when the user hasn't reset them. - -commit fc7b1b005c906d720e03975224ae809974402f55 -Author: Nick Mathewson -Date: Tue Nov 9 11:43:47 2010 -0500 - - When closing a filtering bufferevent, clear callbacks on the underlying bufferevent - - Previously, if BEV_OPT_CLOSE_ON_FREE wasn't set on a - bufferevent_filter or a filtering bufferevent_openssl, when we went - to free the filtering bufferevent, we'd leave the underlying - bufferevent unchanged. That's not so good, since the callbacks are - set to activate stuff in the filtering bufferevent that we're about - to free. Instead, set all the callbacks to NULL. - -commit 5c8a59e8867a45b5791e45a548a73eb135a6a3ea -Merge: 9ed30de 0512487 a38140b 3db6bc0 52aa419 34b84b9 -Author: Nick Mathewson -Date: Tue Nov 9 10:19:05 2010 -0500 - - Merge remote branches 'github/20_evdns_cancel_segfault_v2', 'github/20_http_close_detect', 'github/20_http_versions', 'github/20_more_http_methods', 'github/20_shutdown_iocp_listener' and 'github/20_win64_fixes' - -commit a38140be18b764e98b899ed435b61ea2aa6447bc -Author: Nick Mathewson -Date: Tue Nov 9 10:14:32 2010 -0500 - - Refactor http version parsing into a single function - - Based on a suggestion by Chris Davis to make - evhttp_parse_response_line tolerate odd versions too. - -commit 3db6bc007949366e89cb83efa5027ea9da9af102 -Author: Nick Mathewson -Date: Tue Nov 9 10:03:00 2010 -0500 - - Remove some debugging puts() calls from allow_methods test - -commit 52aa419bf69bc2f46f203800919abcfc25ea98fe -Author: Nick Mathewson -Date: Thu Nov 4 15:40:44 2010 -0500 - - Set SO_UPDATE_ACCEPT_CONTEXT on sockets from AcceptEx so that shutdown() can work - - Based on patch (and lots of debugging work) by Kelly Brock. - -commit 229714d123824d686bece18e6d2d157ed401abd4 -Author: Nick Mathewson -Date: Thu Nov 4 16:04:28 2010 -0400 - - Fix a mistake in http documentation found by Julien Blache - -commit 05124879d34731eafe8a31698c943c0f5e7e24bf -Author: Nick Mathewson -Date: Thu Nov 4 14:05:08 2010 -0400 - - Never call evhttp_readcb while writing. - -commit c76640b5c29390ca3a11eba6614bf51a92e7a2ca -Author: Felix Nawothnig -Date: Tue Jun 1 04:45:55 2010 +0200 - - Don't disable reading from the HTTP connection after sending the request to be notified of connection-close in time - -commit 75e3320efd318634ec367327e4e286fa68178179 -Author: Nick Mathewson -Date: Thu Nov 4 12:41:13 2010 -0400 - - Units test for unexpected evhttp methods. - -commit 536311a46b407902ca0ee52d504c327ec54cfdf1 -Author: Nick Mathewson -Date: Thu Nov 4 12:39:41 2010 -0400 - - evhttp: Return 501 when we get an unrecognized method, not 400. - -commit f5b391e22eb119304877b3829f32a241a0688fa3 -Author: Nick Mathewson -Date: Thu Nov 4 11:53:34 2010 -0400 - - Tweak interface for allowed methods - -commit 75a73414a402005ddc2d2adde5a3acffc00d6382 -Author: Felix Nawothnig -Date: Thu Nov 4 11:25:35 2010 -0400 - - Define enumerators for all HTTP methods, including PATCH from RFC5789 - - This patch defines enumerators for all HTTP methods that exist - (including PATCH introduced in RFC 5789). - - It also makes them bit-masky (that's not a word, is it?), breaking - binary- but not source-code compatibility. - - evhttp now stores a bitmask specifying for which methods requests to - dispatch and which ones to reject with "405 Method Not Allowed". - - By default that's the ones we currently have (GET, POST, HEAD, PUT, - DELETE), thereby keeping functional compatibility (besides the minor - change that one of the other methods will now cause 405 instead of - 400. But I believe that could even be considered a bug-fix). - - evhttp is extended by evhttp_set_allowed_methods() with which the - user can change that bitmask. - - no regressions here and my test-app still works. Haven't yet - actually tested any of the new methods. - - What's obviously missing here is the special logic for the methods: - - OPTIONS: We should be fine here - I believe our current dispatch - logic should work fine. Some convenience functions would be fine - though. - - TRACE: I'm pretty certain we should never dispatch this to the - callbacks and simply implement the necessary functionality built-in. - - CONNECT: Pretty straight-forward to implement (and considering the - framework in which we implement it very efficient too). Should - probably go built-in. - - PATCH: Except for checking the RFC against our pre-dispatch logic - (there just might be some "MUST not have Some-Header" lurking - somewhere) there is nothing to be done here, this is completely up - to the user. Nothing to do. - -commit 9ed30de7ffeb3e5acede92a4e47f3aeb7c6af255 -Author: Nick Mathewson -Date: Wed Nov 3 12:37:37 2010 -0400 - - Don't free evdns_request handles until after the callback is invoked - - Previously, once the callback was scheduled, it was unsafe to cancel - a request, but there was no way to tell that. Now it is safe to - cancel a request until the callback is invoked, at which point it - isn't. - - Found and diagnosed by Denis Bilenko. - -commit 34b84b972775db759f5c2da301967cb288439e93 -Author: Christopher Davis -Date: Wed Nov 3 14:38:45 2010 -0700 - - Fix more wn64 warnings. - -commit 78762383b74ad8159d8c6176fb73c9fdb9ce9623 -Merge: aa5f55f 985430a -Author: Nick Mathewson -Date: Wed Nov 3 15:18:34 2010 -0400 - - Merge branch 'http_nolegacy_v2' - -commit 985430aed122a8c61ca7260779940d523f78ce23 -Author: Nick Mathewson -Date: Wed Nov 3 15:17:57 2010 -0400 - - Remove need for http_compat.h in http tests - -commit 0b137f452ee4516d479ea61ae54d458888cfa8e9 -Author: Nick Mathewson -Date: Wed Nov 3 15:14:29 2010 -0400 - - Stop accessing http request struct directly from in the unit tests. - -commit 22e0a9b2e8f752bfdcff7b0d96065c2da391bf03 -Author: Nick Mathewson -Date: Wed Nov 3 15:12:08 2010 -0400 - - Add evhttp_response_code to remove one more reason to include http_struct.h - -commit c91622d18cb4dda945d92b983a712d1c3a37b45e -Author: Nick Mathewson -Date: Wed Nov 3 15:04:44 2010 -0400 - - Stop using event_compat.h in regress_http - -commit 9bb8239375b78a7be65ce17b4545159590894dc3 -Author: Nick Mathewson -Date: Wed Nov 3 14:31:23 2010 -0400 - - Convert the rest of the http tests to be non-legacy unit tests. - -commit 353402a87ad41788997d4100bbf00bfc21693b4c -Author: Nick Mathewson -Date: Wed Nov 3 14:13:20 2010 -0400 - - Rename the confusing "base" static variable in regress_http.c - -commit 8505a7449cfb6bca91daee1c4d9bae80be92fa26 -Author: Nick Mathewson -Date: Wed Nov 3 13:55:20 2010 -0400 - - Start porting http tests to not use legacy interfaces - -commit 647e094ca2ff90da79bfc3081848f50583d2042c -Author: Nick Mathewson -Date: Tue Nov 2 15:19:12 2010 -0400 - - Replace exact-version checks for HTTP/1.1 with >= or < checks - -commit aa5f55face7347a7fa766ff37534d9413486fcfe -Author: Joachim Bauch -Date: Tue Nov 2 13:50:57 2010 -0400 - - reset "chunked" flag when sending non-chunked reply - -commit ba014569991ead06594e3418705ad42e4818cb33 -Author: Nick Mathewson -Date: Tue Nov 2 12:42:35 2010 -0400 - - Use the label_len local variable in evdns instead of recalculating it over and over - -commit a3245afec2a7c7035cf62bdb67bab482e5986a8c -Author: Nick Mathewson -Date: Mon Nov 1 14:23:33 2010 -0400 - - Fix win32 build in response to fixes from win64 build. - -commit 74a91e5aafcb62f9518615dbc1021dfde113e001 -Author: Nick Mathewson -Date: Mon Nov 1 14:16:39 2010 -0400 - - fix signed/unsigned warnings in http.c - -commit f8095d64e21d7abd16649a65080fd077bf0f0488 -Author: Nick Mathewson -Date: Mon Nov 1 14:15:34 2010 -0400 - - Fix a typo in 7484df61c981fc33db2~ - -commit 545a61145ca8ae38c3d19f5404ff3be18c275308 -Author: Nick Mathewson -Date: Mon Nov 1 13:59:04 2010 -0400 - - Fix even more win64 warnings: buffer, event_tagging, http, evdns, evrpc - -commit 7484df61c981fc33db2152f75ddac689791b9929 -Author: Nick Mathewson -Date: Mon Nov 1 13:43:43 2010 -0400 - - Fix even more win64 warnings - -commit b6a158ca22359831475e4cb10498063f72b07823 -Author: Nick Mathewson -Date: Mon Nov 1 11:48:57 2010 -0400 - - Rename "size" variables in win32select that were really fd counts. - -commit f8064762ae697d34b15039c32d74e55f5491e5bd -Author: Christopher Davis -Date: Thu Oct 28 10:11:25 2010 -0700 - - Increase the skew tolerance to 2 seconds in thread/deferred_cb_skew - - This is to make the test not fail on Sebastian Hahn's Win7 box. - -commit 7b40a0005062e67423f5217e1c8082d0f7d36f1b -Author: Christopher Davis -Date: Thu Oct 28 10:08:17 2010 -0700 - - Make sure IOCP evconnlistener uses virtual events. - -commit 598d13360918e557d1ce5e37078364f4ddd24e36 -Author: Nick Mathewson -Date: Wed Oct 27 22:57:53 2010 -0400 - - Try to clear up more size_t vs int/long issues. - -commit b81217f78dc511782451e793b0505624d8159499 -Author: Nick Mathewson -Date: Wed Oct 27 17:37:32 2010 -0400 - - Fix signal handler types for win64. - -commit 1ae82cd8c6aba98d21342d242facd1bb5e461555 -Author: Dimitre Piskyulev -Date: Wed Oct 27 17:32:41 2010 -0400 - - Set _EVENT_SIZEOF_VOID_P correctly on win32 and win64 - -commit f817bfa4d37448f21d6f753769f6ad91d113dd7c -Author: Dimitre Piskyulev -Date: Wed Oct 27 17:31:52 2010 -0400 - - Fix some ints to evutil_socket_t; make tests pass on win64. - -commit 19c71e7454305e4e10c7d0c6ed1520fe5e1521df -Author: Nick Mathewson -Date: Wed Oct 27 10:36:08 2010 -0400 - - Fix som event_warns that should have been event_warnx - -commit e8a903cee8b3bfc56423a58ba313ee1a030ae6f1 -Merge: 5d389dc f5ad31c -Author: Nick Mathewson -Date: Wed Oct 27 10:27:04 2010 -0400 - - Merge remote branch 'trondn/master' - -commit f5ad31c186ec68c78f0106da4474dca3b660bca0 -Author: Trond Norbye -Date: Wed Oct 27 12:47:07 2010 +0200 - - Check return value for ioctlsocket on win32 - -commit 5d389dc0f0acd8077b51eb053bb98bc4c1b3baa4 -Author: Nick Mathewson -Date: Tue Oct 26 22:27:57 2010 -0400 - - Fix some uses of int for socket in regress - -commit 84a7053e412c08269535431aa845264b90a5a0c2 -Merge: 73bf07f 74c0e86 -Author: Nick Mathewson -Date: Tue Oct 26 21:33:22 2010 -0400 - - Merge remote branch 'github/20_http_read_after_write' - -commit 73bf07fe9b133a39440c03a7fd9ac2f0c2f32f28 -Merge: 093fb98 a4063c0 -Author: Nick Mathewson -Date: Tue Oct 26 21:33:13 2010 -0400 - - Merge remote branch 'github/20_abi_breaks' - -commit 093fb989ecd3ae65700289e00511b678d8b4896c -Merge: 4f20eea 2cbb1a1 -Author: Nick Mathewson -Date: Tue Oct 26 21:33:05 2010 -0400 - - Merge remote branch 'github/20_ratelim_size' - -commit 4f20eeaa0966f01485be21df3a6529edc20451e9 -Merge: fbaf077 e4f34e8 -Author: Nick Mathewson -Date: Tue Oct 26 21:32:53 2010 -0400 - - Merge remote branch 'github/20_chain_realign' - -commit fbaf0770a709aaf7ed50914e26ea3d5a350e189d -Author: Nick Mathewson -Date: Tue Oct 26 12:09:20 2010 -0400 - - Fix bugs in posix thread-id calculation when sizeof(pthread_t) != sizeof(long) - - When pthread_t was smaller, our calculated thread IDs would include - uninitialized RAM, and so our unit tests would fail because thread_ids - would never match one another. - - When pthread_t was larger and alignment was big-endian, our calculated - thread IDs would only have the most significant bytes of the - pthread_t, when in practice all the entropy is in the low-order bytes. - - Found with help from Dagobert Michelsen. - -commit ac1931ac3d3ed4977c95f3aedf047e7c3adedc7f -Author: Nick Mathewson -Date: Tue Oct 26 11:07:26 2010 -0400 - - Remove event-config.h from .gitignore; it moved to include/event2 - -commit e56ff65af118163e4bed33fa33c5cabcea067839 -Author: Nick Mathewson -Date: Tue Oct 26 11:01:58 2010 -0400 - - Fix a minor syntax error that most compilers didn't care about - -commit a4063c06f9a904930631abba6a2b5b8028b10383 -Author: Nick Mathewson -Date: Tue Oct 26 10:38:30 2010 -0400 - - Note that 2.0.9 will break the ABI, and make changes we were postponing. - - We had to turn a couple of 32-bit size arguments into 64-bit arguments - or size_t arguments (since otherwise we would have had to do it post - 2.0.x-stable, and that would be worse). - -commit 2cbb1a161e843a0f50f3d42f622d58d5c58c510d -Author: Nick Mathewson -Date: Tue Oct 26 10:27:29 2010 -0400 - - Make rate-limits go up to SIZE_MAX/EV_SSIZE_MAX, not just INT32_MAX - - Someday, when networks are far faster and people frequently want a - burst value greater than 2GB per tick, this will seem very forsightful - indeed. - - For now, it breaks ABI, but not source. Fixes bug 3092096. - -commit e4f34e8a0fec22a0300d6d529a5899ced3d0582a -Author: Nick Mathewson -Date: Mon Oct 25 22:36:23 2010 -0400 - - Correct logic for realigning a chain in evbuffer_add - - The old logic was both too eager to realign (it would move a whole - chain to save a byte) and too reluctant to realign (it would only - realign when data would fit into the misaligned portion, without - considering the space at the end of the chain). - - The new logic matches that from evbuffer_expand_singlechain: it only - realigns a chain when not much data is to be moved, and there's a - bunch of space to be regained. - - Spotted by Yan Lin. - -commit 74c0e862984edc5585b34abce9e6decd6aa05969 -Author: Nick Mathewson -Date: Mon Oct 25 21:53:15 2010 -0400 - - Avoid missed-request bug when entire http request arrives before data is flushed - - The trigger for starting to read the first line of a request used to - be, "When data has arrived and we're looking for the first line." - But that's not good enough: if the entire next request gets read - into our bufev->inbuf while we're still processing the current - request, we'll never see any more data arrive, and so will never - process it. - - So the fix is to make sure that whenever we hit evhttp_send_done, we - call evhttp_read_cb. We can't call it directly, though, since - evhttp_send_done is reachable from the user API, and evhttp_read_cb - can invoke user functions, and we don't want to force everyone to - have reentrant callbacks. So, we use a deferred_cb. - - Found by Ivan Andropov. This is bug 3008344. - -commit 8e342e563060a5dfc4c33bd46a2a6819a5d5b2f7 -Author: Nick Mathewson -Date: Mon Oct 25 16:09:11 2010 -0400 - - Correctly count req->body_size on http usage without Content-Length - - There was a dumb bug where we would look at the length of the input - buffer immediately _after_ we drained it. - -commit 58a1cc6bc8d4c309a6d8a7bd937479615d4bbffc -Author: Nick Mathewson -Date: Mon Oct 25 16:00:47 2010 -0400 - - Fix a bug where we would read too much data in HTTP bodies or requests. - - We were using evbuffer_add_buffer, which moved the entire buffer - contents. But if we had a valid content_length, we only wanted to - move up to the amount of data remaining in ntoread. Our bug would - make us put our ntoread in the negative, which would in turn make us - read all data until the connection closed. - - Found by Denis Bilenko. Should fix bug 2963172. - -commit 525da3e1eb5fc227e2af245bf3acae02b0627162 -Author: Nick Mathewson -Date: Mon Oct 25 15:49:42 2010 -0400 - - Fix Content-Length when trying send more than 100GB of data (!) on an evhttp. - -commit f1250eb69836eff5a0bca69b48fbd5efe9d742cc -Author: Nick Mathewson -Date: Mon Oct 25 15:23:41 2010 -0400 - - add a requested docstring for event_rpcgen.CommandLine.__init__ - -commit 9c71a3413ab8f52797e504fdbd9ab52ff88f951a -Merge: ac7e52d 006efa7 -Author: Nick Mathewson -Date: Mon Oct 25 15:13:32 2010 -0400 - - Merge remote branch 'github/http_and_listener' - -commit ac7e52d84df955bab7845f4b52a43bf228946fc9 -Author: Nick Mathewson -Date: Mon Oct 25 14:29:30 2010 -0400 - - Make evbuffer_add_file take ev_off_t, not off_t - - This change has no effect on non-windows platforms, since those - either define off_t to 64-bits, or allow you to decide whether - it should be 64-bits yourself via some LARGEFILE-like macro. - - On Windows, however, off_t is always 32-bit, so it's a bad choice - for "file size" or "file offset" values. Instead, I'm adding - an ev_off_t type, and using it in the one place where we used - off_t to mean "the size of a file" or "an offset into a file" in the - API. - - This breaks ABI compatibility on Windows. - -commit 006efa7dbbcaec4d412670107b893f04d38f0d83 -Author: Nick Mathewson -Date: Mon Oct 25 11:50:51 2010 -0400 - - Functions to actually use evhttp_bound_socket with/as evconnlistener. - -commit 46ee061ca011346ec3d99c896cae8571847bdf70 -Author: Nick Mathewson -Date: Mon Oct 25 11:47:05 2010 -0400 - - Add a function to change a listener's callback. - - You can also now initialize listeners with no callbacks set; if so, - they won't get enabled until the callback is set to non-NULL. - -commit 2c66983a6d46cbd863b079a1c92c916b41efe0ba -Author: Nick Mathewson -Date: Sun Oct 24 11:51:14 2010 -0400 - - Simplify the logic for choosing EPOLL_CTL_ADD vs EPOLL_CTL_MOD - - Previously, we chose "ADD" whenever old_events==new_events, (since - we expected the add to fail with EEXIST), or whenever old_events - was==0, and MOD otherwise (i.e., when old_events was nonzero and not - equal to new_events). - - But now that we retry failed MOD events as ADD *and* failed ADD - events as MOD, the important thing is now to try to guess right the - largest amount of the time, since guessing right means we do only - one syscall, but guessing wrong means we do two. - - When old_events is 0, ADD is probably right (unless we're hitting - the dup bug, when we'll fall back). - - And when old_events is set and != new_events, MOD is almost - certainly right for the same reasons as before. - - But when old_events is equal to new events, then MOD will work fine - unless we closed and reopened the fd, in which case we'll have to - fall back to the ADD case. (Redundant del/add pairs are more common - than closes for most use cases.) - - This change lets us avoid calculating new_events, which ought to - save a little time in epoll.c - -commit c281aba30e69a501fc183d068894bfa47f891700 -Author: Nick Mathewson -Date: Sun Oct 24 11:38:29 2010 -0400 - - Fix a nasty bug related to use of dup() with epoll on Linux - - Current versions of the Linux kernel don't seem to remove the struct - epitem for a given (file,fd) combo when the fd is closed unless the - file itself is also completely closed. This means that if you do: - fd = dup(fd_orig); - add(fd); - close(fd); - dup2(fd_orig, fd); - add(fd); - you will get an EEXIST when you should have gotten a success. This - could cause warnings and dropped events when using dup and epoll. - - The solution is pretty simple: when we get an EEXIST from - EPOLL_CTL_ADD, we retry with EPOLL_CTL_MOD. - - Unit test included to demonstrate the bug. - - Found due to the patient efforts of Gilad Benjamini; diagnosed with - help from Nicholas Marriott. - -commit bf11e7ddf7a3f8d6e6bd13aec944dcd37f1763ff -Merge: 70e1b60 bc98f5e -Author: Nick Mathewson -Date: Thu Oct 21 15:33:13 2010 -0400 - - Merge branch 'http_uri_parse' - -commit bc98f5e6bad6a8502895d992cc3413b118969e01 -Author: Nick Mathewson -Date: Thu Oct 21 14:53:21 2010 -0400 - - Unit tests for evhttp_uri_set* - -commit 45f6869c753218a72dd44660a880237aa8daa386 -Author: Nick Mathewson -Date: Thu Oct 21 14:41:12 2010 -0400 - - Make evhttp_uri non-public, and give it accessor functions. - -commit 70e1b607d67657c573cdfc5c1ee832bc64391ddd -Author: Nick Mathewson -Date: Thu Oct 21 14:05:04 2010 -0400 - - Document that two bufferevent functions only work on socket bufferevents - -commit aab49b6069bc86a5cae7f0e8433f3844956dfa8e -Author: Nick Mathewson -Date: Thu Oct 21 14:04:24 2010 -0400 - - Add a bufferevent_get_base function - -commit d9ffa899fa382c8e9a4640e4bacb434e128d0b06 -Author: Nick Mathewson -Date: Thu Oct 21 12:48:13 2010 -0400 - - Update the HTTP regression tests to use Libevent2 apis for non-http stuff - -commit 1f507d754107355c316fe55295a8b2f8b2ba00c1 -Author: Nick Mathewson -Date: Thu Oct 21 12:27:16 2010 -0400 - - Stop using Libevent-1 headers in regress_http - -commit 2a3b5872fe1a2fa0f67d1b435b4650d337c16c4d -Merge: cd00079 90b3ed5 -Author: Nick Mathewson -Date: Thu Oct 21 12:23:10 2010 -0400 - - Merge branch 'http_small_tweaks' - - Conflicts: - http-internal.h - -commit cd00079b2266893472fac795a69fe8aaea6c52e0 -Author: Nick Mathewson -Date: Thu Oct 21 12:19:28 2010 -0400 - - Add evhttp_connection_get_base() to get the event_base from an http connection - - Based on a patch by Mark Ellzey from 27 July 2010. - - Closes ticket 3052406 - -commit 1213d3dd8b477faa80b4828e16edc467d1007f20 -Author: Nick Mathewson -Date: Wed Oct 20 13:41:02 2010 -0400 - - Fix a 100%-CPU bug where an SSL connection would sometimes never stop trying to write - - If an SSL connection becamse disabled or suspended before became open, - it could (under the right circumstances) wind up without ever getting - its write callback disabled. - - The most correct fix is probably more subtle, and involves checking - all caseswhen a write callback is enabled or disabled. This fix is - more blunt, and explicitly checks whether the callback should have - been disabled at the end of the callback to prevent infinite looping. - - Diagnosed with help from Sebastian Hahn - -commit 2075fbcff0d8a9e06e2c3287b1cf4d400394c285 -Author: Nick Mathewson -Date: Tue Oct 19 13:15:48 2010 -0400 - - Add evhttp_parse_query_str to be used with evhttp_uri_parse. - - The old evhttp_parse_query() doesn't work well with struct - evhttp_uri.query, since it expects to get whole URIs, rather than - just the query portion. - -commit 3a33462827ec1c31083c297a16aa0287c92a8bfe -Author: Nick Mathewson -Date: Tue Oct 19 13:02:18 2010 -0400 - - Document behavior of URI parsing more thoroughly. - - Also, move evhttp_uri struct into http.h, since it is part of the API. - -commit a5a76e689c185fb9f6f430fd8e989645b627bdb3 -Author: Nick Mathewson -Date: Tue Oct 19 12:35:50 2010 -0400 - - Add a huge pile of tests for the new URI functions, and make them pass. - -commit ad923a11f1e110b3bf03b7179cdcd15ccfcfedd6 -Author: Nick Mathewson -Date: Tue Oct 19 12:33:50 2010 -0400 - - Improvements to tinytest_macros.h - - First, handle cases where we have %s in a tt_want or tt_assert. - - Second, add tt_want_*_op that do a tt_*_op test, but do not exit the - test on failure. - - We should push these upstream to tinytest some time. - -commit eaa5f1d9edd8ae2a5f637a3a07928dfee113accc -Author: Nick Mathewson -Date: Tue Oct 19 11:26:59 2010 -0400 - - Revise evhttp_uri_parse implementation to handle more of RFC3986 - -commit fadbfd4e6e2d9badd4b61d5f847c589ed84dd2c8 -Author: Nick Mathewson -Date: Mon Oct 18 14:43:54 2010 -0400 - - Clean up error handling in uri_parse a little - -commit 7d45431e15dc0d8aa88fddc4fc406e19fe54d004 -Author: Nick Mathewson -Date: Mon Oct 18 14:38:48 2010 -0400 - - Do not silently truncate URIs in evhttp_uri_join. Also avoid evbuffer_pullup. - -commit 86212341c5f38a973e3190a2c5c36ea947ef7253 -Author: Nick Mathewson -Date: Mon Oct 18 14:34:20 2010 -0400 - - Make evhttp_uri_parse and friends conform to memory management standards - -commit 86dd720a666aca5b95c4f913c3f705d6b7a8f17d -Author: Pavel Plesov -Date: Sun Aug 8 16:46:39 2010 +0400 - - Introduce absolute URI parsing helpers. - - See evhttp_uri_parse(), evhttp_uri_free() and evhttp_uri_join() for details. - -commit f13e449b531bb14d076e28660e2d33fb6fb255ab -Merge: 9dc5f44 49f4bf7 -Author: Nick Mathewson -Date: Mon Oct 18 14:20:06 2010 -0400 - - Merge branch 'http_parse' - -commit 49f4bf7c577790fad711324250ed571a0aceac8b -Author: Nick Mathewson -Date: Mon Oct 18 13:58:02 2010 -0400 - - Add evhttp_request_get_command so code can tell GET from POST without peeking at the struct. - -commit e5870690fcd68fbb02c1367dede73864fd6a61dc -Author: Nick Mathewson -Date: Mon Oct 18 13:53:31 2010 -0400 - - Modernize header usage in bench_http.c - -commit 9dc5f44a19a749e3d5091a2a8003741efb91cf91 -Author: Nick Mathewson -Date: Thu Oct 14 22:12:32 2010 -0400 - - Increment version in git to 2.0.8-rc-dev - -commit ef18c994c3f80c6b7e2699309227b50a9b6dc77d -Author: Nick Mathewson -Date: Thu Oct 14 18:36:07 2010 -0400 - - Increment the version to 2.0.8-rc - - NOTE: This is not the official release until I tag it. If you see - this commit, and you decide that Libevent 2.0.8-rc is now - finalized, you might get something besides 2.0.8-rc. - -commit 15be0493f6fc10f9484570339f50ee363fdcc42e -Author: Nick Mathewson -Date: Thu Oct 14 18:35:11 2010 -0400 - - Changelog and readme for 2.0.8-rc - -commit 4ebf9509f741b4cd85ff925a4009b41d62223e7c -Author: Nick Mathewson -Date: Thu Oct 14 14:40:40 2010 -0400 - - Fixes for MSVC compilation - -commit d3b096c011606836d9b550f009a827c18445844a -Author: Nick Mathewson -Date: Thu Oct 14 13:54:15 2010 -0400 - - Make the --enable-gcc-warnings option include signed comparison warnings - -commit e06f514d4e7bbc5d777c40400f5aecbded667854 -Author: Nick Mathewson -Date: Thu Oct 14 13:51:24 2010 -0400 - - Fix signed/unsigned warnings on win32 - -commit 6be589ae687531a992e5ce4c32de78ba5197d1d3 -Author: Nick Mathewson -Date: Thu Oct 14 13:48:40 2010 -0400 - - Fix signed/unsigned warnings on opensolaris, where iov_len is signed - -commit e5c214a4235d77610ce19298d47b01b95c2fe4c9 -Author: Nick Mathewson -Date: Thu Oct 14 13:16:41 2010 -0400 - - Fix -Wsigned-compare warnings in test/* - -commit f2763fa864a0d84c5ec9433a8693b7815a89f400 -Author: Nick Mathewson -Date: Thu Oct 14 13:16:00 2010 -0400 - - add limits.h to event_tagging.c so opensolaris will build - -commit 5e4bafbb89623f36666e80a5bc9c956990a9ccb1 -Author: Nick Mathewson -Date: Thu Oct 14 13:15:32 2010 -0400 - - fix a signed/unsigned warning in kqueue.c - -commit 02f6259fc3f0430936defb62a94a26aba7db64a8 -Author: Nick Mathewson -Date: Thu Oct 14 11:44:32 2010 -0400 - - New unit test for ssl bufferevents starting with connected SSLs. - -commit 93bb7d8e1965054eb46b4c84b19a580928b174ee -Author: Nick Mathewson -Date: Thu Oct 14 11:41:10 2010 -0400 - - Fix a case where an ssl bufferevent with CLOSE_ON_FREE didn't close its fd - - This could happen when we got an SSL with a BIO already set on it. - -commit 223ee40fde947db7b5abe18ac4b91da7aee46a46 -Author: Nick Mathewson -Date: Thu Oct 14 10:53:26 2010 -0400 - - Avoid spurious reads from just-created open openssl bufferevents - - When handshaking, we listen for reads or writes from the - transport. But when we're connected, we start out with writes enabled - and reads disabled, which means we should not have the transport read - for us. - -commit 34331e456d0abb2f19e2ecfa28249deeaf410de2 -Author: Nick Mathewson -Date: Fri Oct 8 01:09:02 2010 -0400 - - The corrected bufferevent filter semantics let us fix our openssl tests - -commit ac27eb827655b344a08207bf92a0c25da94ac7eb -Author: Nick Mathewson -Date: Fri Oct 8 00:59:02 2010 -0400 - - Correct logic on disabling underlying bufferevents when disabling a filter - - Previously, whenever writing was disabled on a bufferevent_filter (or - a filtering SSL bufferevent), we would stop writing on the underlying - bufferevent. This would make for trouble, though, since if you - implemented common patterns like "stop writing once data X has been - flushed", your bufferevent filter would disable the underlying - bufferevent after the data was flushed to the underlying bufferevent, - but before actually having it written to the network. - - Now, we have filters leave their underlying bufferevents enabled for - reading and writing for reading and writing immediately. They are not - disabled, unless the user wants to disable them, which is now allowed. - To handle the case where we want to choke reading on the underlying - bufferevent because the filter no longer wants to read, we use - bufferevent_suspend_read(). This is analogous to the way that we use - bufferevent_suspend_write() to suspend writing on a filtering - bufferevent when the underlying bufferevent's output buffer has hit - its high watermark. - -commit 34d64f8a347147aa5a6ac222f302e12b142a8f2e -Author: Nick Mathewson -Date: Tue Oct 12 13:46:14 2010 -0400 - - Fix serious bugs in per-bufferevent rate-limiting code - - Our old code was too zealous about deleting the refill events that - would actually make connections able to read or write again after - they had run out of bandwidth. Under some circumstances, this could - cause a bufferevent to never actually refill one of its - rate-limiting buckets. - - Also, the code treated setting a per-connection rate-limit on a - connection that already had a group-limit as if it were changing the - limit on a connection whose allocation had already run out. - - This patch fixes both of those problems. - -commit 819b1715723f1ab8bdf6f3d21d6eac859cf8950e -Author: Nick Mathewson -Date: Tue Oct 12 12:59:13 2010 -0400 - - Handle rate-limiting for reading on OpenSSL bufferevents correctly. - - We were looking at the number of bytes read on the wbio, not in the - rbio. But these are usually different BIOs, and the reading is - supposed to happen on the rbio. - -commit 7ad90f6a25a952836892fbd12b7ad9a43feac9be -Merge: 08ebd26 90651b3 -Author: Nick Mathewson -Date: Sat Oct 9 00:02:31 2010 -0400 - - Merge branch '20_internal_prio' - -commit a8148cedcd4cbff429cbe60e31ee084d236ccc43 -Author: Nick Mathewson -Date: Fri Oct 8 13:05:13 2010 -0400 - - New evhttp_uri(encode|decode) functions to handle + and NUL characters right - - The old evhttp_decode_uri() function would act as tough it was doing - an (illegal, undefined) decode operation on a whole URL at once, and - treat + characters following a ? as different from + characters - preceding one. But that's not useful: If you are decoding a URI - before splitting off query parameters, you are begging to fail as soon - as somebody gives you a value with an encoded & in it. - - The new evhttp_uridecode() function takes an argument that says - whether to decode + signs. Both uridecode and uriencode also now - support encoding or decoding to strings with internal 0-valued - characters. - -commit 2e63a604da3f3c77800d2a2ff1681d8397ecdac6 -Author: Nick Mathewson -Date: Fri Oct 8 12:57:11 2010 -0400 - - evhttp_encode_uri encodes all reserved characters, including !$'()*+,/:=@ - - Perviously, some characters not listed as "unreserved" by RFC 3986 - (notably "!$'()*+,/:=@") were not encoded by evhttp_encode_uri. This - made trouble, especially when encoding path components (where @ and / - are bad news) and parameters (where + should get encoded so it doesn't - later decode into a space). - - Spotted by Bas Verhoeven. - -commit 08ebd26730036feed0609b18e62ecf3f3cc783fb -Merge: 1205703 fdc640b -Author: Nick Mathewson -Date: Thu Oct 7 21:06:25 2010 -0400 - - Merge branch 'iovmax' - -commit 120570356be98c931beb91bb345c5c7a8fa44461 -Author: Nick Mathewson -Date: Thu Oct 7 18:05:01 2010 -0400 - - Turn some booleans in evconnlistener_iocp into one-bit bitfields. - -commit 62b429afa8a8138635a891ff668613e7be3c3aa7 -Author: Christopher Davis -Date: Thu Oct 7 13:41:39 2010 -0700 - - Make iocp/listener/error work; don't accept again if lev is disabled. - -commit 481ef920860cbdf8be2772ee332c03b0fb57da2d -Author: Nick Mathewson -Date: Thu Sep 23 17:41:49 2010 -0400 - - Fix allocation error for IOCP listeners. Probably harmless, since struct event is big - -commit 127d4f2195638bbfa8b693558f3eb408abdcdf24 -Author: Nick Mathewson -Date: Thu Sep 23 16:49:58 2010 -0400 - - Add a LEV_OPT_THREADSAFE option for threadsafe evconnlisteners - -commit 3b844893859c08a17c039dccef2e07e42e7c2f69 -Author: Nick Mathewson -Date: Wed Oct 6 12:35:38 2010 -0400 - - Tweak evhttp_parse_query hack to avoid breaking abi - -commit b1756d019d23656170d0295ed05e13c2fc201ca7 -Author: Nick Mathewson -Date: Wed Oct 6 11:48:52 2010 -0400 - - Let evhttp_parse_query return -1 on failure - - We already detected certain malformed queries, but we responded by - aborting the query-parsing process half-way through without telling - the user. Now, if query-parsing fails, no headers are returned, and - evhttp_parse_query returns -1. - -commit fdc640b02dada6d731452c5a02475a7766d1ecfa -Author: Nick Mathewson -Date: Tue Oct 5 21:34:07 2010 -0400 - - Fix an EINVAL on evbuffer_write_iovec on OpenSolaris. - - The writev() call is limited to at most IOV_MAX iovecs (or UIO_MAXIOV, - depending on whom you ask). This isn't a problem anywhere we've - tested except on OpenSolaris, where IOV_MAX was a mere 16. - - This patch makes us go from "use up to 128 iovecs when writing" to - "use up to 128 iovecs when writing, or IOV_MAX/UIO_MAXIOV, whichever - is less". This is still wrong if you somehow find a platform that - defines IOV_MAX < UIO_MAXIOV, but I hereby claim that such a platform - is too stupid to worry about for now. - - Found by Michael Herf. - -commit 5b7a37063647760646823215361df8605c36acd6 -Author: Nick Mathewson -Date: Tue Oct 5 14:29:48 2010 -0400 - - Fix warnings on mingw with gcc 4.5 - -commit 145f221e8f1f12809a54f0ed3168a930255feee3 -Author: Nick Mathewson -Date: Tue Oct 5 13:06:32 2010 -0400 - - Define symbolic constants to use in place of SHUT_RD etc - -commit e0fd87085d5392039f7406445d1abac47fdde2f5 -Author: Christopher Davis -Date: Tue Oct 5 13:01:54 2010 -0400 - - Send a shutdown(SHUT_WR) before closing an http connection - - This avoids getting an ECONNRESET from the TCP stack. - - Fixes bug 2928690 - -commit 0faaee016583a46006b46c5c2c82440dad1aefb8 -Author: Nick Mathewson -Date: Thu Sep 30 23:15:47 2010 -0400 - - Fix a spurious-call bug on epoll.c - - We were trying to check whether any events had really been - notified on an fd before calling evmap_io_active on it, but instead - we were checking for an event pointer, which was always true. - - In practice, this patch shouldn't change much, since epoll_wait - shouldn't return an event unless there is actually an event going - on. - - Spotted by an anonymous bug reporter on Sourceforge. Closes bug - 3078425. - -commit a8b7674cd5e3636ce36aef9dc1a0cdb4bd3584f2 -Merge: a78ac0f 9c8db0f -Author: Nick Mathewson -Date: Tue Sep 28 01:09:17 2010 -0400 - - Merge remote branch 'github/signed_compare' - -commit a78ac0facb406a056554a3fe9247e4c7fb9209a5 -Merge: b395392 d49b5e3 -Author: Nick Mathewson -Date: Mon Sep 27 16:05:20 2010 -0400 - - Merge remote branch 'github/win_lib' - -commit d49b5e33260d0c5373187e6d0ef08e489f9a0592 -Author: Nick Mathewson -Date: Mon Sep 27 15:12:55 2010 -0400 - - Do not search outside of the system directory for windows DLLs - - Hardens against some attacks. - -commit b395392746f93516bb14cc81ca8b48409b3c359f -Author: Sebastian Hahn -Date: Mon Sep 27 21:14:28 2010 +0200 - - Fix compile in kqueue.c - - Commit 38d09606 removed the evsigbase pointer, but forgot to remove - an assignment to it in kqueue.c. - -commit 9c8db0f804360325e37f032c56c46ef627d2aaf7 -Author: Nick Mathewson -Date: Thu Sep 23 22:45:55 2010 -0400 - - Fix all warnings in the main codebase flagged by -Wsigned-compare - - Remember, the code - int is_less_than(int a, unsigned b) { - return a < b; - } - is buggy, since the C integer promotion rules basically turn it into - int is_less_than(int a, unsigned b) { - return ((unsigned)a) < b; - } - and we really want something closer to - int is_less_than(int a, unsigned b) { - return a < 0 || ((unsigned)a) < b; - } - . - - Suggested by an example from Ralph Castain - -commit 045eef4cdea75c12be49327f961d6d2002c105dd -Author: Nick Mathewson -Date: Thu Sep 23 14:23:45 2010 -0400 - - Unit tests for listener error callbacks - -commit c4be8d82b36a17537b6cc805945e0cf21ab1724c -Author: Simon Perreault -Date: Mon Sep 20 12:47:39 2010 -0400 - - Add error callback to evconnlistener - -commit e1198997bc58403376ec5909ebd8ef872ee48591 -Author: Nick Mathewson -Date: Tue Sep 21 22:44:39 2010 -0400 - - Make event.c debugging messages report fds - -commit ec2b05edddee6144c33ceff23421598fea7c406f -Author: Nick Mathewson -Date: Tue Sep 21 22:23:32 2010 -0400 - - Make debugging output for epoll backend more comprehensive - -commit 90651b327a9819e890e8ababe1e46f3fa989850c -Author: Nick Mathewson -Date: Fri Sep 17 00:24:50 2010 -0400 - - Put internal events at highest priority - - (If we allow user events to starve internal events, then internal events - never actually happen, signals don't get acked, etc) - -commit 38d09606acd9dfa9aba64390435a0901e491317f -Author: Nick Mathewson -Date: Wed Sep 15 12:50:31 2010 -0400 - - Remove event_base.evsigbase; nothing used it. - -commit 4858b7949c665c3b6dafbf69665b9d126fc33e8f -Author: Nick Mathewson -Date: Wed Sep 15 01:54:51 2010 -0400 - - Remove the now-useless evsig_caught and evsig_process - -commit 95a7d418ab4ff332bc299813e6fc83c9be4ed0ec -Author: Nick Mathewson -Date: Wed Sep 15 01:40:02 2010 -0400 - - Make default signal backend fully threadsafe - - Jason Toffaletti discovered with helgrind that our signal handler was - messing with evsig_base, which can be set from lots of places in the - code. Ordinarly, we'd just stick a lock on it, except that it is - illegal (and genuinely error-prone) to call pthread_mutex_acquire() - from inside a signal handler. - - The solution is to only store the fd we write to in a static variable, - write the signal number to the fd, and put evsig_cb in charge of - activating signal events. - - I have no idea how we'll cope if we want to enable this to handle - siginfo (where available) in the future. - -commit 720bd933c8a4e9f0b850be075e055eea98767665 -Author: Nick Mathewson -Date: Wed Sep 15 01:08:39 2010 -0400 - - Warn when using the error-prone EV_SIGNAL interface in an error-prone way. Also, fix a couple of race conditions in signal.c - - When using the signal.c signal backend, Libevent currently only allows - one event_base to actually receive signals at a time. (This has been - the behavior since at least 1.4 and probably much earlier.) Now, we - detect and warn if you're likely to be racing about which signal goes - to which thread. - - We also add a lock to control modifications of the evsig_base field, - to avoid race conditions like those found by Jason Toffaletti. - - Also, more comments. Comments are good. - -commit 040a019f52a7933b2478fe41c3ab0b56835012b1 -Author: Simon Perreault -Date: Thu Sep 9 17:19:20 2010 -0400 - - Obey enabled status when unsuspending - -commit f0bd83ea88788c595fa78ed5da4a91efd36eca48 -Author: Nick Mathewson -Date: Thu Sep 9 16:13:09 2010 -0400 - - Bump to the latest version of tinytest - - This lets us do without libevent-specific code in tinytest.c, and - lets us add a feature to skip individual tests from the command - line. - -commit a5ce9ad4aff34fc10689d0c3b01ab2b7d55fabf0 -Author: Nick Mathewson -Date: Thu Sep 9 16:01:42 2010 -0400 - - Make SSL tests cover enabling/disabling EV_READ. - - I want my 80% coverage. - -commit 5811d74c6b39b5b619b19a2cebe0e709942effc3 -Author: Nick Mathewson -Date: Thu Sep 9 15:59:18 2010 -0400 - - Bump version to 2.0.7-rc-dev - -commit fe008ed656766266b93cdf2083f5b8bc50e6aad3 -Author: Nick Mathewson -Date: Thu Sep 9 14:59:27 2010 -0400 - - Make all versioning changes for 2.0.7-rc, and add ChangeLog - -commit d98511c027320d6c425ff11720e87e04e5594626 -Author: Christopher Davis -Date: Thu Sep 9 14:36:45 2010 -0400 - - Make event_base_virtual_del() notify the base if needed - -commit 2756a10cd94485109caae29dc0c914acd25f5137 -Author: Nick Mathewson -Date: Thu Sep 9 13:43:31 2010 -0400 - - Add a missing time.h include to test/regress_thread.c - -commit fb36f9a7e5456db948263dfb800d2e5bddb27765 -Author: Nick Mathewson -Date: Thu Sep 9 13:00:54 2010 -0400 - - Fix an uninitialized-variable warning on windows - -commit 71b680142120293fb730ac34576c80f63541cd63 -Author: Christopher Davis -Date: Wed Sep 8 20:33:21 2010 -0700 - - Don't decrement virutal event count twice in connect_complete. - -commit 3ec65d6984833310ec125a91c88ef8f7654464f4 -Author: Christopher Davis -Date: Wed Sep 8 19:55:13 2010 -0700 - - Fix a few Windows compile warnings. - -commit 25b6a74be68bc1e8bfcb69193505e7e6d4d39ef5 -Merge: 6f82171 1115366 -Author: Nick Mathewson -Date: Wed Sep 8 14:53:57 2010 -0400 - - Merge branch 'tests' - -commit 6f8217101366642d54d89694c9ff31a9b9a85789 -Merge: de41294 e7dc501 -Author: Nick Mathewson -Date: Wed Sep 8 14:52:37 2010 -0400 - - Merge remote branch 'github/win_notify' - -commit de412948a1f2cf0dce9e0f4c5095e2a5ce5c076e -Author: Nick Mathewson -Date: Wed Sep 8 14:52:24 2010 -0400 - - Add a missing header for regress_thread.c - -commit e7dc501ee5254083feaee97a93d4a47b04b93553 -Author: Nick Mathewson -Date: Wed Sep 8 14:40:51 2010 -0400 - - Implement EVBASE_NEED_NOTIFY on win32 - -commit 911e0db8f095e9fd386fd90087603327a5339c7c -Author: Sebastian Hahn -Date: Wed Sep 8 20:29:39 2010 +0200 - - Fix a compile warning in regress_thread.c - -commit 3658b1696df8784b156cc6643a36f7cfa69e0213 -Merge: 9580e28 17a14f1 -Author: Nick Mathewson -Date: Wed Sep 8 14:12:12 2010 -0400 - - Merge remote branch 'chrisd/iocp-fixes4' - - Conflicts: - test/regress_thread.c - -commit 9580e282d7e5801802e935956902a1948525d474 -Merge: 57d3413 ce85280 -Author: Nick Mathewson -Date: Wed Sep 8 14:00:45 2010 -0400 - - Merge branch 'th_notify_fd_reinit' - -commit ce85280beb56c4b1c7e69c542878a8f1fe647f28 -Author: Nick Mathewson -Date: Wed Sep 8 13:29:06 2010 -0400 - - Improve testing of when thread-notification occurs - -commit 4632b78e01a312ae716bc17322c462be53182eca -Author: Nick Mathewson -Date: Wed Sep 8 13:22:55 2010 -0400 - - Minimize calls to base_notify implementation functions, thereby avoiding needless syscalls - - The trick here is that if we already told the base to wake up, and it - hasn't woken up yet, we don't need to tell it to wake up again. This - should help lots with inherently multithreaded code like IOCP. - -commit c7a06bfaee7f96327779972214e8b744170531ff -Author: Nick Mathewson -Date: Wed Sep 8 13:02:58 2010 -0400 - - Avoid needlessly calling evthread_notify_base() when the loop is not running - - Also make sure that we always hold the base lock when calling evthread_notify_base. - -commit 57d3413c55689d623dad4eb2765d8a3bed9b586b -Merge: 4209007 5de2bcb -Author: Nick Mathewson -Date: Wed Sep 8 11:39:24 2010 -0400 - - Merge remote branch 'github/globals' - -commit 17a14f1af2ace0201baa1b5bbba031296e62d879 -Author: Christopher Davis -Date: Wed Sep 1 11:04:57 2010 -0700 - - Only process up to MAX_DEFERRED deferred_cbs at a time. - - If threads queue callbacks while event_process_deferred_callbacks is - running, the loop may spin long enough to significantly skew timers. - A unit test stressing this behavior is also in this commit. - -commit 2447fe88860c40e968261ad8ea059166cb84a280 -Author: Christopher Davis -Date: Sat Aug 28 04:07:48 2010 -0700 - - Add event_config_set_num_cpus_hint for tuning thread pools, etc. - -commit 499452f4c24f172bf6846599e3886838a4207aca -Author: Christopher Davis -Date: Sat Aug 28 02:44:11 2010 -0700 - - IOCP-related unit test tweaks - -commit 76f7e7ae745ad730795f0a4a3bc1299a00137cc2 -Author: Christopher Davis -Date: Tue Aug 17 05:02:00 2010 -0700 - - Some IOCP bufferevent tweaks. - - - Increment reference count of bufferevents before initiating overlapped - operations to prevent the destructor from being called while operations - are pending. The only portable way of canceling overlapped ops is to - close the socket. - - - Translate error codes to WSA* codes. - - - Better handling of errors. - - - Add an interface to add and del "virtual" events. Because IOCP - bufferevents don't register any events with the base, the event loop - has no way of knowing they exist. This causes the loop to terminate - prematurely. event_base_{add,del}_virtual increment/decrement base's - event count so the loop runs while there are any enabled IOCP - bufferevents. - -commit d844242f9b138be4896942ded25d74a91bf29901 -Author: Christopher Davis -Date: Sat Aug 28 02:08:27 2010 -0700 - - Stop IOCP when freeing the event_base. - -commit 03afa209de96d67f1a4b935460aeabe63f5ef24f -Author: Christopher Davis -Date: Mon Aug 16 01:23:57 2010 -0700 - - IOCP-related evbuffer fixes. - - - Prevent evbuffer_{add,prepend}_buffer from moving read-pinned chains. - - Fix evbuffer_drain to handle read-pinned chains better. - - Raise the limit on WSABUFs from two to MAX_WSABUFS for overlapped reads. - -commit 1115366e95388de70996b5aafda17363db2a44fd -Author: Nick Mathewson -Date: Tue Sep 7 10:28:15 2010 -0400 - - Fix a few memory leaks in the tests - -commit 42090072c15fedc50231bfbce347d4ffb5432e31 -Author: Nick Mathewson -Date: Mon Sep 6 15:47:07 2010 -0400 - - Move the "function to getsockname() on a listener" to regress_testutils - - This reverts commit fab50488fcb741884ccdfa7b83643eac3e5c9cbf. - - The function was, on reflection, not important enough to break the feature - freeze, since it's trivial to build on your own. - -commit c51826ff50fe030f734a1b1687949e1fb621ea67 -Merge: b0f284c ca9048f -Author: Nick Mathewson -Date: Mon Sep 6 15:40:13 2010 -0400 - - Merge remote branch 'github/sysqueue_include_order' - -commit b0f284cb18a6aecb8a5c2a398b0738ba3662c4bc -Author: Shuo Chen -Date: Mon Sep 6 10:10:17 2010 -0400 - - Fix event_del(0) instance in bench.c - -commit 749128b2cfe400755b08981f217064e2a5a64641 -Merge: 150599e e50c0fc -Author: Nick Mathewson -Date: Sat Sep 4 22:02:32 2010 -0400 - - Merge remote branch 'github/win32_posix_underscore' - -commit 150599e6e2a6b8a6d8a5b55cee59406c13a73e2f -Merge: b5dd806 4788277 -Author: Nick Mathewson -Date: Sat Sep 4 22:00:38 2010 -0400 - - Merge remote branch 'github/cdecl' - -commit b5dd8064fc42bd788c0ee46b483741419c152e39 -Author: Nick Mathewson -Date: Fri Sep 3 22:00:25 2010 -0400 - - Fix uninitialized port var in http_delete_test. Last one, I hope. - -commit 3b3fb7438dd7e7108d77c8d61290cbd68f7633b4 -Author: Nick Mathewson -Date: Fri Sep 3 21:03:25 2010 -0400 - - Fix uninitialized variables in http_bad_request_test. (oops) - -commit a97320ac579e58e685c19393e2599accfb5edbe5 -Author: Nick Mathewson -Date: Fri Sep 3 18:48:31 2010 -0400 - - Allow more than one copy of regression tests to run at once - - Mostly this was a matter of just removing all the hardwired ports in - the test code. The http/connection_retry test is still a little - screwy, though. - -commit 195214360c7cb107e86bfaa389812c879873f19c -Author: Nick Mathewson -Date: Fri Sep 3 16:42:16 2010 -0400 - - Expose a function to add a nameserver by sockaddr - -commit fab50488fcb741884ccdfa7b83643eac3e5c9cbf -Author: Nick Mathewson -Date: Fri Sep 3 16:41:16 2010 -0400 - - Expose a function to getsockname() on a listener's fd. - -commit 7ea8e89d5cce36c7f27ea62c9a68a9208266d569 -Author: Nick Mathewson -Date: Fri Sep 3 15:12:35 2010 -0400 - - Prefer autoreconf -ivf to manual autogen.sh - - Suggested by Ralph Castain - -commit 478827739c0365f398a63f86c08f588ae9a12401 -Author: Nick Mathewson -Date: Thu Sep 2 13:21:17 2010 -0400 - - Fix pointer-to-__cdecl-function syntax - -commit e50c0fcc85245881eb67dacb5f5e54e0b2482655 -Author: Nick Mathewson -Date: Thu Sep 2 11:10:50 2010 -0400 - - Use the _func() replacements for open, fstat, etc in evutil.c on win32 - - Remember that in a fit of ANSI C compliance, Microsoft decided to - screw portability by renaming basically all the functions in unistd.h to - get prefixed with an understore. - - For some reason, mingw didn't seem to mind, but at least some people's - compilers did: see bug 3044490. - -commit f0056d041bd890dff8757a3472dd5fa9a1066405 -Author: Nick Mathewson -Date: Thu Sep 2 12:06:58 2010 -0400 - - Declare signal handler function as "__cdecl" on Windows. - - I swear, they must have half a dozen different calling conventions. - - (goes to check) - - Holy crud. They actually do. There's __cdecl, __stdcall, __fastcall, - "thiscall", "naked" and the obsolete "__pascal", "__fortran", and - "__syscall". And don't forget WINAPI and __far. - - Anyways, this should fix 3044488 if I got it right. - -commit ca9048f12cf441625ac3e90edb219d7f4c60b430 -Author: Nick Mathewson -Date: Thu Sep 2 11:36:44 2010 -0400 - - Move evkeyvalq into a separate header for evhttp_parse_query users - - The evhttp_parse_query API is a bit misdesigned; all the other - evkeyvalq stuff is abstract and lets you get away with having a header - stub, but evhttp_parse_query seems to require that you instantiate an - empty evkeyvalq of your own. - -commit d3ceca800eb6478b9e0b74680e2bd247d8213187 -Author: Nick Mathewson -Date: Thu Sep 2 11:27:57 2010 -0400 - - Declare evkeyvalq and event_list even if event_struct.h comes before sys/queue.h - - Fixes bug 3036645 reported by Mihai Draghicioiu - -commit 495ed66705d5790de031f9591b47afcbe4fc1156 -Author: Nick Mathewson -Date: Wed Sep 1 16:36:30 2010 -0400 - - Close th_notify_fds and open a new pair on reinit - - After a fork, you want subthreads to wake up the event_base in the - child process, not to have the child process and the main process - fight over who wakes up whom. - - Related to a problem found by Nicholas Marriott while debugging - 3048812. - -commit 5de2bcb70fa7905d26e608728db24ece01f0c675 -Author: Nick Mathewson -Date: Wed Sep 1 16:03:39 2010 -0400 - - On windows, make lock/thread function tables static - - This requires us to have a separate implementation of the lock macros - that indirects to a set of functions. Fortunately, this isn't too - hard to do. - - This may be a fix for bug 3042969, where our openssl dll and our - libevent dll each got their own version of the thread stuff. - -commit 5218d2a8b186bcf28ffe0a61e321a29585683b45 -Author: Nick Mathewson -Date: Wed Sep 1 15:56:22 2010 -0400 - - Make defer-internal.h use lock macros, not direct cess to lock fns - -commit 1fdec20f8fb1a4e1bc2eeb66831f9ad5c3455888 -Author: Nick Mathewson -Date: Wed Sep 1 15:01:39 2010 -0400 - - Stop using global arrays to implement the EVUTIL_ctype functions - - These apparently made libtool sad on win32, and the function call - overhead here should be negligable anyway. - -commit acc4aca49e246a46e03f8978517c9b3d23b1baea -Author: Nick Mathewson -Date: Mon Aug 30 11:35:06 2010 -0400 - - Fix a bug in our win32 condition implementation - - The do ... while loop in our wait code could spin while waiting - because the event object wasn't reset until there were no longer any - events waiting to be woken up. We also want to reset the event object - if the count of events to wake up reaches zero. - - Found by Chris Davis. Fixes bug 3053358. - -commit d61b2f33861eacdc0f9d343d38522fd91c1b7e72 -Author: Nick Mathewson -Date: Thu Aug 26 15:09:58 2010 -0400 - - Fix an issue with forking and signal socketpairs in select/poll backends - - Nicholas Marriott identifies an issue where a signal socketpair - doesn't get recreated if the event backend doesn't set event_reinit. - - See bug 3048812 - - There may be a similar issue with respect to th_notify_fd - -commit 041989fb6600e9eb4abe3075da721199e771e920 -Author: Nick Mathewson -Date: Tue Aug 17 14:44:12 2010 -0400 - - Rename regress_pthread.c to regress_thread.c - -commit f1074b776a08aa1735752484e25377889140a622 -Author: Nick Mathewson -Date: Mon Aug 23 12:01:45 2010 -0400 - - Detect events with no ev_base; warn instead of crashing - -commit 743f8665395e7e06800e1a09a0ae701b72290d02 -Author: Nick Mathewson -Date: Mon Aug 23 11:48:46 2010 -0400 - - Honor NDEBUG; build without warnings with NDEBUG; make NDEBUG always-off in unit test code - -commit 970e6ad2ba4e42963d51c032ae8f9d2bdf2cefda -Author: Nick Mathewson -Date: Thu Aug 19 14:00:06 2010 -0400 - - Avoid deadlock when activating signals. - - Fixes bug 3048812. - - Based on patch by Nicholas Marriott. - -commit 6123d1298fb3433986f35b2eef90d28282e53132 -Author: Nick Mathewson -Date: Thu Aug 19 09:38:44 2010 -0400 - - Fix kquue correctness test on x84_64 - - Apparently, in our configure.in check for a working kqueue, we were - leaving some fields unset that seemed to irritate 64-bit kqueue a lot. - - Found by Christopher Layne - -commit 4c32b9de2c707beaf09178e0b7793efa3f585669 -Author: Nick Mathewson -Date: Wed Aug 18 12:02:25 2010 -0400 - - Fix logic error in win32 TRY_LOCK that caused problems with rate-limiting - -commit d0b884338f62fba233e3f0d00193e6908c84ee2f -Author: Nick Mathewson -Date: Wed Aug 18 10:49:12 2010 -0400 - - Set close-on-exec bit for filedescriptors created by dns subsystem. - - Based on patch for 1.4 by Ralf Schmitt. - -commit da6e7cd49588f6149166e05e7b7b725b360ab72c -Author: Nick Mathewson -Date: Tue Aug 17 13:26:03 2010 -0400 - - Correctly detect failure to delete bufferevent read-timeout event - - Gilad Benjamini noted that we check the error code for deleting a - write-timeout event twice, and the read timeout not at all. This - shouldn't be a bit problem, since it's really hard for a delete to - fail on a timeout-only event, but it's worth fixing. - - Fixes bug 3046787 - -commit 5fb10958249a89b2e7f3711fe0eed624086c5336 -Author: Nick Mathewson -Date: Mon Aug 16 22:55:45 2010 -0400 - - Add a unit test for conditions - -commit d74ae381e00cec22e562c72583739d70bc9aa1bd -Author: Nick Mathewson -Date: Mon Aug 16 12:38:22 2010 -0400 - - Make the regress_pthread.c tests work on windows with current test APIs - -commit e0972c21389a45c60606ce2b842311c27fea2147 -Author: Nick Mathewson -Date: Tue Aug 17 13:18:18 2010 -0400 - - Use conditions instead of current_event_lock to fix a deadlock. - - Avi Bab correctly noted as bug 3044479 the fact that any thread - blocking on current_event_lock will do so while holding - th_base_lock, making it impossible for the currently running event's - callback to call any other functions that require th_base_lock. - - This patch switches the current_event_lock code to instead use a - condition variable that we wait on if we're trying to mess with - a currently-executing event, and that we signal when we're done - executing a callback if anybody is waiting on it. - -commit d4977b52f07d61e215e5d5e98af2216719c06d16 -Author: Nick Mathewson -Date: Tue Aug 17 13:15:34 2010 -0400 - - Add a condition variable backend, with implementations for pthreads and win32 - - The interface from the user's POV is similar to the locking - implementation: either provide a structure full of function - pointers, or just call evthread_use_*_threads() and everything will - be okay. - - The internal interface is meant to vaguely resemble pthread_cond_*, - which Windows people will better recognize as *ConditionVariable*. - -commit 3920172821c2ad7862c2e4dab4d45adb1356a724 -Author: Gilad Benjamini -Date: Fri Aug 13 17:19:18 2010 -0400 - - Make definition of WIN32_LEAN_AND_MEAN in event.h conditional. - - (Inclusion order might trigger a warning for redefinition on Windows.) - -commit 60433a0a1a4f9efb5c2eb130f0dcd721cab67ec7 -Author: Gilad Benjamini -Date: Fri Aug 13 17:08:59 2010 -0400 - - Clean up syntax on TAILQ_ENTRY() usage - - Though the C standards allow it, it's apparently possible to get MSVC - upset by saying "struct { int field; } (declarator);" instead of - "struct {int field; } declarator;", so let's just not do that. - - Bugfix for 3044492 - - (commit msg by nickm) - -commit a4af9be10a7b725d77a2ddbfa5d6ef8712521500 -Author: Nick Mathewson -Date: Fri Aug 13 11:41:37 2010 -0400 - - Make include/event2/event-config.h not included in source dist - - As a generated file, it shouldn't get included in our source - distribution. Apparently there is an automake incant for this: - nobase_ even stacks with nodist_ . - -commit 4022b287f8b096edeea9b461b4a0e5eb3e7ebebf -Author: Nick Mathewson -Date: Fri Aug 13 11:34:39 2010 -0400 - - Change include order in Makefile.nmake - - If there is an event-config.h in include/event2 (either because we - screwed up packaging like in 2.0.6-rc or because we previously tried - building with mingw and we didn't make distclean in the middle), we - want MSVC to find the one one in WIN32-Code/include/event2 first. - - Found by Gilad Benjamini. - -commit 4991669b7c7a781ec11740dd7b41683c0175ab4b -Author: Nick Mathewson -Date: Tue Aug 10 21:05:52 2010 -0400 - - Update the whatsnew-2.0.txt document - -commit 33200e72de88d505c036c2ae1fec28f519ac72af -Author: Nick Mathewson -Date: Tue Aug 10 15:03:14 2010 -0400 - - Document that DNS_NO_SEARCH is an obsolete alias for DNS_QUERY_NO_SEARCH - -commit 3808168d21afac0846758dbd2d913f49da8a4155 -Author: Nick Mathewson -Date: Tue Aug 10 15:02:50 2010 -0400 - - Completely remove the (mostly-removed) obsolete thread functions. - -commit 9b5c19ac870eae15039146c55f574eea744d31b3 -Merge: 0bffe43 ebcb1f0 -Author: Nick Mathewson -Date: Tue Aug 10 11:46:00 2010 -0400 - - Merge branch 'more_pkgconfig' - -commit ebcb1f0387efa1805a01a4a325da67ad786ca201 -Author: Nick Mathewson -Date: Tue Aug 10 11:11:25 2010 -0400 - - Add pkgconfig files for libevent_{openssl,pthreads} - -commit 90b3ed5bc840480f1c1d40f93bc2d850e3830d64 -Author: Nick Mathewson -Date: Mon Aug 9 13:25:50 2010 -0400 - - Add some comments to http.c and make a few functions static. - -commit 0bffe43a15fbd43bc7826acb88a3bada528c8adf -Author: Nick Mathewson -Date: Mon Aug 9 12:08:40 2010 -0400 - - Fix a nasty dangling-event bug when using rate-limiting groups - - When we freed a bufferevent that was in a rate-limiting group and - blocked on IO, the process of freeing it caused it to get removed - from the group. But removing the bufferevent from the group made - its limits get removed, which could make it get un-suspended and in - turn cause its events to get re-added. Since we would then - immediately _free_ the events, this would result in dangling - pointers. - - Fixes bug 3041007. - -commit ff481a8e43999c4ba1556bc472b5e69fce7ea353 -Author: Nick Mathewson -Date: Fri Aug 6 23:22:01 2010 -0400 - - Increment vesion to 2.0.6-rc-dev - -commit 556d0f4001ae5dae2e98584a7b23e3def6339681 -Author: Nick Mathewson -Date: Fri Aug 6 21:19:44 2010 -0400 - - Increment versions to 2.0.6-rc - -commit f65826404179bdc059eefb4fe4f156170569e034 -Author: Nick Mathewson -Date: Fri Aug 6 21:11:01 2010 -0400 - - Changlog and new acknowledgements for 2.0.6-rc - -commit ec347b92251e188a13cbbfe0fe2e00aa14aeeca5 -Author: Nick Mathewson -Date: Wed Jul 7 16:45:03 2010 -0400 - - Move event-config.h to include/event2 - - This change means that all required include files are in event2, and - all files not in event2/* are optional. - -commit 5fa30d2bf443e9fc4c6ab9bf01f761006b97132d -Author: Nick Mathewson -Date: Fri Aug 6 17:13:27 2010 -0400 - - Fix evdns build with -DUNICODE - - It turns out that GetProcAddress always takes its second argument as - a C string, regardless of whether unicode is on or not. - -commit 28f31a4f8da9367a950e89f28a4ec2314d0e48e0 -Author: Nick Mathewson -Date: Fri Aug 6 16:36:23 2010 -0400 - - Fix unit tests with -DUSE_DEBUG enabled - - If you were to enable USE_DEBUG and slog through all 700+ MB of - debugging output, you'd find that one of the unit tests failed, - since it tested the debug logging code, but the string it expected - and the string it logged differed by a tab vs 2 spaces. - -commit ea1ea3d6eedcaa95ab10eb29401aaa600356e028 -Author: Nick Mathewson -Date: Fri Aug 6 13:34:51 2010 -0400 - - Make test-changelist count cpu usage right on win32 - -commit 9b602096758de9361fdb61b658260da58b03333f -Author: Nick Mathewson -Date: Fri Aug 6 13:03:17 2010 -0400 - - Use AF_INET socketpair to test sendfile on Solaris - -commit 57b30cd7ccf7aca1d89812389a1e320d012f7a9e -Author: Nick Mathewson -Date: Fri Aug 6 13:01:32 2010 -0400 - - Turn our socketpair() replacement into its own function - - This patch splits the formerly windows-only case of evutil_socketpair() - into an (internal-use-only) function named evutil_ersatz_socketpair(), and - makes it build and work right on non-Windows hosts. - - We need this for convenience to test sendfile on solaris, where socketpair - can't give you an AF_INET pair, and sendfile() won't work on AF_UNIX. - -commit de1f5d6d87c8122ede59124ea5d9255cb609af78 -Author: Christopher Davis -Date: Fri Aug 6 09:33:55 2010 -0400 - - Remember to initialize timeout events for bufferevent_async - - Fixes segfaults in unit tests. - -commit 170ffd2b1d3d8458d39d9f74099c0b381557544b -Author: Nick Mathewson -Date: Thu Aug 5 15:57:30 2010 -0400 - - Increase the tolerance in our unit tests for sloppy clocks. - - (Apparently openbsd in virtualbox just doesn't keep very accurate time.) - -commit e996b3d411dcdf58f0d8b4e527402db089cc878d -Author: Nick Mathewson -Date: Thu Aug 5 15:51:16 2010 -0400 - - Make tests quieter on local dns resolver failure - -commit 4558ce23220e28e22140afd61a60399f0a8fbb76 -Merge: b2c6202 009f300 -Author: Nick Mathewson -Date: Wed Aug 4 17:31:28 2010 -0400 - - Merge branch 'openssl_ratelim' - -commit b2c6202d65f3a057ed76f0296b52156980f2482a -Author: Nick Mathewson -Date: Wed Aug 4 15:52:32 2010 -0400 - - Fix an assertion bug in test-ratelim - - If the rate limit was low enough, then the echo_conns wouldn't finish - inside the 300 msec we allowed for them to close. Instead, count the - number of connections we have, and keep waiting until they are all - closed. - -commit 42f6b6241444ff66b08956a7c7f4e13f2f5f49f3 -Author: Nick Mathewson -Date: Wed Aug 4 15:51:14 2010 -0400 - - Add option to test-ratelim to test min_share - -commit 6ae53d676242227bc199c69de9244d6c3599ab44 -Author: Nick Mathewson -Date: Wed Aug 4 15:44:08 2010 -0400 - - Add an interface to expose min_share in ratelimiting groups - -commit 009f300532481d4f3b7237f9a59fd306b371b8c0 -Author: Nick Mathewson -Date: Wed Aug 4 14:54:38 2010 -0400 - - Fix rate-limit calculation on openssl bufferevents. - - When you're doing rate limiting on an openssl connection, you nearly - always want to limit the number of bytes sent and received over the - wire, not the number of bytes read or written over the secure - transport. - -commit 13b912e4acb6fea5802ae3005898535af2ae5263 -Author: Trond Norbye -Date: Sun Aug 1 21:39:48 2010 +0200 - - Fixed compilation of sample/le-proxy.c on win32 - -commit 42a8c7111264ff1469083e50bd5b0c0ee494725b -Author: Nick Mathewson -Date: Sat Jul 31 17:10:04 2010 -0400 - - Build more cleanly with NetBSDs that dislike toupper(char) - - To be fair, when char can be signed, if toupper doesn't take negative - characters, toupper(char) is a very bad idea. So let's just use the - nice safe EVUTIL_TOUPPER instead. (It explicitly only upcases ASCII, - but we only use it for identifiers that we know to be ASCII anyway). - -commit 840a72fbd52197e443efe413650ef3556cfcee60 -Author: Joachim Bauch -Date: Thu Jul 29 20:32:40 2010 -0400 - - Fix badly-behaved subtest of dns/bufferevent_connect_hostname - - The bufferevent_connect_hostname test was specifying AF_INET, but the - gethostbyname test we were using to see what error to expect was using - PF_UNSPEC, leading to possible divergence of results. - -commit 9e725f72e72cb9b37b39915a260f9aee265f2c59 -Author: Nick Mathewson -Date: Thu Jul 29 18:12:05 2010 -0400 - - Improve error message for failed epoll to make debugging easier. - -commit cc2379d2642d2b9d0cbb1098ce1b3095e14551b3 -Author: Nick Mathewson -Date: Mon Jul 26 14:48:32 2010 -0400 - - Constify a couple of arguments to evdns_server_request_add_*_reply - -commit e1c1167cbe7c3c7e60267abe242a2fa91f4c2dfe -Author: Nick Mathewson -Date: Thu Jul 22 14:38:08 2010 +0200 - - Replace (unused,always 0) is_tcp argument to evdns_add_server_port*() with flags - - Since we weren't using it for anything, and we always failed if it was - set, we're allowed to change the future semantics of setting it. - -commit 7e87a599bb004574de8e6a9cdd13a27f561df7e9 -Author: Nick Mathewson -Date: Wed Jul 21 14:33:42 2010 +0200 - - Stop asserting when asked for a (unsupported) TCP dns port. Just return NULL. - -commit c991317409f7787223fc11541100d0b0f60afa20 -Author: Mike Smellie -Date: Mon Jul 19 15:31:19 2010 +1200 - - Change bufferevent_openssl::do_write so it doesn't call SSL_write with a 0 length buffer - - I was running into a problem when using bufferevent_openssl with a - very simple echo server. My server simply bufferevent_read_buffer 'd - data into an evbuffer and then passed that evbuffer straight to - bufferevent_write_buffer. - - The problem was every now and again the write would fail for no - apparent reason. I tracked it down to SSL_write being called with the - amount of data to send being 0. - - This patch alters do_write in bufferevent_openssl so that it skips - io_vecs with 0 length. - -commit 7c926916b21b88d6c3d6f6aff36406023c4aa89c -Author: Nick Mathewson -Date: Mon Jul 19 15:14:10 2010 +0200 - - Make test/test.sh call test-changelist - - Eventually test-changelist should expand to try more cases, maybe - query the status of the actual changelist somehow, and integrate it - with the rest of the unit tests. - - Also, add test-changelist to gitignore. - -commit cb927a51731188a4135906b6d7518c04ce12b05e -Author: Nick Mathewson -Date: Mon Jul 19 15:03:43 2010 +0200 - - Fix whitespace. - -commit b00d4c0452e59b9ca8c8d4454078e1538a3bac8b -Author: Nick Mathewson -Date: Mon Jul 19 14:58:08 2010 +0200 - - Remove unused variables in test/test-changelist.c - -commit cf249e7d997743523ef5bf8b5328697751d303bc -Author: Mike Smellie -Date: Mon Jul 19 13:44:56 2010 +1200 - - Possible fix to 100% cpu usage with epoll and openssl - - I'm running a fairly simple bit of test code using libevent2 with epoll and - openssl bufferevents and I've run into a 100% cpu usage problem. - - Looking into it 100% usage was caused by epoll_wait constantly - returning write events on the openssl socket when it shouldn't really have - been looking for write events at all (N_ACTIVE_CALLBACKS() was returning 0 - also). - - Looking a bit deeper eventbuffer_openssl socket seems to be requesting - that the EV_WRITE event be removed when it should, but the event isn't - actually being removed from epoll. - - Continuing to follow this I think I've found a bug in - event_changelist_del. - - For evpoll event_del calls event_changelist_del which caches the change - which is then actioned later when evpoll_dispatch is called. - - In event_changlist_del there is a check so that if the currently changed - action is an add then the cached action is changed to a no-op rather than a - delete (which makes sense). The problem arises if there are more than - two add or delete operations between calls to dispatch, in this case it's - possible that the delete is turned into a no-op when it shouldn't have - been. - - For example starting with the event on, a delete followed by an add and - then another delete results in a no-op when it should have been a delete (I - added a fair bit of debug output that seems to confirm this behaviour). - - I've applied a small change that checks the original old_event stored with - the change and only converts the delete to a no-op if the event isn't on in - old_event. This seems to have fixed my problem. - -commit 928b7d4960e609e312180b93952c09449bf2d8e3 -Merge: 65abdc2 fc5e0a2 -Author: Nick Mathewson -Date: Fri Jul 16 12:38:23 2010 -0400 - - Merge branch 'pncalls_fix' - -commit 65abdc2011fe1019471cddff78d3cf596b2bccbe -Author: niks -Date: Fri Jul 16 09:11:09 2010 -0400 - - Fix wrong sie calculation of iovec buffers when exact=1 - - The old code had a bug where the 'exact' flag to 1 in - _evbuffer_read_setup_vecs would never actually make the iov_len field - of the last iovec get truncated. This patch fixes that. - -commit 7c2dea1615fa1488c9cadc9f5aeb885c1ba26a60 -Author: Nick Mathewson -Date: Tue Jul 13 11:06:08 2010 -0400 - - Pass flags to fcntl(F_SETFL) and fcntl(F_SETFD) as int, not long - - Everybody but Linux documents this as taking an int, and Linux is - very tolerant of getting an int instead. If it weren't, everybody - doing fcntl(fd,F_SETFL,O_NONBLOCK) would break, since the glibc - headers define O_NONBLOCK as an int literal. - -commit e73cbde15f7fe71649c2d9783a03a805edc10027 -Author: Nick Mathewson -Date: Thu Jul 8 14:41:02 2010 -0400 - - Suppress a spurious EPERM warning in epoll.c - - It's okay for us to get an EPERM when doing an EPOLL_DEL on an fd; it - just means that before we got a chance to the EPOLL_DEL, we closed the - fd and reopened a new non-socket that wound up having the same fd. - - Partial fix for Bug 3019973. - -commit fc5e0a23442f04ccb3b10355a8c5d05419bf0f6c -Author: Nick Mathewson -Date: Mon Jul 5 14:39:39 2010 -0400 - - Don't race when calling event_active/event_add on a running signal event - - There was previously no lock protecting the signal event's - ev_ncalls/ev_pncalls fields, which were accessed by all of - event_signal_closure, event_add_internal, event_del_internal, and - event_active_nolock. This patch fixes this race by using the - current_event_lock in the same way it's used to prevent - event_del_internal from touching an event that's currently running. - -commit 61e1eeec6f914a0c00955e7f376f17010446c78e -Author: Nick Mathewson -Date: Mon Jul 5 13:24:45 2010 -0400 - - Tidy up the code in evthread_make_base_notifiable a little - - Previously, we had a few conditional statements with the "if (...)" - inside an #ifdef and the body outside. That kind of thing is hard to - read. - -commit a5bc15b2e114a39d7b4f14bd1ba17182d6f07ed2 -Author: Nick Mathewson -Date: Mon Jul 5 13:24:12 2010 -0400 - - Drain th_notify_fd[0] more bytes at a time. - -commit 17522d2af846bdeb18bd7e39527caea03a021afa -Author: Nick Mathewson -Date: Mon Jul 5 13:17:47 2010 -0400 - - Fix a deadlock related to event-base notification. Diagnosed by Zhou Li, Avi Bab, and Scott Lamb. - - The problem was that the thread doing the notification could block on - write in evthread_notify_base_default while holding the th_base_lock. - The main thread would never drain th_notify_fd[0], since it would need - th_base_lock to actually trigger events. - -commit d89fdba424c654445d0f927670691d9b55f20846 -Author: Nick Mathewson -Date: Mon Jul 5 12:28:22 2010 -0400 - - Make sample/hello_world work on windows - - We forgot to include the WSAStartup call in main(). - - Patch from an anonymous user on Sourceforge. - - Fixes bug 3025354. - -commit 085987093f186dc6eb1145ae861af0d34fc0d9fd -Author: Nick Mathewson -Date: Mon Jul 5 12:26:21 2010 -0400 - - never let bufferevent_rlim functions return negative - -commit 142500317e84517472a548637efb2844d63cbd47 -Author: Sebastian Hahn -Date: Wed Jun 23 01:15:15 2010 +0200 - - Really only add libevent_core.la to LIBADD on mingw - - Commit fdc629736e1 tried to do this, but added it for mingw and - for everything else. Fixes a segfault in bufferevent unittests. - -commit 215e629cd4244f40769e09df5951c6cbe66ed246 -Author: Nick Mathewson -Date: Mon Jun 21 12:26:21 2010 -0400 - - Add bufferevent_lock()/bufferevent_unlock() - - Although bufferevent operations are threadsafe, sometimes you need - to make sure that a few operations on a single bufferevent will all - be executed with nothing intervening. That's what these functions - are for. - -commit 7b259b6796fc34948402805e88184c29400db159 -Author: Nick Mathewson -Date: Mon Jun 21 12:24:49 2010 -0400 - - Fix sentence fragment in docs for event_get_struct_event_size() - -commit 7510aac3b900d876024f968d8fbbb72f6f49671b -Author: Nick Mathewson -Date: Mon Jun 21 12:23:32 2010 -0400 - - Unit test for event_get_struct_event_size() - -commit 9659eced03c101bf83205c56383f7f52f7f9ee09 -Author: Nick Mathewson -Date: Sat Jun 19 18:23:16 2010 -0400 - - Add a comment to describe our plan for library versioning - -commit b2d7440a9121ab372e8b2b6bf2cec8185bb6b10e -Author: Nick Mathewson -Date: Sat Jun 19 18:22:48 2010 -0400 - - Set library version for libevent_pthreads correctly - -commit e21f5d15ebcc42a2f3300f59afad0c599a0f41a2 -Author: Nick Mathewson -Date: Sat Jun 19 18:21:40 2010 -0400 - - Document a change in the semantics of event_get_struct_event_size() - -commit 8a4406230824ed7d6bc5b9c12b2d8a9293f71c94 -Author: Nick Mathewson -Date: Thu Jun 17 10:33:06 2010 -0400 - - Have autogen.sh pass --force-missing to automake - - Previously, our autogen.sh script wouldn't tell automake to update - older versions of its copied-in scripts, which would cause problems if - they got sufficiently out-of-date. - -commit 9b14911654dec0ab521f29c3868774fea5a492b3 -Author: Nick Mathewson -Date: Thu Jun 17 10:31:35 2010 -0400 - - Remove some automake-generated files from version control. - -commit 276e7ee97eedd3f3745bff2eecccb4f29fcbfdac -Author: Nick Mathewson -Date: Fri Jun 11 11:57:13 2010 -0400 - - Fix a pedantic gcc 4.4 warning in event2/event.h - -commit 29b2e233a7a4eb0f1842368770d545a685743d80 -Author: Felix Nawothnig -Date: Sun May 30 03:17:48 2010 +0200 - - Fix possible nullptr dereference in evhttp_send_reply_end() - - (The existing implementation had sanity-checking code for the case where - its argument was NULL, but it erroneously dereferenced it before actually - doing the sanity-check. --nickm) - -commit 17a8e2d72b156f82c7ecaba989a996c943f03042 -Author: Nick Mathewson -Date: Mon Jun 7 12:06:43 2010 -0400 - - Add a function to retrieve the other side of a bufferevent pair - -commit 44d57eee93724a8f6db24c466de34a410ab22d79 -Author: Nick Mathewson -Date: Thu Jun 3 11:25:54 2010 -0400 - - Add test for behavior on remote socket close - - On all the backends on this little mac laptop, that behavior is to - report a remote socket close as both EV_READ and EV_WRITE. - Historically, we had problem for some of these behaviors on some - backends, so let's make sure that such behaviors don't come back. - -commit 3467f2fa3bbff0dab6865a0ed08475ed3573c230 -Author: Nick Mathewson -Date: Fri May 28 15:05:32 2010 -0400 - - Fix logic in correcting high values from FIONREAD - - The old logic made sense back when buffer.c was an enormous linear - buffer, but it doesn't make any sense for the chain-based - implementation. - - This patch also refactors the ioctl{socket}? call into its own function. - -commit 0798dd1247407fcbae7c8401a41a082b64060e1d -Author: Pierre Phaneuf -Date: Thu May 27 22:37:09 2010 -0400 - - Close the file in evutil_read_file whether there's an error or not. - - evutil_read_file would close the file if there was an error, but not if things went normally. - -commit c21c6631618c71575dd8f372c534af8eedf2f871 -Author: Nick Mathewson -Date: Thu May 27 01:32:11 2010 -0400 - - Add the libtool-generated /m4/* stuff to .gitignore - -commit 39906698ca5db840495af1b68923ae6bd12ae1dd -Author: Nick Mathewson -Date: Wed May 26 12:58:02 2010 -0400 - - Let evhttp_send_error infer the right error reasons - -commit 06bd05634d2f1d098b81859c7b7309a5a4b4a746 -Author: Felix Nawothnig -Date: Wed May 26 12:50:59 2010 -0400 - - Fix the default HTTP error template - - The current template... - - %s - -

Method Not Implemented

- Invalid method in request

- - - is highly confusing. The given title is easily overlooked and the - hard-coded content is just plain wrong in most cases (I really read - this as "the server did not understand the requested HTTP method) - - This patch changes the template to include the error reason in the - body as well as in the header, and to infer the proper reason from - the status code whenever the reason argument is NULL. - - This patch also removes a redundant evhttp_add_header from - evhttp_send_error; evhttp_send_page already adds a "Connection: - close" header. - -commit 3689bd2d497d8af224532282c263581ea47b6db5 -Author: Nick Mathewson -Date: Wed May 26 13:32:32 2010 -0400 - - Have the unit tests report errors from test.sh - - The default behavior of test.sh was to suppress all output from - test/regress, and say nothing but OKAY or FAILED. This wasn't so good - for getting bugs reported, since lots of people didn't know to set - TEST_OUTPUT_FILE, or re-run ./test/regress on its own. - - Now, when you don't specify an output file for test.sh, it runs - regress with the --quiet option. This option makes the unit tests - only print output on failure, which is what we probably wanted. - -commit faf2a04fa5e4c44a356d635502cc7e2dbead34d3 -Author: Nick Mathewson -Date: Wed May 26 13:31:41 2010 -0400 - - Make test.sh exit with nonzero status if tests fail - - This behavior makes "make verify" actually fail when the tests fail, - which is what it's supposed to do. - -commit 8bc1e3d6d109c4f72b2c3962e721c0b9399fb855 -Author: Nick Mathewson -Date: Wed May 26 13:19:08 2010 -0400 - - Remove all non-error prints from test/regress.c - - Now, running ./test/regress --quiet will indeed only inform you - about errors. Previously, it would also spew extra output. - -commit e73f1d792a1c3e8e97a0339fbc20c062c880669a -Author: Nick Mathewson -Date: Wed May 26 13:18:30 2010 -0400 - - Remove the now-obsolete setup_test() and cleanup_test() functions - -commit 899b0a39abdac0af5be956c160b176392c5e6233 -Author: Nick Mathewson -Date: Mon May 24 15:24:03 2010 -0400 - - Use generic win32 interfaces, not ASCII-only ones, where possible. - -commit 4ff247b293c98bae4dc1576f3e9631554cfeb00a -Merge: 47c5dfb b14f151 -Author: Nick Mathewson -Date: Wed May 19 10:49:49 2010 -0400 - - Merge branch 'evdns_no_empty_handles' - -commit 47c5dfbea9b84e41f4b1579fe245307d3a7fc5a4 -Author: Nick Mathewson -Date: Tue May 18 17:28:51 2010 -0400 - - Remove some dead assignments - -commit b14f151b42ca9fddd52bee7c323e1217b28ae8af -Author: Nick Mathewson -Date: Tue May 18 17:27:06 2010 -0400 - - If no evdns request can be launched, return NULL, not a handle - - Some of our evdns code was willing to return an evdns_request with - handle->current_req set to NULL. Really, those cases should just - return NULL. - -commit d14bb926b42a91a1ac48c10b41cfe3a96e8408b9 -Author: Nick Mathewson -Date: Tue May 18 14:05:01 2010 -0400 - - Use -Wlogical-op on gcc 4.5 or higher - - It exposed one bug for us (see 8c3452bcb294e07888), and might - prevent more. - -commit 8c3452bcb294e07888f9044030d5e93825537c08 -Author: Nick Mathewson -Date: Tue May 18 13:55:32 2010 -0400 - - Correctly recognize .255 addresses as link-local when looking for interfaces - -commit bda21e7ff96dafd679f8308eed5fa9c7e83a2d93 -Author: Nick Mathewson -Date: Mon May 17 11:58:07 2010 -0400 - - Avoid close of uninitialized socket in evbuffer unit test - - Attempts to fix a crash bug found by Brodie Thiesfield. - -commit caca2f451c3ecc97745f578bae9b4ad40145d84d -Author: Nick Mathewson -Date: Fri May 14 14:36:49 2010 -0400 - - Replace (safe) use of strcpy with memcpy to appease OpenBSD - - If Libevent uses strcpy, even safely, it seems OpenBSD's linker will - complain every time a library links Libevent. It's easier just not to - use the old thing, even when it's safe to do so. - -commit 75701e897b7a077beb57d49cc1b13df84ec23fb9 -Author: Nick Mathewson -Date: Fri May 14 14:30:09 2010 -0400 - - Add some missing includes to fix Linux build again - -commit b5bfc44d6bf97f404e47217a38b80bf75338d6e7 -Author: Nick Mathewson -Date: Thu May 13 15:38:39 2010 -0400 - - Make test-ratelim clean up after itself better. - -commit 6d195109eb4c7233486fefe7cef834e912f610ec -Author: Nick Mathewson -Date: Thu May 13 14:59:33 2010 -0400 - - Avoid event_del on uninitialized event in event_base_free - - This was mostly harmless, since the event was cleared with calloc, but - still it's not a correct thing to do. - -commit 2b44dccaaf632794b22e8e0e3e407702b1719851 -Author: Nick Mathewson -Date: Thu May 13 12:01:30 2010 -0400 - - Add options to test-ratelim.c to check its results - - The new options let you specify a maximum deviation of bandwidth used - from expected bandwidth used, and make test-ratelim.c exit with a - nonzero status when those deviations are violated. - - This patch also adds a test-ratelim.sh script to run test-ratelim with - a few sensible options for testing. - -commit 218a3c372c9eb0fab8325833342fa7e8e0ce8e86 -Author: Nick Mathewson -Date: Thu May 13 11:24:07 2010 -0400 - - Do not check that event_base is set in EVBASE_ACQUIRE_LOCK - - In every place that we call EVBASE_ACQUIRE_LOCK, the base is either - set, or must be set, so the test is redundant. - -commit fdfc3fc502bf04b2cedf0b9a812e52af315e32b7 -Author: Nick Mathewson -Date: Thu May 13 11:23:12 2010 -0400 - - Remove the now-unusable EVTHREAD_LOCK/UNLOCK constants - -commit 33bbbed9dde90b68d3bf88dca1f21b557425db4b -Author: Nick Mathewson -Date: Thu May 13 10:57:30 2010 -0400 - - Mark the event_err() functions as __attribute__((noreturn)) - - This attribute tells gcc (and anything else that understands gcc - attributes) that the functions will never return control, and helps - the optimizer a little. With luck, it will also tell - less-than-full-program dataflow analysis tools that they don't need to - worry about any code path that involves calling one of these functions - and then returning. - - This patch also forces event_exit() to always exit, no matter what the - user-supplied fatal_callback does. This means that the old unit tests - for the event_err* functions don't work any more, since they assume it - is safe to call event_err* if you've given it a bogus fatal_callback - that doesn't exit. Instead, we have to make the unit tests fork - before calling event_err(), and have the main unit test process wait - for the event_err() test to exit with a sane exit code. On unix, - that's trivial. On windows, let's not bother and just assume that - event_err* works. - -commit dfb75ab207f105c780a9819414c78f235548773d -Author: Nick Mathewson -Date: Wed May 12 15:38:28 2010 -0400 - - Test the unlocked-deferred callback case of bufferevents - -commit c5bab56002bd2cdbfe4687b80a6abf5397786d76 -Author: Nick Mathewson -Date: Tue May 11 11:44:07 2010 -0400 - - Remove the obsolete evthread interfaces - - These were added in 2.0.1, and deprecated in 2.0.4 and 2.0.5; we've - promised that they would be removed, and warned whenever they were - invoked. Users should call evthread_set_lock_callbacks instead... or - ideally just call evthread_use_windows_threads or - evthread_use_pthreads. - -commit 9cb5bc86a9a03a1fb81764ae5fcd54e98772c767 -Author: Nick Mathewson -Date: Mon May 10 14:51:32 2010 -0400 - - Bump version to 2.0.5-beta-dev - -commit ad9b7f153d4774c444793f335990983b47b68811 -Author: Nick Mathewson -Date: Sun May 9 00:22:08 2010 -0400 - - Increment version numbers for 2.0.5-beta - -commit f6aaf176d26e57d1640ed4308e91cf0ce046fea7 -Author: Nick Mathewson -Date: Sun May 9 00:16:35 2010 -0400 - - Add a changelog for 2.0.5-beta - -commit 7c519dfd4fc62493d4ed07f77f9aa4a7bb472cd6 -Author: Nick Mathewson -Date: Sat May 8 23:29:29 2010 -0400 - - Fix some autoconf issues on OpenBSD - - Issue 1: autoconf gets accept when a header works properly with cpp - but not with cc. This was true of the sys/sysctl.h header on - openbsd. The fix: include sys/param.h (if present) when testing for - sys/sysctl.h - - Issue 2: Somehow, autoconf's macro generation code is messed up on - some versions of openbsd (including mine, and other people's too) so - that instead of SIZEOF_VOID_P, it makes SIZEOF_VOID__. - evutil/util.h now works around that. - -commit c1cd32a156b75fa692471def021261126df33f88 -Author: Nick Mathewson -Date: Sat May 8 22:21:52 2010 -0400 - - Define _REENTRANT as needed on Solaris, elsewhere - - It turns out that _REENTRANT isn't only needed to make certain - functions visible; we also need it to make pthreads work properly - some places (like Solaris, where forgetting _REENTRANT basically - means that all threads are sharing the same errno). Fortunately, - our ACX_PTHREAD() configure macro already gives us a PTHREAD_CFLAG - variable, so all we have to do is use it. - -commit 3d9e05b17498c8b982a8d34031341fbe9b6dbb0e -Author: Nick Mathewson -Date: Sat May 8 19:56:25 2010 -0400 - - Fix test.sh on freebsd - - It turns out that in all conformant shells, "unset FOO" removes FOO - both from the shell's variables and from the exported environment. - (I've tested this on msys, opensolaris, linux, osx, and freebsd.) - - And in nearly every shell I can find, "unset FOO; export FOO" does - the same as unset FOO... except in my FreeBSD VM, where the "export - FOO" sets the exported value of FOO equal to "". This broke test.sh - for us. - - The fix is simple: remove the needless exports! - -commit 0ee6f6ce805570576755142d28022c27446e27cc -Author: Nick Mathewson -Date: Sat May 8 18:00:26 2010 -0400 - - Make test.sh support mingw/msys on win32 - - This required: - - Adding another WIN32 section in test.sh - - not running "touch /dev/null" - - calling WSAStartup in all the test binaries - - Fixing a dumb windows-only bug in test-time.c - -commit 935e1504b1bb090119c4b9b42f3b34141290523c -Author: Nick Mathewson -Date: Sat May 8 19:36:05 2010 -0400 - - Fix whitespace in evutil.c - -commit 35570716988ba70f28f9580818903437b6409bcb -Author: Nick Mathewson -Date: Sat May 8 19:16:47 2010 -0400 - - Fix another nasty solaris getaddrinfo() behavior - - Everybody else thinks that when you getaddrinfo() on an ip address - and don't specify the protocol and the socktype, it should give you - multiple answers , one for each protocol/socktype implementation. - - OpenSolaris takes a funny view of RFC3493, and leaves the results set - to 0. - - This patch post-processes the getaddrinfo() results for consistency. - -commit 2cf2a286e42356601514d754acbcefc3cf0b23ad -Author: Nick Mathewson -Date: Wed Apr 21 11:57:55 2010 -0400 - - Fix getaddrinfo with protocol unset on Solaris 9. Found by Dagobert Michelsen - - Apparently when you call Solaris 9's getaddrinfo(), it likes to leave - ai_protocol unset in the result. This is no way to behave, if I'm - reading RFC3493 right. - - This patch makes us check for a getaddrinfo() that's broken in this way, - and work around it by trying to infer socktype and protocol from one - another. - - Partial bugfix for 2987542 - -commit c44de06c766906a7d90f5dcb99877caafad241af -Author: Nick Mathewson -Date: Sat May 8 18:09:27 2010 -0400 - - Numerous opensolaris compilation fixes - - For future note, opensolaris doesn't have sys/sysctl.h, doesn't like - comparing iov_buf to a chain_space_ptr without a cast, and is (predictably) - unforgiving of dumb syntax errors. - - Also, we had accidentally broken the devpoll backend test in configure.in - -commit f89168e7eafb40bc68e17b8fa3323c23343e400a -Author: Nick Mathewson -Date: Sat May 8 19:11:50 2010 -0400 - - Make test for bufferevent_connect_hostname system-neutral - - Previously, the be5_outcome field for the dns error would be set to - something dependent on our system resolver. It turns out that you - can't rely on nameservers to really give you an NEXIST answer for - xyz.example.com nowadays: too many of them are annoyingly broken and - like to redirect you to their locked-in portals. This patch changes - the bufferevent_connect_hostname test so that it makes sure that the - dns_error of be5_outcome is "whatever you would get from resolving - the target hostname" - -commit 88a543fc190c7c3f339e0650b833adfe81caa12e -Author: Nick Mathewson -Date: Sat May 8 19:09:09 2010 -0400 - - Make unit test for add_file able to tell "error" from "done" - - Importantly, we don't actually want to call evbuffer_write() when - the buffer is empty. This makes it an error to ever get a -1 return - value from evbuffer_add_file(), which makes it safe for us to test - the return value. - -commit 384d124581e929e4a9765a8ad16c0edddc0efc2e -Author: Nick Mathewson -Date: Sat May 8 17:15:52 2010 -0400 - - Fix bench_http build on win32. - -commit 05de45d63fa79bb495f9cee5eae707c57f26eb78 -Author: Nick Mathewson -Date: Sat May 8 16:47:07 2010 -0400 - - add more (currently skipped) add_file tests on win32 - -commit ad811cdc2b33c0fc72fdd3ae684a5c3763033d90 -Author: Nick Mathewson -Date: Sat May 8 16:41:01 2010 -0400 - - Fix unused-variable warning when building with threads disabled - -commit dcdae6b743b1cfc2dceff0b95b3236dd83742f61 -Author: Nick Mathewson -Date: Sat May 8 16:34:18 2010 -0400 - - Make evbuffer_add_file() work on windows - - Right now only the add_file() mode is supported, when it would be - nicer to have mmap support. Perhaps for Libevent 2.1.x. - -commit b4f12a17aaa6e9badb25409e59cd32d0c549dbb7 -Author: Nick Mathewson -Date: Sat May 8 14:49:59 2010 -0400 - - Implement regress_make_tempfile on win32 to test evbuffer_add_file - - (Conclusion: evbuffer_add_file is broken on win32, since it - uses recv on a file.) - -commit 90d4225137d00bc58eeee82f1a5fa4272dc17bd1 -Author: Nick Mathewson -Date: Sat May 8 15:31:54 2010 -0400 - - Fix some crazy macro mistakes in arc4random.c - -commit f37cd4c227397bfbc8c0b635417f0bf85d7ded33 -Author: Nick Mathewson -Date: Wed Apr 21 12:25:29 2010 -0400 - - Detect broken unsetenv at unit-test runtime - - If we have an unsetenv function that doesn't work, we can't run the - main/base_environ unit test, so we should skip it. - -commit fdc629736e1cedb7bb4ab201e49cb1638c69888e -Author: Nick Mathewson -Date: Thu May 6 14:37:23 2010 -0400 - - Only add libevent_core.la to LIBADD on mingw - - Chris Davis reports that this is also necessary to fix building with - shared libraries on OSX for him. Should fix bug 2997775. - - There is probably a better fix for the issues solved by commit - 3cbca8661f, but for now, we're trying to get a beta out the door. - -commit 25433b96dc071b6b53914b069fd6525a19b839ac -Author: Nick Mathewson -Date: Thu May 6 14:37:23 2010 -0400 - - Only specify -no-undefined on mingw - - It turns out that commit 3cbca8661f broke building with shared - libraries on OSX. Since -no-undefined is only necessary on platforms - like win32, only use it there. - - There may be a better fix for this. Should fix bug 2997775. - -commit a62c8433407c5c6d762394a3395470e34fb20f49 -Merge: 7731ec8 0ef4070 -Author: Nick Mathewson -Date: Thu May 6 14:16:50 2010 -0400 - - Merge commit 'chrisd/connect-hostname-report-err' - -commit 7731ec882833e3ca660db3875a61432058495a02 -Author: Nick Mathewson -Date: Thu May 6 13:26:05 2010 -0400 - - Stop distributing and installing manpages: they were too inaccurate - - It would be great to have the manpages come back some time, perhaps - from a refactoring of my asciidoc book, but for now the existing - manpages were the single worst, most incomplete, and most misleading - libevent documentation we had. (Less misleading: the doxygen output, - the header files, and my reference book.) - -commit c16e68448c546c99d3c0d1a1447214a55e137b35 -Author: Nick Mathewson -Date: Tue May 4 13:27:36 2010 -0400 - - Rename current_base symbol to event_global_current_base_ - - The "current_base" symbol was never actually declared in an exported - header; it's hideously deprecated, and it was the one remaining - exported symbol (fwict) that was prefixed with neither ev nor - bufferevent nor _ev nor _bufferevent. - - codesearch.google.com turns up no actual attempts to use our - current_base from outside libevent. - -commit 99e50e90bd2a03638f9bef11dae12d9951b0c793 -Author: Nick Mathewson -Date: Tue May 4 12:57:40 2010 -0400 - - Fix symbol conflict between mm_*() macros and libmm - - Our mm_malloc, mm_calloc, etc functions were all exported, since C - hasn't got a nice portable way to say "we want to use this function - inside our library but not export it to others". But they apparently - conflict with anything else that calls its symbols mm_*, as libmm does. - - This patch renames the mm_*() functions to event_mm_*_(, and defines - maros in mm_internal so that all the code we have that uses mm_*() - will still work. New code should also prefer the mm_*() macro names. - - Reported by Gernot Tenchio. Fixes sf bug 2996541 - -commit 20fda296c5faada095c7122244ecd6beff1c0931 -Author: Nick Mathewson -Date: Mon May 3 13:00:00 2010 -0400 - - Try /proc on Linux as entropy fallback; use sysctl as last resort - - It turns out that the happy fun Linux kernel is deprecating sysctl, - and using sysctl to fetch entropy will spew messages in the kernel - logs. Let's not do that. Instead, let's call sysctl for our - entropy only when all other means fail. - - Additionally, let's add another means, and try - /proc/sys/kernel/random/uuid if /dev/urandom fails. - -commit 71afc525804f416cfaabf4ec253f725fe3ec6822 -Author: Frank Denis -Date: Mon May 3 11:37:16 2010 -0400 - - Fix nonstandard TAILQ_FOREACH_REVERSE() definition - - Every current BSD system providing TAILQ_* macros define - TAILQ_FOREACH_REVERSE in this order: - - TAILQ_FOREACH_REVERSE(var, head, field, headname) - - However, libevent defines it in another order: - - TAILQ_FOREACH_REVERSE(var, head, headname, field) - - Here's a trivial patch to have libevent compatible with stock queue.h headers. - - -Frank. - - [From sourceforge patch 2995179. codesearch.google.com confirms that - the only people defining TAILQ_FOREACH_REVERSE our way are people - using it in a compatibility header like us. Did we copy this from - OpenSSH or something?] - - -Nick - -commit 953e2290fc9a649c465d5bcc7b26bdb0d5693c3b -Author: Frank Denis -Date: Mon May 3 11:29:22 2010 -0400 - - Refuse null keys in evhttp_parse_query() - - evhttp_parse_query() currently accepts empty keys, that don't make any - sense. - - -Frank - - [From sourceforge patch 2995183] - -Nick - -commit bd1ed5f3c5015999c91a33bd5d7ed69b8b7b81d5 -Author: Sebastian Hahn -Date: Sun May 2 12:51:35 2010 +0200 - - Fix a compile warning introduced in 739e688 - -commit 739e6882757a0b6b398f95859da4720ca60269c8 -Author: Pierre Phaneuf -Date: Wed Apr 28 21:33:13 2010 -0700 - - Allow empty reason line in HTTP status - -commit 50ec59f4a6aa662fd80e070b9efd795e627b8d59 -Author: Nick Mathewson -Date: Wed Apr 28 15:16:32 2010 -0400 - - Remove redundant checks for lock!=NULL before calling EVLOCK_LOCK - - The EVLOCK_LOCK and EVLOCK_UNLOCK macros already check to make sure - that the lock is present before messing with it, so there's no point - in checking the lock before calling them. - - A good compiler should be able to simplify code like - if (lock) { - if (lock) - acquire(lock); - } - , but why count on it? - -commit 40c301b76c81257fdf1275eb4cc618b1124391a7 -Author: Nick Mathewson -Date: Wed Apr 28 14:56:51 2010 -0400 - - Fix compilation when openssl support is disabled - - Previously, we'd fail if OpenSSL was present but openssl support was - disabled. Now we don't. - -commit 9ecf0d486dbfaba16451676ab3ecefa631d63e6a -Author: Nick Mathewson -Date: Wed Apr 28 12:03:08 2010 -0400 - - Catch attempts to enable debug_mode too late - - Debug mode needs to be enabled before any event is setup or any - event_base is created. Otherwise, we will not have recorded when events - were first setup or added, and so it will look like a bug later when we - delete or free them. - - I have already confused myself because of this requirement, so let's - make Libevent catch it for the next poor forgetful developer like me. - -commit cb6707405cc07e34925e9c9f81a0c4d34ef9b135 -Author: Nick Mathewson -Date: Wed Apr 28 11:51:56 2010 -0400 - - Make debug mode catch mixed ET and non-ET events on an fd - - Of the backends that support edge-triggered IO, most (all?) do not - support attempts to mix edge-triggered and level-triggered IO on the - same FD. With debugging mode enabled, we now detect and refuse attempts - to add a level-triggered IO event to an fd that already has an - edge-triggered IO event, and vice versa. - -commit a5208fe4228b0e2c77d43dd2e3991f2fbac9148a -Author: Joachim Bauch -Date: Tue Apr 27 13:42:26 2010 -0400 - - Release locks on bufferevents while executing callbacks - - This fixes a dead lock for me where bufferevents in different event - loops use each other and access their input/output buffers (proxy-like - scenario). - -commit 0ef407065e5fb98f704b426d1d4fc878a85a391d -Author: Christopher Davis -Date: Sat Apr 24 00:06:38 2010 -0700 - - Report DNS error when lookup fails during bufferevent_socket_connect_hostname. - -commit 25c442e5825d7ca468b61926c729b2766c75442b -Merge: 601a3ff f6ab2a2 -Author: Nick Mathewson -Date: Sat Apr 24 00:15:15 2010 -0400 - - Merge branch 'rpc_leaks' - -commit 601a3ff98c0152a740aa6710bad1c4443960d35d -Merge: 96730d3 a47a4b7 -Author: Nick Mathewson -Date: Sat Apr 24 00:01:31 2010 -0400 - - Merge branch 'arc4seed' - -commit f6ab2a2811477547347b395789c0340c38603944 -Author: Nick Mathewson -Date: Fri Apr 23 23:55:30 2010 -0400 - - Fix a memory leak when unmarshalling RPC object arrays - - The old code would use type_var_add() for its side-effect of expanding the - array, then leak the new object that was added to the array. - - The new code adds a static function to handle the array resizing. - -commit 94ee1251cb0984ca2683c682dda0bb4ab8148508 -Author: Nick Mathewson -Date: Fri Apr 23 23:55:03 2010 -0400 - - fix a leak when unpausing evrpc requests - -commit 96730d319134f2754533ebf7e9a9bd4c0e0acdca -Author: Nick Mathewson -Date: Fri Apr 23 23:13:26 2010 -0400 - - Make http_base_test stop leaking an event_base. - -commit d49b92a8358c42d9fe7208571e9ef0cee9b045a8 -Author: Nick Mathewson -Date: Fri Apr 23 23:04:20 2010 -0400 - - Remove one last bug in last_with_datap logic. Found with valgrind - -commit 9d8edf2ff5882aff3c85f2fa6b5eeaf05ef8c9b4 -Author: Niels Provos -Date: Fri Apr 23 18:59:22 2010 -0700 - - do not leak the request object on persistent connections - -commit a47a4b7e7e52ad8722771c36c4bc147f679c88d1 -Author: Nick Mathewson -Date: Fri Apr 23 16:08:09 2010 -0400 - - Fix a couple of bugs in the BSD sysctl arc4seed logic - - Of course, FreeBSD has its own arc4random() implementation, so this should - never actually be needed. Still, it's good to paint the underside of the - wagon. - -commit a5bf43abb0671ee2ceac7b38cbe36424f621934a -Author: Nick Mathewson -Date: Thu Mar 4 01:14:32 2010 -0500 - - Document evutil_secure_rng_init() and evutil_secure_rng_add_bytes() - -commit f9807167075aacc512ad7bca007064449eee93d9 -Author: Nick Mathewson -Date: Fri Apr 23 15:17:10 2010 -0400 - - Make evutil_secure_rng_init() work even with builtin arc4random - -commit 71fc3eb08b9acd359ba61b31059bf4220808a03b -Author: Nick Mathewson -Date: Thu Mar 4 01:13:51 2010 -0500 - - Seed the RNG using sysctl() as well as /dev/urandom - - William Ahern points out that if the user has chrooted, they might not - have a working /dev/urandom. Linux and many of the BSDs, however, - define a sysctl interface to their kernel random number generators. - - This patch takes a belt-and-suspenders approach and tries to do use the - sysctl _and_ the /dev/urandom approach if both are present. When using - the sysctl approach, it tries to bulletproof itself by checking to make - sure that the buffers are actually set by the sysctl calls. - -commit b1c795007fd6db4655a66ee2dfb306803a43fc1e -Author: Nick Mathewson -Date: Fri Apr 23 14:42:25 2010 -0400 - - Make evdns logging threadsafe - - The old logging code was littered with places where we stored messages in - static char[] fields. This is fine in a single-threaded program, but if you - ever tried to log evdns messages from two threads at once, you'd hit a race. - - This patch also refactors evdns's debug_ntop function into a more useful - evutil_sockaddr_port_format() function, with unit tests. - -commit ceefbe87303c8c96dc809ad8afc736f2dbaa194a -Author: Nick Mathewson -Date: Fri Apr 23 14:04:03 2010 -0400 - - Add a comment to explain why evdns_request is now separte from request - -commit 39b870b8a0a40a63851c37b8854399ba370ed2b1 -Author: Christopher Davis -Date: Thu Apr 22 21:49:05 2010 -0700 - - Add dns/search_cancel unit test. - -commit 67072f3c3bf362654e2069bd468045a3d354190c -Author: Christopher Davis -Date: Thu Apr 22 21:46:05 2010 -0700 - - Assert for valid requests as necessary. - - A valid request has an associated handle, and the handle must point - to the request. - -commit a62584000af5b2563ee98596f174a3a36c1ae6c1 -Author: Christopher Davis -Date: Wed Apr 21 22:20:10 2010 -0700 - - Free search state when finished searching to avoid an infinite loop. - -commit beaa14a46f5db71d890c3aa9326eb223ff176bdf -Author: Christopher Davis -Date: Wed Apr 21 22:01:59 2010 -0700 - - Move domain search state to evdns_request. - - It doesn't seem to make sense to copy the state to each new request - in the search. - -commit 15bb82d690ae0a5df0625b83addcd18d9246afab -Author: Christopher Davis -Date: Wed Apr 21 21:21:21 2010 -0700 - - Ensure that evdns_request is a persistent handle. - - When searching is enabled, evdns may make multiple requests before - calling the user callback with the result. This is a problem because - the same evdns_request handle is not retained for each search request, - so the user cannot reliably cancel the request. - - This patch attempts to ensure that evdns_request persists accross - search requests. - -commit b84b598eae8293dc02bf91cfb4f1cde9516f2fe0 -Author: Gilad Benjamini -Date: Wed Apr 21 01:15:19 2010 -0400 - - Clean up properly when adding a signal handler fails. - - Previously, when a signation() or signal() call failed, we would free - the element we added to sh_old, but not actually clear the pointer. - This would leave a dangling pointer in sh_old that could cause a - crash later. - -commit 899c1dcc9807650ec90e0d5c847d2997fce9b751 -Author: Sebastian Sjöberg -Date: Wed Apr 14 15:42:57 2010 -0400 - - Replace EVUTIL_CLOSESOCKET macro with a function - - The EVUTIL_CLOSESOCKET() macro required you to include unistd.h in your - source for POSIX. We might as well turn it into a function: an extra - function call is going to be cheap in comparison with the system call. - - We retain the EVUTIL_CLOSESOCKET() macro as an alias for the new - evutil_closesocket() function. - - (commit message from email by Nick and Sebastian) - -commit 0861d1708ba6d035ff4c834e2aac0b5855f64afa -Author: Nick Mathewson -Date: Wed Apr 14 14:41:03 2010 -0400 - - Add ctags/etags files to .gitignore - -commit 755fbf16c3ce94bfa09e1bf5da27ccdfc1e7e725 -Author: Shuo Chen -Date: Wed Apr 14 14:27:29 2010 -0400 - - Add void* arguments to request_new and reply_new evrpc hooks - - This makes evprc setup more extensible, and helps with Shuo Chen's - work on implementing Google protocol buffers rpc on top of Libevent 2 - evrpc. - - This patch breaks binary compatibility with previous versions of - Libevent, since it changes struct evrpc and the signature of - evrpc_register_generic(). Since all compliant code should be calling - evrpc_register_generic via EVRPC_REGISTER, it shouldn't break source - compatibility. - - (Code by Shuo Chen; commit message by Nick) - -commit 07edf784fab4e25c31eef3fdcccec3975e2741db -Author: Shuo Chen -Date: Wed Apr 14 14:23:03 2010 -0400 - - Expose the request and reply members of rpc_req_generic() - - This code adds two accessor functions to evprc, and helps integrate - evrpc with Google protocol buffers. - - (Code by Shuo Chen; commit message by nickm) - -commit a0983b67f9d077d59739ed7111cafdd81dd95876 -Author: Nick Mathewson -Date: Wed Apr 14 00:36:09 2010 -0400 - - Initialize last_with_datap correctly in evbuffer_overlapped - - Fixes bug 2985406 - -commit 3cbca8661f2ad267ca890304a3dc5acefb8ba630 -Author: Giuseppe Scrivano -Date: Mon Apr 12 12:52:31 2010 +0200 - - Create shared libraries under Windows - -commit 10c4c9045032c822463cd48caa46bd3254883057 -Author: Giuseppe Scrivano -Date: Mon Apr 12 12:50:17 2010 +0200 - - Do not inhibit automake dependencies generation - - It fixes make parallel builds. - -commit d469c503c57df97f3744070ed96950b0990b6124 -Author: Giuseppe Scrivano -Date: Mon Apr 12 12:18:57 2010 +0200 - - Fix compiler warnings under WIN32 - -commit ab30e553c40b41e124474208a9315763c87c2e2e -Merge: fd90274 eb86c8c -Author: Nick Mathewson -Date: Tue Apr 13 01:46:29 2010 -0400 - - Merge branch 'evbuffer_copyout' - -commit eb86c8c5ffc43a4e52881a20132eb03c3f9da283 -Author: Nick Mathewson -Date: Mon Apr 12 22:24:54 2010 -0400 - - Add evbuffer_copyout to copy data from an evbuffer without draining - - The evbuffer_remove() function copies data from the front of an - evbuffer into an array of char, and removes the data from the buffer. - This function behaves the same, but does not remove the data. This - behavior can be handy for lots of protocols, where you want the - evbuffer to accumulate data until a complete record has arrived. - - Lots of people have asked for a function more or less like this, and - though it isn't too hard to code one from evbuffer_peek(), it is - apparently annoying to do it in every app you write. The - evbuffer_peek() function is significantly faster, but it requires that - the user be able to handle data in separate extents. - - This patch also reimplements evbufer_remove() as evbuffer_copyout() - followed by evbuffer_drain(). I am reasonably confident that this - won't be a performance hit: the memcpy() overhead should dominate the - cost of walking the list an extra time. - -commit fd902740568c93a2bcf3c27584af9f7d59ff88ce -Merge: 819f949 8f9e60c -Author: Christopher Davis -Date: Sat Apr 10 11:26:53 2010 -0700 - - Merge branch 'safetimevalms' - -commit 8f9e60c825768c6dbc22fb6a2874b1f47cb34287 -Author: Christopher Davis -Date: Fri Apr 9 19:16:09 2010 -0700 - - Always round up when there's a fractional number of msecs. - -commit 819f949f4ab61c4c5add40105d299e73c190e94f -Author: Nick Mathewson -Date: Fri Apr 9 19:16:49 2010 -0400 - - Limit the maximum number of events on each socket to 65535 - - This lets us use less RAM for the evmap_io structure, which in turn - can let us have fewer cache misses for evmap operations. - -commit 99210dd9e0f6c2dfbd53c65854bd317cf13054be -Merge: 1234b95 c247adc -Author: Nick Mathewson -Date: Fri Apr 9 19:14:25 2010 -0400 - - Merge branch 'comment' - -commit c247adc79c483638890f8150edf2c3213a32c20e -Author: Nick Mathewson -Date: Fri Apr 9 13:32:08 2010 -0400 - - Add a few more evmap/changelist comments - -commit 1234b95a7593750a248f63af969dcb32def40709 -Author: Nick Mathewson -Date: Fri Apr 9 17:19:39 2010 -0400 - - Test another case of evbuffer_prepend - -commit 8c83e9957907be7f33529a9f0913690520436091 -Author: Nick Mathewson -Date: Fri Apr 9 16:40:53 2010 -0400 - - Add more unit tests for evbuffer_expand - -commit 06a4443abed28d3e0e9e27bcb99cf3191c0d3674 -Author: Nick Mathewson -Date: Fri Apr 9 15:28:26 2010 -0400 - - Unit-test every evbuffer_add_file() implementation. - - Previously, we'd only test the default one, even if the others were still - compiled in. - -commit 28bfed47e289b21e32390411a1a9ea8e057b0e10 -Author: Christopher Davis -Date: Fri Apr 2 19:08:32 2010 -0400 - - Clean up a mistake in pointer manipulation in evbuffer_remove - -commit 850c3ff232659125262bb5e30bef8451fac386bf -Author: Christopher Davis -Date: Wed Mar 31 20:30:55 2010 -0700 - - Add evutil_tv_to_msec for safe conversion of timevals to milliseconds. - - This is useful for backends that require their timeout values be in - milliseconds. - -commit d5ebcf370debb006964814e0529e73736dcad93b -Author: Nick Mathewson -Date: Tue Mar 30 16:47:37 2010 -0400 - - Rewrite evbuffer_expand and its users - - The previous evbuffer_expand was not only incorrect; it was - inefficient too. On all questions of time vs memory tradeoffs, it - chose to burn time in order to avoid wasting memory. The new code - tries to be a little more balanced: it only resizes an existing chain - when doing so doesn't require too much copying, and when failing to do - so would waste a lot of the chain's space. - - This patch also rewrites evbuffer_chain_insert to work properly with - last_with_datap, and adds a few convenience functions to buffer.c. - -commit 45068a312c0c2c6c4e9a144a837fd2f9d5310840 -Author: Nick Mathewson -Date: Wed Mar 31 12:03:43 2010 -0400 - - Fix a memory leak when appending/prepending to a buffer with unused space. - -commit 8e227b04da54b7c4a029a2c9d335c582da4a5dcc -Author: Nick Mathewson -Date: Sat Mar 27 00:09:25 2010 -0400 - - Make the no_iovecs case of write_atmost compile - - Apparently nobody had tested it before on a system that had sendfile. - Why would you have sendfile and not writev? Perhaps you're trying to - test the no-iovecs code to make sure it still works. - -commit 96865c47834f0397a46a38ad992f35167cf12796 -Author: Nick Mathewson -Date: Tue Mar 30 12:48:56 2010 -0400 - - Turn the increasingly complex *_CHAIN() macros into functions - -commit b7442f8e8354b09f66d0110f2c5c970373a730cb -Author: Nick Mathewson -Date: Fri Mar 26 23:18:40 2010 -0400 - - Replace last_with_data with a slightly smarter version - - To implement evbuffer_expand() properly, you need to be able to - replace the last chunk that has data, which means that we need to keep - track of the the next pointer pointing to the last_with_data chunk, - not the last_with_data chunk itself. - -commit cda56abf194eb70f00c8e6ce95ec31f226048f9f -Author: Nick Mathewson -Date: Wed Mar 31 12:29:26 2010 -0400 - - Fix critical bug in evbuffer_write when writev is not available - - evbuffer_pullup() returns NULL if you try to pull up more bytes than - are there. But evbuffer_write_atmost would sometimes ask for more - bytes to be pulled up than it had, get a NULL, and fail. - -commit c87272b7b91b4f443092eb2a81f03c83457ab03a -Author: Nick Mathewson -Date: Fri Mar 26 14:51:39 2010 -0400 - - Make evbuffer_prepend handle empty buffers better - - If the first chunk of a buffer is empty, and we're told to prepend to - the buffer, we should be willing to use the entire first chunk. - Instead, we were dependent on the value of chunk->misalign. - -commit 5c0ebb33f4a646919267fbca11c36eba24003561 -Author: Nick Mathewson -Date: Fri Mar 26 14:50:45 2010 -0400 - - Do not use evbuffer_expand() to add the first chain to a buffer - - (It's a big function, and using it this way is overkill.) - -commit 2014ae4ac630d727f23ca91dad5d0ebf56b694de -Author: Nick Mathewson -Date: Fri Mar 26 14:30:14 2010 -0400 - - Increase MIN_BUFFER_SIZE to 512 (1024 on 64-bit) - - This constant decides the smallest (and typical) size of each evbuffer - chain. Since this number includes sizeof(evbuffer_chain) overhead, - the old value (256) was just too low: on 64-bit platforms, it would - spend nearly 20% of the allocations on overhead. The new values mean - that we'll be spending closer to 5% of evbuffer allocations on overhead. - - It would be nice to get this number even lower if we can. - -commit 6f20492fa27f08524af25914c02bc72d357b4197 -Author: Nick Mathewson -Date: Fri Mar 26 14:20:10 2010 -0400 - - Fix a free(NULL) in minheap-internal.h - -commit a5276180b790fd3571a8e157c1fdd1a296421681 -Author: Nick Mathewson -Date: Fri Mar 26 13:56:01 2010 -0400 - - Fix minheap code to use replacement malloc functions - - minheap-internal.h still had an extra realloc and an extra free that - needed to be replaced with mm_realloc and mm_free(). - -commit 7204b916669f9b9ff0dae689088a5ab0344edebd -Author: Nick Mathewson -Date: Fri Mar 26 13:46:29 2010 -0400 - - Remove a needless min_heap_shift_up_() call - - Previously, every call to min_heap_shift_down_() would invoke - min_heap_shift_up_() at the end. This used to be necessary in the - first version of the minheap code, since min_heap_erase() would call - min_heap_shift_down_() unconditionally. But when patch 8b7a3b36763 - from Marko Kreen fixed min_heap_erase() to be more sensible, we left - the weird behavior of min_heap_shift_down_() in place. - - Fortunately, "cui" noticed this and reported it on Niels's blog. - -commit e1e703d2f5d35118e80be6a0e780682284ce8bc3 -Author: Patrick Galbraith -Date: Tue Mar 23 16:04:59 2010 -0400 - - Make evutil_signal_active() match declaration. - -commit 3eb044d0a9cdaa9bc6a8fc202f1725bd7eda5e0b -Author: Trond Norbye -Date: Tue Mar 23 13:27:10 2010 -0400 - - Never test for select() on windows - - On 64-bit windows, configure actually _finds_ select when it tests for - it, and due to the ordering of the io implementations in event.c it is - chosen over the win32select implementation. - - This modification skips the test for select on win32 (we don't want - that anyway, because Windows has its own), causing my windows box to - get the win32select implementation. - - (edited by Nick) - -commit 7960af51133b76dc2bd48bcf69bc2213fd354206 -Merge: 8398641 9eb2fd7 -Author: Nick Mathewson -Date: Mon Mar 22 13:37:39 2010 -0400 - - Merge branch 'build' - -commit 9eb2fd75becc336b6b9c38071ad4d4495bc83b9a -Author: Nick Mathewson -Date: Mon Mar 22 13:27:47 2010 -0400 - - Use dist_bin_SCRIPTS, not EXTRA_DIST, to distribute scripts - -commit 83986414b0de36923f32c2c3330db6cbf4b0455f -Author: Jardel Weyrich -Date: Fri Mar 12 06:04:56 2010 -0300 - - Fix infrequent memory leak in bufferevent_init_common(). - -commit b557b175c00dc462c1fce25f6e7dd67121d2c001 -Author: Nick Mathewson -Date: Sun Mar 21 13:28:48 2010 -0400 - - Detect and refuse reentrant event_base_loop() calls - - Calling event_base_loop on a base from inside a callback invoked by - that same base, or from two threads at once, has long been a way to - get exceedingly hard-to-diagnose errors. This patch adds code to - detect such reentrant invocatinos, and exit quickly with a warning - that should explain what went wrong. - -commit fb366c1d880e49a19c40c9d62cbd7cbef297c6e7 -Author: Nick Mathewson -Date: Sun Mar 21 13:16:31 2010 -0400 - - Functions to track the total bytes sent over a rate limit group. - -commit 33874b05286834b6ec690ee2ae22912691ec6d85 -Author: Nick Mathewson -Date: Tue Mar 16 13:37:15 2010 -0400 - - Make 'main/many_events' test 70 fds, not 64. - - This is mainly intended to ensure that we don't get hung up on - the 64-handle limit that lots of O(n) Windows functions (but FWICT - not select) like to enforce. - -commit 657d1b6d3f0f27484d368bca39f99c2c5da107b6 -Author: Nick Mathewson -Date: Sat Mar 13 01:06:57 2010 -0500 - - Set mem_offset for every bufferevent type - -commit 0cf1431e5d85411ac8174ffe3b802c6a37f6e3a8 -Author: Nick Mathewson -Date: Sat Mar 13 01:04:30 2010 -0500 - - Avoid an (untriggerable so far) crash bug in bufferevent_free() - - We were saying - mm_free(bufev - bufev->be_ops->mem_offset); - when we should have said - mm_free(((char*)bufev) - bufev->be_ops->mem_offset); - - In other words, if mem_offset had ever been nonzero, then instead of - backing up mem_offset bytes to find the thing we were supposed to free, we - would have backed up mem_offset*sizeof(struct bufferevent) bytes, and freed - something completely crazy. - - Spotted thanks to a conversation with Jardel Weyrich - -commit 274a7bd9a11fd25339c4b978a25367f6d5ff0238 -Author: Nick Mathewson -Date: Sat Mar 13 00:55:39 2010 -0500 - - Fix some memory leaks in the unit tests - - These don't matter except inasmuch as they give real memory leaks - a place to hide. - - Found with valgrind - -commit 859af6772c8ff929ec73b862bb3b64dc0e57bada -Author: Nick Mathewson -Date: Sat Mar 13 00:53:54 2010 -0500 - - Free evdns_base->req_heads on evdns_base_free - - It looks like when we moved from one big inflight-requests list to an - n-heads structure, we didn't make evdns_base_free() free the array of - heads. This patch should fix that. - - Found with valgrind - -commit 68dc742bf1adc6fb7033788a41520625c516bf48 -Author: Nick Mathewson -Date: Fri Mar 12 20:38:25 2010 -0500 - - Fix a write of uninitialized RAM in regression tests - - Not actually harmful, but not something we should be doing. - - Found by valgrind. - -commit b34abf3069bada10c15f09a0073052e32b686708 -Author: Nick Mathewson -Date: Fri Mar 12 18:36:18 2010 -0500 - - Do not close(-1) when freeing an uninitialized socket bufferevent - -commit 70a44b61bb574d4e550ef7a4f933b95efc1a5316 -Author: Nick Mathewson -Date: Fri Mar 12 18:35:15 2010 -0500 - - Avoid a spurious close(-1) on Linux - - On Linux, we use only one fd to do main-thread signaling (since we have - eventfd()), so we don't need to close th_notify_fd[1] as we would if we were - using a socketpair. - -commit 75018951ece71668b56ce688740a62f9d4db9277 -Author: Nick Mathewson -Date: Sat Mar 13 00:23:06 2010 -0500 - - Fix a possible double-free bug in SSL bufferevents with CLOSE_ON_FREE - - With CLOSE_ON_FREE set, we were telling the BIO to free the bufferevent when - it was closed, and also freeing it ourselves. - -commit 0d047c3f11b4639236816c8f7a166e233d88d10c -Author: Nick Mathewson -Date: Sat Mar 13 00:29:15 2010 -0500 - - Fix an obnoxious typo in the bufferevent_timeout_filter test - - We were using the same bufferevent as the child of two filtering parents, - orphaning another. This made one get freed twice, and the other not at all. - - Possible fix for bug 2963306 spotted by Doug Cuthbertson. - -commit f1bc125eb453af61cbb750652103532b77c271b0 -Author: Nick Mathewson -Date: Fri Mar 12 23:00:49 2010 -0500 - - Improve robustness for refcounting - - Document that we do intend to double-decref underlying bufferevents under - some circumstances. Check to make sure that we don't decref past 0. - -commit 77c917ded058a18480685a026622eef94ebb450e -Author: Nick Mathewson -Date: Fri Mar 12 14:37:54 2010 -0500 - - Give a better warning for bad automake versions. - - If you tried to build with automake-1.6 or earlier, we would - previously spit out pages and pages of garbage output. Now, automake - should just say "Hey, I'm not new enough for this." - -commit 0794b0d29c7485d10f8e752339b2ed58ffbb5be3 -Author: Nick Mathewson -Date: Fri Mar 12 14:21:52 2010 -0500 - - Remove an orphaned RELEASE flag in Makefile.am - -commit 2e898f542bb6dd5dcf13a0612ecd1e5855a014ef -Author: Nick Mathewson -Date: Fri Mar 12 14:16:30 2010 -0500 - - Switch to using AM conditionals in place of AC_LIBOBJ - - AC_LIBOBJ is really only meant for defining missing library functions, - not conditional code compilation. Sticking our conditionally compiled - modules in SYS_SRC should make stuff easier to maintain. - -commit b660edf9db50bff0e437a262506a72f125763756 -Author: Nick Mathewson -Date: Fri Mar 12 13:22:47 2010 -0500 - - Remove redundant stuff from EXTRA_DIST - - To a first approximation, sources that are mentioned anywhere in an - automake file don't need to get mentioned in EXTRA_DIST. - -commit 426c8fbe9345ee1d3ee0b05c8e35391ef380ad2c -Author: Nick Mathewson -Date: Fri Mar 12 13:09:28 2010 -0500 - - Support the standard 'make check' target in place of 'make verify' - - Based on patch 2816088 from Zack Weinberg - -commit 6c83e6c9725ad61f8d28955ee7a5d1f3162d74d0 -Merge: ee41aca 17da042 -Author: Nick Mathewson -Date: Fri Mar 12 12:26:06 2010 -0500 - - Merge branch 'evbuffer_insert_point' - -commit ee41aca63e27f6c5a91a01978b409f5994d03817 -Author: Nick Mathewson -Date: Fri Mar 12 00:46:39 2010 -0500 - - Functions to manipulate existing rate limiting groups. - - This patch adds a function to change the current rate limit of a rate - limiting group, and another to free an empty rate limiting group. - -commit cdd4c4905be7e56675c1fcccf9d04c1777ae0da1 -Author: Nick Mathewson -Date: Thu Mar 11 00:38:46 2010 -0500 - - Try to comment some of the event code more - -commit 17da042db6b8f7fec9064747dc53fa2855e96ab7 -Author: Nick Mathewson -Date: Thu Mar 11 15:39:44 2010 -0500 - - Add some glass-box tests for the last_with_data code. - -commit 1e7b986827f2654de500678ef56dcbaecd5a08d4 -Author: Nick Mathewson -Date: Thu Mar 11 14:23:02 2010 -0500 - - Fix last_with_data compilation on windows - -commit 78772c3503215eb0d55a370f5fc192eca713d0ad -Author: Nick Mathewson -Date: Thu Mar 11 00:18:02 2010 -0500 - - Clarify Christopher Clark's status as writer of original ht code. - -commit e470ad3c354c586a3a995ce3a1fe7d093ebf999c -Author: Nick Mathewson -Date: Wed Mar 10 23:39:30 2010 -0500 - - Allow evbuffer_read() to split across more than 2 iovecs - - Previously it would only accept 2 iovecs at most, because our - previous_to_last nonsense didn't let it take any more. This forced us - to do more reallocations in some cases when an extra small malloc - would have sufficed. - -commit 6f47bd12ed27085f68573a02dfa2e2761eb1e6b0 -Author: Nick Mathewson -Date: Wed Mar 10 23:28:51 2010 -0500 - - Remove previous_to_last from evbuffer - -commit c8ac57f1f58358dfdb1030143ab043b6addd0c3c -Author: Nick Mathewson -Date: Wed Mar 10 23:24:14 2010 -0500 - - Use last_with_data in place of previous_to_last - - This actually makes some of the code a lot simpler. The only - ones that actually used previous_to_last for anything were reserving - and committing space. - -commit 2a6d2a1e4be261e071f5ddb95be183e172643916 -Author: Nick Mathewson -Date: Wed Mar 10 22:16:14 2010 -0500 - - Revise evbuffer to add last_with_data - - This is the first patch in a series to replace previous_to_last with - last_with_data. Currently, we can only use two partially empty chains - at the end of an evbuffer, so if we have one with 511 bytes free, and - another with 512 bytes free, and we try to do a 1024 byte read, we - can't just stick another chain on the end: we need to reallocate the - last one. That's stupid and inefficient. - - Instead, this patch adds a last_with_data pointer to eventually - replace previous_to_last. Instead of pointing to the penultimated - chain (if any) as previous_to_last does, last_with_data points to the - last chain that has any data in it, if any. If all chains are empty, - last_with_data points to the first chain. If there are no chains, - last_with_data is NULL. - - The next step is to start using last_with_data everywhere that we - currently use previous_to_last. When that's done, we can remove - previous_to_last and the code that maintains it. - -commit c7f1b820fcf3181bccae4dc72dd2d16fbe712887 -Merge: b2f2be6 8111fac -Author: Nick Mathewson -Date: Wed Mar 10 21:21:33 2010 -0500 - - Merge branch 'evport' - -commit b2f2be6edca55ed6f51bb3dc77c43cd4e47aa4af -Author: Nick Mathewson -Date: Wed Mar 10 16:25:16 2010 -0500 - - Make evdns use the regular logging system by default - - Once, for reasons that made sense at the time, we had evdns.c use its - own logging subsystem with two levels, "warn" and "debug". This leads - to problems, since setting a log handler for Libevent wouldn't actually - trap these messages, since they weren't on by default, and since some of - the warns should really be msgs. - - This patch changes the default behavior of evdns.c to log to - event_(debugx,warnx,msgx) by default, and adds a new (internal-use-only) - log level of EVDNS_LOG_MSG. Programs that set a evdns logging - function will see no change. Programs that don't will now see evdns - warnings reported like other warnings. - -commit 13e4f3bd89225b3a339ac06ac051090e7e4bcab7 -Author: Brodie Thiesfield -Date: Mon Mar 8 13:46:48 2010 -0500 - - Avoid errors in http.c when building with VC 2003 .NET - -commit b677032ba239157c0c98a7b74050e730d96f99ab -Author: Brodie Thiesfield -Date: Mon Mar 8 13:46:04 2010 -0500 - - Avoid errors in evutil.c when building with _UNICODE defined - -commit 2c2618d85861c1508f12787f2757459e02f9a002 -Author: Nick Mathewson -Date: Fri Mar 5 13:00:15 2010 -0500 - - more whitespace normalization - -commit c7cf6f004951615cf775431d4f47663a20f2db6e -Author: Nick Mathewson -Date: Fri Mar 5 12:47:46 2010 -0500 - - Replace users of "int fd" with "evutil_socket_t fd" in portable code - - Remeber, win32 has a socket type that's actually a handle, so if - there's a chance that code is run on win32, we can't use "int" as the - socket type. - - This isn't a blind search-and-replace: sometimes an fd is really in - fact for a file, and not a socket at all. - -commit 38b7b571c81d1545bb4b6a1c5e4fd9e1bf0f542d -Author: Nick Mathewson -Date: Thu Mar 4 01:40:32 2010 -0500 - - Add Christopher Clark and Maxim Yegorushkin to the LICENSE file - -commit 17efc1cdfa5dbd275cbe7ab11e1382170df8a18b -Author: Nick Mathewson -Date: Thu Mar 4 01:25:51 2010 -0500 - - Update all our copyright notices to say "2010" - -commit cc1600afefc0c30586b12d916bb2a98ecf2d727b -Author: Nick Mathewson -Date: Tue Mar 2 17:00:06 2010 -0500 - - Improve the speed of evbuffer_readln() - - This makes some cases of bench_http about 5% faster. - - Our internal evbuffer_strpbrk() function was overly general (it tried - to handle all character sets when we only used it for "\r\n"), and - not very efficient (it called memchr once for each character in the - buffer until it found a \r or a \n). It actually showed up in some - profiles for HTTP testing, since evbuffer_readln() calls it when doing - loose CRLF detection. This patch replaces it with a faster - implementation. - -commit 2fac0f70a388d3a35a2d7883eeb673c6fbbe16e1 -Author: Nick Mathewson -Date: Wed Mar 3 12:15:15 2010 -0500 - - Remove signal_assign() and signal_new() macros. - - These were introduced and deprecated in the same version (2.0.1-alpha), - presumably in two-stage process. Everybody sane should be using - evsignal_assign() and evsignal_new() instead. - -commit 1273d2f519a386c30149143a85e5175e100cb980 -Author: Christopher Davis -Date: Tue Mar 2 15:16:28 2010 -0800 - - VC has no getopt(), so do without in bench_http. - -commit 4ac38a5c38f915298a65b10d34bf45c8e9654860 -Author: Christopher Davis -Date: Tue Mar 2 14:34:30 2010 -0800 - - Get bench_http to work on Windows; add a switch to enable IOCP. - -commit bf3bfd0c044a3110b49ca06621f1b2ca0621dd84 -Author: Nick Mathewson -Date: Mon Mar 1 22:12:04 2010 -0500 - - Revert the broken part of 2cffd6c937 - - It looks like I accidentally removed most of WIN32-Code/event-config.h - when I was bumping the version. Fortunately, this happened when I - bumped to 2.0.4-alpha-dev rather than when I bumped to 2.0.4-alpha. :) - - This patch restores the deleted parts of WIN32-Code/event-config.h - -commit 22aff0492dc51c8c9ce967871652e62e0144833d -Author: Nick Mathewson -Date: Mon Mar 1 22:06:12 2010 -0500 - - Distribute libevent.pc.in, not libevent.pc - -commit 2cffd6c937af5097db6a19cdebed3412c5454775 -Author: Nick Mathewson -Date: Sun Feb 28 16:53:42 2010 -0500 - - Bump version to 2.0.4-alpha-dev - -commit 9669ade5250a159b1c9addd5b329b32176f38440 -Author: Nick Mathewson -Date: Sun Feb 28 12:55:29 2010 -0500 - - Bump the version to 2.0.4-alpha - -commit 3a5cfb0d381a1b9e7d69903c3005abf1e447658b -Author: Nick Mathewson -Date: Sun Feb 28 12:49:03 2010 -0500 - - Add a changelog for 2.0.4-alpha from Git, sorted by hand - -commit ad85908a4f6bd8fc1cbfb869fa0b4774f4249e0f -Author: Nick Mathewson -Date: Sun Feb 28 12:52:39 2010 -0500 - - Fix compilation with --disable-debug-mode - -commit 57b72488233f749cd402d6133b5e4b1fb83878d3 -Author: Nick Mathewson -Date: Sat Feb 27 22:27:13 2010 -0500 - - Small cleanups on freebsd-connect-refused patch. - - There should be no need to call be_socket_enable: that does an - event_add(). What we really want to do is event_active(), to make - sure that the writecb is executed. - - Also, there was one "} if () {" that was missing an else. - - I've noted that the return value for evutil_socket_connect() is - getting screwy, but since that isn't an exported function, we can fix - it whenever. - -commit 7bc48bfd3ac61aa4ff118cacb44145c6ecda366e -Author: Niels Provos -Date: Sat Feb 27 18:59:06 2010 -0800 - - deal with connect() failing immediately - -commit 98edb891f89911ab5bdfa2a26ba2c549c66a3b1f -Author: Nick Mathewson -Date: Thu Feb 25 17:14:41 2010 -0500 - - Fix arc4random compilation on MSVC. - -commit 1e14f826695eeeb856c614e4da57a88a7c8202b4 -Author: Nick Mathewson -Date: Thu Feb 25 17:11:28 2010 -0500 - - Try to define a sane _EVENT_SIZEOF_SIZE_T for msvc compilation - -commit 23170a69f8f3394574652377e446604210d0c464 -Author: Nick Mathewson -Date: Thu Feb 25 16:57:57 2010 -0500 - - Fix mingw compilation - -commit 7ffd3875747f5a824d2f17872372278704b2ae27 -Author: Nick Mathewson -Date: Wed Feb 24 13:40:06 2010 -0500 - - Delete stack-alloced event in new unit test before returning. - -commit f3dfe46206d28eb99cd82beec0033ea7fd795f95 -Author: Nick Mathewson -Date: Tue Feb 23 23:59:26 2010 -0500 - - Use new timeval diff comparison function in bufferevent test - -commit 8fcb7a1b0419b275bd1570044f0e2024723fe4dd -Author: Nick Mathewson -Date: Tue Feb 23 23:55:32 2010 -0500 - - Add test for periodic timers that get activated for other reasons - - This was already independently verified by the new bufferevent - timeout tests, but it's good to explicitly check that our code - does what it should. - -commit c02bfe12f8cb695e67ec895443c592d1f3e9bc36 -Author: Nick Mathewson -Date: Tue Feb 23 16:36:52 2010 -0500 - - Add a test for timeouts on filtering bufferevents. - -commit d3288293fdc6aef510cc217b171187aac19c444b -Author: Nick Mathewson -Date: Sat Feb 20 18:44:35 2010 -0500 - - Provide consistent, tested semantics for bufferevent timeouts - - The different bufferevent implementations had different behavior for - their timeouts. Some of them kept re-triggering the timeouts - indefinitely; some disabled the event immediately the first time a - timeout triggered. Some of them made the timeouts only count when - the bufferevent was actively trying to read or write; some did not. - - The new behavior is modeled after old socket bufferevents, since - they were here first and their behavior is relatively sane. - Basically, each timeout disables the bufferevent's corresponding - read or write operation when it fires. Timeouts are stopped - whenever we suspend writing or reading, and reset whenever we - unsuspend writing or reading. Calling bufferevent_enable resets a - timeout, as does changing the timeout value. - -commit 38ec0a773b73375410cbb5a4eaeece3d0ab1caa0 -Author: Nick Mathewson -Date: Tue Feb 23 14:24:10 2010 -0500 - - Fix a bug in resetting timeouts on persistent events when IO triggers. - - When we fixed persistent timeouts to make them reset themselves - based on the previous scheduled time rather than the current - time... we made them do so regardless of whether the event was - triggering because of a timeout or not! - - This was of course bogus. When a _timeout_ triggers, we should - schedule the event for N seconds based on the last - _schedule_ time... but when IO triggers, we should reset the - timeout for N seconds after now. - -commit e2642f0a880dcee81114c1c25766f0380672ee30 -Author: Nick Mathewson -Date: Tue Feb 23 15:14:57 2010 -0500 - - Fix some race conditions in persistent events and event_reinit - - I found these by adding an EVENT_BASE_ASSERT_LOCKED() call to most - of the functions in event.c that can only be called while holding - the lock. - - event_reinit() never grabbed the lock, but it needed to. - - event_persist_closure accessed the base to call event_add_internal() - and gettime() when its caller had already dropped the lock. - - event_pending() called gettime() without grabbing the lock. - -commit 4b37e6a5eab3d85e01920a679201d1e3a7ed2aa4 -Merge: 162ce8a b2fbeb3 -Author: Nick Mathewson -Date: Tue Feb 23 00:39:02 2010 -0500 - - Merge remote branch 'github/split_free_from_decref' - -commit 162ce8a856224bdb3119db41d93fb94194886ddd -Author: Nick Mathewson -Date: Tue Feb 23 00:38:30 2010 -0500 - - Expose view of current rate limit as constrained by group limit - -commit b2fbeb3f074258e4559aa879ef0cbe0ef415ed0f -Author: Nick Mathewson -Date: Mon Feb 22 15:38:23 2010 -0500 - - Make bufferevent_free() clear all callbacks immediately. - - This should end the family of bugs where we call bufferevent_free() - while a pending callback is holding a reference on the bufferevent, - and the callback tries to invoke the user callbacks before it releases - its own final reference. - - This means that bufferevent_decref() is now a separate function from - bufferevent_free(). - -commit db08f640d543bd4ef32ffe1f83c8aeca77bb0ce0 -Author: Nick Mathewson -Date: Sat Feb 20 12:55:59 2010 -0500 - - Suspend read/write on bufferevents during hostname lookup - - When we're doing a lookup in preparation for doing a connect, we - might have an unconnected socket on hand, and mustn't actually do - any reading or writing with it. - -commit 4faeaea90e5d7a5d76acd8891ba88d4ed099edbd -Author: Nick Mathewson -Date: Fri Feb 19 03:39:50 2010 -0500 - - Clean up formatting: function/keyword spacing consistency. - - - Keywords always have a space before a paren. Functions never do. - - - No more than 3 blank lines in a row. - -commit e5cf98795e3526fadd9e779d4368ed6fbafd6e91 -Author: Nick Mathewson -Date: Thu Feb 18 17:46:56 2010 -0500 - - Clean up formatting: remove trailing spaces - -commit e5bbd40ad7f66f80170454683342076ec1e92d31 -Author: Nick Mathewson -Date: Thu Feb 18 17:41:15 2010 -0500 - - Clean up formatting: use tabs, not 8-spaces, to indent. - -commit 8fdf09c09d2f92d7bc1a333b24a6490f65d5369c -Author: Nick Mathewson -Date: Thu Feb 18 17:08:50 2010 -0500 - - Clean up formatting: Disallow space-before-tab. - -commit 7515de91fe6c721d304d06cedc8af8d334916eaf -Author: Nick Mathewson -Date: Thu Feb 18 14:50:44 2010 -0500 - - When connect() succeeds immediately, don't invoke the callback immediately. - - We need this to get unit tests to pass on freebsd. - -commit b72be50d7a3ff0f69f440edafd5ad5fd86e0c2d9 -Author: Nick Mathewson -Date: Thu Feb 18 13:52:04 2010 -0500 - - Add some headers to fix freebsd compilation - -commit 1ba6bed89a342d7485aadeacd8f9ff6dd1c2eeac -Author: Nick Mathewson -Date: Thu Feb 18 13:50:15 2010 -0500 - - Add the "compile" script to gitignore. - -commit 48a29b681619bfd431e987c7cbd623121ef91b13 -Author: Nick Mathewson -Date: Thu Feb 18 01:43:37 2010 -0500 - - Add a unit test for secure rng. - - Mostly, this is just to make sure our arc4random_buf() implementation isn't - dumb. - -commit ff2a134d6e2ab74f2aa3eb5832128478202dd137 -Author: Nick Mathewson -Date: Thu Feb 18 00:54:44 2010 -0500 - - Fix getpid() usage on Windows - - On Windows, getpid() is _getpid(), and requires that we first include - . arc4random.c previously didn't know that. - - Actually, I question whether arc4random needs to do its getpid() tricks - on Windows. They exist only so that we remember to re-seed the ARC4 - cipher whenever we fork... but Windows has no fork(), so I think we're - in the clear. - -commit cb52838fc501b1c18eec6bad367d29e87654d45b -Author: Nick Mathewson -Date: Thu Feb 18 00:27:35 2010 -0500 - - When working without a current event base, don't try to use IOCP listeners - - This fixes a bug turned up with the http unit tests, where we create - the evhttp object using an implicit (NULL) event_base. This failed - pretty badly when we tried to use IOCP-based listeners. We could - hunt for the current base from inside listener.c in the future, or - get the iocp base some other way, but for now this is probably the safest - solution. - -commit 32c6f1bacdb40f0d1b57aa6e8b2ce4eaf3979d08 -Author: Nick Mathewson -Date: Mon Feb 15 19:54:15 2010 -0500 - - Construct Windows locks using InitializeCriticalSectionAndSpinCount - - Previously we were using InitializeCriticalSection, which creates a - lock that blocks immediately on contention and waits to be - rescheduled. This is inefficient; it's better to wait for a little - while before telling the US to reschedule us, in case the lock becomes - available again really soon (since most locks mostly do). - - Good pthreads implementations do this automatically. On Windows, - though, we need to call this magic function, and we need to pick the - spin count ourselves. - -commit ca46d25b01aaf28b319965ee03b8df7816101767 -Merge: 7116bf2 e15e1e9 -Author: Nick Mathewson -Date: Wed Feb 17 23:02:28 2010 -0500 - - Merge branch 'arc4random' - -commit e15e1e9486b12b6790ecb4d5d6a23d049a713826 -Author: Nick Mathewson -Date: Wed Feb 17 22:54:43 2010 -0500 - - Add the arc4random.c license to the LICENSE file. - -commit 7116bf231433d565da33cee3b7292e212e026c7d -Author: Nick Mathewson -Date: Mon Feb 15 21:03:52 2010 -0500 - - Fix two unlocked reads in evbuffer. - - Some initializers (in evbuffer_read and evbuffer_commit) were reading - the last and/or previous_to_last fields without grabbing the evbuffer - lock. - - This may fix a hard-to-trigger race condition or two. - -commit aae7db5256e26ef70ba420a1d8f03eb1037221f8 -Author: Nick Mathewson -Date: Mon Feb 15 17:53:24 2010 -0500 - - Update event-config.h version number to match configure.in - -commit 60753da0e941f400ef02c5ea93abad616c9fd302 -Merge: 63e868e 2f782af -Author: Nick Mathewson -Date: Mon Feb 15 17:07:26 2010 -0500 - - Merge commit 'niels/http_close_connection' - -commit 63e868e69f404112505e64067a870890c98e3d94 -Author: Nick Mathewson -Date: Mon Feb 15 16:45:19 2010 -0500 - - Increment the submicro version number. - - We've changed a couple of APIs introduced in 2.0.1-alpha, so it - behooves us to give high-needs apps (like Tor) a way to tell we've - done this. - - Sensible apps will just say "is it 2.0.3-alpha or 2.0.4-alpha" and - ignore the existence of 2.0.3-alpha-dev, which is just as it should - be. - -commit 2f782af35b0f17615a43fff0ddc34cde5da39268 -Author: Niels Provos -Date: Sat Feb 13 17:04:17 2010 -0800 - - validate close cb on server when client connection closes - -commit e8a9782c1d8a87efb66878c59f4da401da585f43 -Author: Niels Provos -Date: Sat Feb 13 16:59:37 2010 -0800 - - clean up terminate_chunked test - -commit 4ec8fea68e59f5e847f3f31af28f7c1f9c9cdccb -Author: Nick Mathewson -Date: Sat Feb 13 00:11:44 2010 -0500 - - Make RNG work when we have arc4random() but not arc4random_buf() - -commit 3fe60fdf478101cec0f06a3fc4e1f69aa570ef6e -Author: Nick Mathewson -Date: Fri Feb 12 23:40:13 2010 -0500 - - Use off_t for the length parameter of evbuffer_add_file - -commit d4de062efcf3facf451c826deee9240fac478bfd -Author: Nick Mathewson -Date: Wed Feb 10 17:19:18 2010 -0500 - - Add an arc4random implementation for use by evdns - - Previously, evdns was at the mercy of the user for providing a good - entropy source; without one, it would be vulnerable to various - active attacks. - - This patch adds a port of OpenBSD's arc4random() calls to Libevent - [port by Chris Davis], and wraps it up a little bit so we can use it - more safely. - -commit 1dd7e6dc3aeff29f9de44678d2aeea3bb82e4f24 -Author: Nick Mathewson -Date: Fri Feb 5 01:16:23 2010 -0500 - - Remove the 'flags' argument from evdns_base_set_option() - - The 'flags' argument made sense when passed to - evdns_(base_)?parse_resolv_conf when it said which parts of the - resolv.conf file to obey. But for evdns_set_option(), it was really - silly, since you wouldn't be calling evdns_set_option() unless you - actually wanted to set the option. Its meaning was basically, "set - this to DNS_OPTIONS_ALL unless you want a funny surprise." - - evdns_base_set_option was new in 2.0.1-alpha, so we aren't committed - to keeping it source-compatible. - -commit 6810bdb10156f5fda1c8172114ea22c61da6e4c5 -Author: Nick Mathewson -Date: Fri Feb 5 13:50:51 2010 -0500 - - Always use our own gai_strerror() replacement. - - This is necessary if we have any errors that the platform gai_strerror() - doesn't know how to handle. - -commit c18490e6429cf5b2c476d3aee26fa046d2b6f8a7 -Author: Nick Mathewson -Date: Fri Feb 5 01:09:01 2010 -0500 - - Add a check to make soure our EVUTIL_AI flags do not conflict with the native ones - -commit cfe7a9ff4cb1eb3bc321fda904e5d5dfe8e7c1db -Merge: a7a9431 3978180 -Author: Nick Mathewson -Date: Thu Feb 4 10:15:39 2010 -0500 - - Merge remote branch 'niels/http_chunk' - -commit a7a943106cc45cc8d9bbfe813cbcf463a9647e87 -Author: Nick Mathewson -Date: Wed Feb 3 23:49:22 2010 -0500 - - Fix some additional -DUNICODE issues on win32. - - Brodie's patch didn't catch the ones that were new since 1.4. - -commit 000a33ec83daec1c37c84a4370f509b97585dc37 -Author: Brodie Thiesfield -Date: Wed Feb 3 23:27:40 2010 -0500 - - Make Libevent 1.4.12 build on win32 with Unicode enabled. - - This patch fixes calls to the win32 api to explicitly call the char* versions - of the functions. This fixes build failures when libevent is built with the - UNICODE define. - -commit 397818011b6a0a5f17cb1243e2e46ee3d3612382 -Author: Niels Provos -Date: Wed Feb 3 16:54:18 2010 -0800 - - make evhttp_send() safe against terminated connections, too - -commit e2d15d81c38925b30891751505ad20679d35d4fd -Merge: 60742d5 93d7369 -Author: Nick Mathewson -Date: Wed Feb 3 17:52:55 2010 -0500 - - Merge remote branch 'niels/http_chunk' - -commit 93d736910616ad32e6d8c2f7f377b12f5848f5d5 -Author: Niels Provos -Date: Wed Feb 3 14:34:56 2010 -0800 - - do not fail while sending on http connections the client closed. - - when sending chunked requests via multiple calls to evhttp_send_reply_chunk, - the client may close the connection before the server is done sending. this - used to cause a crash. - - we introduce a new function evhttp_request_get_connection() that allows the - server to determine if the request is still associated with a connection. - If it's not, evhttp_request_free() needs to be called explicitly or the user - can call evhttp_send_reply_end() which just frees the request, too. - -commit 60742d581bef0e8c234c2ce7343a59556a1af2c9 -Author: Nick Mathewson -Date: Wed Feb 3 17:01:45 2010 -0500 - - Add the rest of the integer limits, and add a test for them. - -commit 8f654678484b7c4ad95626593c0ccdc696d841e8 -Merge: 85047a6 ec34533 -Author: Nick Mathewson -Date: Wed Feb 3 16:25:34 2010 -0500 - - Merge remote branch 'github/http_listener' - - Conflicts: - http.c - -commit 85047a69836391bf095b98c36ec2b17876b2e325 -Author: Nick Mathewson -Date: Wed Feb 3 15:12:04 2010 -0500 - - Functions to view and manipulate rate-limiting buckets. - - We need these for Tor, and other projects probably need them too. Uses - include: - - Checking whether bandwidth is mostly-used, and only taking some - actions when there's plenty of bandwidth. - - Deducting some non-bufferevent activities from a rate-limit group. - -commit aba1fff33a9c1060a6a721f01f4d09c884a4ed5d -Author: Nick Mathewson -Date: Wed Feb 3 14:37:42 2010 -0500 - - Add EV_*_MAX macros to event2/util.h to expose limits for ev_* types. - -commit da6135e356b4ff8489b7810682a70d5a70ac7197 -Author: Nick Mathewson -Date: Wed Feb 3 02:09:19 2010 -0500 - - Reduce windows header includes in our own headers. - - It turns out that absolutely everything that was including - windows.h was doing so needlessly; our headers don't need it, - so we should just include winsock2.h (since that's where - struct timeval is defined). - - Pre-2.0 code will use the old headers, which include windows.h - for them, so we aren't breaking source compatibility with 1.4. - - This solves the bug where we were leaving WIN32_LEAN_AND_MEAN - defined, in roughly the same way that buying an automobile - solves the question of what to give your coachman for boxing - day. - -commit 27c9a40f15701244bca209f05abc07792499dbb4 -Author: Nick Mathewson -Date: Wed Feb 3 02:08:08 2010 -0500 - - Fix a dumb typo in ev_intptr_t definitions. - - We said "#define ev_uintptr_t" twice instead of ever saying - "#define ev_intptr_t". - -commit e244a2ea7478c67352f32f89c6af32484e2c69c4 -Author: Nick Mathewson -Date: Wed Feb 3 01:26:07 2010 -0500 - - Add the msvc-generated .lib files to .gitignore. - -commit 6c21c895d9943f2be9662f71ea425cde8cf24658 -Author: Nick Mathewson -Date: Wed Feb 3 01:22:44 2010 -0500 - - Remove EVUTIL_CHECK_FMT. - - This was never supposed to be an exposed API, so its name should have been - more like _EVUTIL_CHECK_FMT. But it was only used in one place, so let's - just eliminate it. - -commit f6b269498af6538d3c2a0c3bf0dae4630584c66a -Author: Nick Mathewson -Date: Wed Feb 3 01:16:47 2010 -0500 - - Deprecate EVENT_FD and EVENT_SIGNAL. - - These are old aliases for event_get_fd and event_get_signal, and they - haven't been the preferred way of doing things since 2.0.1-alpha. - - For a while, we made them use struct event if it was included, but call - event_get_(fd|signal) if it wasn't. This was entirely too cute. - -commit d38a7a19316002da9e9184402f9252e11766712b -Author: Nick Mathewson -Date: Tue Feb 2 15:44:10 2010 -0500 - - const-ify a few more functions in event.h - -commit f4190bfb8553387038ce773947caee047450e9f4 -Author: Nick Mathewson -Date: Wed Jan 27 01:47:36 2010 -0500 - - Update time-test.c to use event2 - - time-test.c wasn't crazy, but it used some old interfaces. - - There are probably more cleanups and explanations to do beyond the - ones here. - -commit d60a1bd50c8388f6f74522bf0eadb3fe37d6e95a -Author: Nick Mathewson -Date: Wed Jan 27 01:46:41 2010 -0500 - - Clarify status of example programs - - (That is, add comments to say that dns-example and le-proxy are recent and - ugly; event-test is old and ugly.) - -commit becb9f9cd320d9b3ac571ffc788a01423568e9d0 -Author: Nick Mathewson -Date: Wed Jan 27 01:46:23 2010 -0500 - - Add a new "hello world" sample program - -commit 137f2c602f440327b10e68f5af4e575e23d82362 -Author: Nick Mathewson -Date: Tue Jan 26 12:08:34 2010 -0500 - - Try to fix a warning in hash_debug_entry - - Apparently some 64-bit platforms don't like it when you say - - unsigned hash(void *p) - { - return (unsigned)p; - } - - even if you really honestly don't want the high bits of p. Perhaps - they will tolerate it if I say the equivalent of - - unsigned hash(void *p) - { - return (unsigned) (uintptr_t) p; - } - -commit cef61a2f1b6562b0576c56d5fe6e1717962e8755 -Author: Nick Mathewson -Date: Tue Jan 26 12:08:17 2010 -0500 - - Use ev_[u]intptr_t types in place of [u]intptr_t - -commit 1fa4c81c71517c0b530b71cc6dd4d1812cab5996 -Author: Nick Mathewson -Date: Tue Jan 26 12:06:41 2010 -0500 - - Add ev_[u]intptr_t to include/event2/util.h - - We already emulate most of the other useful bits of stdint.h, and - we seem to have started to use uintptr_t in a few places throughout - the code. Let's make sure we can continue to do so even on backwards - platforms that don't do C99. - -commit 439aea0d072b98daf13ebe3d6eff8ab8ee5bd875 -Author: Nick Mathewson -Date: Mon Jan 25 14:07:01 2010 -0500 - - Try to untangle the logic in server_port_flush(). - - The logic that prevented the first loop in this function from being - infinite was rather confusing and hard to follow. It seems to confuse - some automatic analysis tools as well as me. Let's try to replace it - with something more comprehensible. - -commit 361da8f2022fb6c9ca937297f1769eb75a5e56e8 -Author: Nick Mathewson -Date: Mon Jan 25 13:54:14 2010 -0500 - - Note a missing ratelim function - -commit a66e947b8b7ea6da7e246a02a6abf759c63dbe38 -Author: Nick Mathewson -Date: Mon Jan 25 13:44:56 2010 -0500 - - Use less memory for each entry in a hashtable - - Our hash-table implementation stored a copy of the hash code in each - element. But as we were using it, all of our hash codes were - ridiculously easy to calculate: most of them were just a matter of a - load and a shift. - - This patch lets ht-internal be built in either of two ways: one caches - the hash-code for each element, and one recalculates it each time it's - needed. - - This patch also chooses a slightly better hash code for - event_debug_entry. - -commit a19b4a05e690601dde105d0a301c75118f013a46 -Author: Nick Mathewson -Date: Mon Jan 25 13:38:07 2010 -0500 - - Call event_debug_unassign on internal events - - I don't expect that many users will be so religious about calling - unassign, but we need to be so that it's at least possible to use - debug mode without eating memory. - -commit cd17c3acd57b6b5bdedb31fc4152584fb6e089f7 -Author: Nick Mathewson -Date: Fri Jan 22 00:34:37 2010 -0500 - - Add support for a "debug mode" to try to catch common errors. - - Right now it only catches cases where we aren't initializing events, - or where we are re-initializing events without deleting them first. - These are however shockingly common. - -commit 70a4a3ef141e8e5f21549669fc4f67ae75d150f1 -Author: Nick Mathewson -Date: Sat Jan 23 16:47:54 2010 -0500 - - Remove a needless include of rpc_compat.h - - Nothing in evrpc.c was using rpc_compat.h, so it's best to take it - out, especially since it polluted our build process with GCC variadic - macros. - - While we're at it, this patch puts an extra restriction on when the - variadic macros in rpc_compat.h are defined. Not only must GCC be the - compiler, but GCC must not be running in -ansi mode. - -commit 5c7a7bca4c7c3d0bbda4bb8e4ff9f1b335f55499 -Author: Nick Mathewson -Date: Sat Jan 23 20:07:05 2010 -0500 - - Fix windows and msvc build - -commit c8c6a8978e57fcf17135782933b5174b950231bf -Author: Nick Mathewson -Date: Sat Jan 16 15:24:58 2010 -0500 - - Minimize epoll_ctl calls by using changelist - - The logic here is a little complex, since epoll_add must used called exactly - when no events were previously set, epoll_mod must be used when any events - were previously set, and epoll_del only called when the removing all events. - -commit 918e9c5e722f53e14396df7596d326ecdb89093e -Author: Nick Mathewson -Date: Sat Jan 23 16:38:36 2010 -0500 - - Fix a number of warnings from gcc -pedantic - -commit e2ca403faed26e0e709728ddc2efce1da8bd99d7 -Author: Nick Mathewson -Date: Sat Jan 23 16:23:45 2010 -0500 - - Make it compile under gcc --std=c89. - -commit ff3f6cd42b8d58d6db9c2ceb2cf9868d1a8f7ec0 -Author: Nick Mathewson -Date: Fri Jan 22 16:14:49 2010 -0500 - - Check more internal event_add() calls for failure - - Most of these should be unable to fail, since adding a timeout - generally always works. Still, it's better not to try to be "too - smart for our own good here." - - There are some remaining event_add() calls that I didn't add checks - for; I've marked those with "XXXX" comments. - -commit 7296971b105ffc2bc9d20b0a24a3055c2ecf5e69 -Author: Nick Mathewson -Date: Tue Dec 29 16:38:03 2009 -0500 - - Detect setenv/unsetenv; skip main/base_environ test if we can't fake them. - - Previously, we assumed that we would have setenv/unsetenv everywhere - but WIN32, where we could fake them with putenv. This isn't so: some - other non-windows systems lack setenv/unsetenv, and some of them lack - putenv too. - - The first part of the solution, then, is to detect setenv/unsetenv/ - putenv from configure.in, and to fake setenv/unsetenv with putenv - whenever we have the latter but not one of the former. - - But what should we do when we don't even have putenv? We could do - elaborate tricks to manipulate the environ pointer, but since we're - only doing this for the unit tests, let's just skip the one test in - question that uses setenv/unsetenv. - -commit 97a8c79006d41b8196e37e0c64db45e70578e70e -Author: Nick Mathewson -Date: Fri Jan 22 00:34:21 2010 -0500 - - Fix compilation of rate-limit code when threading support is disabled - -commit 26e1b6f298f4bb66d6d684ed23a468bb8d3f4a37 -Author: Nick Mathewson -Date: Thu Jan 21 01:51:40 2010 -0500 - - Remove some commented-out code in evutil - -commit 8d4aaf9086b721c0379891ca4a1fea8736f19d8f -Author: Nick Mathewson -Date: Wed Jan 20 12:56:54 2010 -0500 - - Don't use a bind address for nameservers on loopback - - If the user sets a bind address to use for nameservers, and a - nameserver happens to be on 127.0.0.1, the nameserver will generally - fail. This patch alters this behavior so that the bind address is - only applied when the nameserver is on a non-loopback address. - -commit 068395038423cc42e05f7cd745f00e58b16a5f35 -Author: Nick Mathewson -Date: Tue Jan 19 14:01:36 2010 -0500 - - Functions to access more fields of struct event. - - Once event_assign() or event_new() had been called, there was no way - to get at a copy of the event's callback, callback argument, or - configured events. This patch adds an accessor function for each, and - an all-fields accessor for code that wants to re-assign one field of - an event. - - This patch also adds a function to return sizeof(struct event), so - that code with intense RAM needs can still retain ABI compatibility - between versions of Libevent without having to heap-allocate every - struct event individually. - - The code here was first proposed by Pavel Pisa. - -commit 706700674c303ce32e23ead78a4b8ce2bc6d2d55 -Author: Nick Mathewson -Date: Tue Jan 19 13:55:53 2010 -0500 - - Add a LICENSE file so people can find our license easily - - For what it's worth, we are aware that "Copyright $YEAR $NAME" is - sufficient notice of copyright on software under US law and - Internationally, and saying Copyright (c) $YEAR $NAME is a bit nutty. - The character sequence (c) has never been ruled to have the same force - in US law as the actual copyright symbol, and that neither of these - US-specific symbols adds anything of value beyond saying "Copyright" - since the Berne convention took effect in the US back in 1989. - - Similarly, saying "all rights reserved" doesn't do anything magical - unless your software goes in a time-warp back to when the Buenos Aires - Convention was the general rule. (And what will they run it on back - then?) And what would even lead you to say "All Rights Reserved" when - you're explicitly granting most of those rights to anybody receiving - the work in accordance with the 3-clause BSD license? - - But still the FOSS community retains these ritual notations out of a - kind of cargo-cult lawyering. Who knows? Perhaps one day, if we - write our copyright notices ineptly enough, John Frum will come and - give us a DFSG-compatible license that everybody can get behind. - - (Also, I am not a lawyer. The above should not be taken as legal - advice. -- Nick) - -commit 4b9f307d8d584c91ea606af687528199ea072aad -Author: Nick Mathewson -Date: Fri Jan 15 10:26:25 2010 -0500 - - Add a forgotten header (changelist-internal.h) - -commit 854645797b1dcef69ce551ac52599c2708da2901 -Merge: 3225dfb 78a50fe -Author: Nick Mathewson -Date: Thu Jan 14 23:28:16 2010 -0500 - - Merge commit 'niels/http_dns' - -commit 78a50fe04cdbe3c69abdef7d1f15c6d09cd21f15 -Author: Niels Provos -Date: Thu Jan 14 17:39:54 2010 -0800 - - forgot to add void to test function - -commit 26714ca19f7754c6ddfda7ebdde4d76fc21d2c1f -Author: Niels Provos -Date: Thu Jan 14 17:05:00 2010 -0800 - - add a test for evhttp_connection_base_new with a dns_base - -commit b8226390bcc865ad182449f9dc4ce9d332f83545 -Author: Niels Provos -Date: Thu Jan 14 16:53:25 2010 -0800 - - move dns utility functions into a separate file so that we can use them for http testing - -commit 5032e52680f751ce64b3bda4fa4439bebfd13bb0 -Author: Niels Provos -Date: Thu Jan 14 15:42:07 2010 -0800 - - do not use a function to assign the evdns base; instead assign it via evhttp_connection_base_new() which is a new function introduced in 2.0 - -commit 3225dfb91d73a82939d6e4f848cc7bffb6a3ba5c -Author: Nick Mathewson -Date: Thu Jan 14 17:04:08 2010 -0500 - - Remove kqueue->pend_changes. - - Since we're no longer writing directly to it from add/del, we don't - need to worry about it changing as kq_dispatch releases the lock. We - would make it a local variable, except that we wouldn't want to malloc - and free it all the time. - -commit 45e5ae3717aa238050a1eb0148beb83f2711c743 -Author: Nick Mathewson -Date: Thu Jan 14 16:31:05 2010 -0500 - - Make kqueue use changelists. - - This fixes a bug in kqueue identified by Charles Kerr and various - Transmission users, where adding and deleting an event in succession - would make the event get reported, even if we didn't actually want to - see it. - - Of course, this also makes the array of changes passed to kevent - smaller, which could help performance. - -commit 27308aae4d921ecc286ab7a734693c2e27737a99 -Author: Nick Mathewson -Date: Thu Jan 14 16:30:40 2010 -0500 - - Changelist code to defer event changes until just before dispatch - - This is necessary or useful for a few reasons: - - 1) Sometimes applications will add and delete the same event more - than once between calls to dispatch. Processing these changes - immediately is needless, and potentially expensive (especially - if we're on a system that makes one syscall per changed event). - - Yes, this actually happens in practice for nonpathological - code, such as in cases where the user's callback conditionally - re-adds a non-persistent event, or where draining a buffer - turns off writing and invokes a user callback which adds more - data which in turn re-enabled writing. - - 2) Sometimes we can coalesce multiple changes on the same fd into - a single syscall if we know about them in advance. For - example, epoll can do an add and a delete at the same time, but - only if we have found out about both of them before we tell - epoll. - - 3) Sometimes adding an event that we immediately delete can cause - unintended consequences: in kqueue, this makes pending events - get reported spuriously. - -commit ec34533a9c5aafab741e29e1f8af73654f5e767a -Author: Nick Mathewson -Date: Wed Dec 30 00:41:03 2009 -0500 - - Make http use evconnlistener. - - Now that we have a generic listen-on-a-socket mechanism, there's no - longer any reason to have a separate listen-on-a-socket implementation - in http.c. - - This also lets us use IOCP and AcceptEx() when they're enabled. - - Possibly, we should have a new mechanism to add a socket given only a - listener. - -commit c698b77d197b809e606ee56881330af41c02fc04 -Author: Nick Mathewson -Date: Wed Dec 30 00:11:27 2009 -0500 - - Allow http connections to use evdns for hostname looksups. - - This was as simple as using bufferevent_connect_hostname instead of - calling connect() ourself, which already knows how to use an - evdns_base if it gets one. - - Untangling the bind code might be a little trickier. - -commit a334b31c6f4fac24eb30048edb16b188a3ee2250 -Author: Nick Mathewson -Date: Thu Jan 14 14:46:16 2010 -0500 - - More unit tests for getaddrinfo_async: v4timeout and cancel. - - One covers the case where the v4 request times out but the v6 request - doesn't. The other makes sure that cancelling a request actually works. - -commit 94131e92b827ab2b46a4cb7ded52cdc143f807a8 -Author: Nick Mathewson -Date: Tue Jan 12 15:58:36 2010 -0500 - - Fix test.sh on shells without echo -n - - Some systems have a version of /bin/sh whose builtin echo doesn't - support the -n option used in test/test.sh. /bin/echo, however, - usually does. This patch makes us use /bin/echo for echo -n whenever - it is present. - - Also, our use of echo -n really only made sense when suppressing all - test output. Since test output isn't suppressed when logging to a - file, this pach makes us stop using echo -n when logging to a file. - -commit b9f43b231fe738789110f99d7045f2535986e997 -Author: Nick Mathewson -Date: Mon Jan 11 20:47:36 2010 -0500 - - Add a comment on evthread_enable_lock_debuging. - -commit 6cc79c6b40501e32360386fcd7f9e013d0804bda -Author: Pavel Plesov -Date: Mon Jan 11 19:04:11 2010 -0500 - - Add unit-test for bad_request bug fixed in 1.4 recently. - - This is a partial forward-port from 4fd2dd9d83a000b6. There's no need - to forward-port the bugfix, since the test passes with http.c as-is. - I believe we fixed this while we were porting evhttp to bufferevent. - --nickm - -commit 510ab6bce0783e49b6e52e8f00b456dd95e003e5 -Author: Jardel Weyrich -Date: Wed Dec 30 19:24:39 2009 -0200 - - Comestic changes in evconnlistener_new(), new_accepting_socket(), accepted_socket_invoke_user_cb() and iocp_listener_enable(). - -commit fec66f96850b77f77f720d3983ae98fc3594f282 -Author: Jardel Weyrich -Date: Wed Dec 30 19:22:23 2009 -0200 - - Improved error handling in evconnlistener_new_async(). Also keeping the fd open because it is not opened by this function, so the caller is responsible for closing it. Additionally, since evconnlistener_new_bind() creates a socket and passes it to the function above, it required error checking to close the same socket. - -commit 4367a33a205c64df92e604aa3c4b01ac40aa821d -Author: Jardel Weyrich -Date: Wed Dec 30 19:09:14 2009 -0200 - - Fixed a fd leak in start_accepting(), plus cosmetic changes - -commit 2f33e00af3e617d4a1fbb22de37f7c382de6961b -Author: Jardel Weyrich -Date: Fri Jan 1 04:13:05 2010 -0200 - - Fixed a memory leak on windows threads implementation. The CRITICAL_SECTION was not being free'd in evthread_win32_lock_free(). - -commit 66c02c7826ed7b65ddbd071c6ac0a86b1407ebc4 -Author: Nick Mathewson -Date: Fri Jan 8 04:02:19 2010 -0500 - - Look at the proper /etc/hosts file on windows. - - This is harder than it might initially seem, since the proper filename - depends on what the admin has decided to call the windows system directory, - which for all we know might be Q:\tralfamidore\slartibartfast. And of course, - this being windows, there are twelve ways to do it, where you can pick a - nice one or a portable one, but not a really nice portable one. - -commit 72dd666777d4e341fc5c066cd7dc1975d0dd0090 -Author: Nick Mathewson -Date: Mon Dec 7 17:21:41 2009 -0500 - - evdns_getaddrinfo() now supports the /etc/hosts file. - - The regular blocking evutil_getaddrinfo() already supported /etc/hosts - by falling back to getaddrinfo() or gethostbyname(). But - evdns_getaddrinfo() had no such facility. Now it does. - - The data structure here isn't very clever. I guess people with huge - /etc/hosts files will either need to get out of the 1980s, or submit a - patch to this code so that it uses a hashtable instead of a linked - list. - - Includes basic unit tests. - -commit 0f7144fd8b05e95788ac2877caaf2b7c4688bf82 -Author: Nick Mathewson -Date: Mon Dec 7 17:21:13 2009 -0500 - - Refactor code from evdns into a new internal "read a file" function. - -commit eaaf27f1f7b834bf60a1003c4d9c32a9a346b1dc -Author: Nick Mathewson -Date: Wed Jan 6 18:41:46 2010 -0500 - - Enable branch-prediction hints with EVUTIL_UNLIKELY. - - This had been accidentally disabled. Since it seems to work with GCC, I'm - turning it back on when GCC is present. - -commit 29151e65b754eb254e6cc3596f006a2de85fd2fb -Author: Nick Mathewson -Date: Wed Jan 6 18:42:59 2010 -0500 - - Fix byte counts when mixing deferred and non-deferred evbuffer callbacks. - - This patch finishes 390e0561, which was somehow committed in a half-finished - state. It solves a failing unit test on windows. - -commit ba2945f9314fa2f81afe09284d21724d2b5dc31d -Merge: 0546ce1 165d30e -Author: Nick Mathewson -Date: Wed Jan 6 17:59:44 2010 -0500 - - Merge branch 'ratelimit' - - Conflicts: - bufferevent_async.c - -commit 0546ce11e88c6c8b20c3ac85cb05fb0155e73a59 -Author: Jardel Weyrich -Date: Wed Dec 30 05:03:54 2009 -0200 - - Eradicated the last free() call. Let mm_free() take care of deallocation. - -commit 165d30e31a167215c03a9104423f2767c9ff9c9a -Author: Nick Mathewson -Date: Wed Dec 30 14:29:56 2009 -0500 - - Fix compilation of rate-limiting code on win32. - -commit 885b42734c2360e95b9acb7a5b202262f24b7626 -Author: Nick Mathewson -Date: Wed Dec 30 13:50:52 2009 -0500 - - Fix test-ratelim compilation on Linux. - - I'd forgotten to include time.h, and to link against libm. - -commit 78ed097267f2db83c9b05915c76b5287cb2c89f7 -Author: Nick Mathewson -Date: Wed Dec 30 11:58:36 2009 -0500 - - Never believe that we have pthreads on win32, even if gcc thinks we do. - - Apparently some newer versions of mingw provide a fake pthreads api to - let applications work even if they don't know about windows threading. - That's nice, but we aren't one of those. - -commit 2e8eeea3e86b1f577e34ef2bc4f7099d848ae787 -Author: Nick Mathewson -Date: Tue Dec 29 19:50:03 2009 -0500 - - Fix crash bugs when a bufferevent's eventcb is not set. - - In many places throughout the code, we called _bufferevent_run_eventcb - without checking whether the eventcb was actually set. This would - work fine when the bufferevent's callbacks were deferred, but - otherwise the code would segfault. Strangely, we always remembered to - check before calling the _bufferevent_run_{read,write}cb functions. - - To prevent similar errors in the future, all of - _buferevent_run_{read,write,event}cb now check to make sure the - callback is actually set before invoking or deferring the callback. - This patch also removes the now-redundant checks for {read,write}cb. - -commit 0b151a9fa1365ad9f6f2e58fcfcfb36840707403 -Author: Nick Mathewson -Date: Tue Dec 29 18:11:52 2009 -0500 - - Whitespace fixes in test.sh - -commit 7dfbe94aa3873c7e5426deb4a1684a0423c85d41 -Author: Nick Mathewson -Date: Tue Dec 29 18:07:51 2009 -0500 - - Allow test.sh to be run as ./test/test.sh - -commit c382de6421e1f2330105f74e2a465cf7cd1bfe23 -Author: Nick Mathewson -Date: Tue Dec 29 17:59:55 2009 -0500 - - Allow the user to redirect the verbose output of test/test.sh to a file - - By default, the test.sh script still suppresses the output of all the - tests it invokes. Now, however, you can have that output written to - a file specified in the TEST_OUTPUT_FILE shell variable. - -commit 1e56a32d081a68d03c8ad2a923f702f2a034e76b -Author: Nick Mathewson -Date: Tue Dec 29 16:04:16 2009 -0500 - - Make the initial nameserver probe timeout configurable. - - When we decide that a nameserver is down, we stop sending queries to - it, except to periodically probe it to see if it has come back up. - Our previous probe sechedule was an ad-hoc and hard-wired "10 seconds, - one minute, 5 minues, 15 minutes, 1 hour, 1 hour, 1 hour...". There - was nothing wrong with having it be ad-hoc, but making it hard-wired - served no good purpose. - - Now the user can set the initial timeout via a new - "initial-probe-timeout:" option; future timeouts back off by a factor - of 3 on every failure to a maximum of 1 hour. - - As a side-benefit, this lets us cut the runtime of the dns/retry test - from about 40 seconds to about 3 seconds. Faster unit tests are - always a good thing. - -commit ee4953f89e8b6505bdd7899795b2b7d2395ad4d5 -Author: Nick Mathewson -Date: Tue Dec 29 16:03:30 2009 -0500 - - Fix the code that allowed DNS options to not end with : - - We tried to fix this in 0.2.0.3-alpha, but our fix was buggy. - -commit d0939d2b971417cd5714b535dabfdbd4213b26cb -Author: Jardel Weyrich -Date: Tue Dec 29 16:21:26 2009 -0200 - - Introduced evutil_make_socket_closeonexec() to preserve fd flags for F_SETFD. - - Use this to eliminate the various macros that called F_SETFD throughout - the code. - -commit 4df7dbcbdfc9bf169f70b3e74e0a3ec824065bf3 -Author: Jardel Weyrich -Date: Tue Dec 29 16:19:24 2009 -0200 - - Adjusted fcntl() retval comparison on evutil_make_socket_nonblocking(). - - Apparently, a successful return value on F_SETFL is "anything but - -1". - -commit 8111fac0650c6e4dbb296dfc8f63453e4532f30b -Author: Nick Mathewson -Date: Tue Dec 29 14:38:35 2009 -0500 - - Add missing thread imports so that evport.c will build - - When I made the changes to release the base lock around the call to - port_getn(), I didn't add evthread-internal.h to the includes in - evport.c would build, and I didn't catch it since I haven't got a - Solaris host to build on. Tao Feng just reported this on - Libevent-users. - -commit 82743794d37b0ddece31c0d4f637d2f7d0896f2d -Author: Nick Mathewson -Date: Thu Dec 24 17:47:14 2009 -0500 - - Do not make bufferevent_setfd implicitly disable EV_READ and EV_WRITE. - - This obviates the need for BEV_SUSPEND_CONNECTING, and good riddance. - -commit f0c0124e603945f4693ae1457c7b9ef2b08689bf -Author: Nick Mathewson -Date: Wed Dec 23 07:54:13 2009 -0500 - - Testing code for bufferevent rate-limiting. - - This is not part of the regression tests, since running it necessarily - takes a while. There is a new test-ratelim test; run it with '-h' - for an argument to see its options. - -commit 737c9cd87b453d7371ea0b9774aa2bc51124c4eb -Author: Nick Mathewson -Date: Fri Nov 27 13:16:54 2009 -0500 - - Rate-limiting for bufferevents; group and individual limits are supported. - - The fairness algorithms are not the best, not every bufferevent type - is supported, and some of the locking tricks here are simply absurd. - Still, this code should be a good first step. - -commit 47854a802a575b44291d27e4b57199942106cf62 -Author: Nick Mathewson -Date: Mon Dec 28 01:40:37 2009 -0500 - - Expose our cached gettimeofday value with a new interface - - I've got a two use case that wants this for a fairly sensible purpose: - one external and on internal. - -commit 5a43df82b89f5f396d845ced49b9f3f65dee52ab -Author: Jardel Weyrich -Date: Mon Dec 28 16:03:47 2009 -0500 - - Improve readability of evutil_unparse_protoname() - -commit 0d64051f5b25ed9987c675e3270e7a452b18adf2 -Author: Jardel Weyrich -Date: Mon Dec 28 16:01:59 2009 -0500 - - Fix a bogus free in evutil_new_addrinfo() - -commit 24fb502f7027e59b61934f6f0f586494bd22fdba -Author: Jardel Weyrich -Date: Mon Dec 28 16:01:12 2009 -0500 - - Fix an fd leak in evconnlistener_new_bind(). - -commit 4c8b7cdc64d054e18be3bd6e3f85d277927c639c -Author: Jardel Weyrich -Date: Mon Dec 28 16:00:05 2009 -0500 - - Make evutil_make_socket_nonblocking() leave any other flags alone. - - Fixes bug 2922121 - -commit fee2c77919196b59cc5a50bc532b048844972784 -Author: Dagobert Michelsen -Date: Mon Dec 28 15:53:01 2009 -0500 - - Fix compilation of devpoll.c by adding missing thread includes. - - (Bug 2922156) - -commit a47d88d7c2743d4924d395102d3b8e4585f61d6e -Author: Nick Mathewson -Date: Wed Dec 23 07:53:19 2009 -0500 - - Replace some cases of uint32_t with ev_uint32_t. - - Spotted by Roman Puls. - -commit 4a5b53432b1348740534e8a562a82f825d31e3ca -Author: Nick Mathewson -Date: Wed Dec 23 07:48:43 2009 -0500 - - Do not ignore bufferevent_enable(EV_READ) before bufferevent_connect(). - - Previously, we weren't remembering that we wanted to re-add the read - event once the connect was finished. Now we are. - -commit 390e056152ba4f92476aebae56ad3bba7bbfee0b -Author: Nick Mathewson -Date: Tue Dec 22 15:52:02 2009 -0500 - - Fix up behavior of never-defered callbacks a little - -commit 5846bf6cddbed402dbdf51e6268795cf41dbf9ba -Author: Nick Mathewson -Date: Tue Dec 22 15:51:39 2009 -0500 - - Simplify the read high-watermark checking. - -commit c69d5a5d3c5e8e3cf406e2919441f30c400cf9e1 -Author: Nick Mathewson -Date: Tue Dec 22 12:03:46 2009 -0500 - - Remove the contents of WIN32-Prj as unmaintained. - - Makefile.nmake is now the preferred way to build with MSVC; the - project files haven't worked properly in ages. - -commit 292467c02e9a9c679d5760c171c74aaa090e0308 -Author: Nick Mathewson -Date: Tue Dec 22 00:58:52 2009 -0500 - - Use evutil_socket_t, not int, when logging socket errors. - -commit c51bb3c342a02536a74ed8c4e739dc76dd145c70 -Author: unknown -Date: Mon Dec 21 16:36:40 2009 -0500 - - Fix a few locking issues on windows. - -commit 5a112d3c0748d8e65c0fd36c2717dd3fe7c0639b -Author: Nick Mathewson -Date: Fri Dec 18 23:37:50 2009 -0500 - - Set all instances of the version number correctly. - - Note that we've made two subtle mistakes: we are supposed to suffix - any non-released version with "-dev", and we're supposed to use the - last byte of the numeric version to indicate whether we have done this. - - For example, when 2.0.4-alpha is released, its numeric versin will be - 0x 02 00 04 00. As soon as we tag it, we will change the version in - the git repository to 2.0.4-alpha-dev, whose numeric version will be - 0x 02 00 04 01 or something. - -commit 67995270ff75fb971f7043afa3c8072a8ea8fe3d -Author: Nick Mathewson -Date: Fri Dec 18 17:04:37 2009 -0500 - - Drop install-sh from our git repo: a mismatched version could break "make dist" - -commit a773df54cef1707984fe2c8b4b5866b35ae0c66d -Author: Joachim Bauch -Date: Fri Dec 18 16:24:41 2009 -0500 - - Fix a segfault when freeing SSL bufferevents in an unusual order - - Have container bufferevents hold a reference to their underlying bufferevents. - - (Commit message and minor revisions by nickm.) - -commit a6adeca72ccf1202c013001136d6e3ee3ddc0764 -Author: Joachim Bauch -Date: Thu Dec 17 12:38:46 2009 -0500 - - Fix a segfault when writing a very fragmented evbuffer onto an SSL - - Fixes bug 2916328. - -commit f6430ac1e32e77870cd7a10c1e788c217afc621e -Author: Evan Jones -Date: Tue Dec 8 17:02:24 2009 -0500 - - Update sample/signal-test.c to use newer APIs and not leak. - -commit ea6b1df28806129316f4a6f1ed333b3dcb6052fb -Author: Joachim Bauch -Date: Tue Dec 8 15:38:34 2009 -0500 - - Only define _GNU_SOURCE if it is not already defined. - -commit 70cdfe49fae83a3662fa72ff803f2ff5b486af9b -Author: Sebastian Hahn -Date: Sun Dec 6 02:59:19 2009 +0100 - - Fix compile on Snow Leopard with gcc warnings enabled - -commit 7ae94450fde617375a0a79387bed0090550debf7 -Author: Nick Mathewson -Date: Fri Dec 4 16:37:43 2009 -0500 - - Fix a snow leopard compile warning in the unit tests. - - Reported by Sebastian Hahn. - -commit 0d744aa1738f6f16324a07f6185107d28c4f7fe4 -Author: Nick Mathewson -Date: Mon Nov 23 18:34:32 2009 -0500 - - Refactor our 'suspend operation' logic on bufferevents. - - There are lots of things we do internally in bufferevents to indicate - "the user would like this operation to happen, but we aren't going to - try until some other condition goes away." Our logic here has gotten - entirely too complicated. - - This patch tries to fix that by adding the idea of 'suspend flags' for - read and write. To say "don't bother reading or writing until - condition X no longer holds," bufferevent_suspend_read/write(bev, - BEV_SUSPEND_X). When X no longer holds, call - bufferevent_unsuspend_read/write(bev, BEV_SUSPEND_X). - - Right now, only the read-watermark logic uses this. - -commit 438f9ed26c63bd47c9e1a5cbe52731996f05c3ea -Author: Nick Mathewson -Date: Mon Nov 23 15:53:24 2009 -0500 - - Add the abilitity to mark some buffer callbacks as never-deferred. - -commit 689fc091a58dc90826ec90c1ca90a5d21b7184ad -Author: Nick Mathewson -Date: Sat Nov 28 11:31:39 2009 -0500 - - New EVTHREAD_TRY_LOCK function to try to grab a lock. - -commit 2b7abf038fc22c3f2b0ab05066733ca388b1a3d0 -Merge: b62d979 6c7c579 -Author: Nick Mathewson -Date: Fri Dec 4 13:49:27 2009 -0500 - - Merge commit 'niels/dnscrash' - -commit 6c7c5799a4a3d590fac4c3b87c1c813d9e92f61c -Author: Yasuoka Masahiko -Date: Fri Dec 4 10:44:46 2009 -0800 - - Fix a crash when reading badly formatted resolve.conf; from Yasuoka Masahiko - -commit b62d979b6804f8a7d89e863d1ae46424b4205aed -Author: unknown -Date: Wed Dec 2 01:24:37 2009 -0500 - - Update nmake makefile to build evthread.c - -commit 31687b4d8a8e870762d6aa4b115cc36cbeb47773 -Author: unknown -Date: Wed Dec 2 01:22:07 2009 -0500 - - Fix regress_iocp.c usage of old lock allocation macros. - -commit bd6f1babf7c93c1a4b32ad9bbb0022d203398ac3 -Author: Roman Puls -Date: Wed Dec 2 01:15:15 2009 -0500 - - Fix up evthread compilation on windows - -commit 56771a3eedb8c5ef55d67a707be91b1906e5a45b -Author: William Ahern -Date: Sun Nov 29 10:20:46 2009 -0500 - - Valgrind fix: Clear struct kevent before checking for OSX bug. - - William's original commit message: - - Valgrind complains on startup because kq_init passes to kevent only - a partially initialized structure. The code doesn't expect kevent - to look at .fflags, .udata, or .data, I suppose, because it merely - tickles the kernel looking for an error response. But perhaps - that's unwarranted chuminess (notwithstanding that it's checking - for an OS X bug), and needless noise nonetheless. - -commit 0cd3bb9f3a53cce9a64ce1536d6e171848e8da59 -Author: Nick Mathewson -Date: Fri Nov 27 17:22:19 2009 -0500 - - Improved optional lock debugging. - - There were a couple of places in the code where we manually kept lock - counts to make sure we never accessed resources without holding a - lock, and that we never released a lock we didn't have. The - lock-debugging code already puts counts on _every_ lock when lock - debugging is enabled, so there is no need to keep these counts around - otherwise. This patch rewrites the ASSERT_FOO_LOCKED macros to all - use a common EVLOCK_ASSERT_LOCKED(). - - We also teach the lock debugging code to keep track of who exactly - holds each lock, so that EVLOCK_ASSERT_LOCKED() means "locked by this - thread." - -commit 2df1f82bfa1b432a277b0e1f8fc65aed7898f5e5 -Author: Zhuang Yuyao -Date: Fri Nov 27 16:02:49 2009 -0500 - - Fix an evdns lock violation. - - Original message: - - evdns contains a bug related to thread lock. - - enable thread lock by evthread_use_pthreads() will cause successive - evdns_base_resolve_ipv4() (and other resolve functions i think) to - hang on EVDNS_LOCK(base) after one or several successful call to - evdns_base_resolve_ipv4(). - -commit da1718b28992076e5cceb68e1715244a7dbd9669 -Author: Nick Mathewson -Date: Fri Nov 27 16:00:59 2009 -0500 - - Fix a locking bug in event_base_loop() - - We previously were releasing the lock when we exited the main loop - in some ways, but not in others. - -commit d84d8385cda1bf795a927a019b26db8bb9d0a4c4 -Author: Nick Mathewson -Date: Fri Nov 27 15:24:32 2009 -0500 - - Fix two use-after-free bugs in unit tests spoted by lock debugging - -commit 76cd2b70bb64962636cba0073571d0694b9c237a -Author: Nick Mathewson -Date: Fri Nov 27 16:44:47 2009 -0500 - - Stop passing EVTHREAD_READ and EVTHREAD_WRITE to non-rw locks. - - Previously, our default lock model kind of assumed that every lock was - potentially a read-write lock. This was a poor choice, since - read-write locks are far more expensive than regular locks, and so the - lock API should only use them when we can actually take advantage of - them. Neither our pthreads or win32 lock implementation provided rw - locks. - - Now that we have a way (not currently used!) to indicate that we - really want a read-write lock, we shouldn't actually say "lock this - for reading" or "lock this for writing" unless we mean it. - -commit 347952ffe0039369ff4e7c94c4e27e7333ba8ecb -Author: Nick Mathewson -Date: Fri Nov 27 15:20:43 2009 -0500 - - Revise the locking API: deprecate the old locking callbacks and add trylock. - - Previously, there was no good way to request different kinds of lock - (say, read/write vs writeonly or recursive vs nonrecursive), or for a - lock function to signal failure (which would be important for a - trylock mode). - - This patch revises the lock API to be a bit more useful. The older - lock calls are still supported for now. - - We also add a debugging mode to catch common errors in using the - locking APIs. - -commit e1ffbb82e34d786d07a5acdb16077f6526f610c3 -Author: Nick Mathewson -Date: Sat Nov 21 01:11:49 2009 -0500 - - Fix memory-leak of signal handler array with kqueue. - - It turns out that kqueue_dealloc wasn't calling evsig_dealloc() - (because it doesn't use the main signal handler logic) so the sh_old - array was leaking. - - This patch also introduces a fix in evsig_dealloc() where we set - the sh_old array to NULL when we free it, so that main/fork can pass. - -commit 07e9e9b4b1d6c29fbca214f105567717e29ade2b -Author: Nick Mathewson -Date: Fri Nov 20 16:50:55 2009 -0500 - - Parenthesize macro arguments more aggressively - -commit f32b57505e7221db068979e22ade5518aa7b4559 -Author: Nick Mathewson -Date: Fri Nov 20 16:38:01 2009 -0500 - - Add a warning about the use of event_initialized. - -commit 91fe23fc08b2b8e42140c54cbb4757ae1375b9a3 -Author: Nick Mathewson -Date: Fri Nov 20 15:46:04 2009 -0500 - - Tolerate code that returns from a fatal_cb. - - Also, replace more abort() calls with EVUTIL_ASSERT() or event_errx. - -commit 94d00651f458fdff584037900ad976419583ee4a -Author: Nick Mathewson -Date: Fri Nov 20 12:56:29 2009 -0500 - - Add stub header for 2.0.4-alpha changelog. - -commit 0af10d5695ab987678b59e1dcdd22b5cb3695044 -Author: Nick Mathewson -Date: Fri Nov 20 12:46:00 2009 -0500 - - Add more people who wrote patches to the acknowledgments - - The names came from grepping ChangeLog for 'patch/code from/by'. - -commit 0b4272681f35bb516594b88cf9437a24996d585b -Author: Nick Mathewson -Date: Fri Nov 20 12:37:47 2009 -0500 - - Improve the README with more information and links. - - (Also, try to test out the new commit script.) - -commit ba3407142b07f7d9ea7dd61ff9873d2a6f639f8d -Author: Nick Mathewson -Date: Fri Nov 20 12:17:14 2009 -0500 - - Add a .gitignore file. - - .gitignore plays the same role in Git as the svn:ignore property does in - subversion. - -commit 505040a2b5d41834d69d3412a03bd2e20f6d8598 -Author: Niels Provos -Date: Fri Nov 20 00:18:35 2009 +0000 - - call it 2.0.3-alpha - - svn:r1556 - -commit f169153956d9aa578b96d50cd574c47ee8fd7511 -Author: Niels Provos -Date: Thu Nov 19 23:08:50 2009 +0000 - - Remove most calls to event_err() in http and deal with memory errors instead - - svn:r1555 - -commit 986500de4db591134832923f5dd8d78477a62f2e -Author: Niels Provos -Date: Thu Nov 19 22:02:33 2009 +0000 - - nick found a race condition in the pthreads test case - - svn:r1554 - -commit b8f222e055bbba81790ebf13d294cc30a292c49b -Author: Niels Provos -Date: Thu Nov 19 21:14:31 2009 +0000 - - On FreeBSD and other OSes, connect can return ECONREFUSED immediately; instead of failing the function call, pretend with faileld in the callback. - - svn:r1553 - -commit bdfe72f3c5fe085806e53acc5d1bf8d39d16e252 -Author: Nick Mathewson -Date: Thu Nov 19 00:21:48 2009 +0000 - - Documentation adjustments - - svn:r1552 - -commit 7511b6a97c7eb055c3b886010423d85e0106f847 -Author: Nick Mathewson -Date: Thu Nov 19 00:21:38 2009 +0000 - - Fix a spelling error and remove some dead code - - svn:r1551 - -commit f070a4aed2129a722f10d23e6defc4f901143fea -Author: Nick Mathewson -Date: Wed Nov 18 23:18:55 2009 +0000 - - Do the proper hack for the (Open)BSD getaddrinfo quirk. - - From evutil.c: - - Some older BSDs (like OpenBSD up to 4.6) used to believe that - giving a numeric port without giving an ai_socktype was verboten. - We test for this so we can apply an appropriate workaround. If it - turns out that the bug is present, then: - - - If nodename==NULL and servname is numeric, we build an answer - ourselves using evutil_getaddrinfo_common(). - - - If nodename!=NULL and servname is numeric, then we set - servname=NULL when calling getaddrinfo, and post-process the - result to set the ports on it. - - We test for this bug at runtime, since otherwise we can't have the - same binary run on multiple BSD versions. - - svn:r1550 - -commit 07ce7f9991551c571759deabebb7a72527b40840 -Author: Nick Mathewson -Date: Wed Nov 18 21:17:00 2009 +0000 - - Make our failing-connection bufferevent test more tolerant. - - I thought we had a way to do connect() that would never fail - immediately, but always wait for a moment before failing. It - turns out that on FreeBSD it can fail immediately. This is not - FreeBSD's fault, or even a real bug anywhere but in the unit test. - - svn:r1549 - -commit cf749e227c9a064894502d2a04901f0a18edd96a -Author: Nick Mathewson -Date: Wed Nov 18 21:16:53 2009 +0000 - - Add a temporary workaround for an ssl bug found on FreeBSD. - - Basically, we only want to report the 'connected' event because of - the socket connect() finishing when we have an actual socket - bufferevent; on an SSL bufferevent, 'connected' means 'SSL - connection finished.' - - This isn't FreeBSD's fault: it just has a connect() that tends to - succeed pretty early. - - svn:r1548 - -commit 9bf124bff6d43fd9283c3ceb9629683ed790c136 -Author: Nick Mathewson -Date: Wed Nov 18 21:16:47 2009 +0000 - - Build correctly with mm replacement turned off. - - svn:r1547 - -commit 767eb70f5016cf65c3fad8e91ded8b4362bc79b0 -Author: Nick Mathewson -Date: Wed Nov 18 21:16:33 2009 +0000 - - Fix compilation with threading disabled. - - svn:r1546 - -commit d7d1f1da09f32a14ff4c08dc0f1f0e0673ed5afd -Author: Nick Mathewson -Date: Tue Nov 17 20:31:09 2009 +0000 - - Move responsibility for IOCP callback into bufferevent_async. - - This patch from Chris Davis saves some callback depth, and adds proper - ref-counting to bufferevents when there's a deferred evbuffer callback - inflight. It could use a couple more comments to really nail down what - its invariants are. - - svn:r1543 - -commit 201d8d0bafeb2ba1388746ed745cd5d8defb3689 -Author: Nick Mathewson -Date: Tue Nov 17 18:29:44 2009 +0000 - - Clarify even more about various system-specific problems with getaddrinfo - - svn:r1542 - -commit 9151d000e674560a2034313d696b39fbe2adc30b -Author: Nick Mathewson -Date: Tue Nov 17 03:36:43 2009 +0000 - - Use the common-case code from getaddrinfo_common *always*; OS differences are just too huge. - - svn:r1541 - -commit 3451c870dad6dc3555cfb798149087adb9192b33 -Author: Nick Mathewson -Date: Tue Nov 17 02:57:32 2009 +0000 - - Never pass our weird flags to the system getaddrinfo. Make sure there is no overlap between flag values. - - svn:r1540 - -commit 625a261a530cc273fba062ac59fd6b6ca9ddc8ad -Author: Nick Mathewson -Date: Tue Nov 17 02:40:14 2009 +0000 - - OpenBSD demands that sys/types.h be included before sys/socket.h - - svn:r1539 - -commit 888007f9a4617db574b0455919b52867cc8ce64d -Author: Nick Mathewson -Date: Tue Nov 17 02:38:19 2009 +0000 - - Windows *does* have getservbyname, no matter what autoconf says. - - TODO: figure out why autoconf is confused about this. - - svn:r1538 - -commit 86f5742015c6ac5e83ffcf5b747cb6ca1139d066 -Author: Nick Mathewson -Date: Mon Nov 16 22:25:46 2009 +0000 - - Add two implementations of getaddrinfo: one blocking and one nonblocking. - - The entry points are evutil_getaddrinfo and evdns_getaddrinfo respectively. - There are fairly extensive unit tests. - - I believe this code conforms to RFC3493 pretty closely, but there are - probably more issues. It should get tested on more platforms. - - This code means we can dump the well-intentioned but weirdly-implemented - bufferevent_evdns and evutil_resolve code. - - svn:r1537 - -commit 72bafc175a75f8775eae9ab7b3c828395bb0eaa6 -Author: Nick Mathewson -Date: Mon Nov 16 22:23:55 2009 +0000 - - Remove the stupid brokenness where DNS option names needed to end with a - colon. - - svn:r1536 - -commit f9de8670fd1a88f0db898acd46de38a73d764c18 -Author: Nick Mathewson -Date: Mon Nov 16 22:23:06 2009 +0000 - - Fix a declaration of __func__ in rpcgen. - - svn:r1535 - -commit 18a8cfac390a67ac3279b0119aa55d3c2015a00b -Author: Nick Mathewson -Date: Sun Nov 15 19:00:12 2009 +0000 - - Prefer calloc(a,b) to malloc(a*b). via openbsd. - - svn:r1531 - -commit 629a61339823cd65351c7aeb294b3337db06dccb -Author: Nick Mathewson -Date: Sun Nov 15 18:59:59 2009 +0000 - - When running set[ug]id, don't check the environment. - - Idea from OpenBSD, but made a bit more generic to handle uncivilized lands - that do not define issetugid. - - svn:r1530 - -commit e2b2de79bfb3e50bfcb943b145ac45e7f68c9616 -Author: Nick Mathewson -Date: Sun Nov 15 18:59:48 2009 +0000 - - Use arc4random() for dns transaction ids where available. Patch taken from OpenBSD - - svn:r1528 - -commit c79a45e0097dd34c7f7024598a5b4c3b1b0fb422 -Author: Nick Mathewson -Date: Sat Nov 14 21:54:30 2009 +0000 - - Fix a couple of event_debug calls. - - svn:r1527 - -commit 74871cacb8318116e2cf24958e1456e9b429542b -Author: Nick Mathewson -Date: Mon Nov 9 19:37:27 2009 +0000 - - Change event_base.activequeues to "array of eventlist". - - Previously, event_base.activequeues was of type "array of pointers to - eventlist." This was pointless: none of the eventlists were allowed - to be NULL. Worse, it was inefficient: - - - It made looking up an active event queue take two pointer - deferences instead of one, thus risking extra cache misses. - - It used more RAM than it needed to, because of the extra pointer - and the malloc overhead. - - Also, this patch fixes a bug where we were saying - calloc(N,N*sizeof(X)) instead of calloc(N,sizeof(X)) when allocating - activequeues. That part, I'll backport. - - Also, we warn and return -1 on failure to allocate activequeues, - rather than calling event_err. - - svn:r1525 - -commit cdf58009fc7c81e9b353cf953c8eda94337644fb -Author: Nick Mathewson -Date: Mon Nov 9 19:37:21 2009 +0000 - - Change an OOM err to a warn in event_tagging.c - - svn:r1524 - -commit 26573d3de3e35e956fc79eb8c8e3849ca714c109 -Author: Nick Mathewson -Date: Mon Nov 9 19:37:15 2009 +0000 - - Change an err to a warn in bufferevent_openssl - - svn:r1523 - -commit 37e23f806be8665f35b83ae61440faece86e7e61 -Author: Nick Mathewson -Date: Mon Nov 9 18:50:20 2009 +0000 - - Patch from Ryan Phillips: accept ipv6 addresses returned by getaddrinfo in http.c - - svn:r1522 - -commit b2fe4aedaae559761b5818a964b63deae02dbdf0 -Author: Nick Mathewson -Date: Mon Nov 9 18:36:34 2009 +0000 - - Unit tests for got_break and got_exit. - - svn:r1521 - -commit e88079a82c52c213b0e335c52a25a00cd9fd1605 -Author: Nick Mathewson -Date: Mon Nov 9 18:30:57 2009 +0000 - - Make persistent timeouts more accurate. - - Previously, if the user scheduled a persistent timeout for {1,0}, we - would schedule the first one at "now+one second", and then when we - were about to run its callback, we would schedule it again for one - second after that. This would introduce creeping delays to the event - that was supposed to run every second. - - Now, we schedule the event for one second after it was _last - scheduled_. To do this, we introduce internal code to add an event at - an _absolute_ tv rather than at now+tv. - - svn:r1520 - -commit 59be8942c9e9b30ebc67b83bdf27866d5efb4636 -Author: Nick Mathewson -Date: Mon Nov 9 18:30:48 2009 +0000 - - Make sure that common timeouts are inserted in-order. - - This code should be a no-op, except under strange thread contention - situations. - - svn:r1519 - -commit ab96b5f3f5247c7c7500a64536ceb345e0b8a65f -Author: Nick Mathewson -Date: Mon Nov 9 18:30:33 2009 +0000 - - Add an option to disable the timeval cache. - - svn:r1518 - -commit 693c24ef9d01c55c81f50fc1d70950dcfa2a524e -Author: Nick Mathewson -Date: Mon Nov 9 17:16:30 2009 +0000 - - Implement queued timeouts for case where many timeouts are the same. - - Libevent's current timeout code is relatively optimized for the - randomly scattered timeout case, where events are added with their - timeouts in no particular order. We add and remove timeouts with - O(lg n) behavior. - - Frequently, however, an application will want to have many timeouts - of the same value. For example, we might have 1000 bufferevents, - each with a 2 second timeout on reading or writing. If we knew this - were always the case, we could just put timeouts in a queue and get - O(1) add and remove behavior. Of course, a queue would give O(n) - performance for a scattered timeout pattern, so we don't want to - just switch the implementation. - - This patch gives the user the ability to explicitly tag certain - timeout values as being "very common". These timeout values have a - cookie encoded in the high bits of their tv_usec field to indicate - which queue they belong on. The queues themselves are each - triggered by an entry in the minheap. - - See the regress_main.c code for an example use. - - svn:r1517 - -commit 784b8773a452f36a68b71a42104e241074d208ee -Author: Nick Mathewson -Date: Fri Nov 6 21:46:57 2009 +0000 - - We do not work any more without an event-config.h; stop pretending that it is meaningful to check for HAVE_CONFIG_H - - svn:r1516 - -commit 4d48cf61a2734aa37a7a5904f5c1454a62aa943a -Author: Nick Mathewson -Date: Fri Nov 6 21:13:25 2009 +0000 - - Fix kqueue.c build on GNU/kFreeBSD systems. - - Yes, some people like to have a BSD-family kernel (thus getting - kqueue) with a GNU-family libc (thus occasionally mandating - _GNU_SOURCE). - - Thanks to Debian for noticing this. - - svn:r1514 - -commit 5ec43fe446d399464125d7cc0d5d1182756c953f -Author: Nick Mathewson -Date: Fri Nov 6 17:12:39 2009 +0000 - - Fix a miscalculated realloc() size in win32select.c. - - This bug was introduced by the code to make the backend able to safely release the base lock while calling select(). - - Also, we change win32select.c to the same 32-fds-to-start default as the rest of the backends, so that the main/many_events test can test it. It was at 64-to-start, so the test wasn't hitting it. - - svn:r1513 - -commit ae5fbf492f2ba43f05063179a583f4711ddfec20 -Author: Nick Mathewson -Date: Thu Nov 5 22:24:21 2009 +0000 - - Actually add the new dns-example.c code. :p - - svn:r1512 - -commit d2e7e65d215a5de8a77ec5e4b7c0d79ddaba0107 -Author: Nick Mathewson -Date: Thu Nov 5 22:19:09 2009 +0000 - - Move the evdns sample code into the sample directory and fix it not to use any deprecated APIs. - - svn:r1511 - -commit ac633aebdfb094b19c8c322614e3fb4739dfb0d4 -Author: Nick Mathewson -Date: Thu Nov 5 21:22:23 2009 +0000 - - Fix some build warnings on MSVC, mostly related to signed/unsigned comparisons. - - svn:r1510 - -commit 43ba66936aa24bde5e2e77a62365e3711cc427c2 -Author: Nick Mathewson -Date: Thu Nov 5 20:45:07 2009 +0000 - - Export nmakefiles in source distribution. - - svn:r1509 - -commit 4ca9efeaef6a56ae4109053f20e21781bd2c5ea0 -Author: Nick Mathewson -Date: Thu Nov 5 20:40:11 2009 +0000 - - Add nmake files to build with MSVC. - - Right now, they just make static libraries and unit tests. They probably set lots of options wrong. - - svn:r1507 - -commit 25a5e6819d9f49fd143308fad0d9189a8eef8a97 -Author: Nick Mathewson -Date: Thu Nov 5 20:37:19 2009 +0000 - - Build fixes for MSVC - - svn:r1506 - -commit d34019289ca58deb0c1c182f5fbd3cb6b93774ee -Author: Nick Mathewson -Date: Thu Nov 5 18:49:08 2009 +0000 - - Rename win32.c to win32select.c, and take it out of the WIN32-Code ghetto. - - svn:r1504 - -commit d14c3b4570fd3e5e9db827d9b97e4eed69511c83 -Author: Nick Mathewson -Date: Thu Nov 5 18:25:46 2009 +0000 - - Fix another ssize_t user - - svn:r1503 - -commit a0b302631ff9ca2c440365a6ba70e78f0c3b11f2 -Author: Nick Mathewson -Date: Thu Nov 5 18:07:27 2009 +0000 - - Remove win32-code/config.h. It was apparently confusing. - - svn:r1502 - -commit 34f28e08b3eda22033089c5ca72b5650fa38a21b -Author: Nick Mathewson -Date: Thu Nov 5 15:57:22 2009 +0000 - - Fix a few types to use compatible versions - - svn:r1501 - -commit 47bad8abb70c49f1d2bc1ddbc13ec7ec96bc20f5 -Author: Nick Mathewson -Date: Wed Nov 4 20:17:32 2009 +0000 - - Implement size limits on HTTP header length and body length. - - Patch from Constantine Verutin, simplified a little. - - svn:r1500 - -commit 86db1c851be804b13aadebcc0b1a21a4493192dd -Author: Nick Mathewson -Date: Wed Nov 4 05:19:26 2009 +0000 - - Commit ConnectEx code to get connect working with async bufferevents. - - This is code by Chris Davis, with changes to get the unit tests failing less aggressively. - - The unit tests for this code do not completely pass yet; Chris is looking into that. If they aren't passing by the next release, I'll turn off this code. - - svn:r1499 - -commit 6ca32df11ac92a4c3ab417d656253353e28a7dc3 -Author: Nick Mathewson -Date: Wed Nov 4 03:54:05 2009 +0000 - - Add a missing include for win32. - - svn:r1498 - -commit f9c65580f0438dacb741cabe3ab96b89422aea33 -Author: Nick Mathewson -Date: Tue Nov 3 20:42:32 2009 +0000 - - Oops; add missing bufferevent_evdns.c file - - svn:r1497 - -commit 0b9eb1bffbd5af7d1dc6987f1a859e5f1e8c25e8 -Author: Nick Mathewson -Date: Tue Nov 3 20:40:48 2009 +0000 - - Add a bufferevent function to resolve a name then connect to it. - - This function, bufferevent_socket_connect_hostname() can either use - evdns to do the resolve, or use a new function (evutil_resolve) that - uses getaddrinfo or gethostbyname, like http.c does now. - - This function is meant to eventually replace the hostname resolution mess in - http.c. - - svn:r1496 - -commit fcc7668c008ce25d47834019c3d081819851c32d -Author: Nick Mathewson -Date: Tue Nov 3 20:05:06 2009 +0000 - - Fix one IOCP-callback signature I missed - - svn:r1495 - -commit 0fd0255fa4b1e60cd49324f79472657c1f1ed24f -Author: Nick Mathewson -Date: Tue Nov 3 19:54:56 2009 +0000 - - Remove compat/sys/_time.h - - I've gone through everything that it declared to see where it was used, - and it seems that we probably don't need it anywhere. - - Here's what it declared, and why I think we're okay dropping it. - - o struct timeval {} - (Used all over, and we can't really get away with declaring it ourselves; - we need the same definition the system uses. If we can't find struct - timeval, we're pretty much sunk.) - - o struct timespec {} - (Used in event.c, evdns.c, kqueue.c, evport.c. Of these, - kqueue.c and event.c include sys/_time.h. event.c conditions its use on - _EVENT_HAVE_CLOCK_GETTIME, and kqueue() only works if timespec is defined.) - - o TIMEVAL_TO_TIMESPEC - (Used in kqueue.c, but every place with kqueue has sys/time.h) - - o struct timezone {} - (event2/util.h has a forward declaration; only evutil.c references it and - doesn't look at its contents.) - - o timerclear, timerisset, timercmp, timeradd, timersub - (Everything now uses the evutil_timer* variants.) - - o ITIMER_REAL, ITIMER_VIRTUAL, ITIMER_PROF, struct itemerval - (These are only used in test/regress.c, which does not include _time.h) - - o CLOCK_REALTIME - (Only used in evdns.c, which does not include _time.h) - - o TIMESPEC_TO_TIMEVAL - o DST_* - o timespecclear, timespecisset, timespeccmp, timespecadd, timespecsub - o struct clockinfo {} - o CLOCK_VIRTUAL, CLOCK_PROF - o TIMER_RELTIME, TIMER_ABSTIME - (unused) - - svn:r1494 - -commit 0aa6f5136a10d4d6426ab4abb10ed4cbbde208bd -Author: Nick Mathewson -Date: Mon Nov 2 20:59:13 2009 +0000 - - Fix remaining AcceptEx issues. - - svn:r1492 - -commit e794d716a3ed525ca427d35cb1c80fc6bb9f8543 -Author: Nick Mathewson -Date: Mon Nov 2 20:20:40 2009 +0000 - - Clean up acceptex code some more: add locking, single-threading, enable/disable. - - svn:r1491 - -commit a84c87d76abcd023ddfb2c0985a65bafd522682b -Author: Nick Mathewson -Date: Mon Nov 2 19:51:26 2009 +0000 - - Refactor IOCP callback interface - - Chris Davis points out that GetQueuedCompletionStatus - sometimes returns false not to report "No events for - you!" but instead to report "An overlapped operation - failed." Add a way to tell an event_overlapped that - its operation failed. - - svn:r1490 - -commit 9a772148f2efcbaadbe8ccc50a2bd5d0004f971d -Author: Nick Mathewson -Date: Mon Nov 2 19:31:29 2009 +0000 - - Compilation and correctness fixes for IOCP listener code. - - svn:r1489 - -commit 8283b2f0dcba87974db767e4838434896a92d402 -Author: Nick Mathewson -Date: Mon Nov 2 19:30:25 2009 +0000 - - Fix a major parenthesis bug in EVUTIL_UPCAST. - - Fortunately, this didn't hurt anything previously, since we had no actual users of the macro where the offset of the base type wasn't 0. - - svn:r1488 - -commit 5f1d6e640f965d468122598b92be609a483d1923 -Author: Nick Mathewson -Date: Mon Nov 2 17:42:16 2009 +0000 - - Add more IOCP tests. They might not pass yet. - - svn:r1487 - -commit 5d2c1650f3c39e89c0c7d687a2fec3f6f66955e4 -Author: Nick Mathewson -Date: Mon Nov 2 17:42:09 2009 +0000 - - More refactoring for IOCP listener code - - svn:r1486 - -commit e90e14fb94f7bb54f822dd5d3bfbf476649451e5 -Author: Nick Mathewson -Date: Mon Nov 2 16:31:13 2009 +0000 - - Call the bufferevent_flush_mode variable "mode" more consistently in the documentation. Spotted by Alex. - - svn:r1485 - -commit 7f0ad2f63cd5c7e41a1916e4d8a3a5606880b429 -Author: Nick Mathewson -Date: Mon Nov 2 16:17:06 2009 +0000 - - Fix an errant user of ssize_t to use ev_ssize_t. - - My usual strategy of grep '[^_]ssize_t' had apparently failed me, - since this ssize_t was in the first column. - - Resolves bug 2890434; spotted by Mihai Draghicioiu. - - svn:r1484 - -commit 315fde1a70da1c1e4b9565f38f52680e23114a84 -Author: Nick Mathewson -Date: Fri Oct 30 22:43:53 2009 +0000 - - Remove some duplicate code in kqueue.c and fix a small memory leak. - - svn:r1483 - -commit 96c6956e0247f615d8afd25d79586dfa5b478ef0 -Author: Nick Mathewson -Date: Fri Oct 30 22:43:30 2009 +0000 - - Add a "many events" regression test. - - This is a glass-box test to get more coverage on the event loop - backends. We've run into bugs here before with fencepost errors, and - it turns out that none of our unit tests had enough events to - exercise the resize code. - - Most of the backends have some kind of logic that resizes an array - when: - - The highest fd is too high - - The number of events added since the last iteration of the loop - is too high - - The number of active events is too high. - - This test hits all 3 cases, and increases coverage in select.c by 7%, - in poll by 1%, and in kqueue by 9%. - - svn:r1482 - -commit 516452b71a4450f7201bc1a6bd31878c68a81e57 -Author: Nick Mathewson -Date: Fri Oct 30 21:08:29 2009 +0000 - - Keep openssl errors associated with the right bufferevent object. - - OpenSSL has a per-thread error stack, and really doesn't like you - leaving errors on the stack. Rather than discard the errors or force - the user to handle them, this patch pulls them off the openssl stack - and puts them on a stack associated with the bufferevent_openssl. If - the user leaves them on the stack then, it won't affect any other - connections. - - This bug was found by Roman Puls. Thanks! - - svn:r1481 - -commit 20f5bdfd6b9c0f51c56f55a9bd349c35576fafc8 -Author: Nick Mathewson -Date: Thu Oct 29 19:25:33 2009 +0000 - - Refactor evconnlistener to allow multiple implementations; add an (incomplete, not-yet-integrated) IOCP implementation. - - svn:r1480 - -commit fa313f28c57769a819c8d4194180571c6772acf8 -Author: Nick Mathewson -Date: Thu Oct 29 18:30:43 2009 +0000 - - Extract XP-only functions when initializing the IOCP port - - svn:r1479 - -commit 9976f1e74c1a285a591d8a80af61727af50b4961 -Author: Nick Mathewson -Date: Thu Oct 29 17:11:12 2009 +0000 - - reformat weird indentation in dns tests - - svn:r1478 - -commit 3c2198cb48724c1eac117db04dbebf32bb883077 -Author: Nick Mathewson -Date: Thu Oct 29 17:10:36 2009 +0000 - - Unit test for reverse ipv6 lookup - - svn:r1477 - -commit 5b3fb5bfa50a23d2a3d973a66b1a0d76195a3cca -Author: Nick Mathewson -Date: Thu Oct 29 16:35:20 2009 +0000 - - More documentation and unit tests for event_tagging. - - svn:r1476 - -commit 1eadb3e3a299da5c384422792a672ff022870f4c -Author: Nick Mathewson -Date: Thu Oct 29 16:35:15 2009 +0000 - - Actually use the logic in select.c designed to make the out_sets threadsafe. - - svn:r1475 - -commit c70c25937e6c6f2d20cdf3d19f95dd80790935e5 -Author: Nick Mathewson -Date: Thu Oct 29 16:35:09 2009 +0000 - - Unit test for strlcpy - - svn:r1474 - -commit e9098203f7df0a3c30db2c07cebfc3a9680f7c06 -Author: Nick Mathewson -Date: Tue Oct 27 18:25:19 2009 +0000 - - Fix from Chris Davis: get error-logging to be happy on win32. - - svn:r1473 - -commit 904b5721cb239fd6cc1dd52471f81b4c89f42cbb -Author: Nick Mathewson -Date: Tue Oct 27 06:47:25 2009 +0000 - - Avoid calling exit() during event_base_new*() - - Previously, each of the three make-an-event-base functions would exit - under different, weird circumstances, but return NULL on others. - - All three would exit on OOM sometimes. - - event_base_new() and event_init() would die if all backends were - disabled. - - None of them would die if the socketpair() call failed. - - Now, only event_init() exits on failure, and it exits on every kind of - failure. event_base_new() and event_base_new_with_config() never do. - - svn:r1472 - -commit a2a7d1d12316c7e317e5f4bd3f8a18aa91027c95 -Author: Nick Mathewson -Date: Tue Oct 27 05:16:32 2009 +0000 - - Do not call the locking variant of event_add or event_active in some cases when we know we have the lock. - - svn:r1471 - -commit d386dc89b52fbbe218f1ac192169fd07484c0d8d -Author: Nick Mathewson -Date: Tue Oct 27 05:16:23 2009 +0000 - - Refactor event_assing even more to avoid unnecessary calls - - svn:r1470 - -commit e9ee1057e63b33d833b83b404232a0ccde34ae56 -Author: Nick Mathewson -Date: Tue Oct 27 04:25:45 2009 +0000 - - Give event_assign a return value, and make it less inclined to exit(). - - We also refactor event_assign so that it is the core function, and - event_set() is only the wrapper. - - svn:r1469 - -commit 10cf631e841a9b4272ca62100257b51d6a519654 -Author: Nick Mathewson -Date: Tue Oct 27 04:04:07 2009 +0000 - - Do not add a newline to the end of log statements. - - svn:r1468 - -commit 369aafc4d785a7ac65aad138ded6c602bc9381fe -Author: Nick Mathewson -Date: Tue Oct 27 04:03:58 2009 +0000 - - Refactor kq_init error handling. - - svn:r1467 - -commit ed0e91e02af2aa19ed0e7340c52f2f31686cc9b6 -Author: Nick Mathewson -Date: Tue Oct 27 04:03:50 2009 +0000 - - New test flag to suppress logging for one test. - - svn:r1466 - -commit 7f10fac34296eb856118fd882cc12a576ed39a04 -Author: Nick Mathewson -Date: Mon Oct 26 20:07:06 2009 +0000 - - Note assert-related change in changelog - - svn:r1465 - -commit 2e36dbe1a6b1056917c85350e2743a6babe96aa2 -Author: Nick Mathewson -Date: Mon Oct 26 20:00:43 2009 +0000 - - Use EVUTIL_ASSERT() consistently instead of assert. - - svn:r1464 - -commit 37c3456d70b343588acf09b38b6dde6e9745b2f8 -Author: Nick Mathewson -Date: Mon Oct 26 20:00:08 2009 +0000 - - Add an EVUTIL_ASSERT() to replace our calls to assert(). - - The big difference here is that EVUTIL_ASSERT() passes its message on - via event_errx() before aborting, so that the application has a prayer - of noticing and recording it. - - svn:r1463 - -commit a8267663de2feb27051682cb51f9596f59613e5f -Author: Nick Mathewson -Date: Mon Oct 26 19:59:51 2009 +0000 - - API to replace all calls to exit() with a user-supplied fatal-error handler. - - Also, add unit tests for logging. - - svn:r1462 - -commit 38aec9ec7cb7d4bd135b0a02ce9f186871d1f0b9 -Author: Nick Mathewson -Date: Fri Oct 23 22:38:35 2009 +0000 - - Tweaks to IOCP interface. - - svn:r1461 - -commit 7b10724901aa87d8f819e93796c020463a8ba9f1 -Author: Nick Mathewson -Date: Fri Oct 23 22:07:05 2009 +0000 - - Fix my fix for the bufferevent_connect_fail() test. - - svn:r1460 - -commit 879420a711453a67c0421968e9592b6cc9f0aae2 -Author: Nick Mathewson -Date: Fri Oct 23 22:00:29 2009 +0000 - - Expose a narrow window to the IOCP code. - - svn:r1459 - -commit c119e4a13ff171aafff9e0f27f11f8cae389880e -Author: Nick Mathewson -Date: Fri Oct 23 17:40:00 2009 +0000 - - Improve the behavior of le-proxy in a few cases. - - svn:r1458 - -commit fdd11c00bb7a90d2f11a8933baa577ac199f74e3 -Author: Nick Mathewson -Date: Wed Oct 21 19:21:05 2009 +0000 - - Make the bufferevent_connect_fail test faster on OSX. - - It seems that connecting to a listener that is bound but not accepting - or listening doesn't give a 'connection refused' error on OSX, but - rather makes the connect() time out after 75 seconds. I couldn't find - any way to make the timout shorter. Fortunately, closing the listener - after a second or so makes the desired error occur after another - second or so. - - svn:r1457 - -commit b73ad7bc4504882f7b50ed72c2643653fdc43a61 -Author: Nick Mathewson -Date: Wed Oct 21 18:48:22 2009 +0000 - - Treat the bitwise OR of two enum values as an int. - - This makes our interfaces usable from C++, which doesn't believe - you can say "bufferevent_socket_nase(base, -1, - BEV_OPT_CLOSE_ON_FREE|BEV_OPT_DEFER_CALLBACKS)" but which instead - would demand "static_cast(BEV_OPT_CLOSE_ON_FREE| - BEV_OPT_DEFER_CALLBACKS))" for the last argument. - - Diagnosis and patch from Chris Davis. - - svn:r1456 - -commit 4fbac2a5aef7bc3dee065241f20f3140c4f57b7e -Author: Nick Mathewson -Date: Wed Oct 21 07:00:19 2009 +0000 - - Test failing case of bufferevent_connect(). - - Code by Chris Davis. - - svn:r1455 - -commit d8164d0cfc5eda8101ad08008e3f3de2032b26a9 -Author: Nick Mathewson -Date: Wed Oct 21 07:00:14 2009 +0000 - - Fix win32 connect() event handling. - - Christopher Davis reported: - - Connection failures aren't reported on Windows when - using bufferevent_socket_connect, because Windows uses - select's exceptfds to notify of failure, and libevent - treats them like read events. Only the write event - handler is currently used to handle connection events. - - We should think hard about this one, since it changes - behavior from 1.4.x. Anything that worked on Mac/Unix before - will work more consistently on Windows now... but this might - break stuff that worked only on Windows, but nowhere else. - - Patch from Chris Davis. - - svn:r1454 - -commit b89b58b5f4ea91792883c84e2f7b98befbc1a3a0 -Author: Nick Mathewson -Date: Wed Oct 21 06:03:00 2009 +0000 - - OSX compilation issues - - svn:r1453 - -commit c9c4ec26eeca16400b9bffab26a8dc655b7354d5 -Author: Nick Mathewson -Date: Wed Oct 21 05:36:27 2009 +0000 - - Remove an EVBASE_RELEASE_LOCK that I missed. - - svn:r1452 - -commit ed748a48ba8ebd573a3e5d047c9de15958d8417a -Author: Nick Mathewson -Date: Wed Oct 21 04:45:59 2009 +0000 - - Fix win32 compilation. - - svn:r1451 - -commit 6b22e74aa187f2bbabb58652070af27fff6f547e -Author: Nick Mathewson -Date: Wed Oct 21 03:54:00 2009 +0000 - - Add locking to event_base_loop. - - This is harder than it sounds, since we need to make sure to - release the lock around the key call to the kernel (e.g., - select, epoll_wait, kevent), AND we need to make sure that - none of the fields that are used in that call are touched by - anything that might be running concurrently in another - thread. I managed to do this pretty well for everything but - poll(). With poll, I needed to introduce a copy of the - event_set structure. - - This patch also fixes a bug in win32.c where we called - realloc() instead of mm_realloc(). - - svn:r1450 - -commit 50825466821c87f55a7549df47086f7412a5a726 -Author: Nick Mathewson -Date: Wed Oct 21 02:14:16 2009 +0000 - - Fix windows compilation warnings. - - svn:r1449 - -commit e1c9b84ae6ae5de9fa03a8028a7336f65c5a1d61 -Author: Niels Provos -Date: Mon Oct 19 16:20:12 2009 +0000 - - Fix compilation for listener.h for C++ - missing extern "C". Patch from Ferenc Szalai. - - svn:r1448 - -commit b812563a6e8f735403e1f1fbcee1d56bd5ff5b4f -Author: Nick Mathewson -Date: Fri Oct 16 13:20:16 2009 +0000 - - Add a note that we should change previous_to_last to last_with_space - - svn:r1447 - -commit f3dee9e8be0240a344e75fb275bbc3fb7541274a -Author: Nick Mathewson -Date: Fri Oct 16 13:20:09 2009 +0000 - - Correct the signatures for the evmap_io_* functions to use evutil_socket_t. - - svn:r1446 - -commit e3fd294a6d2f498aa72e92fe4b005a28a1b312f1 -Author: Nick Mathewson -Date: Fri Oct 16 13:19:57 2009 +0000 - - Spelling fixes in comments and strings. - - svn:r1445 - -commit 25af6954411e369c41d452af5e6d95b9d5c73558 -Author: Nick Mathewson -Date: Wed Oct 14 00:46:47 2009 +0000 - - When a bufferevent_connect() call fails, give the client an error callback. - - Patch from Christopher Davis. - - svn:r1444 - -commit fc83ca3c7086fe1e1988722b95295c96d89a4152 -Author: Nick Mathewson -Date: Wed Oct 14 00:46:40 2009 +0000 - - Fix some crash bugs when initializing evdns - - svn:r1443 - -commit e6b747c34a69fbd93e40cbf58530054522f7e5f9 -Author: Nick Mathewson -Date: Mon Oct 12 21:06:30 2009 +0000 - - Declare struct timezone in util.h so that borken mingw versions do not complain - - svn:r1441 - -commit 633f3fb7aa15b29063de0b26823d1660d2ce6dd2 -Author: Nick Mathewson -Date: Fri Oct 2 03:07:29 2009 +0000 - - Add changelog for last commit - - svn:r1440 - -commit ba8a17714ead9f36424c4ecc21c009735d1408e5 -Author: Nick Mathewson -Date: Fri Oct 2 03:03:58 2009 +0000 - - Do not notify the main thread more than needed. - - Basically, we suppress the notification when an event is added or deleted - and: - - The event has no fd, or there is no change in whether we are - reading/writing on the event's fd. - - The event has no timeout, or adding the event did not make the earliest - timeout become earlier. - - This should be a big efficiency win in applications with multiple threads and - lots of timeouts. - - svn:r1439 - -commit d5b640fc16e9d9e1e709ec73eb938de9eeff3f2c -Author: Nick Mathewson -Date: Thu Oct 1 15:29:08 2009 +0000 - - Apply Ka-Hing Cheung's event_base_got_[break|exit] patch, with locking and whitespace fixes. - - svn:r1438 - -commit 8e8d94a3e08d4cfa9cb817ae36fd4181edea84d2 -Author: Niels Provos -Date: Thu Sep 24 22:18:19 2009 +0000 - - Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec - - svn:r1436 - -commit 18fe400805699b6d60bfc26896294a34c6990756 -Author: Nick Mathewson -Date: Wed Sep 23 23:51:26 2009 +0000 - - Forward-port: fix android compilation - - svn:r1435 - -commit 2622e5ace2863e8e869254d9dba86549bbd9159b -Author: Nick Mathewson -Date: Wed Sep 16 17:17:57 2009 +0000 - - Fix the assert I added to epoll.c: spotted by Dmitry Novikov - - svn:r1432 - -commit c2ead9f173b7d3b40132920fbc62d2319e4b9176 -Author: Nick Mathewson -Date: Fri Sep 11 21:02:19 2009 +0000 - - Treat events with fd == -1 as addable. - - This turns out to simplify a fair bit of logic, including the bufferevent - code, and should fix bug 2850656. - - svn:r1431 - -commit 85255a63974bf41d153e06b34fa346bd2d2f08b2 -Author: Nick Mathewson -Date: Fri Sep 11 18:47:35 2009 +0000 - - Make epoll use less RAM. - - We do this by not allocating the maximum epoll_event array for the epoll - backend at startup. Instead, we start out accepting 32 events at a time, and - double the array's size when it seems that the OS is generating events faster - than we're requesting them. This saves up to 374K per epoll-based - event_base. Resolves bug 2839240. - - svn:r1428 - -commit e3f89fa2753da08e4a7b55d5e9d288eea92cba40 -Author: Nick Mathewson -Date: Fri Sep 11 18:21:57 2009 +0000 - - Add a trivial race-fix from Chromium: do not try to re-detect whether we have a monotonic clock every time we make a new event_base. - - svn:r1427 - -commit 3b461a6d03927220eae00e232d26053c71afd60f -Author: Nick Mathewson -Date: Fri Sep 11 18:21:37 2009 +0000 - - Treat a negative number of bytes to read as the kernel saying "I don't know." - - svn:r1426 - -commit f65b8b0964bfd2653b5c6c9fbf1196310b77e084 -Author: Nick Mathewson -Date: Wed Aug 19 20:55:25 2009 +0000 - - On connect, call only one of BEV_EVENT_CONNECTED or writecb. - - Previously, if we had a socket bufferevent in connect state, we'd send - both of these to indicate that the connection was done. That was broken - since the point of adding BEV_EVENT_CONNECTED was so that we could - distinguish "we're connected" and "we wrote something". - - Now, writecb is called only when - A) the connection finished but the user never put the socket into a - "connecting" state, or - B) data was actually written. - - svn:r1425 - -commit 2c1b0e442826baec932e614e8c730fd13ab3cd07 -Author: Nick Mathewson -Date: Sun Aug 16 19:22:15 2009 +0000 - - Fix build warnings and add changelog entry for evhttp patches. - - svn:r1424 - -commit c8b0fe4ad76bab55fd089ee1a01720e4af31c7f5 -Author: Nick Mathewson -Date: Sun Aug 16 19:22:10 2009 +0000 - - Define evhttp_del_accept_socket - - [Patch from David Reiss] - - svn:r1423 - -commit 6c53334c65769acd79b423cb89bbd456c7c83977 -Author: Nick Mathewson -Date: Sun Aug 16 19:22:04 2009 +0000 - - Define evhttp_{bind,accept}_socket_with_handle - - [Patch from David Reiss] - - svn:r1422 - -commit 4bcd5646d8f754a38eec606e2dda37a9696160bb -Author: Nick Mathewson -Date: Sun Aug 16 19:21:57 2009 +0000 - - Make evhttp_bound_socket visible, and provide an accessor to its fd - - Declare the previously private struct evhttp_bound_socket in - event2/http.h as an opaque struct. - - Implement evhttp_bound_socket_get_fd, which returns the file descriptor - of an evhttp_bound_socket. - - [Patch from David Reiss] - - svn:r1421 - -commit 0755833e8410bed8835f75344cc80a7fd6a703d4 -Author: Nick Mathewson -Date: Sun Aug 16 19:21:50 2009 +0000 - - Minor documentation fixes - - [Patch from David Reiss] - - svn:r1420 - -commit 22bd5b4287fdad8a627b286516392078aebcdcf6 -Author: Nick Mathewson -Date: Sun Aug 16 16:40:42 2009 +0000 - - Support sendfile on solaris: patch from Caitlin Mercer. - - svn:r1419 - -commit f22823982fe9e21bf49529c366b021183e52b826 -Author: Nick Mathewson -Date: Fri Aug 14 20:07:35 2009 +0000 - - New function to put an SSL bufferevent into a renegotiating state. - - svn:r1418 - -commit 46a61869ca066405c47ac5d8036e8c9c5a676f52 -Author: Nick Mathewson -Date: Fri Aug 14 20:07:17 2009 +0000 - - Disable whichever struct event we don't want during ssl handshaking. - - svn:r1417 - -commit 58b0708e1881e82a4abf660c7cd8693b17cb594a -Author: Nick Mathewson -Date: Fri Aug 14 20:07:09 2009 +0000 - - Only send a connected event _after_ we've adjusted the SSL state. - - This is important if the callback adjusts it to something else. - - svn:r1416 - -commit d17c720c052ea639521da7b9d2bb50ec6c3f1bf8 -Author: Nick Mathewson -Date: Fri Aug 14 20:07:01 2009 +0000 - - Remove an extraneous puts(). - - svn:r1415 - -commit eff09a299cb7759a63c988cf542b4eeff7ed0c8f -Author: Nick Mathewson -Date: Fri Aug 14 20:06:48 2009 +0000 - - tab/whitespace fixes in bufferevent_sock.c - - Also note that write() doesn't usually say 0. - - svn:r1414 - -commit bd26bace0d2f97efe04c20f9cd949edeb541963c -Author: Nick Mathewson -Date: Tue Aug 11 19:47:46 2009 +0000 - - When running with deferred callbacks, always send the "connected" event - before any read/write events, and send timeout/error/eof events after. - - svn:r1413 - -commit 7a55c48d775e94f158fb6db0470c9a68abbec068 -Author: Nick Mathewson -Date: Sun Aug 9 20:18:00 2009 +0000 - - Add a few missing changelog entries - - svn:r1412 - -commit 800f9aa607e4fd48d50615c10bb6f71d831c7071 -Author: Nick Mathewson -Date: Sun Aug 9 20:17:29 2009 +0000 - - When bufferevent_socket_connect is called with no address, assume that our existing fd is connecting and put the connection into "connecting" mode. - - svn:r1411 - -commit 8a99083f0123765b6b73d7b5efccae1e88fff608 -Author: Nick Mathewson -Date: Fri Aug 7 17:16:52 2009 +0000 - - Add an evbuffer_search_range() to search a bounded range of a buffer - - This can be handy when you have one search to find the end of a header - section, and then you want to find a substring within the header - section without looking at the body. - - svn:r1410 - -commit 0c09fe5adac221d2c74fa9891f39fef4600b7461 -Author: Nick Mathewson -Date: Mon Aug 3 20:50:56 2009 +0000 - - Add a couple more evdns tests. Libevent is now, for me, at 80.02% coverage. - - svn:r1409 - -commit 94e8f9b9010e748cfccfaf3c6c46ff1f5009ed1f -Author: Nick Mathewson -Date: Mon Aug 3 20:15:45 2009 +0000 - - Another DNS unit tests, to handle reissues. - - The evdns module is now up to ~72% coverage; Libevent is up to nearly 80%. - - svn:r1408 - -commit dc1f5b1ee0ae0ebca6f6f2f5228814f3e0dd9ac6 -Author: Nick Mathewson -Date: Mon Aug 3 20:15:39 2009 +0000 - - why say fprintf(stdout, X) when you can say printf? - - svn:r1407 - -commit 213dc2a2ef719a310de867cbae858e98360952d0 -Author: Nick Mathewson -Date: Mon Aug 3 20:15:32 2009 +0000 - - Fix an annoying evdns crash bug, and add more unit tests for evdns. - - svn:r1406 - -commit a5006d80cd5ef4d1b38155ee790255ac54ec7e09 -Author: Nick Mathewson -Date: Mon Aug 3 16:15:57 2009 +0000 - - Unit tests for DNS search. - - svn:r1405 - -commit d41347722a8599d6daf82a765efe53de573afd2b -Author: Nick Mathewson -Date: Fri Jul 31 17:35:42 2009 +0000 - - Refactor evbuffer_readln() into a search-for-eol function and an extract-line function. - - svn:r1404 - -commit a26d2d1b87f373a4d4e48a91575fb6fd4163186a -Author: Nick Mathewson -Date: Fri Jul 31 17:34:47 2009 +0000 - - Refactor evbuffer_readln to use evbuffer_ptr; remove old evbuffer_iterator. - - svn:r1403 - -commit 6dc488bd7ee616c84dd2867e34ec6ad26e5f49ac -Author: Nick Mathewson -Date: Fri Jul 31 17:34:18 2009 +0000 - - Improved coverage for evbuffer_readln() - - svn:r1402 - -commit 7c688dd9a2380a8af3f1903d34510ef3feaaa275 -Author: Nick Mathewson -Date: Fri Jul 31 14:41:45 2009 +0000 - - New function to expose bufferevent.enabled - - svn:r1401 - -commit 621aafd27a3aafaab6c061f0522a27d62390b3bc -Author: Nick Mathewson -Date: Thu Jul 30 22:11:23 2009 +0000 - - Export sockaddr comparison functionality. - - svn:r1400 - -commit cf54d74a651064f93d2fa4074b15abbb2da42b45 -Author: Nick Mathewson -Date: Thu Jul 30 20:41:41 2009 +0000 - - More unit tests for Openssl, including initializing with no socket. Up to 75% coverage. - - svn:r1399 - -commit d1a2254bf25e449cf7f0f989e0e9e05792fb585a -Author: Nick Mathewson -Date: Thu Jul 30 20:41:31 2009 +0000 - - Fix some bugs in bufferevent_socket_connect - - svn:r1398 - -commit 7a2a51a3a1ea6ece8bab492f9f494dece207eaf7 -Author: Nick Mathewson -Date: Thu Jul 30 20:41:21 2009 +0000 - - Add unit tests for SSL session renegotiation. - - This tickles the write-blocked-on-read code, and in this case turned - up a bug in it. - - svn:r1397 - -commit 595f7e3877c7597ce2349e725b901f0d5c4e4479 -Author: Nick Mathewson -Date: Thu Jul 30 20:41:12 2009 +0000 - - Always retry SSL_write() with the same number you told it last time. - - svn:r1396 - -commit eecefc50e77041c588b2c281f57b5609ae80885c -Author: Nick Mathewson -Date: Thu Jul 30 20:41:00 2009 +0000 - - Add a function to extract the SSL object from a bufferevent_openssl. - - svn:r1395 - -commit d5a3f1f11685af21bd38ffceddcb949b7997cd46 -Author: Nick Mathewson -Date: Thu Jul 30 20:40:50 2009 +0000 - - Set the SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER flag, and explain why. - - svn:r1394 - -commit 44715517e869afed7fb32419aecd7410b4ab458c -Author: Nick Mathewson -Date: Thu Jul 30 20:40:40 2009 +0000 - - Use SSL_do_handshake in place of SSL_connect/SSL_accept - - svn:r1393 - -commit 8a3007efb97f1b0dd1091a366cf341fad6417c7f -Author: Nick Mathewson -Date: Thu Jul 30 17:01:38 2009 +0000 - - More evconnlistener unit tests: bump its coverage from 71% to 83%. - - svn:r1392 - -commit 7c20a6ae5231971a49596d12d64beeb98e1562f0 -Author: Nick Mathewson -Date: Thu Jul 30 17:01:21 2009 +0000 - - Export an ev_socklen_t. - - svn:r1391 - -commit 75fe762e03be63577ccbfa78baf9c78e8be40d7f -Author: Nick Mathewson -Date: Thu Jul 30 17:00:56 2009 +0000 - - Accessor function to get a listener's associated fd - - svn:r1390 - -commit 625116295a25e438114f137323d0b5db1c748b4c -Author: Nick Mathewson -Date: Thu Jul 30 17:00:46 2009 +0000 - - Add unit test for parsing addresses with bad ports. - - svn:r1389 - -commit 3c99c79df9509ce4da489e237ead4c8104af7b21 -Author: Nick Mathewson -Date: Tue Jul 28 19:45:54 2009 +0000 - - Changelog entry for msvc fixes. - - svn:r1388 - -commit 72ea534f8e0eb217695035b549f734eed1695d9e -Author: Nick Mathewson -Date: Tue Jul 28 19:41:57 2009 +0000 - - Export evutil_str[n]casecmp as evutil_ascii_str[n]casecmp. - - svn:r1387 - -commit a826a75800ce614a06ae53ddb95c54ccaf2f51d2 -Author: Nick Mathewson -Date: Tue Jul 28 19:41:48 2009 +0000 - - Some tweaks to Brodie Thesfield's MSVC patch. - - svn:r1386 - -commit 5b5b880be7452eaf42d401f3ad54474ae60a9dbf -Author: Nick Mathewson -Date: Tue Jul 28 19:41:39 2009 +0000 - - Various MSVC cleanups from Brodie Thiesfield. - - svn:r1385 - -commit 12199fa7a51ee93479fa0db30c2f7b9c8159bb94 -Author: Nick Mathewson -Date: Tue Jul 28 17:11:03 2009 +0000 - - Fix segfault during failed allocatino of locked evdns base. - - We need to comb the rest of the code to make sure that we don't blindly wrap - functions in LOCK(x), UNLOCK(x) when those functions might contain a FREE(x) - in the middle. - - Rocco Carbone found and reported this bug. - - svn:r1384 - -commit f8b527e6a1b3a1cc2b90397b827bf219d0ba3aa6 -Author: Nick Mathewson -Date: Tue Jul 28 05:09:06 2009 +0000 - - Fix a dumb bug where we would allocate too little memory in event_get_supported_methods(). - - svn:r1383 - -commit 709c21c48ca541c75bf803e6801c335d8ae3d043 -Author: Nick Mathewson -Date: Tue Jul 28 04:03:57 2009 +0000 - - Bufferevent support for openssl. - - This code adds a new Bufferevent type that is only compiled when the - openssl library is present. It supports using an SSL object and an - event alert mechanism, which can either be an fd or an underlying - bufferevent. - - There is still more work to do: the unit tests are incomplete, and we - need to support flush and shutdown much better. Sometimes events are - generated needlessly: this will hose performance. - - There's a new encrypting proxy in sample/le-proxy.c. - - This code has only been tested on OSX, and nowhere else. - - svn:r1382 - -commit b06b2649b4c7f5feaedea97c31001c14708e4d1f -Author: Nick Mathewson -Date: Sun Jul 26 01:29:39 2009 +0000 - - Make "deferred callback queue" independent of event_base. - - This way, we can more easily have an IOCP bufferevent implementation - that does not need an event_base at all. Woot. - - svn:r1381 - -commit 8cc68835245dd3f542d28299ecfa5c2bc3d471eb -Author: Nick Mathewson -Date: Sat Jul 25 03:35:32 2009 +0000 - - Fix the main/methods unit test to pass from "make verify". - - The problem was introduced when we changed the semantics of - get_supported_methods() to reflect all the methods that exist. - Previously, it had not returned methods disabled from the environment, - but the test didn't know that. - - svn:r1379 - -commit 6fbeb9237c68df4ae2ea6e5119ca6d9b8bc0ca1e -Author: Niels Provos -Date: Sat Jul 25 03:23:46 2009 +0000 - - call it 2.0.2-alpha - - svn:r1378 - -commit 8eb155a1c0812da33fceb47462c9380d71c320d3 -Author: Nick Mathewson -Date: Thu Jul 23 14:48:24 2009 +0000 - - Fix build on platforms (like Solaris 10, reportedly) which lack a MAP_FILE. - - svn:r1375 - -commit 49de08ef35c77d44cbf7fb4698d0d91612f616ad -Author: Nick Mathewson -Date: Tue Jul 21 19:20:44 2009 +0000 - - Push coverage of event.c a little higher - - svn:r1373 - -commit 59e8e959dcaa9208bf0fa107a5709fa65a660f72 -Author: Nick Mathewson -Date: Tue Jul 21 19:20:25 2009 +0000 - - Add clarifying "static" to definitions of fns in event.c - - svn:r1372 - -commit 670658ebd7485e61e32932d35be0e26900a447b8 -Author: Nick Mathewson -Date: Tue Jul 21 18:32:57 2009 +0000 - - Correct the signatures for evdns_configure_windows_nameservers(), now that it is exposed. - - svn:r1369 - -commit f4775918cd4faeddc090e7755c259cfcf0e094c6 -Author: Nick Mathewson -Date: Mon Jul 20 14:55:51 2009 +0000 - - Refactor evtag tests into their own suite. - - svn:r1366 - -commit e8400a43ca3f67e44e7593907353c6e5335c304e -Author: Nick Mathewson -Date: Mon Jul 20 14:55:35 2009 +0000 - - Rename encode_int(64) to avoid polluting the global namespace. - - They're now called evtag_encode_int(64). The old names are available - as macros in event2/tag_compat.h. - - Also, add unit tests for encode/decode_int64. - - svn:r1365 - -commit dc031990e083bef785ec107271559ccc60705873 -Author: Nick Mathewson -Date: Mon Jul 20 14:55:07 2009 +0000 - - Add strcasecmp tests to improve evutil coverage a bit - - svn:r1364 - -commit 1fb2e818a6273571c01aed5ccce30a5d846a1663 -Author: Nick Mathewson -Date: Fri Jul 17 21:47:45 2009 +0000 - - Use a uniform strategy when a function is not working: do not expose - it. - - Rather than failing at runtime, it is better to fail at compile or - link time. - - svn:r1363 - -commit 9cf4ee7e17aa9bb9b53f9135ec2efa9e6563bf23 -Author: Nick Mathewson -Date: Fri Jul 17 21:47:35 2009 +0000 - - Fix a simple warning - - svn:r1362 - -commit d3bef1a1e3b93190ef8b1a4459f2c6fb9c205095 -Author: Nick Mathewson -Date: Fri Jul 17 20:32:25 2009 +0000 - - Finish implementing new convention that whenever an optional function is declared, a corresponding macro is defined. - - svn:r1361 - -commit a386fde321dd20874a31f8659fa7337b170415de -Author: Nick Mathewson -Date: Fri Jul 17 20:28:03 2009 +0000 - - Checking for MS_WINDOWS rather than WIN32 is a Tor-ism. Fix that! - - svn:r1360 - -commit c02b305ae59a2ac8c01bce36c6c0dbc195503195 -Author: Nick Mathewson -Date: Fri Jul 17 20:23:12 2009 +0000 - - Trivial tests to exercise deferred and locking bufferevent code. - - These are done as variations of test_bufferevent_connect, since that - one exercises event callbacks as well as read/write callbacks. - - The coverage for bufferevent.c is now up to about 87%, from about 70%. - - svn:r1358 - -commit 61f2a45de165edbb149dd476ec03b9ff134afc63 -Author: Nick Mathewson -Date: Fri Jul 17 20:23:05 2009 +0000 - - Add a tinytest flag to initialize threading. - - svn:r1357 - -commit 4ba6eda48fb8cc451f649a19f5a3d2006995073d -Author: Nick Mathewson -Date: Fri Jul 17 20:22:56 2009 +0000 - - Make evthread_use_pthreads() actually return 0 on success. - - svn:r1356 - -commit ed038295cdaf1095776f2849b05b9c685fdc78f2 -Author: Nick Mathewson -Date: Fri Jul 17 20:22:48 2009 +0000 - - Define a macro to indicate that we have defined one of the optional evthread_use macros - - svn:r1355 - -commit 69601fc2f63ff7ed144cd9b42c659d90a564b198 -Author: Nick Mathewson -Date: Fri Jul 17 18:59:22 2009 +0000 - - Update event_tv when time jumps backwards, so that we only note each jump once. Fix for 1939984 - - svn:r1353 - -commit 9c2ecba7f819072cd562b8bf20060c78a4a63f97 -Author: Nick Mathewson -Date: Fri Jul 17 18:42:12 2009 +0000 - - Oops. -1 is an integer, not a pointer. - - svn:r1352 - -commit d6f2e199243ef6eb4b1b96dbff16793a5fe2c202 -Author: Nick Mathewson -Date: Fri Jul 17 18:38:46 2009 +0000 - - Unit tests for bufferevent_get(fd|_underlying) - - svn:r1351 - -commit 5d71b25b516332af4dec0fe29d44fea28c06ccd0 -Author: Nick Mathewson -Date: Fri Jul 17 18:38:38 2009 +0000 - - Remove all trailing whitespace from end-of-line. - - svn:r1350 - -commit d4e3671fb43b8ab2c743fec0f1deb6634e382d7d -Author: Nick Mathewson -Date: Fri Jul 17 18:38:21 2009 +0000 - - Add a test to free_active_base to free a base with an active event. - - svn:r1349 - -commit 638116cacd7e6239760fc8ddd76f046a921549c2 -Author: Nick Mathewson -Date: Fri Jul 17 18:38:14 2009 +0000 - - Add a check for event_add failure to evthread_make_base_notifiable() - - svn:r1348 - -commit a62283a9c3a46c4ba0d72eb3bc18a3db7f9648e2 -Author: Nick Mathewson -Date: Fri Jul 17 17:46:17 2009 +0000 - - Always hold a reference to a bufferevent when calling its callbacks. - - Rationale: we hold a lock on the bufferevent when its callbacks are - executing, so we need to release the lock afterwards. But the - callback might free the bufferevent, so unless we're holding a - reference on the bufferevent, the lock might not be there for us to - release. - - svn:r1347 - -commit e83a32dfe1c10c90c27ccf1f4f93a59820517108 -Author: Nick Mathewson -Date: Tue Jul 14 19:31:20 2009 +0000 - - Do not define _FORTIFY_SOURCE if the platform GCC already defined it for us. - - svn:r1346 - -commit 9fcd84d196205e3eb6dcd0477005cb04974e703f -Author: Nick Mathewson -Date: Tue Jul 14 19:19:45 2009 +0000 - - Include disabled methods in event_get_supported_methods() output. - - Previously, events that were disabled using EVENT_NO* were left out of - event_get_supported_methods(). This was wrong, broke unit tests - (under some circumstances) and left the user with no good way to tell - which methods were actually compiled in. - - Fixes bug 2821015. - - svn:r1344 - -commit 043515bc52dcc11109c7460fcfd92b67105f3f2a -Author: Nick Mathewson -Date: Tue Jul 14 18:50:06 2009 +0000 - - Stop using C++ style comments. - - svn:r1343 - -commit e224321c6413d8245d88655b7d88e5b3a2da0690 -Author: Nick Mathewson -Date: Tue Jul 14 18:49:42 2009 +0000 - - Convert and expand free_active_base/event_base_new tests to avoid dbl-free. Patch from Zack Weinberg - - svn:r1342 - -commit 6b4b77a26590f862dff5b490630d2a4b1ea994cd -Author: Nick Mathewson -Date: Tue Jul 14 16:54:48 2009 +0000 - - Make event_del(E) block while E is running in another thread. - - This gives you the property that once you have called event_del(E), - you know that E is no longer running or pending or active at all, and - so it is safe to delete the resource used by E's callback. - - svn:r1341 - -commit d866f055857794b8bfad93d93b247b2936a4f7a0 -Author: Nick Mathewson -Date: Mon Jul 13 20:03:00 2009 +0000 - - Patch from Zack Weinberg: normalize perror() tt functions and add tt_fail/tt_abort_printf - - svn:r1340 - -commit 0cc10e419c6d1bca947a31315138d32d5addf480 -Author: Nick Mathewson -Date: Mon Jul 13 20:02:49 2009 +0000 - - Use -version-info, not -release. - - Patch from Zack Weinberg. His description: - - This one might be a little more controversial. Libtool's -release and - -version-info options are supposed to be mutually exclusive, but it doesn't - either enforce that or make it sufficiently clear in the manual. Using - both makes the -version-info switch ineffective; you will get sonames like - "libevent-2.0.so.1", "libevent-2.1.so.1", etc., even though version 2.1 - will presumably be backward ABI compatible with 2.0. - - This patch just takes out the -release switches and bumps the -version-info - value to 2:0:0 so that people looking at the files in /usr/lib will not be - confused (it'll be "libevent.so.2"). This does change the soname, but the - current release is labeled an alpha, and it would be better to stop using - both switches as soon as possible, before someone over at libtool - headquarters decides to enforce the mutual exclusivity here... - - Note that libevent_pthreads is not being linked with any versioning - switches I didn't change that because I wasn't sure whether it was - intentional. - - svn:r1339 - -commit d3a8ccb8073c3d76b8bfbb4205cfddfd5a351831 -Author: Nick Mathewson -Date: Fri Jul 10 19:38:16 2009 +0000 - - Change use of AC_CHECK_LIB to AC_SEARCH_LIBS. - - Patch from Zack Weinberg. His message: - - This one eliminates all use of AC_CHECK_LIB in the configure script. - AC_CHECK_LIB has a serious flaw: if the library you mention *exists* - but is not *necessary* for the function you want, it adds it to - $(LIBS) anyway. This was fine in the days of static libraries, - because the linker would ignore an .a library that didn't contain - anything you needed. However, ELF shared libraries are different - (let's not get into why): the linker will by default record a - DT_NEEDED entry for every shared object mentioned on the link - command line. Thus, every use of AC_CHECK_LIB is a potential - unnecessary DT_NEEDED, making extra work for the dynamic loader. The - cure is simply to use AC_SEARCH_LIBS instead; it first tries to find - the function you ask for in libc, and only if that doesn't work does - it try to use the extra library you mention. - - For the same reasons, pkg-config .pc files should distinguish - between the libraries to use for shared linkage (Libs:) and the - additional libraries needed for static linkage (Libs.private:). I - have also made that correction in this patch. I also took the - opportunity to clean up the substitution variables a little and make - absolutely sure that the core library does not get linked against - zlib. - - svn:r1338 - -commit a501d6833bae3415381e62acd6e45f4a22fea5b6 -Author: Nick Mathewson -Date: Fri Jul 10 19:34:00 2009 +0000 - - Add a lock/unlock pair inside the event callbacks in bufferevents. - - This fixes part of bug 2800642, I believe, though there is still a - general race condition in multithreaded use of events that we need to - think about. - - svn:r1337 - -commit 6469598e568a62072c35a3e9322ad09e102b81a7 -Author: Niels Provos -Date: Fri Jul 3 17:43:26 2009 +0000 - - Allow C identifiers as struct names; allow multiple comments in .rpc files; from Zack Weinberg; plus a tiny tweak - - svn:r1336 - -commit fbb181d1aaa0cbc22ac8c1ce91a8f2216be95ed9 -Author: Niels Provos -Date: Fri Jul 3 17:31:17 2009 +0000 - - Allow specifying the output filename for rpcgen; based on work by jmansion; patch from Zack Weinberg. - - svn:r1335 - -commit bbcc54ef9ce0dbbdf4a26b4bcc43cfb9c4e3bec4 -Author: Niels Provos -Date: Fri Jul 3 17:25:45 2009 +0000 - - fix preamble of rpcgen-generated files to rely on event2 includes; based on work by jmansion; patch from Zack Weinberg. - - svn:r1334 - -commit 37d3e16ce9fe71a7112fd4e35c31629e470dff04 -Author: Niels Provos -Date: Fri Jul 3 17:20:56 2009 +0000 - - Raise RpcGenError in event_rpcgen.py; from jmanison and Zack Weinberg - - svn:r1333 - -commit 342ad3550ba685c0b0e95a8aa98d86f1509f36ab -Author: Nick Mathewson -Date: Tue Jun 30 14:23:18 2009 +0000 - - The truncated bit is in the 3rd byte of a dns reply, not the 4th. [fwd-port] - - svn:r1332 - -commit 5aefb8a6d62c5d9f346d0104fb831d33eb55b88d -Author: Nick Mathewson -Date: Thu Jun 25 15:22:36 2009 +0000 - - Fix type on freebsd sendfile. Patch from navin seshadri. Fixes bug 2811991 - - svn:r1330 - -commit f901f9867c3c8a18334e108cb087fa6880864e4e -Author: Nick Mathewson -Date: Wed Jun 24 22:40:15 2009 +0000 - - When our IP address changes, do not break all existing dns server sockets. Patch from Christopher Davis - - svn:r1329 - -commit 01be8708e9cbccf4c7ca951853d072fdd2e48c9c -Author: Nick Mathewson -Date: Thu Jun 11 19:09:08 2009 +0000 - - Fix compile on cygwin. This isnt the solution I would like: I would prefer to get pton and ntop to work even when AF_INET6 is not defined. - - svn:r1326 - -commit bbd14de0537bec133dd6fa8e686b5390704bee38 -Author: Nick Mathewson -Date: Thu Jun 11 17:55:08 2009 +0000 - - Add sometimes-needed header to regress_bufferevent.c - - svn:r1325 - -commit d1ffba1d7ce3979e8aefbdd0a26036fe974e5242 -Author: Nick Mathewson -Date: Fri Jun 5 19:52:13 2009 +0000 - - Replace some read/write instances with send/recv to work properly on win32. - - svn:r1324 - -commit a43a1c2b237b2bcd0806635055a62f7406a16f2f -Author: Nick Mathewson -Date: Thu May 28 20:44:04 2009 +0000 - - Fix compilation problems in win32.c - - svn:r1322 - -commit eb97bb76e1a99eed4850f78421392f4765c63a73 -Author: Nick Mathewson -Date: Thu May 28 15:58:28 2009 +0000 - - Make the headers compile happily with pedantic C compilers. - - Original message from SF patch 2797966: - - While commas at the end of enumerator lists are valid in c99, they - are not valid +in c89 nor in c++. When using gcc/g++ with the - -pedantic flag, users will +receive a warning (gcc) or an - error(g++) when including the event2/event.h and - +event2/bufferevent.h. The errors look something like - - event2/event.h:159: error: comma at end of enumerator list - - Patch from Akita Noek on Sourceforge. - - svn:r1321 - -commit 0b4ab122514f391a24711af0f92b04b8dd0c6055 -Author: Nick Mathewson -Date: Thu May 28 15:47:15 2009 +0000 - - Spell-check the the headers - - svn:r1320 - -commit 3f0e49283b88c577b9d23fadcc89959a5676778f -Author: Nick Mathewson -Date: Wed May 27 23:48:59 2009 +0000 - - small doc fix. - - svn:r1319 - -commit cdaca02c2909452de23244738630f408b8eee8e1 -Author: Nick Mathewson -Date: Wed May 27 15:35:00 2009 +0000 - - Activate fd events in a pseudorandom order on older backends. - - New backends like poll and kqueue and so on add fds to the queue in - the order that they are triggered. But the select backend currently - activates low-numbered fds first, whereas the poll and win32 backends - currently favor whatever fds have been on for the longest. This is no - good for fairness. - - svn:r1318 - -commit 11a178f2bdd533d4f4cf7448653b0adc30c9779f -Author: Nick Mathewson -Date: Mon May 25 23:11:31 2009 +0000 - - Defer EOF on paired bufferevent correctly. - - svn:r1317 - -commit 5232cfa357e2d1a7cf2c6936e565fd79dade7aae -Author: Nick Mathewson -Date: Mon May 25 23:11:20 2009 +0000 - - Consistently say "eventcb" instead of "errorcb" - - svn:r1316 - -commit 2f655f008cf6d019114cbdd8cac30ffcd4c44140 -Author: Nick Mathewson -Date: Mon May 25 23:10:47 2009 +0000 - - Add documentation for bufferevent-internal.h stuff - - svn:r1315 - -commit 34574db0f8bad98f59e66e62b94a2abec6211d5f -Author: Nick Mathewson -Date: Mon May 25 23:10:23 2009 +0000 - - Add a generic mechanism to implement timeouts in bufferevents. - - Paired and asynchronous bufferevents didn't do timeouts, and filtering - bufferevents gave them funny semantics. Now they all should all work - in a way consistent with what socket bufferevents do now: a [read/write] - timeout triggers if [reading/writing] is enabled, and if the timeout is - set, and the right amount of time passes without any data getting - [added to the input buffer/drained from the output buffer]. - - svn:r1314 - -commit 49f18a0aab4a6456f9da9d2367d9f680310039fc -Author: Nick Mathewson -Date: Mon May 25 20:02:51 2009 +0000 - - Add requirement in configure.in for autoconf 2.59c. Needed for ssize_t test. Spotted by Yang Hong. - - svn:r1313 - -commit dfe321e1ee27cc5d128c932f584535b089cd80d8 -Author: Nick Mathewson -Date: Fri May 22 20:11:29 2009 +0000 - - Add missing windows include in time-test.c - - svn:r1311 - -commit e8343e9ff18b768fdc0944da18350349ef26cdf0 -Author: Nick Mathewson -Date: Fri May 22 19:11:59 2009 +0000 - - work around missing __func__ in sample code - - svn:r1310 - -commit 0b22ca192991aa5fa95e958cd6b010d89915bdb3 -Author: Nick Mathewson -Date: Fri May 22 19:11:48 2009 +0000 - - Use ev_ssize_t in place of ssize_t *everywhere*. - - svn:r1309 - -commit 7289d7f80071cffe1b0e4886c9efc6d688f6d3b1 -Author: Nick Mathewson -Date: Fri May 22 18:20:59 2009 +0000 - - Fix a potentially very annoying evdns bug that we found in Tor. - - Generally speaking, it way better to event_assign() an event when you - allocate it than to assign it before every time you event_add it: if - it is already event_add()ed, the assign will mess it up so that it - doesn't _look_ added, and event_add() will insert a second copy. - Later, event_del() will only delete the second copy. Eventually, the - event_base will have a dangling pointer to freed memory. Ouch! - - svn:r1307 - -commit 7a844735d531e9b5fc0de28a3eafb87e88199396 -Author: Nick Mathewson -Date: Fri May 22 17:20:05 2009 +0000 - - Fix some small win32 build issues on trunk. - - svn:r1306 - -commit 8c66eb2e9b13e409cda3b296d292c3def1c20cd1 -Author: Nick Mathewson -Date: Fri May 22 14:48:40 2009 +0000 - - Try to contain the failure when we are running without socketpair(). - - Some win32 systems (mostly those using Kaspersky, it would seem) - prevent us from faking socketpair(). This makes our signal - notification code just not work. Our response since 1.4 has been to - assert. For users who would rather work without signals than not work - at all, this has been a regression from 1.3e. - - This patch makes adding signal events fail in this case; there's no - reason to kill the whole process. - - svn:r1303 - -commit 59cd49363c470195b892693e2c394f74ddc1f5ce -Author: Nick Mathewson -Date: Fri May 22 14:31:07 2009 +0000 - - Do not free the event base lock until we are done removing all the events. Spotted by Joachim Bauch; fixes bug 2795402. - - svn:r1302 - -commit 1ee65b7f94dd94ce0bc5159fd6117f916857dcd9 -Author: Nick Mathewson -Date: Thu May 21 20:59:17 2009 +0000 - - Do not assume we know the value for FD_CLOEXEC. - - svn:r1301 - -commit 7e3ea82ee6f89d9d7035aec388c766e235752f79 -Author: Nick Mathewson -Date: Thu May 21 20:59:09 2009 +0000 - - Disallow backlog==0 in evconnlistener_new_bind(). - - svn:r1300 - -commit 8997f234f23ce0599250ce7b831d56a04f240f61 -Author: Nick Mathewson -Date: Thu May 21 20:59:00 2009 +0000 - - Use the native "struct iovec" as our "struct evbuffer_iovec" when available, so we do not need to copy more pointers than necessary. - - svn:r1299 - -commit 594842970ead07fd3e100234c908744563d0f734 -Author: Nick Mathewson -Date: Wed May 20 12:24:13 2009 +0000 - - Fix a deadlock: there were some LOCKs that should have been UNLOCKs. Resolves bug 2794244 - - svn:r1298 - -commit 66df9dafe1a8f25760f2a5eefb04aa3ad0a448d5 -Author: Nick Mathewson -Date: Tue May 19 21:49:53 2009 +0000 - - Add changelog for last commit - - svn:r1297 - -commit 23243b8a985e26e19deafd81e58159d545a31f34 -Author: Nick Mathewson -Date: Tue May 19 21:39:35 2009 +0000 - - Replace reserve/commit with new iovec-based interface. Add a new evbuffer_peek. - - svn:r1296 - -commit ed1bbc7a9f41be00607b3f56933378a625838d6a -Author: Nick Mathewson -Date: Mon May 18 16:15:56 2009 +0000 - - Tweak the evconnlistener interface a little. - - svn:r1295 - -commit dc4c7b95707864d09d710fbe4736f05a39e823a0 -Author: Nick Mathewson -Date: Fri May 15 22:44:18 2009 +0000 - - Change the interface of evbuffer_add_reference: give the cleanup function more info. - - svn:r1294 - -commit bba69e03f8101ec3efe7db69973fc93151e242ba -Author: Nick Mathewson -Date: Fri May 15 20:23:59 2009 +0000 - - New semantics for evbuffer_cb_set_flags(). - - Previously, set_flags() would replace all previous user-visible flags. - Now it just sets the flags, and there is a clear_flags() function to - clear other flags. - - svn:r1293 - -commit b4886ec80d11a20f0b247db2378a5eea9dee1e24 -Author: Nick Mathewson -Date: Fri May 15 18:44:44 2009 +0000 - - Trim 22 bytes from struct event on 32 bit platforms, more on 64-bit platforms. - - svn:r1292 - -commit 85b0a7a23f83370af1f029b744fa1387cab6fa06 -Author: Nick Mathewson -Date: Fri May 15 01:38:23 2009 +0000 - - We were distributing the wrong event-config.h with our source distributions. Fix that. - - svn:r1289 - -commit 27fef1ef2699f71faaaab1d0d2051704da05474a -Author: Nick Mathewson -Date: Thu May 14 18:06:41 2009 +0000 - - Note problems with some newer evbuffer interfaces. - - svn:r1286 - -commit 3e759a0172b935b900ac6058c62716cce7c9af52 -Author: Nick Mathewson -Date: Thu May 14 18:06:29 2009 +0000 - - Actually, do not provide a compatibility name "EVBUFFER_CONNECTED": there is no old code that uses it. - - svn:r1285 - -commit 31d89f274bc28655bca3e6aec19b90080cb09add -Author: Nick Mathewson -Date: Wed May 13 20:37:21 2009 +0000 - - Add a "ctrl" mechanism to bufferevents for property access. - - OpenSSL uses something like this to implement get/set access for - properties on its BIOs, so that it doesn't need to add a pair of - get/set functions to the vtable struct for every new abstract property - it provides an accessor for. - - Doing this lets us make bufferevent_setfd abstract, and implement an - abstract bufferevent_getfd. - - svn:r1284 - -commit 83f46e51d77759cc1857519f4bc94e833404980d -Author: Nick Mathewson -Date: Wed May 13 20:36:56 2009 +0000 - - Do not use the "evbuffer_" prefix to denote parts of bufferevents. - - This is a bit of an interface doozy, but it's really needed in order - to be able to document this stuff without apologizing it. This patch - does the following renamings: - - evbuffercb -> bufferevent_data_cb - everrorcb -> bufferevent_event_cb - EVBUFFER_(READ,WRITE,...) -> BEV_EVENT_(...) - EVBUFFER_(INPUT,OUTPUT) -> bufferevent_get_(input,output) - - All the old names are available in event2/bufferevent_compat.h - - svn:r1283 - -commit f11dff2c7a40ee723c7ef6d32c3c333d2538c3c4 -Author: Nick Mathewson -Date: Thu May 7 03:45:51 2009 +0000 - - Add and use locale-independent strcasecmp functions. - - svn:r1280 - -commit 89109010200c3702b8f2c031aa7982ed80f86733 -Author: Nick Mathewson -Date: Wed May 6 02:34:10 2009 +0000 - - Addition to bufferevent_async unit test - - svn:r1279 - -commit a8bcbfd4160b7f55ace800f632108333b56dc327 -Author: Nick Mathewson -Date: Wed May 6 02:33:37 2009 +0000 - - Fix bufferevent_async to use lock/unlock, not unlock/unlock. - - You do NOT want to know what windows does when you unlock a lock that is already unlocked. - - svn:r1278 - -commit fe47003d06e4f036de6874c1d00098cd6a687de5 -Author: Nick Mathewson -Date: Tue May 5 16:52:37 2009 +0000 - - Make unit tests for bufferevent_async compile and _almost_ work. - - Either I need to make the callbacks get deferred in a base with no events (doable), or I need to make it okay to call launch_read from inside the callback for read (tricky). - - svn:r1277 - -commit 02801e5be5e14ef783d5a4095cca32d21fc7da8f -Author: Nick Mathewson -Date: Tue May 5 15:36:28 2009 +0000 - - Add a trival start of a be_async test. - - svn:r1276 - -commit af8b82224bffd93c885dfcb84c64ca63a0e6cc7e -Author: Nick Mathewson -Date: Tue May 5 15:30:58 2009 +0000 - - Add missing include to buffer_iocp.c - - svn:r1275 - -commit b69d03b5a8eaf906575d44615e5bf0cab6fbe66a -Author: Nick Mathewson -Date: Tue May 5 14:18:14 2009 +0000 - - Add a constructor for bufferevent_async. - - svn:r1274 - -commit 6b21fe2be89c2be0974aa125fc2c3fe12e24522e -Author: Nick Mathewson -Date: Tue May 5 03:01:24 2009 +0000 - - oops; do not forget to distribute listener.h - - svn:r1273 - -commit 659d54d5304c476f5cf0ec502235e376e1d2d8a1 -Author: Nick Mathewson -Date: Tue May 5 02:59:26 2009 +0000 - - Add new code to make and accept connections. - - This is stuff that it's easy to get wrong (as I noticed when writing - bench_http), and that takes up a fair amount of space (see http.c). - Also, it's something that we'll eventually want to abstract to use - IOCP, where available. - - svn:r1272 - -commit 0fd70978c8d83f0f677a0d119f2737d0b68ac511 -Author: Nick Mathewson -Date: Tue May 5 01:09:03 2009 +0000 - - Add an event_get_base() function to remove one more reason to include event_struct.h - - svn:r1271 - -commit 0e63e72a0515559b972b9c525593d6d94471c949 -Author: Nick Mathewson -Date: Sun May 3 18:56:08 2009 +0000 - - Nothing ever sets event_sigcb or event_gotsig any more: remove them. - - svn:r1270 - -commit bd73ed48e5cfe72dae168e9534398accb88b349a -Author: Nick Mathewson -Date: Sat May 2 16:24:23 2009 +0000 - - Revise regress_pthreads.c to not use event_set - - svn:r1269 - -commit 5a3eddf03f9a2c2d9bf52326e504be1555e2882f -Author: Nick Mathewson -Date: Sat May 2 16:24:05 2009 +0000 - - Use fewer _compat.h headers in our own code. - - svn:r1268 - -commit d5ca076379a82677d7148456e975bcb2f9f1b4b5 -Author: Nick Mathewson -Date: Sat May 2 16:23:29 2009 +0000 - - Move event_set() and friends to event2/event_compat.h. - - These functions are deprecated in favor of event_assign(). - - svn:r1267 - -commit 00ecd1d8e4571e019406293b28042b0628a676fd -Author: Nick Mathewson -Date: Sat May 2 16:23:08 2009 +0000 - - Make evrpc use event2/rpc*.h, not evrpc.h - - svn:r1266 - -commit 7b24d72ad616fe4927f452518bd058164db44854 -Author: Nick Mathewson -Date: Sat May 2 16:22:55 2009 +0000 - - Remove some duplicated includes in evdns.c - - svn:r1265 - -commit a109d95c72635e6c4ea046af31a6b0cb261600ca -Author: Nick Mathewson -Date: Sat May 2 16:11:06 2009 +0000 - - Add changelog entry for vc++ fixes - - svn:r1264 - -commit 1aebcd50476c0341d04a351351be228ed2b41d56 -Author: Nick Mathewson -Date: Fri May 1 01:42:33 2009 +0000 - - Initial core implementation of bufferevent_async.c - - svn:r1263 - -commit e865eb938ca5614b1897f265f50587bc71f2c6b1 -Author: Nick Mathewson -Date: Fri May 1 00:54:14 2009 +0000 - - More msvc build tweaks. - - svn:r1262 - -commit b2e8fd0e41d3437d7214fb4604e22476ddc94e4d -Author: Nick Mathewson -Date: Thu Apr 30 23:56:53 2009 +0000 - - Apparently MSVC lacks a ssize_t. Define an ev_ssize_t for headers, and make ssize_t work elsewhere. - - svn:r1261 - -commit ebf294559e47717872fb7cc31764bcfba2d0e840 -Author: Nick Mathewson -Date: Thu Apr 30 23:49:15 2009 +0000 - - Compilation fixes for vc++ 2008 express. Not the end of them. - - svn:r1260 - -commit 7f9678079fdef0a1373b91dc4c8a7df62763f673 -Author: Nick Mathewson -Date: Thu Apr 30 20:48:40 2009 +0000 - - Initial unit test for overlapped evbuffer usage. It's lame, but it doesn't crash any more. - - svn:r1259 - -commit efc24f7cf108e87b9b5b001af87deb08755d2425 -Author: Nick Mathewson -Date: Thu Apr 30 20:47:38 2009 +0000 - - Get launch_read and launch_write to (apparently) work. - - svn:r1258 - -commit 23121bfb41c70351877cd7e4a2f6a0b80671fad0 -Author: Nick Mathewson -Date: Thu Apr 30 19:56:23 2009 +0000 - - Fix a reversed check in upcast_evbuffer - - svn:r1257 - -commit 16612eb936ef702c8bcdfc7330d159bb09a6bc28 -Author: Nick Mathewson -Date: Thu Apr 30 19:20:42 2009 +0000 - - Beef up the events in the last test a little. - - svn:r1256 - -commit ec1468832e182406049e975c7b546732329054a7 -Author: Nick Mathewson -Date: Thu Apr 30 19:05:43 2009 +0000 - - Oops: actually commit changes to build and use regress_iocp - - svn:r1255 - -commit f1090833b2557bc18353aee293a61ee556da80df -Author: Nick Mathewson -Date: Thu Apr 30 19:04:44 2009 +0000 - - First tests for IOCP loop, and related fixes. - - The fixes are: a shutdown mode that works, and a way to activate an - arbitrary event_overlapped. - - svn:r1254 - -commit b45cead762ca0d9b59a71d9a97fe95ce9a4639c3 -Author: Nick Mathewson -Date: Thu Apr 30 18:05:33 2009 +0000 - - Make environment-variable tests work on win32, which has only one method and lacks (un)setenv. - - svn:r1253 - -commit 24607a397c5f63c73d82b1ac55ce9b9530187a5f -Author: Nick Mathewson -Date: Wed Apr 29 20:48:43 2009 +0000 - - Note a place we might do better about lock releasing. - - svn:r1252 - -commit 50e20fe076ce1b4f6728a6fd715e14629b0b25ca -Author: Nick Mathewson -Date: Wed Apr 29 20:48:35 2009 +0000 - - fix a typo in a comment - - svn:r1251 - -commit 37bc34662b22afd96e44e81c4da251383a1a8f15 -Author: Nick Mathewson -Date: Wed Apr 29 20:48:28 2009 +0000 - - Catch attempts to event_base_once a persistent event. - - svn:r1250 - -commit 1959414120308bd72d82a7a9736870fa7b32a927 -Author: Nick Mathewson -Date: Wed Apr 29 20:48:21 2009 +0000 - - Clarify semantics on event_pending() - - svn:r1249 - -commit 9ad45eef75a8dd6e6895707a7f1ace8c376732d2 -Author: Nick Mathewson -Date: Tue Apr 28 19:08:36 2009 +0000 - - Patch from Eric Hopper: the test for EVENT_BASE_FLAG_IGNORE_ENV was inverted. - - svn:r1248 - -commit 586aa46886ae0868e690b5ac698733896d992b86 -Author: Nick Mathewson -Date: Tue Apr 28 19:08:27 2009 +0000 - - Unit test for disabling events with EVENT_NO*, and for EVENT_BASE_FLAG_IGNORE_ENV. - - svn:r1247 - -commit 2ebfd3bafde18cadc4c337d507e7d2739112a652 -Author: Nick Mathewson -Date: Tue Apr 28 19:08:17 2009 +0000 - - Oops. We never actually defined event_config_set_flag(). - - svn:r1246 - -commit 11cab334189a473b4f51368787251df4fa655641 -Author: Nick Mathewson -Date: Tue Apr 28 19:08:07 2009 +0000 - - Fix compile: #elif FOO is not the same as #elif defined(FOO). - - svn:r1245 - -commit a146af1db892bf2e85cd80599ab992b8a79420ea -Author: Niels Provos -Date: Sat Apr 25 00:15:55 2009 +0000 - - move more code directly into evrpc.c; provide backwards compatible vararg macros - - svn:r1244 - -commit b228ff91b857158933dd2162bdf872749a6b9cb8 -Author: Niels Provos -Date: Sat Apr 25 00:15:31 2009 +0000 - - remove vararg macros for accessing evrpc structs - - svn:r1243 - -commit f69cd80d17b6118503dc39dc676471ab452a59d4 -Author: Niels Provos -Date: Sat Apr 25 00:15:09 2009 +0000 - - refactor evrpc.h header filer - - svn:r1242 - -commit bbf79707f9b19c1b732baa75e9943ff106173a80 -Author: Niels Provos -Date: Sat Apr 25 00:14:58 2009 +0000 - - refactor evrpc.h header filer - - svn:r1241 - -commit 5c4c13d8c24ae4451d753c5b5bfa9444d7bc08da -Author: Niels Provos -Date: Fri Apr 24 03:24:22 2009 +0000 - - make sendfile work on freebsd - - svn:r1239 - -commit a5897917da9549daf56173fc7a59c3ac97a92597 -Author: Nick Mathewson -Date: Thu Apr 23 21:43:44 2009 +0000 - - Changelog entry for r1237 - - svn:r1238 - -commit ec6bfd033566562730d2f37333b3f26bf0ba1391 -Author: Nick Mathewson -Date: Thu Apr 23 21:41:53 2009 +0000 - - Fix for evbuffer_read() when all data fits in penultimate chain. - - Previously we were reading into the next-to-last chain, but incrementing - the fullness of the last. Bug found by Victor Goya. - - svn:r1237 - -commit faa756c7c19190dd8d5c27fa519870bac0c78cee -Author: Nick Mathewson -Date: Thu Apr 23 21:34:37 2009 +0000 - - Oops. event_config.flags was never initialized. Bugfix on 2.0.1-alpha. Found by Victor Goya. - - svn:r1236 - -commit d70b0804888beef9d562ab73e4fde8962e1b5635 -Author: Nick Mathewson -Date: Thu Apr 23 18:08:42 2009 +0000 - - Make main/methods test pass on systems where only one backend exists. - - svn:r1235 - -commit 1ad03264408238061cf894e7b4a0ffb4b8660315 -Author: Nick Mathewson -Date: Thu Apr 23 18:04:50 2009 +0000 - - Fix win32 compilation issues. - - svn:r1234 - -commit c5c9589fb0a37bdbe101a05256ec93eaa865ea6f -Author: Nick Mathewson -Date: Thu Apr 23 06:27:58 2009 +0000 - - Add missing case to make http.c compile with warnings enabled. - - svn:r1232 - -commit 9516df0e2eeb28234f679a65062631d409781346 -Author: Nick Mathewson -Date: Thu Apr 23 05:40:06 2009 +0000 - - Fix c89 bugs reported by Cory Stup. - - Others may remain. I wasn't able to get gcc --std=c89 to build libevent - at all, so I don't know what compiler the original reporter is using here. - - Note that this change requires us to disable the part of our rpc code - that uses variadic macros when using a non-gcc compiler. This is a - problem if we want our rpc api to be portable. - - svn:r1231 - -commit 8ba25b9ec7b66facafdd2c59bf55aefaeeab9042 -Author: Nick Mathewson -Date: Thu Apr 23 05:20:08 2009 +0000 - - Add missing regress_minheap.c file - - svn:r1230 - -commit 5c104cef5198473441d40e760fb4ea6fea989231 -Author: Nick Mathewson -Date: Thu Apr 23 00:33:37 2009 +0000 - - Add a randomized test for heap correctness. - - svn:r1229 - -commit df0617f28978f809a93bbaf1efc24372a2d8d39f -Author: Nick Mathewson -Date: Thu Apr 23 00:21:23 2009 +0000 - - Use signal.h, not sys/signal.h. - - This is patch 2673214 from mmadia. It is correct, since we unconditionally - include signal.h in many other places, and only sometimes include sys/signal.h. - It is necessary to compile on Haiku, I'm told. - - svn:r1228 - -commit 8b7a3b3676375d145e0b89d3f3d9194c7031a760 -Author: Nick Mathewson -Date: Thu Apr 23 00:01:24 2009 +0000 - - Fix min_heap_erase when we remove an element from the middle of the heap. - - Previously, we could lose the heap property when we removed an item - whose parent was greater than the last element in the heap. We would - replace the removed item with the last element, and consider shifting - it down, but we wouldn't consider shifting it up. - - Patch from Marko Kreen. - - svn:r1226 - -commit 0068c98ad2653c3ed3ac70250893531d072c2fbb -Author: Nick Mathewson -Date: Thu Apr 23 00:01:14 2009 +0000 - - Make version test ignore the bottom byte of the version number. - - svn:r1225 - -commit e2b987ede1ee90a94977f5284e33e8e8ce153802 -Author: Nick Mathewson -Date: Thu Apr 23 00:01:05 2009 +0000 - - bump the numeric version; this is not the same as the alpha. - - svn:r1224 - -commit b21be2454553b245844c9bd91979257ee38d1140 -Author: Nick Mathewson -Date: Thu Apr 23 00:00:55 2009 +0000 - - Somehow free_active_base was using the socketpair, but not saying it needed it. How did this ever work? - - svn:r1223 - -commit 253151c54cc224aefe0c7123d0fb44fa762b0f70 -Author: Nick Mathewson -Date: Wed Apr 22 20:28:30 2009 +0000 - - Detect and reject n_priorities less than 1. - - svn:r1222 - -commit 01bda2b8fa4c34a633efedacb95b64689d6b366a -Author: Nick Mathewson -Date: Wed Apr 22 20:27:21 2009 +0000 - - Add forgotten changelog. - - svn:r1221 - -commit 11ff74cf648f2b934a5b75d23611abbd92a88e7c -Author: Nick Mathewson -Date: Wed Apr 22 19:41:23 2009 +0000 - - Add a flag to disable checking the EVENT_* environment variables. - - svn:r1220 - -commit 1f9c9e5137128ba63831fe77f3dac1efebb350a2 -Author: Nick Mathewson -Date: Wed Apr 22 15:38:50 2009 +0000 - - Add a missing "static". - - svn:r1219 - -commit 133a015dba3d80c99de89ac427108a783179b871 -Author: Nick Mathewson -Date: Tue Apr 21 18:48:05 2009 +0000 - - Make sure the test case for mem_functions hits strdup too. - - svn:r1218 - -commit d3fbe7fa05680ecf4c8a01c0db5277ef5d3db5f8 -Author: Nick Mathewson -Date: Tue Apr 21 18:47:53 2009 +0000 - - Do not free the signal index unless it was at some point allocated - - svn:r1217 - -commit 7f1855d064a6676a82802b481b75e1eae4aec73f -Author: Nick Mathewson -Date: Tue Apr 21 18:47:35 2009 +0000 - - Add a basic test for set_mem_functions - - svn:r1216 - -commit ea8cc76cf8553ceff764407d49360e0b36bcd835 -Author: Nick Mathewson -Date: Tue Apr 21 18:47:23 2009 +0000 - - Fix the documentation of event_pending. - - svn:r1215 - -commit 386279d051a644b9d895a55414af648ca8d4e24b -Author: Nick Mathewson -Date: Tue Apr 21 18:47:02 2009 +0000 - - Add a test for event_pending; especially the timeout part. - - svn:r1214 - -commit ff1f429510b2fc946e65d46b57adb6f1c96e49f2 -Author: Nick Mathewson -Date: Tue Apr 21 18:46:43 2009 +0000 - - Unit tests for event_base_once. - - svn:r1213 - -commit ea664bf29a76966ffbc613e10689e17d18245472 -Author: Nick Mathewson -Date: Tue Apr 21 18:46:30 2009 +0000 - - Refactor test wrappers to divide legacy items from useful stuff. - - svn:r1212 - -commit 122e934e92fe27e76d469dab58e50f47f0a358a9 -Author: Nick Mathewson -Date: Tue Apr 21 18:46:11 2009 +0000 - - Add unit tests for version methods and feature-based backend selection - - svn:r1211 - -commit 7cf8a7b0e04e5c853734d1648d398ccc7e7aeb3d -Author: Nick Mathewson -Date: Tue Apr 21 18:45:59 2009 +0000 - - Call the main testcases "main", not "legacy". - - svn:r1210 - -commit 1bb8e010f99fa0bfe64f4440caf6e9ef80013fb4 -Author: Nick Mathewson -Date: Tue Apr 21 16:17:59 2009 +0000 - - Format microseconds correctly in bench_httpclient - - svn:r1209 - -commit eda27f9557eaf25d10b02c0b498be1a292491874 -Author: Nick Mathewson -Date: Sun Apr 19 20:54:12 2009 +0000 - - Update copyright notices, add some missing license statements - - svn:r1208 - -commit 0c15d6ab7d50d7d17c5dce766ec46dc72d196825 -Author: Niels Provos -Date: Sun Apr 19 13:33:52 2009 +0000 - - defer-internal.h was missing from dist; so our first tar ball did not even compile. ouch. - - svn:r1207 - -commit b7907a7bfb3b44548ef47df2d0b1eef02b632036 -Author: Nick Mathewson -Date: Sun Apr 19 01:59:25 2009 +0000 - - Note dns work in changelog and whatsnew - - svn:r1206 - -commit 2d9619d78f05b475148b0efce59b6fd59382c36c -Author: Nick Mathewson -Date: Sun Apr 19 01:59:09 2009 +0000 - - Make dns callbacks run deferred - - svn:r1205 - -commit 327165b339bbe996cfee0eea12b06e43bdc5aa63 -Author: Nick Mathewson -Date: Sun Apr 19 01:58:54 2009 +0000 - - Add locks to evdns. - - svn:r1204 - -commit ac3fc9913a9336f0aed4a178a553200b9c01801e -Author: Nick Mathewson -Date: Sun Apr 19 01:58:41 2009 +0000 - - Use new-style headers in evdns.c - - svn:r1203 - -commit 4d8919ec442ede9e479c861f5d31476c8be946ab -Author: Nick Mathewson -Date: Sun Apr 19 01:58:26 2009 +0000 - - Do not try to double-free the nameserver in regression test - - svn:r1202 - -commit b182ed765e3484719eab1281e1b0b440745feae4 -Author: Nick Mathewson -Date: Sat Apr 18 18:28:18 2009 +0000 - - More tweaks to http stress-tester - - svn:r1201 - -commit a835c7cf1843a4232ba7f76b4a3c2bfedd39f833 -Author: Nick Mathewson -Date: Sat Apr 18 18:27:56 2009 +0000 - - fix a misindent - - svn:r1200 - -commit f00f0c253354b319b9ef23a7208daf20b14f78f2 -Author: Niels Provos -Date: Sat Apr 18 04:34:45 2009 +0000 - - make doxygen happier - - svn:r1199 - -commit e4f24219ee93f3b9dc20991b18e71230468b7b94 -Author: Nick Mathewson -Date: Sat Apr 18 00:12:52 2009 +0000 - - Add a new bench_httpclient for a trivial codecon demo. - - svn:r1198 - -commit a98a512bc1dc85a87cd00fa7682aeccaeea2859c -Author: Nick Mathewson -Date: Fri Apr 17 23:12:34 2009 +0000 - - Add a generic way for any bufferevent to make its callback deferred - - svn:r1197 - -commit 99de18670e59616e6794c2b371ffde17f002d339 -Author: Nick Mathewson -Date: Fri Apr 17 23:07:48 2009 +0000 - - Bump version to 2.0.1-alpha-dev so that nobody mistakes a svn checkout for 2.0.1-alpha. - - svn:r1196 - -commit d047b323bd030d81cb03e286dac3a935862427c7 -Author: Nick Mathewson -Date: Fri Apr 17 17:22:32 2009 +0000 - - Increment version to 2.0.1-alpha, and add a numeric version facility - - svn:r1193 - -commit b346038724c827ed487653d35a1ed1a05d10fc67 -Author: Nick Mathewson -Date: Fri Apr 17 06:58:18 2009 +0000 - - Even _more_ recent tinytest, designed to give better help output. - - svn:r1192 - -commit 2c4c294ed8168c3d9bea99d02896235cd8d7385f -Author: Nick Mathewson -Date: Fri Apr 17 06:58:04 2009 +0000 - - note new unit test framework. - - svn:r1191 - -commit 812800629b15c20c7d5fc15c6999c0df47136005 -Author: Nick Mathewson -Date: Fri Apr 17 06:57:52 2009 +0000 - - Add the latest tinytest. This one supports a --terse flag and a --no-fork flag, and outputs nicer. - - svn:r1190 - -commit 91039e4d48c6306c749e44853891416d131cee6d -Author: Nick Mathewson -Date: Fri Apr 17 06:57:38 2009 +0000 - - Add reference counts to bufferevents. - - svn:r1189 - -commit 1351e61cf671c94f665b16c7fd97bae99266a350 -Author: Nick Mathewson -Date: Fri Apr 17 06:57:25 2009 +0000 - - Write a huge pile of whatsnew-2.0.txt - - svn:r1188 - -commit 49354138425021ecc2a576efc1d51a5bcad63ad5 -Author: Nick Mathewson -Date: Fri Apr 17 06:57:13 2009 +0000 - - Oh hey. There is no support for suspend/unsuspend. - - svn:r1187 - -commit 7fa8451d7e9310d0aac2f619ffecb3bd93dca267 -Author: Nick Mathewson -Date: Fri Apr 17 06:56:57 2009 +0000 - - Add a configure flag to hardcode all of our mm functions. - - svn:r1186 - -commit 64a37e61a12330b2e3793c63eb11bfa7025ffaf6 -Author: Nick Mathewson -Date: Fri Apr 17 06:56:36 2009 +0000 - - Fix evmap indentation to be less stupid. - - svn:r1185 - -commit 9097c95b6ea003bcf5f7a9536adb7bc7d65a682d -Author: Nick Mathewson -Date: Fri Apr 17 06:56:23 2009 +0000 - - Rename whatsnew file to reflect actual version. - - svn:r1184 - -commit a8f6d961eb3bec921473e91c72675c1dbe853f2e -Author: Nick Mathewson -Date: Fri Apr 17 06:56:09 2009 +0000 - - Actually stop using EVBUFFER_LENGTH/DATA, and move them to buffer_compat.h - - svn:r1183 - -commit 796ba15fc6b6e2e0e17e78ac92e00ee79d4d69c0 -Author: Nick Mathewson -Date: Fri Apr 17 06:55:25 2009 +0000 - - Stop claiming that APIs we have are missing. - - svn:r1182 - -commit 838d0a81c3343432897739d14e2af1a4e5edb7db -Author: Nick Mathewson -Date: Fri Apr 17 06:55:08 2009 +0000 - - Document many internal functions and pieces of code. - - svn:r1181 - -commit 433e2339ca1605326f35c2d873a42f6d2abe505d -Author: Nick Mathewson -Date: Fri Apr 17 06:54:28 2009 +0000 - - Remove long copy-and-paste section full of windows api notes. - - svn:r1180 - -commit 30648529e888dd7438d13d7a0b86625a24c6abcf -Author: Niels Provos -Date: Fri Apr 17 01:03:07 2009 +0000 - - have evhttp_set_cb return an int; -1 on failure, 0 on success; this is better than returning a pointer - - svn:r1179 - -commit edfc28caef29a203deaef4c0b808ad8caa7fa012 -Author: Niels Provos -Date: Fri Apr 17 00:24:58 2009 +0000 - - pkgconfig support from Ted Bullock - - svn:r1177 - -commit 0b987813537b74835a5c3990de756d35ea9b4fbc -Author: Nick Mathewson -Date: Thu Apr 16 00:32:52 2009 +0000 - - More hacking on event_iocp.c: make it compile, and give it more of an interface. This code is now testable. - - svn:r1176 - -commit 09c23b6a5679b1a4a871bdd3143e615209aac05d -Author: Nick Mathewson -Date: Thu Apr 16 00:27:32 2009 +0000 - - It seems support for GetCompletionEventEx is not in my mingw. Use the simpler interface instead, for now. - - svn:r1175 - -commit 93d4f884aa2f42d832b4fefa0fe4d39bb0098750 -Author: Nick Mathewson -Date: Tue Apr 14 20:11:10 2009 +0000 - - Make buffer iocp stuff compile happily - - svn:r1174 - -commit fe95df15d3c5ad424c76f75596452f0229e191b2 -Author: Nick Mathewson -Date: Mon Apr 13 18:32:24 2009 +0000 - - Fix typo in mm_free - - svn:r1173 - -commit ca737ff3b5e0b5e93e3b2bd49d5434ff20e95d1e -Author: Nick Mathewson -Date: Mon Apr 13 18:29:31 2009 +0000 - - Add draft (nonworking) versions of iocp code to hack on more. - - svn:r1172 - -commit 4e8cdc6f086bcf0b31df203451aa38741e149ac3 -Author: Nick Mathewson -Date: Mon Apr 13 18:23:02 2009 +0000 - - Fix two windows compilation bugs. - - svn:r1171 - -commit 915193e7df010fb3f280208b1e7af8c74b462686 -Author: Nick Mathewson -Date: Mon Apr 13 03:17:19 2009 +0000 - - Locking support for bufferevents. - - svn:r1170 - -commit 1becc4c4e656213d0f71938029a08a2da04dc97f -Author: Nick Mathewson -Date: Mon Apr 13 03:08:11 2009 +0000 - - Refactor new elements of bufferevent into bufferevent_private structure - - This way we don't expose more of a bufferevent than we need to. One - motivation is to make it easier to automatically get deferred callbacks - with a bufferevent without exposing the deferred_cb structure. - - svn:r1169 - -commit 6567ecd4c587563be843ee8803417b53d3318cbd -Author: Nick Mathewson -Date: Mon Apr 13 03:07:37 2009 +0000 - - Remove if0 code in bufferevent_struct.h - - svn:r1168 - -commit 8dec59bb35c16aa18f90135f23cb4307817f140d -Author: Nick Mathewson -Date: Mon Apr 13 03:07:17 2009 +0000 - - Use freeze operations to prevent shenanegans on bufferevent pair evbuffers. - - svn:r1167 - -commit 0e32ba54dcccdd40e6cf02124827a9b57d9fd97d -Author: Nick Mathewson -Date: Mon Apr 13 03:06:59 2009 +0000 - - Do not remove an empty chain that we have pinned for reading when we drain the whole buffer. - - svn:r1166 - -commit 9f1a94ecec836aae50ce761f1a269881a5f42167 -Author: Nick Mathewson -Date: Mon Apr 13 03:06:47 2009 +0000 - - add pin/unpin functions, and a deref-and-free pair. - - svn:r1165 - -commit dcda7915acb64e67b8cb6089e2ff265e83f7ee3e -Author: Nick Mathewson -Date: Mon Apr 13 03:06:27 2009 +0000 - - Add a reference count to evbuffers. - - svn:r1164 - -commit b01891fe1d48fc2ee7a0f39e671447195ada8177 -Author: Nick Mathewson -Date: Mon Apr 13 03:06:05 2009 +0000 - - Make evbuffer_commit_space trigger callbacks. - - svn:r1163 - -commit 829b52b6c1af2c43aa240d3d4e832b5914c34124 -Author: Nick Mathewson -Date: Mon Apr 13 03:05:46 2009 +0000 - - Refactor the code that sets up iovecs for reading into its own function. iocp needs this. - - svn:r1162 - -commit 0b47b125cfe584f6d6c12a748208ceec3430990e -Author: Nick Mathewson -Date: Sun Apr 12 22:02:54 2009 +0000 - - Add a new EVUTIL_UPCAST macro so that I do not need to keep figuring out the right offsetof magic over and over. - - svn:r1160 - -commit bbd6a332e17fd934d7ec9cac6b9dd2f327c60bcb -Author: Nick Mathewson -Date: Sun Apr 12 22:02:12 2009 +0000 - - reindent macros in util-internal.h - - svn:r1159 - -commit d475fb5861a6203fc4fa3bd9e6957e2a34159a91 -Author: Niels Provos -Date: Sun Apr 12 00:38:31 2009 +0000 - - http benchmark: add a way to change the size of the buffer; also use add_reference - - svn:r1158 - -commit d2794e65e018166c2ecf598f8e77c4f4d5abd2f4 -Author: Niels Provos -Date: Sat Apr 11 15:26:29 2009 +0000 - - document evhttp_parse_query better - - svn:r1157 - -commit 382a1587a040f2c771484d64c631832249fff14e -Author: Niels Provos -Date: Sat Apr 11 04:18:49 2009 +0000 - - previous commit changed the semantics of evhttp_decode_uri; need a test for that - - svn:r1156 - -commit b29b875d8476d2e1603e7703ef5309cbd7cae79f -Author: Nick Mathewson -Date: Fri Apr 10 20:43:08 2009 +0000 - - Facility to make evbuffers get their callbacks deferred. - - svn:r1154 - -commit decdacfaf8265cf9520eabcf4215501566376d84 -Author: Nick Mathewson -Date: Fri Apr 10 20:42:53 2009 +0000 - - Better explanation for bufferevent_pair - - svn:r1153 - -commit 23085c92477035507c499530d4a200bceee5d8a1 -Author: Nick Mathewson -Date: Fri Apr 10 15:01:31 2009 +0000 - - Add a linked-pair abstraction to bufferevents. - - The new bufferevent_pair abstraction works like a set of buferevent_sockets - connected by a socketpair, except that it doesn't require a socketpair, - and therefore doesn't need to get the kernel involved. - - It's also a good way to make sure that deferred callbacks work. It's a good - use case for deferred callbacks: before I implemented them, the recursive - relationship between the evbuffer callback and the read callback would - make the unit tests overflow the stack. - - svn:r1152 - -commit 8161662007e4ffe8c71e3f8267733b2131d8d619 -Author: Nick Mathewson -Date: Fri Apr 10 14:58:15 2009 +0000 - - A couple of tweaks for deferred callbacks. - - svn:r1151 - -commit 4868f4d217d19d4b0f4e45c4648460c21bc5f80f -Author: Nick Mathewson -Date: Fri Apr 10 14:22:33 2009 +0000 - - Initial support for a lightweight 'deferred callbacks'. - - A 'deferred callback' is just a function that we've queued in the - event base. This ability is needed for some mt stuff, and for complex - callback chains. For internal use only. - - svn:r1150 - -commit e3d82497c99d9cb3b1b23cc746b448811910e260 -Author: Nick Mathewson -Date: Fri Apr 10 14:21:53 2009 +0000 - - Don't allow internal events to starve lower-priority events. - - This is exceptionally important with multithreaded stuff, where we use - an event to notify the base that other events have been made active. - If the activated events have a prioirty number greater than that of the - notification event, it will starve them, and that's no good. - - svn:r1149 - -commit ce146eb1cb02a6ed29beecc16da611030d471937 -Author: Niels Provos -Date: Fri Apr 10 05:43:45 2009 +0000 - - Fix parsing of queries where the encoded queries contained \r, \n or + - - svn:r1148 - -commit 6dece3e980a5f4d3f8dd40436603772d59e821dd -Author: Niels Provos -Date: Fri Apr 10 05:22:15 2009 +0000 - - revert last commit; git user error - - svn:r1147 - -commit f43f1d14c50d54630b05b2da4ea792709b358d17 -Author: Niels Provos -Date: Fri Apr 10 05:18:18 2009 +0000 - - initial version of query decoding patch - - svn:r1146 - -commit f98385a4074a0d90bbec89ea57652e3baf112568 -Author: Nick Mathewson -Date: Wed Apr 8 16:57:38 2009 +0000 - - add a missing "static" to timeout_process. - - svn:r1145 - -commit 72b6ffe869f63180a55f7c3d2582dc1c37314cc5 -Author: Nick Mathewson -Date: Wed Apr 8 03:05:42 2009 +0000 - - Prevent unsupported modifications to bufferevent_sock buffers. - - In particular, we don't allow adding any data to end front of inbuf - (we do that when we read), or removing it from the front of outbuf (we - drain data only when we write). - - svn:r1144 - -commit 747331d164ea4839a89e168f9f712159509984db -Author: Nick Mathewson -Date: Wed Apr 8 03:04:39 2009 +0000 - - Add freeze support to evbuffers. - - From the documentation: - Prevent calls that modify an evbuffer from succeeding. A buffer may - frozen at the front, at the back, or at both the front and the back. - - If the front of a buffer is frozen, operations that drain data from - the front of the buffer, or that prepend data to the buffer, will - fail until it is unfrozen. If the back a buffer is frozen, operations - that append data from the buffer will fail until it is unfrozen. - - We'll use this to ensure correctness on an evbuffer when we're waiting - for an overlapped IO call to finish. - - svn:r1143 - -commit d9086fc00777ff841209fdc8373a1b3ae784dec6 -Author: Nick Mathewson -Date: Wed Apr 8 03:03:59 2009 +0000 - - Add a new facility to "pin" the memory in an evbuffer chain. - - For overlapped IO (and possibly other stuff) we need to be able to - label an evbuffer_chain as "pinned", meaning that every byte in it - must remain at the same address as it is now until it unpinned. This - differs from being "immutable": it is okay to add data to the end - of a pinned chain, so long as existing data is not moved. - - svn:r1142 - -commit 68d0139f19c876fae18120689f384fc36779d676 -Author: Nick Mathewson -Date: Tue Apr 7 04:49:25 2009 +0000 - - Refactor the zlib and pthreads tests to appear in the regular tinytest tree structure. - - svn:r1141 - -commit 684c022a21d00214ebd598ad1ba8cf656f4432be -Author: Nick Mathewson -Date: Mon Apr 6 20:38:42 2009 +0000 - - Avoid a double event_del() in evdns.c. - - The bug could occur when a nameserver was marked as up, but then an - outstanding probe sent to the nameserver failed. Now, evdns_up() cancels - any outstanding probe. - - svn:r1140 - -commit d2e9caa6fcff77d5f69e10ef3b24d5e3e65d961e -Author: Nick Mathewson -Date: Mon Apr 6 20:38:19 2009 +0000 - - Fix evdns_cancel to alert callback and free associated RAM. - - Also, we add a test to make sure evdns_cancel is working properly. - - svn:r1139 - -commit 0f3c0983c0e1779f9d690830b3b1c2a0e1c94883 -Author: Nick Mathewson -Date: Sun Apr 5 17:50:18 2009 +0000 - - Fix a double-delete on the request timeout event. Port from Tor. - - svn:r1138 - -commit 28255a26357afde52f2e73cd163bdde929480477 -Author: Nick Mathewson -Date: Sun Apr 5 04:26:46 2009 +0000 - - Finally, get unit tests to pass with threading turned off again. - - svn:r1137 - -commit 6a18f4b0057587a46a21503e3cc23f7e87046d52 -Author: Nick Mathewson -Date: Sun Apr 5 04:15:01 2009 +0000 - - Munge the read_suspended flag before re-enabling reads on the underlying bufferevent. This makes it so the enabled thing has some idea whether reads are supposed to be suspended or not. - - svn:r1136 - -commit 661b5eea092920dcb316f8e1b4b0843096c707c7 -Author: Nick Mathewson -Date: Sun Apr 5 04:10:05 2009 +0000 - - Actually, move EVUTIL_NIL_STMT to util-internal.h - - svn:r1135 - -commit 60e0d59b33277755c532dae8242d120e5877bef4 -Author: Nick Mathewson -Date: Sun Apr 5 02:44:17 2009 +0000 - - Add locking to evbuffers. - - svn:r1134 - -commit d13b59ce372f167135ea1eaec1c6d7e399e9777d -Author: Nick Mathewson -Date: Sun Apr 5 02:44:04 2009 +0000 - - Fix build with thread support disabled, and make no-op macros a little more no-oppy. - - svn:r1133 - -commit 70ee390fc9696f555d383b64541c5fe205443d72 -Author: Nick Mathewson -Date: Sun Apr 5 02:43:55 2009 +0000 - - Add some more utility macros to evthread-internal.h - - svn:r1132 - -commit f1b1bad415332f6d49a59eb40004ca1d7946c4da -Author: Nick Mathewson -Date: Fri Apr 3 14:27:03 2009 +0000 - - Make the new evbuffer callbacks use a new struct-based interface. - - The old interface would fail pretty hard when we had to batch up - multiple adds and drains in a single call. - - svn:r1131 - -commit f90500a5df9af60502215d640ccbf2ba031d30e0 -Author: Nick Mathewson -Date: Fri Apr 3 01:21:36 2009 +0000 - - Add a new improved search function. - - The old evbuffer_find didn't allow iterative searching, and forced us - to repack the buffer completely every time we searched in it. The - new evbuffer_search addresses both of these. As a side-effect, the - evbuffer_find implementation is now a little more efficient. - - svn:r1130 - -commit 0afb1f7ffbdb229c3adbaae18899c6b5c4774558 -Author: Nick Mathewson -Date: Wed Apr 1 16:08:34 2009 +0000 - - Glibc mkstemp requires exactly 6 Xs. - - svn:r1129 - -commit 994e85781c2b3ccd9736d7b751c4cc02b9f7c774 -Author: Niels Provos -Date: Mon Mar 30 17:36:22 2009 +0000 - - correct evbuffer_drain documentation from John Khvatov - - svn:r1127 - -commit 23655dfb87e88482a9152140ad62b0667b5fa916 -Author: Niels Provos -Date: Thu Mar 12 17:43:43 2009 +0000 - - include Doxyfile in tar ball; from Jeff Garzik - - svn:r1125 - -commit 73094d595208ff45ec44d8d399b1811472156b8f -Author: Nick Mathewson -Date: Fri Feb 13 13:43:35 2009 +0000 - - Make tmpfile code compile without warnings - - svn:r1123 - -commit 79b7799bd1a2023864e1f2124444692a289ff72b -Author: Niels Provos -Date: Fri Feb 13 01:42:59 2009 +0000 - - a simple test for evbuffer_add_file - - svn:r1122 - -commit ec35eb5520514769818fa4440d4801f803e8fb4c -Author: Nick Mathewson -Date: Thu Feb 12 22:19:54 2009 +0000 - - Make threading functions global, like the mm_ functions. Use the libevent_pthread.la library in regress_pthread. - - svn:r1121 - -commit d0a9c90e9300f7dc5701e9682d80c85025504573 -Author: Nick Mathewson -Date: Wed Feb 11 17:29:17 2009 +0000 - - Fix some of the crazier indentation and tabbing choices in evdns.c - - svn:r1120 - -commit 77c80b8dcf26b2cef66bce03cb25835a9a939306 -Author: Nick Mathewson -Date: Wed Feb 11 17:24:11 2009 +0000 - - New bind-to option to allow DNS clients to bind to arbitrary ports for their outgoing addresses. - - svn:r1119 - -commit acaf65c359d7e0b0c2f7f4d44c97dd187ac2ed61 -Author: Nick Mathewson -Date: Wed Feb 11 17:23:32 2009 +0000 - - Make evutil_parse_sockaddr_port give a useful socket-length output. - - svn:r1118 - -commit f2a24d6e58df45229015f6d32fcf95f87faea701 -Author: Nick Mathewson -Date: Wed Feb 11 17:22:40 2009 +0000 - - Better comments for some confusing-to-me code. - - svn:r1117 - -commit c6f4dc987c153c9a347d6275d2e8d6bebbca9371 -Author: Nick Mathewson -Date: Wed Feb 11 17:21:48 2009 +0000 - - Port some evdns changes over from Tor. - - svn:r1116 - -commit ac36f4047e8c4b7cb9fb5908741e885f11cfdb35 -Author: Nick Mathewson -Date: Wed Feb 11 05:17:27 2009 +0000 - - oops; coding too quickly on nil-filter patch. Caught by niels. - - svn:r1115 - -commit cd731b77d7e6d0398010ff45bb80e9a3534eaccc -Author: Nick Mathewson -Date: Tue Feb 10 21:40:12 2009 +0000 - - Do not use ctypes functions in cases when we need the "net" locale. - - This patch adds a new set of EVUTIL_IS* functions to replace use of - the ctypes is* functions in all cases where we care about characters' - interpretations in net ascii rather than in the locale. For example, - when we're working with DNS hostnames, we don't want to do the 0x20 - hack on non-ascii characters, even if the host thinks they should be - isalpha. - - svn:r1114 - -commit 1ed27048e4807fe2bf182e9544dc9c7b4741cbc0 -Author: Nick Mathewson -Date: Tue Feb 10 21:39:56 2009 +0000 - - Stop rolling our own offsetof twice. - - svn:r1113 - -commit f04b90e5b3a6ebf0588c6e55ebe3b25364021a28 -Author: Nick Mathewson -Date: Tue Feb 10 19:43:19 2009 +0000 - - Make a couple of newer evdns functions more bulletproof. - - svn:r1112 - -commit da49d6a3b05cd7d3c9d417f4f08cb63431635617 -Author: Nick Mathewson -Date: Tue Feb 10 19:43:11 2009 +0000 - - Stop using platform inet_aton/inet_addr; they can behave strangely on certain misformed addresses. - - svn:r1111 - -commit 01456265c3113c401579895f60c410202d633788 -Author: Nick Mathewson -Date: Tue Feb 10 19:39:22 2009 +0000 - - Explode less badly in the case where we're told to prepend/append/remove a buffer to itself. Note some API/implementation deficiencies. - - svn:r1110 - -commit 20f809ce8c4001f279a208fe3118f51cd8a1abad -Author: Nick Mathewson -Date: Tue Feb 10 19:39:12 2009 +0000 - - Make default (nil) filter use evbuffer_remove_buffer to respect the high-water mark of the target buffer. - - svn:r1109 - -commit e7fd1034cfc6cd8a28f03178b3d8fd2bd4729d27 -Author: Nick Mathewson -Date: Tue Feb 10 19:39:03 2009 +0000 - - Test some formerly untested prepend cases of evbuffer. Now evbuffer coverage is over 80 percent. - - svn:r1108 - -commit 9e3e7b360d1ccce5fbd94e32b3a0d10a3d15ebe2 -Author: Nick Mathewson -Date: Tue Feb 10 19:38:54 2009 +0000 - - More unit tests for evbuffer_add_reference to make sure that certain interleaved data patterns work; that free invokes callback; that callbacks are not invoked too early or later; etc. - - svn:r1107 - -commit 98b7046b9761896e05f84413a4e3589730ffd117 -Author: Nick Mathewson -Date: Tue Feb 10 19:38:43 2009 +0000 - - A few more comments on evbuffer-internal structures. - - svn:r1106 - -commit edfdb698e3b2e5132bb474478b0b9daa6676e8fa -Author: Nick Mathewson -Date: Tue Feb 10 19:38:34 2009 +0000 - - Add an assertion to evbuffer_chain_align so we can't reuse it in the future. - - svn:r1105 - -commit 71604d85be2ee20d6d4408249217f34625b9bd20 -Author: Nick Mathewson -Date: Tue Feb 10 19:38:25 2009 +0000 - - Remove some needless includes - - svn:r1104 - -commit deb2a1210bffcf9a902ae449d7d79bb29c617f4a -Author: Nick Mathewson -Date: Tue Feb 10 19:38:14 2009 +0000 - - use new evutil_make_listen_socket_reuseable() in http.c - - svn:r1103 - -commit c7b2f8fdc955fa06999c73dbab58c07492cfb6e9 -Author: Nick Mathewson -Date: Tue Feb 10 19:38:05 2009 +0000 - - New function to abstract SO_REUSEADDR. - - svn:r1102 - -commit f9e4e0f98e4ccce8a589948cfec3a4840b3aa2bf -Author: Nick Mathewson -Date: Tue Feb 3 18:28:53 2009 +0000 - - Move bufferevent tests to regress_bufferevent.c file. - - svn:r1101 - -commit cc049bfc306436d0d2ff94a4d47fa1c003a3c6e9 -Author: Nick Mathewson -Date: Tue Feb 3 05:22:57 2009 +0000 - - Enable (and debug) WSARecv for evbuffer iovec-like reads. - - The two things we were missing: the flags parameter is not optional, and an error can actually indicate a close. - - svn:r1100 - -commit ea11f8195fae2e559b369ad868c334947d84e055 -Author: Nick Mathewson -Date: Mon Feb 2 22:17:32 2009 +0000 - - Compile http_connection_retry_test, but mark it skipped on win32. - - svn:r1099 - -commit 722885fba96b4195479d4c335946f714beb119eb -Author: Nick Mathewson -Date: Mon Feb 2 21:59:53 2009 +0000 - - Some mingws have AF_UNIX, which may have prevented our socketpair from working at all on them. Fix that. - - svn:r1098 - -commit 3502a472b564e289acf89c06d0e3d6e8eaa21d2f -Author: Nick Mathewson -Date: Mon Feb 2 21:24:04 2009 +0000 - - convert new bufferevent_*.c files to event-config.h only. - - svn:r1097 - -commit 4d92e4261b5915658fbdc5dfb0f1c7a1dd86d9db -Author: Nick Mathewson -Date: Mon Feb 2 19:22:27 2009 +0000 - - forward-port: Make evdns_resolve_reverse args const. - - svn:r1096 - -commit ea4b8724c088934412401bdf32f52f2e2f1840b1 -Author: Nick Mathewson -Date: Mon Feb 2 19:22:13 2009 +0000 - - checkpoint work on big bufferevent refactoring - - svn:r1095 - -commit e84c765615352d094ce331aefe60c25c8c6a7702 -Author: Nick Mathewson -Date: Sun Feb 1 05:26:47 2009 +0000 - - Allocate callback entries with contents 0d out. - - svn:r1093 - -commit 2e3f0f682a94f4651143e912780ca0114be71c09 -Author: Nick Mathewson -Date: Sun Feb 1 02:20:16 2009 +0000 - - Enable the edge-triggered test again - - svn:r1092 - -commit 8d3a10f8f1a820ec6ebe2780dc2b676926dcfeb2 -Author: Nick Mathewson -Date: Sun Feb 1 01:43:58 2009 +0000 - - Support temporarily suspending an evbuffer callback. This is different from disabling the callback, since we want to process changes, but not just yet. - - svn:r1091 - -commit e3e1153109c250bdd308e3bb2370f0d93648d9d7 -Author: Nick Mathewson -Date: Sun Feb 1 01:07:42 2009 +0000 - - Unit tests for evbuffer callback manipulation - - svn:r1090 - -commit 2e50658d8d99ca071872eeca15b38ed5a0fa642e -Author: Nick Mathewson -Date: Sun Feb 1 01:07:33 2009 +0000 - - Fix a typo in buffer.h - - svn:r1089 - -commit ca37fef95164de326df95a626a398f13b3ca41c7 -Author: Nick Mathewson -Date: Sun Feb 1 01:07:22 2009 +0000 - - Change evbuffer callbacks to use tinytest natively and never assert. - - svn:r1088 - -commit a30c9eb1ac05cbf71130e046959996025f18a939 -Author: Nick Mathewson -Date: Sun Feb 1 01:07:12 2009 +0000 - - Move evbuffer tests into their own file. - - svn:r1087 - -commit ff7a5e1272dcdca3af5f8b74121da01a07bad597 -Author: Nick Mathewson -Date: Sat Jan 31 19:32:20 2009 +0000 - - slightly more coverage for evutil. - - svn:r1086 - -commit 12e8db5b23160e2d77db585230113992ca2001c1 -Author: Nick Mathewson -Date: Sat Jan 31 18:36:47 2009 +0000 - - Convert evtag test. - - svn:r1085 - -commit 5831d11a4251eea6e63eb1bb5a63979c10600997 -Author: Nick Mathewson -Date: Sat Jan 31 18:36:37 2009 +0000 - - Move rpc_test to regress_rpc. - - svn:r1084 - -commit fa6ae16992c95632afea1b9c24669a48f2688f3b -Author: Nick Mathewson -Date: Sat Jan 31 18:36:24 2009 +0000 - - Convert RPC suite. There are still some places it can exit(1), but those always run forked, so no big deal. - - svn:r1083 - -commit d9628ef4ffcaa2adf0298547894707ba7616ac8a -Author: Nick Mathewson -Date: Sat Jan 31 18:36:08 2009 +0000 - - Add missing initializers - - svn:r1082 - -commit eac75f91e4839ba289dd599ce36da5cf2a5303ef -Author: Nick Mathewson -Date: Sat Jan 31 07:32:14 2009 +0000 - - Port DNS tests. - - svn:r1081 - -commit e6ba208ba30fd22f52508a865f448c24ffaaed96 -Author: Nick Mathewson -Date: Sat Jan 31 07:32:00 2009 +0000 - - Tinytest update: mostly just to allow test skipping. - - svn:r1080 - -commit 52eb4951302554dd696d6a0120ad5d3f6cffb7bb -Author: Nick Mathewson -Date: Sat Jan 31 07:31:47 2009 +0000 - - Build with the -fno-strict-aliasing flag on GCC. - - You do not want to know about the 2 hours I just spent tracking down - an evdns bug that only affected me on some platforms to the way we - were using sockaddr* and sockaddr_in*. Suffice it to say that I do - not think this is the only C99-aliasing-dubiousness in our code, nor - that I am smart enough to keep my code correct with the GCC's strict - aliasing optimizations in place. - - svn:r1079 - -commit 2546ea665e9ba4c4215f4b62a87c664d7bda6057 -Author: Nick Mathewson -Date: Sat Jan 31 05:45:26 2009 +0000 - - Do not attempt to pass a va_args to regular snprintf. Hilarity will ensue. Fortunately, 1.4 does not have this bug. - - svn:r1078 - -commit 4ec690d35ef82e98799497a89cb8b720153925e8 -Author: Nick Mathewson -Date: Sat Jan 31 05:45:16 2009 +0000 - - Rename a couple of http tests so they all end with _test. This lets us simplify the naming. - - svn:r1077 - -commit 153093ecc346b51fd3df20d8480a17414aeda1a6 -Author: Nick Mathewson -Date: Fri Jan 30 17:44:13 2009 +0000 - - Port the HTTP unit tests. Most are still legacy (since they use test_ok so much), but at least they no longer exit(1) on failure - - svn:r1076 - -commit 241690b230301fa9388cd84b33030938df7b1853 -Author: Nick Mathewson -Date: Fri Jan 30 17:43:59 2009 +0000 - - Move util tests to regress_util.c - - svn:r1075 - -commit 4e9470b481f2ad2e1ddb9967de8e5599d9b5fe6d -Author: Nick Mathewson -Date: Fri Jan 30 17:43:48 2009 +0000 - - Convert test_evutil_strtoll to new framework. - - svn:r1074 - -commit a8203b3490b3ab6ee17460ddd32c0efb355fee02 -Author: Nick Mathewson -Date: Thu Jan 29 23:19:57 2009 +0000 - - Refactor unit tests using my spiffy new "tinytest" framework. - - The big win here is that we can get process-level isolation. - - This has been tested to work okay on at least Linux and Win32. Only - the tests in regress.c have been converted wrapped in the new wrapper - functions; the others are still on the old system. - - svn:r1073 - -commit 39c8dbe073bf13c9c08d8901465a0d7641119126 -Author: Nick Mathewson -Date: Thu Jan 29 20:07:59 2009 +0000 - - Make ht-internal.h get distributed. - - svn:r1072 - -commit cc7a53c152b4ef2b32d44545e281be843baea5d1 -Author: Nick Mathewson -Date: Thu Jan 29 18:15:36 2009 +0000 - - fix signed/unsigned warning in unit tests. can we just use "char*" on all new APIs? this void/unsigned char*/char* business is awful. - - svn:r1071 - -commit 7dd362b15871096430e078a6b94406563634ebe7 -Author: Nick Mathewson -Date: Thu Jan 29 15:09:24 2009 +0000 - - Have util-internal.h define socklen_t if we need it, and include it appropriately. This fixes win32 compilation. - - svn:r1070 - -commit a0cae310d05d99a1f235a1814ba5ef7893959ec8 -Author: Niels Provos -Date: Thu Jan 29 03:22:47 2009 +0000 - - make it so that evbuffer_add_file where we read the complete contents of the file can fail without side effects - - svn:r1069 - -commit 66b2a7ffb72e68a059c7479362bfe4863e2331df -Author: Niels Provos -Date: Thu Jan 29 03:20:40 2009 +0000 - - test evbuffer_add_reference - - svn:r1068 - -commit f13bede758cd419c407a9124a13b7955f8ea0068 -Author: Nick Mathewson -Date: Wed Jan 28 20:31:19 2009 +0000 - - Fix an unlikely degenerate case of evutil_vsnprintf - - svn:r1067 - -commit e3e696c822917fcf909e71b7822130c73f442e56 -Author: Nick Mathewson -Date: Wed Jan 28 20:24:12 2009 +0000 - - Use size_t for name length in DNS requests. Not that it matters much. - - svn:r1066 - -commit b85b710cf5e693294e0d68ce682ecb1c5e357383 -Author: Nick Mathewson -Date: Tue Jan 27 22:34:36 2009 +0000 - - Update copyright statements to reflect the facts that: - a) this is 2009 - b) niels and nick have been comaintainers for a while - c) saying "all rights reserved" when you then go on to explicitly - disclaim some rights is sheer cargo-cultism. - - svn:r1065 - -commit 8889a7703999d3ce5902b5b8e239107579c75ca0 -Author: Nick Mathewson -Date: Tue Jan 27 22:30:46 2009 +0000 - - Replace all use of config.h with event-config.h. - - svn:r1064 - -commit 9993137cbbd9508dbf28e431e0f84d809c516128 -Author: Nick Mathewson -Date: Tue Jan 27 21:10:31 2009 +0000 - - Remove all trailing whitespace in all the source files. - - svn:r1063 - -commit 3065389973fcfb724981376c31a51b11b679abc0 -Author: Niels Provos -Date: Tue Jan 27 16:35:28 2009 +0000 - - make it so that test_persistent_timeout can call loopexit only once; reported by Alexander Drozdov - - svn:r1062 - -commit 1c927b7d2fad4b2f1d96cd2d91e116acf53f5123 -Author: Niels Provos -Date: Tue Jan 27 16:29:48 2009 +0000 - - fix memory leak whens etting up priorities; reported by Alexander Drozdov - - svn:r1061 - -commit 88f2b7a00fd60bbf353b4a33cb2374bc491e1ee7 -Author: Nick Mathewson -Date: Tue Jan 27 13:37:09 2009 +0000 - - Fix some warnings on linux gcc with --enable-gcc-warnings - - svn:r1060 - -commit 1757cf717f487c3c78b7104b52738ff804f69c42 -Author: Niels Provos -Date: Tue Jan 27 06:21:12 2009 +0000 - - use %zu for off_t - - svn:r1059 - -commit 8b5bd77415fb6634fadf08357676926fecf5f032 -Author: Niels Provos -Date: Tue Jan 27 06:18:45 2009 +0000 - - make it compile on linux - - svn:r1058 - -commit fdf694933ceafbf379e038597e56eb2498dea1e0 -Author: Niels Provos -Date: Tue Jan 27 06:05:38 2009 +0000 - - sendfile/mmap and memory reference implementation for evbuffers - - svn:r1057 - -commit b93e50545231ffb85254fa2d6c0fe50d0de39d8e -Author: Niels Provos -Date: Tue Jan 27 05:33:39 2009 +0000 - - second argument to evbuffer_pullup should be ssize_t - - svn:r1056 - -commit 4f02a9630d7a982254d20696c306ac2e1017e3d1 -Author: Nick Mathewson -Date: Mon Jan 26 18:04:18 2009 +0000 - - More docs and example code in whatsnew - - svn:r1055 - -commit c0712b16085b7f4e3c8f9f2ae5b951ce976a3476 -Author: Nick Mathewson -Date: Mon Jan 26 17:29:45 2009 +0000 - - Initial documentation for evdns server functions. Also deprecate the one that didn't take an event_base. - - svn:r1054 - -commit 2b1d535e0d41ea12a8f61f026e366dcfc0b4c53f -Author: Nick Mathewson -Date: Mon Jan 26 17:29:27 2009 +0000 - - Accept evutil_socket_t for evdns_server_ports. - - svn:r1053 - -commit bdbd5e0e2fda62f2f0d277867319d470d096b096 -Author: Nick Mathewson -Date: Mon Jan 26 17:09:37 2009 +0000 - - For every deprecated function, explain why it is deprecated and what you should call instead. - - svn:r1052 - -commit 52a75f18e17cde5f7e4f705ae9ef32ee008b6c6f -Author: Nick Mathewson -Date: Mon Jan 26 17:09:22 2009 +0000 - - Documentation (or more accurate documentation) for a few more functions. - - svn:r1051 - -commit dddd58ba1375a9e78c01771299c820c22f04795e -Author: Nick Mathewson -Date: Mon Jan 26 17:09:09 2009 +0000 - - Reformat util.h slightly so that it looks ok with 8-char tabs. - - svn:r1050 - -commit 0e779906f9a14f7c9f3bd818be5b9ff082b32553 -Author: Niels Provos -Date: Mon Jan 26 06:13:24 2009 +0000 - - fix memleak in evmap_signal_clear; from Alexander Drozdov - - svn:r1049 - -commit 765ff1b9def2ec0423bee8617763d7b182ca4fa2 -Author: Niels Provos -Date: Sat Jan 24 17:38:27 2009 +0000 - - really install the buffer_compat.h file - - svn:r1048 - -commit 81dd04a726c8fa3a95a8780b06648187b15b1b2d -Author: Nick Mathewson -Date: Fri Jan 23 18:04:34 2009 +0000 - - Add a "flags" field to evbuffer callbacks. - - For now, there is just one: enabled. This lets us avoid lots of - mallocs/frees/tailq-manipulations just to turn a callback on and off. - The revised bufferevent code wants this. - - svn:r1047 - -commit de7f7a84a32045a706559ae37ccaa325fe9b2720 -Author: Nick Mathewson -Date: Fri Jan 23 18:03:45 2009 +0000 - - Remove in_callbacks check: allow full recursion in evbuffer callbacks. If you get yourself in an infinite loop, that's not our fault. Note this in the docs. Also reindent some docs now that my tabs match Niels's. - - svn:r1046 - -commit b1495865aa2d876bf1545f5ae399775f70e7e155 -Author: Niels Provos -Date: Fri Jan 23 02:04:41 2009 +0000 - - also install the buffer_compat.h header file - - svn:r1044 - -commit ec2f4cbc0961d562f39639a1ea3eb4044fc402c7 -Author: Nick Mathewson -Date: Fri Jan 23 01:35:57 2009 +0000 - - Move obsolete evbuffer function into include/event2/buffer_compat.h - - svn:r1043 - -commit c735f2b45aaca4d9c118245e407a00e6b8f4d234 -Author: Nick Mathewson -Date: Fri Jan 23 01:11:13 2009 +0000 - - Code to allow multiple callbacks per evbuffer. - - svn:r1042 - -commit 86d526a0648a884dd966b52142c620f2f5180c28 -Author: Nick Mathewson -Date: Fri Jan 23 01:04:10 2009 +0000 - - Start writing more of whatsnew-xx.txt, which will become whatsnew-2.0.txt - - svn:r1041 - -commit f20902a2902b85f5d63d785a32b00fdbbd64a52d -Author: Nick Mathewson -Date: Thu Jan 22 17:56:15 2009 +0000 - - Remove evperiodic_assign and its related parts: its functionality is subsumed by EV_PERSIST timeouts. - - svn:r1040 - -commit 5e6f6dcd1b9d50b39d2878619c5b4c0d6d34591f -Author: Nick Mathewson -Date: Thu Jan 22 17:48:55 2009 +0000 - - Use EV_PERSIST on notify event for efficiency and simplicity. - - svn:r1039 - -commit 20c20466fb55647823a4db865f8cb042e87788e0 -Author: Nick Mathewson -Date: Thu Jan 22 17:48:27 2009 +0000 - - Use EV_PERSIST in bufferevents for efficiency and simplicity. - - svn:r1038 - -commit dc1526e0da9c13eba2138c8a551d2535ede385d8 -Author: Nick Mathewson -Date: Thu Jan 22 17:48:16 2009 +0000 - - Fix warnings on compile: make static functions static. - - svn:r1037 - -commit fe72c885d938881a876affe1c930aedb64a11306 -Author: Niels Provos -Date: Thu Jan 22 06:23:14 2009 +0000 - - fix signal processing for non-kqueue backends; when a signal callback delivers a signal; from Alexander Drozdov - - svn:r1035 - -commit a077fb8c099e90523d1365bbd9f2db8328a46ca1 -Author: Niels Provos -Date: Thu Jan 22 02:47:35 2009 +0000 - - rename sys/signal.h to signal.h; configure m4 macro dir; this assist with compilation on Haiku - - svn:r1033 - -commit 56ea4687a5e6cf131c825c99a8f0ffe04afa4c2d -Author: Niels Provos -Date: Thu Jan 22 02:33:38 2009 +0000 - - Change the semantics of timeouts in conjunction with EV_PERSIST; timeouts in that case will now repeat until deleted. - - svn:r1032 - -commit 309fc7c4ad34f7e50245c305a776a5e04b4a0555 -Author: Nick Mathewson -Date: Wed Jan 21 07:51:25 2009 +0000 - - New functions to provide sane threading callbacks with pthreads and win32 threading implementations. - - svn:r1031 - -commit 70405e3c7a184a11be506e2e4fd4774e867f978b -Author: Niels Provos -Date: Wed Jan 21 07:18:31 2009 +0000 - - fix freebsd compile; from Alexander Drozdov - - svn:r1030 - -commit fa1c9a6d096b0be115db99095912750a4e12dca9 -Author: Niels Provos -Date: Mon Jan 19 23:52:21 2009 +0000 - - rename the backend from "event ports" to "evport" - this will allow environment based disabling to work - - svn:r1027 - -commit ed7e0e77ed573d9f5b4123d7874de3efb02763d1 -Author: Niels Provos -Date: Mon Jan 19 23:40:11 2009 +0000 - - bug fix and potentital race condition from Alexander Drozdov - - svn:r1025 - -commit f6eb1f816c77f2b3e209690551b9c2f7d7d2e454 -Author: Nick Mathewson -Date: Mon Jan 19 21:53:03 2009 +0000 - - Change evbuffer_read implementation to split data across chunks, and use readv when available. This should make us use less space. - - svn:r1024 - -commit a5901991c74590d81e35b5b3f44877f00b6e3397 -Author: Nick Mathewson -Date: Mon Jan 19 20:37:24 2009 +0000 - - Use eventfd for main-thread notification where available (i.e., linux). - - svn:r1023 - -commit c3e9fcf672b87ba9314899cfcc9f60400cfb73fb -Author: Nick Mathewson -Date: Mon Jan 19 20:22:47 2009 +0000 - - Change the semantics of notify so we can implement it with eventfd or (given a different backend for win32) a windows Event. - - svn:r1022 - -commit 34d2fd063472d088fea1d7730123cdbda93cc0db -Author: Nick Mathewson -Date: Mon Jan 19 19:46:03 2009 +0000 - - Debug and enable pipe notification - - svn:r1021 - -commit ddf3ee976d60e5d17f73cdd441cbc260b3f72f6a -Author: Niels Provos -Date: Mon Jan 19 07:00:51 2009 +0000 - - make event ports compile again - - svn:r1020 - -commit ec4cfa33c91b9df4dc1621315999cba60cc839e2 -Author: Nick Mathewson -Date: Mon Jan 19 01:34:14 2009 +0000 - - Make event_break threadsafe; make notify-thread mechanism a little more generic; let it use pipes where they work. - - svn:r1019 - -commit 2b7febc80a447b4ee4a2a2dc7339b6226be9bb1a -Author: Nick Mathewson -Date: Sun Jan 18 01:33:18 2009 +0000 - - Fix osx compile - - svn:r1018 - -commit fed2fd094402790a329ff769286bdf54fb470210 -Author: Niels Provos -Date: Sat Jan 17 07:50:34 2009 +0000 - - try to make devpoll work again; i dont have access to a machine - - svn:r1017 - -commit 5e796901c11fc7b52b143aa3dd24d6260f64f553 -Author: Niels Provos -Date: Fri Jan 16 00:25:54 2009 +0000 - - clean up buffered data on reset; reported by Brian O'Kelley - - svn:r1015 - -commit 83d2a34c99ba73a23a7031d525f6278d1859dc8a -Author: Niels Provos -Date: Thu Jan 15 06:15:24 2009 +0000 - - rename time-test in comment to signal-test - - svn:r1013 - -commit 8278c9be548f8357f124f4691f0b7cc12703ea3f -Author: Nick Mathewson -Date: Wed Jan 14 22:17:46 2009 +0000 - - Note the one restriction on what you can do with the evbuffers of a bufferevent. - - svn:r1011 - -commit 840318196b3bdf500ac3d3002feb249f20f900ef -Author: Nick Mathewson -Date: Wed Jan 14 22:17:31 2009 +0000 - - Make some evbuffer functions const - - svn:r1010 - -commit 89fe316779d0323a7ef5786f3aea81892ee82122 -Author: Nick Mathewson -Date: Wed Jan 14 21:13:58 2009 +0000 - - Update win32 code to put indices in evmap. - - svn:r1009 - -commit 554e14934e46f11fcec09d5c69bff5d231db2ea9 -Author: Nick Mathewson -Date: Wed Jan 14 20:52:32 2009 +0000 - - Move per-fd info from eventops into evmap. Not done for win32.c yet. - - svn:r1008 - -commit 3552ac1eb3af86fcc0b6d8015b4ba9c72ed0f54a -Author: Nick Mathewson -Date: Wed Jan 14 19:39:17 2009 +0000 - - Do not allow chain length to expand indefinitely. - - svn:r1007 - -commit ad7f1b4ae99d0d0652087ab23abd2717745f2d27 -Author: Nick Mathewson -Date: Wed Jan 14 18:45:42 2009 +0000 - - The element size for our linear evmaps is a pointer, not the whole struct. - - svn:r1006 - -commit 6bb2f84216ef82184b3502ee77b98aa8b608805a -Author: Nick Mathewson -Date: Wed Jan 14 18:38:03 2009 +0000 - - Add initializer functions for evmap types. - - svn:r1005 - -commit 6d3ed0657d1be559cc3376ed3f8473ddfa2aadb6 -Author: Nick Mathewson -Date: Wed Jan 14 14:58:48 2009 +0000 - - Simplify evbuffer_write logic: combine nearly all of WSASend and writev cases. - - svn:r1004 - -commit bab8f2e1827d47f622806404bdc765515f81e8c2 -Author: Nick Mathewson -Date: Tue Jan 13 22:02:32 2009 +0000 - - Fix compilation on win32 WSASend evbuffer_write() code. - Still not enabled until I make sure that the unit tests test this. They _do_ pass. - - svn:r1003 - -commit 9935d5b01e4345829a7ea5c06e86d45156ea8944 -Author: Nick Mathewson -Date: Tue Jan 13 21:39:32 2009 +0000 - - Fix win32 compilation. Surprisingly, unit tests pass too. - - svn:r1002 - -commit 574d320217b07023ac2e50a16f7999f04aceffae -Author: Nick Mathewson -Date: Tue Jan 13 20:50:34 2009 +0000 - - There is no WSAEAGAIN. There is only Zuul^WSAEWOULDBLOCK. - - svn:r1001 - -commit 169321c9e6aebee26c1fe3e6deaf51ce00d7308e -Author: Nick Mathewson -Date: Tue Jan 13 20:26:37 2009 +0000 - - Rename four internal headers to follow the -internal.h convention. - - svn:r1000 - -commit 822ca048add2b10f73054914fd0ff7c2bf241661 -Author: Nick Mathewson -Date: Tue Jan 13 19:34:50 2009 +0000 - - Untested (and compiled-out) evbuffer_write backend to use WSASend on win32 where we use writev on unix. - - svn:r998 - -commit fbd5e820d7c02f16d43568e281cd9ffde9f834a4 -Author: Nick Mathewson -Date: Tue Jan 13 19:20:22 2009 +0000 - - Stop linking backends into libevent_extra.la - - svn:r997 - -commit 554909420dc1db14c0b1764f1be5ca5dd5459840 -Author: Nick Mathewson -Date: Tue Jan 13 19:20:14 2009 +0000 - - Move internal headers into noinst_HEADERS automake target where they belong. - - svn:r996 - -commit 81ab45add511fd02ac08924841ec811186b3e4bb -Author: Nick Mathewson -Date: Tue Jan 13 19:20:04 2009 +0000 - - Use new EVUTIL_ERR_*_RETRIABLE macros when we're testing an errno for blocking. - Previously, we used inconsistent and incompletely ported ifdefs. - (We don't use these macros in platform-specific files like evpoll.c, since - they don't need to work on win32.) - - svn:r995 - -commit 5ebd23ad7472ce00dc8e5e2467df7ec02ef8584c -Author: Nick Mathewson -Date: Tue Jan 13 19:19:50 2009 +0000 - - New EVUTIL_ERR_*_RETRIABLE macros to tell if an errno blocked or failed. - - svn:r994 - -commit 99db0e7f72ecbc81de2d73da98e3f9be66db1e68 -Author: Nick Mathewson -Date: Mon Jan 12 20:42:19 2009 +0000 - - Add a new evbuffer_write_atmost() functino to write no more than a given number of bytes to an fd. - - svn:r993 - -commit f446f1493a81fbbc2c3c22d4acfd125e70093e78 -Author: Nick Mathewson -Date: Mon Jan 12 20:42:06 2009 +0000 - - Small cleanups to buffer.h documentation. - - svn:r992 - -commit 1df57d2b97311ecb59c86873e9cccf2b9e0be401 -Author: Nick Mathewson -Date: Mon Jan 12 20:36:24 2009 +0000 - - Move strlcpy.c into libevent-core, so that code built against libevent-core on platforms without strlcpy can link. - - svn:r991 - -commit 8a72441077548fc327163ed19ccb5658d4e7ca7e -Author: Niels Provos -Date: Mon Jan 12 05:22:29 2009 +0000 - - make it compile with USE_DEBUG again; reported by Alexander Drozdov - - svn:r990 - -commit 91e3ead85eb81c3f8aabb8a193e3cc952755d87a -Author: Nick Mathewson -Date: Sat Jan 10 14:37:45 2009 +0000 - - Improve the hashsocket function. - - svn:r989 - -commit 55bcd7d2f0cae7f60dedf9b48265bb155bec157f -Author: Nick Mathewson -Date: Fri Jan 9 13:42:21 2009 +0000 - - On win32, use a hashtable to map sockets to events rather than using an array. - - svn:r988 - -commit 8f5777e692e7e85dc711174da6d129bc43a836d4 -Author: Nick Mathewson -Date: Fri Jan 9 05:01:48 2009 +0000 - - Document internal evmap functions, add a couple of asserts, and fix up some things that did not need to be void* any more - - svn:r987 - -commit 980bcd68f7e49f8c0a9042f64d62e624f8c5f76b -Author: Nick Mathewson -Date: Fri Jan 2 21:21:58 2009 +0000 - - Work better with platforms that do not have ipv6 structures, or that do not have sin_len fields, etc. - - svn:r986 - -commit 135591aeab4ac58f91f2109aa4cafdeeb0ce040b -Author: Nick Mathewson -Date: Fri Jan 2 20:46:35 2009 +0000 - - Change the type of nameserver.address from u32 to sockaddr_storage, so that we can handle nameservers at IPv6 addresses. - - svn:r985 - -commit cfbd1680080cc917f0d15d2a840dd05d9f462217 -Author: Nick Mathewson -Date: Fri Jan 2 20:46:26 2009 +0000 - - Add another function to parse the common address:port combination formats into a sockaddr. - - svn:r984 - -commit 0d9d5cfe22c89391a1ee25e2104cbf1fd6e1fcfb -Author: Nick Mathewson -Date: Fri Jan 2 20:46:12 2009 +0000 - - New functions in evutil to clone inet_pton and inet_ntop, with tests. - Adapted from Tor code. - - svn:r983 - -commit 172b657567777078296442f5363b9a1e764886b9 -Author: Niels Provos -Date: Fri Jan 2 18:18:30 2009 +0000 - - malloc fd only if it is needed. - - svn:r982 - -commit f37d1685df84cd7da52a21f4e4469faa641d1aaa -Author: Nick Mathewson -Date: Fri Jan 2 04:56:56 2009 +0000 - - Include http_compat.h in http.c so we do not get warnings about functions with no prototypes. - - svn:r981 - -commit 87be18daa192bdb2e75e56f1ef5226a0df6b2f73 -Author: Niels Provos -Date: Thu Dec 25 16:25:37 2008 +0000 - - implement evdns_cancel_request; test one of the new evdns_base functions - - svn:r980 - -commit 49f4c0ef883e822b98b03ca422fd69590697380b -Author: Niels Provos -Date: Thu Dec 25 16:21:13 2008 +0000 - - generate documentation for move dns header files - - svn:r979 - -commit eed234519c5abee420a255aa7fccfd779ee3a08f -Author: Niels Provos -Date: Thu Dec 25 16:20:45 2008 +0000 - - forgot to re-enable dns tests - - svn:r978 - -commit 30cba6d0b3a7d3de4bfdc3a939729b73d36a2a49 -Author: Niels Provos -Date: Thu Dec 25 09:22:13 2008 +0000 - - we cannot realloc memory used by TAILQ; instead malloc each slot individually - - svn:r977 - -commit 17bfc07e940f981168b136ce08570dbd0a99bff1 -Author: Niels Provos -Date: Tue Dec 23 22:38:01 2008 +0000 - - remove http_compat include - - svn:r976 - -commit b55ca7de1c58043fd04d1fcc934870aa1e7b5cf6 -Author: Niels Provos -Date: Tue Dec 23 22:31:27 2008 +0000 - - reduce void *age a little bit - - svn:r975 - -commit b225e756ae6a50578cacfcf7bfd1a51c1362834b -Author: Niels Provos -Date: Tue Dec 23 22:24:32 2008 +0000 - - remove unused variable - - svn:r974 - -commit d776f8462be6c68ac4cd7bf3903710aad5dd842b -Author: Niels Provos -Date: Tue Dec 23 22:23:37 2008 +0000 - - deprecate the usage of signal_{add,del,set} and name it evsignal_{add,del,set} instead; move the old definitions to compat - - svn:r973 - -commit 02b2b4d1bee7dfd5d75d0a376ce64fc7298e350f -Author: Niels Provos -Date: Tue Dec 23 16:37:01 2008 +0000 - - Restructure the event backends so that they do not need to keep track of events themselves, as a side effect multiple events can use the same fd or signal. - - svn:r972 - -commit 97cebce8fdc400401093f669a56e46bef518386e -Author: Niels Provos -Date: Tue Dec 23 14:53:55 2008 +0000 - - the switch of bufferevents for http connections did not handle the EVBUFFER_ERROR case correctly - - svn:r971 - -commit ebcf5efcfe208ee4381ac6d5ed6783b77fbd6056 -Author: Niels Provos -Date: Fri Dec 19 22:42:51 2008 +0000 - - fix memory leaks in the regression tools; add another close detection test that validates that there are no dangling connections on the server - - svn:r969 - -commit f1728d94eb0fe93fc503ef9cda42a8d78e223f96 -Author: Niels Provos -Date: Fri Dec 19 22:41:07 2008 +0000 - - fix the close detection problem correctly by not running close detection on the server - - svn:r968 - -commit f700566cb947f7229be3909e3c926b096ca826a8 -Author: Niels Provos -Date: Fri Dec 19 21:31:43 2008 +0000 - - Make the http connection close detection work properly with bufferevents and fix a potential memory leak associated with it - - svn:r963 - -commit 8c594168785feb1b899350b03538ed24756d3be6 -Author: Niels Provos -Date: Fri Dec 19 21:03:42 2008 +0000 - - memory leak: forgot to free paused rpcs in server - - svn:r962 - -commit 77867244a9bb7af857a198cfc2ed08227895e88f -Author: Niels Provos -Date: Fri Dec 19 21:02:36 2008 +0000 - - memory leak: forgot to free the configuration object - - svn:r961 - -commit 808f00e1a1351b1b5a14276c928ecd778a9d3e2d -Author: Niels Provos -Date: Sat Dec 13 06:11:12 2008 +0000 - - constify structs; from Andrei Nigmatulin - - svn:r959 - -commit dd73168556961d690e355c9eb7c086f633543461 -Author: Nick Mathewson -Date: Wed Dec 3 20:09:13 2008 +0000 - - Implement increased DSN-poisoning resistance via the 0x20 hack. - - svn:r958 - -commit 1eeb96aa8863d6ed3e8eb9080a618df48b688baa -Author: Niels Provos -Date: Sat Nov 29 01:12:41 2008 +0000 - - move cirular queue removal into its own function - - svn:r957 - -commit cdf9453af44dceed3274d33a279d5181b3a81237 -Author: Niels Provos -Date: Fri Nov 28 20:55:11 2008 +0000 - - install the header files, too - - svn:r956 - -commit 1c765b78fb0c633f377b2fee8fee6d4bb07965e4 -Author: Niels Provos -Date: Fri Nov 28 20:11:24 2008 +0000 - - move dns header files into the include directory; move old functions into compat and structs into a struct header file - - svn:r955 - -commit 4fa4a56253fda85d5451eb66bcddc1bf960756cb -Author: Niels Provos -Date: Thu Nov 27 19:57:48 2008 +0000 - - fix a typo in setting the global event base; reported by lance - - svn:r953 - -commit ffb3966ec2a9975a103d78b0d30a318737b1e22a -Author: Niels Provos -Date: Thu Nov 27 19:34:07 2008 +0000 - - minor compilation and regresson fixes; from Frank Denis - - svn:r952 - -commit 4fe25cefb59bdda688acf0ba54aacf640374e4d2 -Author: Niels Provos -Date: Thu Nov 27 19:27:33 2008 +0000 - - Clear the timer cache when leaving the event loop; reported by Robin Haberkorn - - svn:r950 - -commit 5792d42f0ff130380d036ff427d8408ecd61b6f2 -Author: Niels Provos -Date: Sun Nov 16 23:22:14 2008 +0000 - - Allow setting of local port for evhttp connections to support millions of connections from a single system; from Richard Jones - - svn:r948 - -commit 50202d757d719316f5d6d92d1fb6941fcef66b72 -Author: Niels Provos -Date: Sat Nov 15 05:27:23 2008 +0000 - - only bind the socket on connect when a local address has been provided; reported by Ajejo Sanchez - - svn:r946 - -commit 31cfe52662fe14c24f0b6794fe2e16cc3aac0696 -Author: Niels Provos -Date: Thu Oct 30 19:38:31 2008 +0000 - - clear the timer cache on entering event loop; reported by Victor Chang - - svn:r944 - -commit c97ee898dca9b1d18cddb0dcc0cf2c9bb3346065 -Author: Nick Mathewson -Date: Fri Sep 26 13:36:15 2008 +0000 - - Fix: do not crash when asked to configure an impossible event_base - - svn:r942 - -commit b3d6a569e7a0bee12718b1ff0da6277d470cdf76 -Author: Niels Provos -Date: Sun Sep 7 23:24:54 2008 +0000 - - do not remove accept-encoding header in make request - - svn:r938 - -commit fded0a8783f3a8d688f60f176b87598164aeb650 -Author: Nick Mathewson -Date: Fri Sep 5 16:47:04 2008 +0000 - - Fix compilation of recent error code with win32. - - svn:r937 - -commit de069b99774221193530f9eaa43ebfa417be941f -Author: Nick Mathewson -Date: Fri Sep 5 16:29:56 2008 +0000 - - On win32, errno is not the last socket error. Worse, WSAGetLastError() is not the last socket error sometimes (i.e., EWOULDBLOCK). Also, strerror() does not handle winsock errors. Therefore, event_err() and event_warn() are completely wrong for windows socket errors. Fix that. - - svn:r936 - -commit a710d817ad67dccbf75526738d658b881126d6d1 -Author: Niels Provos -Date: Sat Aug 30 23:19:49 2008 +0000 - - Match the query in DNS replies to the query in the request; from Vsevolod Stakhov - - svn:r930 - -commit c968eb3e01ff80b9959952b858d152d62a3ac9b6 -Author: Niels Provos -Date: Tue Aug 19 11:26:47 2008 +0000 - - Fix a bug where headers arriving in multiple packets were not parsed; fix from Jiang Hong; test by me. - - svn:r928 - -commit b89a3de044077b851c669b967d599bf24982e2cd -Author: Niels Provos -Date: Fri Jul 25 05:22:28 2008 +0000 - - do not warn on accept when errno is egain|eintr - - svn:r925 - -commit cca2f8fa0eee370e1b75de198dc755c9a4a23bf2 -Author: Niels Provos -Date: Fri Jul 25 01:29:54 2008 +0000 - - make event_add not change any state if it fails; repoted by Ian Bell - - svn:r923 - -commit 1aa6826f62880be761834bc1317ac0cb8dc398f4 -Author: Niels Provos -Date: Fri Jul 25 01:18:40 2008 +0000 - - fix off by one errors in devpoll; from Ian Bell - - svn:r921 - -commit 3b24f4eedc2a60247496de74c85bc0997461edba -Author: Niels Provos -Date: Fri Jul 25 00:48:30 2008 +0000 - - another fix; we also need to remove the signal event from the queue - - svn:r918 - -commit e67a5ea9bb546587f6143643f6201d4574f474b7 -Author: Niels Provos -Date: Fri Jul 25 00:19:15 2008 +0000 - - fix a problem with epoll and event_reinit; reported by Alexander Drozdov - - svn:r917 - -commit a4e2f52a4467af1ce6724d04df14fc98a6f06359 -Author: Niels Provos -Date: Sun Jul 20 23:31:28 2008 +0000 - - add a signal and free the base for reinit test - - svn:r915 - -commit 1c164cebb892bd355f9dfbbd4bbc147e7b15466b -Author: Niels Provos -Date: Sat Jul 19 23:35:29 2008 +0000 - - restore signal handlers correctly when we deallocate the signal base - - svn:r913 - -commit 5e905c9dd52a601d0af581c28ca3c96e7163b79b -Author: Niels Provos -Date: Thu Jul 17 14:09:07 2008 +0000 - - if we change the timeouts on bufferevents, we might have to readd pending events - - svn:r911 - -commit 12077b4e2ed997206c0e02291263c432ac51bca2 -Author: Niels Provos -Date: Wed Jul 16 03:47:47 2008 +0000 - - support setting of AA or RD in dns server response - - svn:r910 - -commit 506f3d0c8df77b0b6d52fa491c451901228c65a6 -Author: Niels Provos -Date: Sun Jul 13 20:18:41 2008 +0000 - - fix cname replies - - svn:r907 - -commit c4af6211bd692a3faa3f7b4390e7f2a493eeae0b -Author: Niels Provos -Date: Fri Jul 11 16:11:16 2008 +0000 - - forgot to add Alexander Drozdov as bug reporter in ChangeLog - - svn:r905 - -commit 4bf44654a6429eaff145434e4b60e4eeeee1227f -Author: Niels Provos -Date: Fri Jul 11 16:04:07 2008 +0000 - - assert(a & b) -> assert(a && b) - - svn:r903 - -commit f7e61870e95efded87d17f2cf29ec9af815b9d30 -Author: Niels Provos -Date: Fri Jul 11 15:49:04 2008 +0000 - - support multiple events listening on the same signal; make signals regular events that go on the same event queue - - svn:r901 - -commit 5512be01765f3d0607bf6c48d7fe00b80f9d83fa -Author: Niels Provos -Date: Fri Jul 11 15:15:04 2008 +0000 - - fix a bug where deleting signals with kqueue would delete subsequent adds - - svn:r899 - -commit df97fca9ca112c4ed24a0b81b5115b53c3f2fc47 -Author: Niels Provos -Date: Wed Jul 2 06:08:16 2008 +0000 - - From Scott Lamb: - * Allow the user to set the Content-Length: then stream a reply. - This is useful for large requests of a known size. Added unit test. - - * Don't send a response body on HEAD requests, 1xx status codes, 204 - status codes, or 304 status codes, as described in RFC 2616 section - 4.3. (Doing otherwise causes problems - in particular, if a 304 has a - chunked body (even an empty one), Safari 3.1.1 issues and then fails - the next request on the connection with the non-sequitur error message - "Too many HTTP redirects"!) - - * Specify a default Content-Type: when a response body is required, not - when we have data in the response buffer by the time we make the - header. (I.e., do this on evhttp_send_reply_start() for consistency.) - - * Don't expect a body in response to HEAD requests. - - - - svn:r898 - -commit 409236a77d40f234e93684e51eb5928c30854daa -Author: Niels Provos -Date: Wed Jul 2 04:39:09 2008 +0000 - - detect CLOCK_MONOTONIC at runtime for evdns - - svn:r896 - -commit 707f67849aeafc491b24019f972e78062290adcb -Author: Niels Provos -Date: Wed Jul 2 04:22:48 2008 +0000 - - reject negative content-length headers - - svn:r894 - -commit cb7c3bd671097bf247ed1a84f11a5c4e1612e910 -Author: Niels Provos -Date: Sun Jun 29 01:30:06 2008 +0000 - - support multi-line http headers; based on a patch from Moshe Litvin - - svn:r890 - -commit 9998c0cbc814decba91f90f3cdcda8da5cc1f5e3 -Author: Niels Provos -Date: Thu Jun 26 00:40:57 2008 +0000 - - correct handling of trailing headers in chunked replies; from Scott Lamb. - - svn:r887 - -commit 21f76156b115299ffd8438ed323b03cee050cb77 -Author: Niels Provos -Date: Wed Jun 25 16:32:47 2008 +0000 - - change min_heap_idx to signed - - svn:r883 - -commit 52161b47b6df9e2abb5d1b5fa5039cd8c7936ecf -Author: Niels Provos -Date: Wed Jun 25 14:56:35 2008 +0000 - - fix a bug in which nameservers would not be added to the correct base in windows. - - svn:r873 - -commit 8aa94ced6d8a04511d4366bb9232e0718dbcf8d4 -Author: Niels Provos -Date: Wed Jun 25 01:01:11 2008 +0000 - - proper library dependencies for regress. - - svn:r872 - -commit 637508144c723d17f85628f5e868cbb8b72a72fc -Author: Niels Provos -Date: Wed Jun 25 01:00:29 2008 +0000 - - add a visual studio 2005 solution - - svn:r871 - -commit 9816192ac434e585f78d4a69f8d1f3807b74a53a -Author: Niels Provos -Date: Wed Jun 25 00:59:21 2008 +0000 - - add log.h header file - - svn:r870 - -commit ac0c7e2c7db4328362b54cab8753ebe05d2769e8 -Author: Niels Provos -Date: Wed Jun 25 00:58:08 2008 +0000 - - skip connection-retry test on windows - - svn:r869 - -commit 0bee2ff3830b041ed758225007adf4144a827aeb -Author: Niels Provos -Date: Wed Jun 25 00:34:24 2008 +0000 - - void function should not return a value - - svn:r868 - -commit c3dc717a38d07f89850b9ddfe5b46c3859392d40 -Author: Niels Provos -Date: Tue Jun 24 23:37:37 2008 +0000 - - close fd if evhttp_get_requestion_connection fails - - svn:r867 - -commit 24580e2b586f48ade544be64c8d57ed2c21bbc84 -Author: Niels Provos -Date: Tue Jun 24 22:43:19 2008 +0000 - - fix build on unix side - - svn:r866 - -commit 60e4c0674a5cf31fa256054e6d26e95730c2bc19 -Author: Niels Provos -Date: Tue Jun 24 22:41:43 2008 +0000 - - add an event_debug statement for executing active events. - - svn:r865 - -commit 30abfd99a2e1b12d21f896c9546588e4d701ded9 -Author: Niels Provos -Date: Tue Jun 24 22:38:37 2008 +0000 - - provide fake_getnameinfo so that the http layer works under windows. - - svn:r864 - -commit f80f90ed8bcd83e41a14cf120b69b7444ffa73fa -Author: Niels Provos -Date: Tue Jun 24 21:01:44 2008 +0000 - - fix a bug in http_connect for windows; the address was not copied correctly. - - svn:r863 - -commit 2f8708db3ff01c8402eb0f3fc5de651161c7258d -Author: Niels Provos -Date: Tue Jun 24 18:04:41 2008 +0000 - - ifdef out a whole bunch of sections; gettimeofday to evutil_gettimeofday - - svn:r862 - -commit 994a7c50e1935ab0ae9c08384b386657ddbeff7d -Author: Niels Provos -Date: Tue Jun 24 16:39:45 2008 +0000 - - close -> EVUTIL_CLOSESOCKET() - gettimeofday -> evutil_gettimeofday() - - svn:r861 - -commit 55f914941d134bf86a3da504fce7fe5c67d47bbd -Author: Niels Provos -Date: Tue Jun 24 16:29:02 2008 +0000 - - fix evutil_snprintf on windows - - svn:r860 - -commit 35b1236c84a7f06359f7d389bd7716550c4e5d00 -Author: Niels Provos -Date: Tue Jun 24 15:29:41 2008 +0000 - - change write to send for windows. - - svn:r859 - -commit e736991aea9b8c8cf706b2f39e82ef4d14640460 -Author: Niels Provos -Date: Sun Jun 22 16:00:48 2008 +0000 - - make it work with older versions of automake; from Scott Lamb - - svn:r858 - -commit e711ce454ae94cd76c5bcc54395d3a395c32f92f -Author: Niels Provos -Date: Sat Jun 21 06:10:10 2008 +0000 - - reintroduce a memmove when there is enough misalignment to hold the new data; otherwise the size of the buffer may grow without bounds - - svn:r857 - -commit 99a1063e735f70443268b50d14f042c87cb9b99a -Author: Niels Provos -Date: Sat Jun 21 02:21:25 2008 +0000 - - support 64-bit integers in rpc structs - - svn:r856 - -commit 4c56ba1cede32ba30624208e8e84672531e644e3 -Author: Niels Provos -Date: Fri Jun 20 06:52:13 2008 +0000 - - do not use SO_REUSEADDR when connecting - - svn:r854 - -commit 774d056c46dbe7c3075b2628f7d57c514d404249 -Author: Niels Provos -Date: Tue Jun 17 01:14:58 2008 +0000 - - warn on connection failures - - svn:r853 - -commit 2baaac7fdb330dc98ca5d117d8fcc7ab049396be -Author: Nick Mathewson -Date: Sat Jun 14 17:50:36 2008 +0000 - - Forward-port: Rename INPUT and OUTPUT to EVRPC_INPUT and EVRPC_OUTPUT, but keep the INPUT/OUTPUT aliases on non-win32 platforms to maintain backwards compatibility. - - svn:r852 - -commit a6ce520cfbcfa21406406b1649ee3ba99307a797 -Author: Niels Provos -Date: Thu Jun 12 14:43:35 2008 +0000 - - allow min_heap_erase to be called on removed members; from liusifan - - svn:r849 - -commit c584741baf59d9bf69cb59ae05f943ab4cbcee45 -Author: Nick Mathewson -Date: Mon Jun 2 18:35:02 2008 +0000 - - Fix line ending style on windows projects files. - - - - svn:r847 - -commit 344c2b56f1b3eb7bcbb9a732c5b6221146f915ba -Author: Niels Provos -Date: Mon Jun 2 05:45:26 2008 +0000 - - deliver partial data to request callbacks when chunked callback is set even if there is no chunking on the http level; allows cancelation of requests from within the chunked callback; from Scott Lamb. - - svn:r846 - -commit 9586a1cbb00d84d2c913d6719aa0ba614dbc1d7a -Author: Niels Provos -Date: Sun Jun 1 16:21:24 2008 +0000 - - fix an evbuffer corruption when adding an empty evbuffer; from Scott Lamb - - svn:r845 - -commit 480d8142b8dc12a051ebd99d34a2a4aa44444181 -Author: Niels Provos -Date: Sun Jun 1 01:19:08 2008 +0000 - - do not define a variable in a header file; it will lead to duplicate symbols when linking - - svn:r844 - -commit f9707a01e582818a71085f1c45bd8f8f1c923e3b -Author: Niels Provos -Date: Sat May 31 18:57:21 2008 +0000 - - we need to declare the enum first before it can be used; c++ compilation errors - - svn:r843 - -commit 05965921ab76880bf1faf3e405ca6c40c32fdf30 -Author: Nick Mathewson -Date: Sat May 31 14:37:31 2008 +0000 - - Add new functions to access backends by their features and to query the features of a backend. - - svn:r842 - -commit 9515c8076ee3e60580903338594c86a9b344619e -Author: Nick Mathewson -Date: Fri May 30 17:35:20 2008 +0000 - - Oops; add regress_et.c - - svn:r841 - -commit 39400e68b6202dc40545b5ac26468fc3f7a11184 -Author: Nick Mathewson -Date: Fri May 30 16:56:34 2008 +0000 - - Patch from Valery Kholodkov: support for edge-triggered events with epoll and kqueue. Changed from original patch: made test into a regression test, with explicit success/failure for edge-triggered and non-edge-triggered cases. Closes SF request 1968284. - - svn:r840 - -commit 9ca7a3a3d6be5741095b3ba2c7e1c979f66628cb -Author: Nick Mathewson -Date: Fri May 30 16:19:01 2008 +0000 - - Resolve two conflicts. - - svn:r839 - -commit 2deb3ce061adffccbacff6b87401134c4047b8b3 -Author: Niels Provos -Date: Thu May 29 01:39:43 2008 +0000 - - simplify handling of environment variables for disabling backends; - make event_get_supported_methods obey environment variables; this - fixes make verify; problem reported by Scott Lamb. - - - svn:r838 - -commit 8b66f1bd4dd7c4e5e2b913062ea6c9ee1836e7ec -Author: Niels Provos -Date: Sat May 17 02:14:17 2008 +0000 - - constify struct timeval * - - svn:r836 - -commit 134344b79ebbda2ff765f7381e49da686bed9f7c -Author: Niels Provos -Date: Fri May 16 01:55:40 2008 +0000 - - Fix use of freed memory in event_reinit; pointed out by Peter Postma - - svn:r834 - -commit bc5e27190f11e23d1737a0644fa221f1642f3f6a -Author: Niels Provos -Date: Thu May 15 06:36:36 2008 +0000 - - Attempt to make a project for the regression test. There are several problems: - - no gettimeofday on windows - - no varargs macros on windows (all the rpc stuff does not build) - - no zlib on windows (zlib test does not build) - - some library dependencies seem to be missing - - svn:r833 - -commit 89a1512a74a8ae8b920ce52c7b0f706bf59832b8 -Author: Niels Provos -Date: Thu May 15 06:33:23 2008 +0000 - - close -> EVUTIL_CLOSESOCKET - - svn:r832 - -commit 9e8688a749297b88b1841f723b51f60dfa314a07 -Author: Niels Provos -Date: Thu May 15 06:10:40 2008 +0000 - - windows does not have varargs macros, so this is all useless - - svn:r831 - -commit a35529c60faa45e551fef155bfa6f8646f3f3583 -Author: Niels Provos -Date: Thu May 15 06:03:23 2008 +0000 - - add the code here until we figure out how to generate it on windows - - svn:r830 - -commit a68de2525d3e3bc39cfaa9e3eac055a284ad6c00 -Author: Nick Mathewson -Date: Thu May 15 03:49:03 2008 +0000 - - r19749@catbus: nickm | 2008-05-14 23:48:44 -0400 - New function to dump inserted and active events. Also do not recv() on an int array. - - - svn:r829 - -commit f9b4ee0aa4cc786cbc567de12edb914122614107 -Author: Niels Provos -Date: Thu May 15 03:19:05 2008 +0000 - - replace write/read/close with send/recv/EVUTIL_CLOSESOCKET - - svn:r828 - -commit 35245a6037bd1a2e3d678014b05a22276e022c09 -Author: Nick Mathewson -Date: Thu May 15 03:16:34 2008 +0000 - - Minor project content tweaks - - svn:r827 - -commit 90ddd91ff046b01158a2f9c88e49960b294a8697 -Author: Niels Provos -Date: Thu May 15 03:14:48 2008 +0000 - - do not include sys/time.h on windows - - svn:r826 - -commit 3ca22aa837262bdb9a5960de750217dc5e8fe5d3 -Author: Nick Mathewson -Date: Thu May 15 03:05:10 2008 +0000 - - r19739@catbus: nickm | 2008-05-14 23:05:03 -0400 - Use our offsetof; do not rely on platform offsetof - - - svn:r825 - -commit c3c11f27b0915e5ba91ba00293381c962494ea0d -Author: Niels Provos -Date: Thu May 15 01:54:20 2008 +0000 - - add a simple http server for potential benchmarking - - svn:r823 - -commit ec3956ba48f2212cd23cfdb88d4e777b51441146 -Author: Niels Provos -Date: Thu May 15 01:53:48 2008 +0000 - - fix connection keep-alive behavior for HTTP/1.0 - - svn:r822 - -commit 7be8f13b95b85816329d725307e9f8fc8839e6e4 -Author: Nick Mathewson -Date: Wed May 14 15:56:17 2008 +0000 - - r19736@catbus: nickm | 2008-05-14 11:50:49 -0400 - Add casts to make some printf formats in regress.c happier. - - - svn:r821 - -commit aa4b92574b4ca57f1172119d66b6559409410a68 -Author: Niels Provos -Date: Tue May 13 05:05:30 2008 +0000 - - move some structure definitions from evrpc.h to evrpc-internal.h - - svn:r817 - -commit 1bce6f74349051fbda3e435f1e7dce7ae8c80644 -Author: Niels Provos -Date: Tue May 13 03:51:10 2008 +0000 - - use evhttp_connection_base_new() - - svn:r816 - -commit ef0221cc3957fa3103e4f24db10eb090ae2db0f1 -Author: Niels Provos -Date: Tue May 13 03:42:47 2008 +0000 - - document chunked replies plus fix doxygen warnings - - svn:r815 - -commit 0cafdeb6f53370877a74fa4687bcaf1b269396a5 -Author: Nick Mathewson -Date: Mon May 12 17:16:47 2008 +0000 - - Tweaks to make unit tests fail less badly on mingw on trunk. - - svn:r814 - -commit c6da86ffcb85636e56dd4ea14a6d65ba7970d921 -Author: Nick Mathewson -Date: Mon May 12 16:44:24 2008 +0000 - - r19709@catbus: nickm | 2008-05-12 12:42:48 -0400 - Possible fix for [1960723] snprintf and vsnprintf return values are wrong on win32 - - - svn:r813 - -commit 1080852e91291bcb1fb46dbc9e493d255aaa06fb -Author: Niels Provos -Date: Mon May 12 03:12:09 2008 +0000 - - allow cancelation of user initiated http requests; this will allow cancelation of rpc requests eventually - - svn:r812 - -commit 03fafae0068ed014dfe9ee97a3e150fbe6ff6ba0 -Author: Nick Mathewson -Date: Mon May 12 01:03:36 2008 +0000 - - Make trunk event.c build happily on win32 under mingw. - - - svn:r811 - -commit 054159f59c0de3fe3a73cad011883f6c02ce6f3f -Author: Nick Mathewson -Date: Mon May 12 00:56:19 2008 +0000 - - r19679@catbus: nickm | 2008-05-11 20:56:12 -0400 - Windows does not have alloca(). - - - svn:r810 - -commit 04366d5acc691783083c5e746056694943924b3a -Author: Nick Mathewson -Date: Mon May 12 00:51:48 2008 +0000 - - r19677@catbus: nickm | 2008-05-11 20:51:41 -0400 - Oops; we had not changed event_malloc() to mm_malloc() [etc] in win32.c - - - svn:r809 - -commit 6bf1ca780c5f60618e59e02b61eae4bfee199f46 -Author: Nick Mathewson -Date: Mon May 12 00:40:04 2008 +0000 - - r19675@catbus: nickm | 2008-05-11 20:39:39 -0400 - Stop pretending that u_char and u_short are standard types that win32 is dumb not to have. In fact, u_char can really just be spelled out, and u_short was usually just a bad way of saying ev_uint16_t. - - - svn:r808 - -commit a57767faf8d140797b0adf3fe885b7eb8928057c -Author: Niels Provos -Date: Sun May 11 16:22:35 2008 +0000 - - more accessors for evhttp_request - - svn:r807 - -commit 687be1241bd1c931f724ceeb562d64037f4e13f1 -Author: Niels Provos -Date: Sat May 10 07:32:05 2008 +0000 - - dispatch the callbacks against the decoded uri to be more http compliant - - svn:r806 - -commit 7bbe185b0e54f3d3228ed7e17c78ed3c5ec05836 -Author: Niels Provos -Date: Sat May 10 06:32:53 2008 +0000 - - evhttp_request_uri -> evhttp_request_get_uri - - svn:r805 - -commit 950af186791c01636fe37ef8c3720154e48f975c -Author: Niels Provos -Date: Sat May 10 05:58:17 2008 +0000 - - replace fnmatch with homegrown function - - svn:r804 - -commit 7868ab5a435d6697cc0c70ab085d7970e5b97384 -Author: Nick Mathewson -Date: Fri May 9 04:00:17 2008 +0000 - - r19667@catbus: nickm | 2008-05-08 23:49:26 -0400 - fwd-port: Always include winsock2.h before windows.h. Apparently some SDKs need this. - - - svn:r803 - -commit 64ce7990831e76038285bb78b9c061b6fcba4370 -Author: Nick Mathewson -Date: Thu May 8 23:57:31 2008 +0000 - - r15555@tombo: nickm | 2008-05-08 19:56:51 -0400 - fwd-port The IRIX compiler thinks #error means warn. Fix configure.in to tolerate this. - - - svn:r801 - -commit 8acb80b4f9a19469dd0d93e5b7cd149e7f89da3b -Author: Nick Mathewson -Date: Thu May 8 22:51:39 2008 +0000 - - r15551@tombo: nickm | 2008-05-08 14:49:20 -0400 - Use _get_ convention for new accessor functions. (These are all new ones as of 2.0, I believe). - - - svn:r799 - -commit 7defe4cbc16a53b10e8b03ed618140121cc91144 -Author: Nick Mathewson -Date: Thu May 8 15:55:09 2008 +0000 - - r15549@tombo: nickm | 2008-05-08 11:53:11 -0400 - Make new http headers include minimal parts of event2/ tree; make old evhttp.h incldue event.h, since the old one did too. - - - svn:r798 - -commit a29f7eefac8f3c66434fb5d7461546d1c7234675 -Author: Nick Mathewson -Date: Thu May 8 15:38:31 2008 +0000 - - svn:r797 - -commit 3d60bccc8ef2ef9413d198bc670f00efb21149af -Author: Nick Mathewson -Date: Thu May 8 14:25:44 2008 +0000 - - r19656@catbus: nickm | 2008-05-08 10:25:08 -0400 - forward-port: Remove #include "misc.h"s. - - - svn:r795 - -commit a26442c5acba29b315793e67bc802c4fed13e31d -Author: Nick Mathewson -Date: Thu May 8 14:06:33 2008 +0000 - - r19649@catbus: nickm | 2008-05-08 10:00:14 -0400 - Replace gettimeofday() usage with a new evutil_gettimeofday(). This removes all previous need for win32-code/misc.[ch] - - - svn:r792 - -commit 85ed7133439658bf7b44a99100fcf82eed1d232e -Author: Niels Provos -Date: Thu May 8 07:00:16 2008 +0000 - - deprecate timeout_* event functions by moving them to event_compat.h - - svn:r791 - -commit de1c43926b032954a91f7edf50bbf4f233bd791e -Author: Niels Provos -Date: Thu May 8 06:15:04 2008 +0000 - - migrate evhttp to event2; accessors are still missing - - svn:r790 - -commit 3f56e364b76ccc3a688768e92952d08052556120 -Author: Niels Provos -Date: Thu May 8 05:56:20 2008 +0000 - - event_base_new_with_config() and related methods - - svn:r789 - -commit 3b2022ef3a9eba280b256ac7bbe99f224a8584ad -Author: Niels Provos -Date: Thu May 8 05:33:15 2008 +0000 - - provide an api for retrieving the supported event mechanisms - - svn:r788 - -commit 0a804f3c837f7969d04f6604a40897a9b5aa8c57 -Author: Nick Mathewson -Date: Wed May 7 21:51:49 2008 +0000 - - r19641@catbus: nickm | 2008-05-07 17:51:26 -0400 - Forward-port: Fix win32 vc-2005 build. - - - svn:r786 - -commit f2d65f8a9cdbfd5500d1b3a01b5c9de8e1f89f5c -Author: Nick Mathewson -Date: Wed May 7 20:29:33 2008 +0000 - - r19634@catbus: nickm | 2008-05-07 16:10:37 -0400 - the C syntax is fn(void), not fn(). - - - svn:r784 - -commit 68fecb7ab6c24c13a2693464e62228601d0af10b -Author: Nick Mathewson -Date: Wed May 7 20:29:11 2008 +0000 - - r19633@catbus: nickm | 2008-05-07 16:10:00 -0400 - Fix bug 1958901: stop overriding CPPFLAGS in test directory. - - - svn:r783 - -commit 300a4efb2d3b28fd0dfbb7cfb004ddf7a19d5ef4 -Author: Niels Provos -Date: Wed May 7 01:52:24 2008 +0000 - - test virtual hosts - - svn:r780 - -commit caa368e1cc901abf75c02ae19d70d148a95e79ba -Author: Nick Mathewson -Date: Mon May 5 19:19:47 2008 +0000 - - r19610@catbus: nickm | 2008-05-05 15:18:52 -0400 - Switch strcmp() tests in test_evbuffer() to use memcmp instead. Previously they broke on my Linux box. - - - svn:r779 - -commit 803dc36ad8dde5964d87ee87bc1e4f64277f4903 -Author: Nick Mathewson -Date: Mon May 5 19:19:08 2008 +0000 - - r19609@catbus: nickm | 2008-05-05 15:16:52 -0400 - Reename evdns-internal struct request to evdns_request, and expose the name. switch new evdns resolve APIs to return evdns_request*. This is a prereq to making evdns requests cancelable. - - - svn:r778 - -commit 957e9fd829b64dc8f54824a34601eff95e71d669 -Author: Nick Mathewson -Date: Mon May 5 17:49:52 2008 +0000 - - r19607@catbus: nickm | 2008-05-05 13:49:44 -0400 - Hack to make sure that there is always a working fast EVENT_FD() - - - svn:r777 - -commit 4e8a339ef7afaecaa230ef4acd68c87c78f51e96 -Author: Nick Mathewson -Date: Mon May 5 15:46:00 2008 +0000 - - r19602@catbus: nickm | 2008-05-05 11:45:18 -0400 - Make most of the tests use the new headers. - - - svn:r776 - -commit bb37fbb22ef403b993c86ce8930a5061c3d49c93 -Author: Nick Mathewson -Date: Mon May 5 15:45:47 2008 +0000 - - r19601@catbus: nickm | 2008-05-05 11:45:04 -0400 - Make event_rpcgen.py use the new headers. - - - svn:r775 - -commit bc6da5ea79be0083c6b276d9fd6a62cb8278f096 -Author: Nick Mathewson -Date: Mon May 5 15:45:39 2008 +0000 - - r19600@catbus: nickm | 2008-05-05 11:34:06 -0400 - Move EV_* flags into event.h; they are a necessary part of the public API. - - - svn:r774 - -commit d0c3644e63667380ff08645621eefaea0231241a -Author: Nick Mathewson -Date: Mon May 5 15:45:30 2008 +0000 - - r19599@catbus: nickm | 2008-05-05 11:26:18 -0400 - Turn event_initialized() and friends into a function; add function equivalents for EVENT_FD and EVENT_SIGNAL. - - - svn:r773 - -commit 891dba4376535df407189de3a2af7c3951280752 -Author: Nick Mathewson -Date: Mon May 5 15:00:53 2008 +0000 - - r19597@catbus: nickm | 2008-05-05 11:00:29 -0400 - define _GNU_SOURCE before including fnmatch.h so that FNM_CASEFOLD gets defined and linux build gets fixed. This whole fnmatch() business will be a bit hard to port, though: windows doesn't have one IIUC, so we'll have to reimplement our own to work there. - - - svn:r772 - -commit f2a81fbc67b90551a50e07f4af5a266ac081ccd4 -Author: Niels Provos -Date: Mon May 5 07:17:05 2008 +0000 - - add support for virtual http hosts; no tests yet - - svn:r771 - -commit f940eb4b8d26f677af4bcaa21ed98cfdb9db0acc -Author: Niels Provos -Date: Sun May 4 22:21:29 2008 +0000 - - fix a bug where it was not possible to bind multiple sockets to the same http - server; test that binding multiple sockets works. - - - svn:r769 - -commit 5786d5255a3a906b0768304d28171ef95c05bdbb -Author: Niels Provos -Date: Sun May 4 20:05:39 2008 +0000 - - improve doxygen documentation for evhttp.h - still incomplete - - svn:r768 - -commit 36d7ab508293985ac08f8df043d837b96028cd0f -Author: Niels Provos -Date: Sun May 4 18:31:21 2008 +0000 - - trust in naming: rename evbuffer.c to bufferevent.c - - svn:r767 - -commit 40a44b36bbc108a97e65517b98bc2bb65896ff07 -Author: Nick Mathewson -Date: Sun May 4 17:23:20 2008 +0000 - - r19564@catbus: nickm | 2008-05-04 13:23:10 -0400 - Fix compile with --enable-gcc-warnings and clock_gettime() - - - svn:r766 - -commit a83caa6b29b1d86dd2e8121bc782a5ce92bbdbb9 -Author: Niels Provos -Date: Sun May 4 03:52:24 2008 +0000 - - remove too agressive assert - - svn:r765 - -commit 181007b9cf52ae6aea8d97e64e114895c7f885f0 -Author: Niels Provos -Date: Sat May 3 22:14:44 2008 +0000 - - make event_assign void; it cannot return an error - - svn:r763 - -commit 1d30750b1de39c25ff930d8a52e2f3228fac353b -Author: Niels Provos -Date: Sat May 3 22:10:09 2008 +0000 - - support for periodic timeouts - - svn:r762 - -commit 8c750eaff8412b8387eeca1e75d62540ad725f00 -Author: Niels Provos -Date: Sat May 3 21:37:33 2008 +0000 - - separate signal events from io events - - svn:r760 - -commit 45e6fb0dd263f878135bd210d3d410906eb45c9f -Author: Niels Provos -Date: Sat May 3 18:23:44 2008 +0000 - - cache clock_gettime/gettimeofday values in base - - svn:r758 - -commit f04497e493c6b665d6cc889a57f2441d71d176d1 -Author: Niels Provos -Date: Sat May 3 03:05:28 2008 +0000 - - introduce evbuffer_reserve_space() and evbuffer_commit_space() to make processing in filters more efficient - - svn:r757 - -commit becc89b7788984924b3041d5a187b1c978bac458 -Author: Niels Provos -Date: Sat May 3 02:37:18 2008 +0000 - - introduce evbuffer_contiguous_space() and use it in the zlib filter test - - svn:r756 - -commit 5fbc7f0aeedcc5e57ac40aad01211bce7a7c7a0d -Author: Nick Mathewson -Date: Fri May 2 16:28:25 2008 +0000 - - r15439@tombo: nickm | 2008-05-02 12:28:08 -0400 - use event_assign internall; switch uses of event_set to use event_assign instead. - - - svn:r755 - -commit e8f450f232cdb01349e5639181dd115ed5a663f0 -Author: Niels Provos -Date: Thu May 1 02:08:26 2008 +0000 - - expose a way to create the rpc context manually - - svn:r754 - -commit 85c4904bc526103e5702c716ee80d03937083168 -Author: Niels Provos -Date: Thu May 1 01:45:00 2008 +0000 - - allow connections to be removed from an rpc pool - - svn:r753 - -commit d76cca72736a0918221506c64d76124e65a71f1a -Author: Niels Provos -Date: Wed Apr 30 04:36:26 2008 +0000 - - fix missing printf format argument - - svn:r752 - -commit ccb70f1bc747068e960dd721669f0298b4f7870c -Author: Niels Provos -Date: Wed Apr 30 04:31:10 2008 +0000 - - provide example bufferevent filters doing compression and decompression as additional regression test - - svn:r751 - -commit 522480f5cebeb8bb9ff9c09d14b8ae6280f15038 -Author: Niels Provos -Date: Wed Apr 30 01:01:57 2008 +0000 - - improve documentation for bufferevent.h - - svn:r750 - -commit c58a01a23bc3fb649b3c45a625ebb643864166a9 -Author: Niels Provos -Date: Wed Apr 30 00:50:20 2008 +0000 - - fix regression test; oops - - svn:r749 - -commit 682adc443b03a47c849f028474639c5d8254101c -Author: Niels Provos -Date: Wed Apr 30 00:09:16 2008 +0000 - - support input/output filters for bufferevents - - svn:r748 - -commit 28add6b9e2d03b96ff73d06f825c3186101ac445 -Author: Niels Provos -Date: Tue Apr 29 23:18:04 2008 +0000 - - add more header files to doxygen - - svn:r747 - -commit 98dc98c59fb7833bb60319a988beea596698b98a -Author: Nick Mathewson -Date: Tue Apr 29 21:19:26 2008 +0000 - - r15346@tombo: nickm | 2008-04-29 17:19:18 -0400 - Remove the never-exported, never-used, never-threadsafe evhttp_hostportfile() - - - svn:r746 - -commit 9626a421de2e3b4e2eed34bfdffdd0d417655c78 -Author: Nick Mathewson -Date: Tue Apr 29 18:11:23 2008 +0000 - - r15341@tombo: nickm | 2008-04-29 14:09:50 -0400 - Use internal implementation for evutil_timercmp() everywhere, to avoid bugs when the platform timercmp() has never heard of <= or >=. Also, replace timercmp() usage in min_heap.c with call to evutil_timercmp(). - - - svn:r744 - -commit 4cff82bb4f2519d139559c308b63be54cb86b002 -Author: Nick Mathewson -Date: Tue Apr 29 18:11:10 2008 +0000 - - r15339@tombo: nickm | 2008-04-29 14:03:48 -0400 - Note that evhttp_hostportfile is not threadsafe, and so its usage will change. Mark its first argument const. Remove a now-redundant declaration for it in http-internal.h. - - - svn:r743 - -commit e44ef375ee9a8b4c7e8d21a752e9e4864595758f -Author: Niels Provos -Date: Tue Apr 29 04:52:50 2008 +0000 - - convert evhttp_connection to use bufferevents - - svn:r742 - -commit 0ec09b550795d19a74425c1756fcc598b1f3f8b3 -Author: Niels Provos -Date: Tue Apr 29 04:35:26 2008 +0000 - - also try client connection for chunked requests - - svn:r741 - -commit 9c480533bf1181d41eadf21fde0df6f4481d8e55 -Author: Niels Provos -Date: Tue Apr 29 02:33:27 2008 +0000 - - test the server side of sending chunked replies - - svn:r740 - -commit 72a3902e5c25272c0c6f690971633c5be947a392 -Author: Niels Provos -Date: Tue Apr 29 00:24:00 2008 +0000 - - test some primitives from http.c - - svn:r739 - -commit 9485ff9a6629e2b5f73a775a7fa799f56d589e30 -Author: Niels Provos -Date: Sun Apr 27 20:40:56 2008 +0000 - - introduce bufferevent_setcb and bufferevent_setfd to allow better manipulation of bufferevents - - svn:r737 - -commit 22c8a404027c7efcd486d70568c5d6f723781635 -Author: Niels Provos -Date: Sun Apr 27 20:04:33 2008 +0000 - - test connection retry logic - - svn:r736 - -commit 7b29ad57d95513ff806c4bbdace0861330dd8054 -Author: Niels Provos -Date: Sun Apr 27 19:41:26 2008 +0000 - - test server behavior when connection times out while reading the headers - - svn:r735 - -commit dd183f7c97777e8937187c0041be383338d0c0ad -Author: Niels Provos -Date: Sun Apr 27 00:32:10 2008 +0000 - - provide bufferevent_input and bufferevent_output without requiring knowledge of the structure - - svn:r734 - -commit f6c40173819c911e99b61867c53daa766618c4c5 -Author: Niels Provos -Date: Sat Apr 26 05:13:56 2008 +0000 - - fix a bug in which bufferevent_write_buffer would not schedule a write event - - svn:r733 - -commit 3a17aeed7a481e614c65925cbe07b286ae257e54 -Author: Niels Provos -Date: Sat Apr 26 01:00:44 2008 +0000 - - fix a bug in buffrevent read water marks and add a test for them - - svn:r731 - -commit 3278012f33bc5bf3a965244d570803dd6b7e663f -Author: Niels Provos -Date: Sat Apr 26 00:35:17 2008 +0000 - - expose bufferevent_setwatermark via header files and fix high watermark on read - - svn:r729 - -commit 89f63b205d29b9ff9642713d22ca59427c1ffab5 -Author: Niels Provos -Date: Fri Apr 25 02:44:46 2008 +0000 - - add bufferevent_read_buffer function - - svn:r728 - -commit fe2e7307f3a2d7915098a3fa671da3c3e89bdd64 -Author: Nick Mathewson -Date: Fri Apr 25 01:29:15 2008 +0000 - - r15320@tombo: nickm | 2008-04-24 21:29:06 -0400 - Yes, niels says this is safe. - - - svn:r727 - -commit 94fb4d0a1e95f140dd840535bb066fb7dbb3013c -Author: Nick Mathewson -Date: Fri Apr 25 01:18:18 2008 +0000 - - r15317@tombo: nickm | 2008-04-24 21:17:49 -0400 - Add new functions to be more threadsafe (and structure-ignorant) than event_set. - - - svn:r726 - -commit 49868b618a55c375d6c378edc174cd81e478f213 -Author: Nick Mathewson -Date: Fri Apr 25 01:18:08 2008 +0000 - - r15316@tombo: nickm | 2008-04-24 20:58:36 -0400 - Rename internal memory management functions from event_malloc() etc to mm_malloc() etc. - - - svn:r725 - -commit a55a67d56e989b9f7fa2027f2c75bec8a55a9a87 -Author: Nick Mathewson -Date: Fri Apr 18 13:46:13 2008 +0000 - - r15249@tombo: nickm | 2008-04-18 09:46:02 -0400 - Avoid leaking a string in the unlikely OOM case from name_from_addr. spotted by niels. - - - svn:r724 - -commit a404bf9877ad2cca2f4bb403afff6818bb94d6e8 -Author: Nick Mathewson -Date: Fri Apr 18 13:28:00 2008 +0000 - - r15245@tombo: nickm | 2008-04-18 09:27:50 -0400 - Oops; use libevent-internal type instead of uint32_t. - - - svn:r722 - -commit 8d2a61605b6c32a06b961238eb5d3195b8b452d1 -Author: Nick Mathewson -Date: Fri Apr 18 13:25:05 2008 +0000 - - r15242@tombo: nickm | 2008-04-18 09:24:44 -0400 - Make tagging code thread-safe, and fix a bug in encode_int_internal - - - svn:r721 - -commit a2d4a06298173e0db43ae4012edb48f538825fd6 -Author: Nick Mathewson -Date: Thu Apr 17 19:27:54 2008 +0000 - - r15228@tombo: nickm | 2008-04-17 15:27:39 -0400 - Use new includes in evport.c and devpoll.c. I do not have the hardware to compile these on; somebody else should test them. - - - svn:r720 - -commit 3eb21c0d33683302e1acd7e14a899889f28b2931 -Author: Nick Mathewson -Date: Thu Apr 17 19:25:35 2008 +0000 - - r15226@tombo: nickm | 2008-04-17 15:25:25 -0400 - Fix a couple of gcc warnings on 64-bit platforms - - - svn:r719 - -commit 8863ff7625c3d4fd81063029738bb7c31471e79d -Author: Nick Mathewson -Date: Thu Apr 17 19:19:36 2008 +0000 - - r15224@tombo: nickm | 2008-04-17 15:19:24 -0400 - Oops. We need to make sure that strdup wasn't oom. - - - svn:r718 - -commit ae09ac4ae0194880fe7871dc4b6704d99901bd8a -Author: Nick Mathewson -Date: Thu Apr 17 19:18:40 2008 +0000 - - r15220@tombo: nickm | 2008-04-17 15:16:02 -0400 - Use new includes in more files still - - - svn:r717 - -commit 3f3a16757f2843c1edebe8df58a85aed965f7fd9 -Author: Nick Mathewson -Date: Thu Apr 17 19:17:50 2008 +0000 - - r15219@tombo: nickm | 2008-04-17 15:12:17 -0400 - Use new includes in epoll.c - - - svn:r716 - -commit beb39f577032cc7ba1c727fda00fc63816a90262 -Author: Nick Mathewson -Date: Thu Apr 17 19:16:30 2008 +0000 - - r15218@tombo: nickm | 2008-04-17 15:10:13 -0400 - Add a missing #include - - - svn:r715 - -commit e688a88a821506e8cfb43155496c8e2b1b39af53 -Author: Nick Mathewson -Date: Thu Apr 17 17:55:35 2008 +0000 - - r15216@tombo: nickm | 2008-04-17 13:55:05 -0400 - Add new thread-safe interfaces to evdns functions. Needs review. - - - svn:r714 - -commit fc41ffde4d21a61a070c88ae57e1e18f3055b08b -Author: Nick Mathewson -Date: Thu Apr 17 15:50:28 2008 +0000 - - r15214@tombo: nickm | 2008-04-17 11:47:10 -0400 - Make name_from_addr() threadsafe in http.c - - - svn:r713 - -commit 963ae2cf42af8f9fea2729d5c424ef9ffa0a9a6c -Author: Nick Mathewson -Date: Wed Apr 16 21:01:31 2008 +0000 - - r15212@tombo: nickm | 2008-04-16 17:01:21 -0400 - Remove some needless includes - - - svn:r712 - -commit 0ac73078ed42b5185a45610534ce3475ba6c27e7 -Author: Nick Mathewson -Date: Wed Apr 16 20:01:51 2008 +0000 - - r15193@tombo: nickm | 2008-04-16 16:00:35 -0400 - Split event.h into several new headers in include/event2. event.h is now just a wrapper that includes all the subheaders. - - - svn:r711 - -commit f560198e4598fe1b1fe471c9f3da2251edf87105 -Author: Nick Mathewson -Date: Wed Apr 16 20:01:27 2008 +0000 - - r15192@tombo: nickm | 2008-04-16 15:59:51 -0400 - Fix a compilation error on OSX. - - - svn:r710 - -commit f9f4d4fe1720f888ff1d89d7edfdc9725f62432d -Author: Nick Mathewson -Date: Fri Apr 11 20:02:50 2008 +0000 - - r19309@catbus: nickm | 2008-04-11 16:02:07 -0400 - Fix for epoll-on-linux bug (#1908866) where timeout values over (LONG_MAX-999)/HZ) (35 for me, or maybe 6 hours 50 min for some people, or maybe 3 hours 25 minutes for a special few) get treated as "wait forever". This actually deserves to be fixed in the kernel, but even if it is we will need to support Linux versions with this bug. - - - svn:r709 - -commit 44ceb945a37cc3b791b59b4ac1a9c669eb3e7e2e -Author: Nick Mathewson -Date: Thu Apr 10 19:34:50 2008 +0000 - - r19305@catbus: nickm | 2008-04-10 15:34:10 -0400 - Fix bug 1938754: do not warn when epoll_create() fails with ENOSYS. - - - svn:r706 - -commit 0c843507abcf18c8a7c766fa5b7a307b2030bd8f -Author: Nick Mathewson -Date: Thu Apr 10 19:25:11 2008 +0000 - - r19301@catbus: nickm | 2008-04-10 14:54:46 -0400 - Forward-port: Correct the documentation on evbuffer_add_[v]printf: Fix for bug 1914464. - - - svn:r705 - -commit 812d2fd8fd4dfab158bbc8e278a723363cf29e6e -Author: Niels Provos -Date: Thu Apr 3 14:27:01 2008 +0000 - - proxy one more generator - - svn:r701 - -commit a7e395512efd5622ad81dc0e10a41ce157301cee -Author: Niels Provos -Date: Thu Apr 3 03:33:07 2008 +0000 - - slight refactoring - - svn:r700 - -commit 193c06a7ed9730f5f08ca3958fbacee2c3e28e36 -Author: Niels Provos -Date: Mon Mar 31 02:04:34 2008 +0000 - - fix a bug in which evbuffer_add_vfprintf would loop forever; avoid - fragmentation in evbuffer_expand by increasing the size of the last buffer - in the chain; as a result with have to keep track of the previous_to_last - chain; provide a evbuffer_validate() function in the regression test to - make sure that all evbuffer are internally consistent. - - - svn:r699 - -commit 3ef1f5041596672affcfe8af01d6d73eb86865de -Author: Niels Provos -Date: Mon Mar 31 00:33:46 2008 +0000 - - do not delete uninitialized timeout event in evdns - - svn:r697 - -commit 502929cdf21ba9433f9956c1e3f177a28a1d5b0f -Author: Niels Provos -Date: Mon Mar 31 00:31:53 2008 +0000 - - add a check that base != NULL for threading; might want to drop this later - - svn:r696 - -commit 8920ac4ddf509be3981b00d5b13ed349359e4834 -Author: Niels Provos -Date: Sun Mar 30 21:06:33 2008 +0000 - - make RPC replies use application/octet-stream - - svn:r694 - -commit ca42671a1443b695bc9a7640d4eb223d1a34fbcc -Author: Niels Provos -Date: Sat Mar 29 01:45:45 2008 +0000 - - make event methods static so that they are not exported; from Andrei Nigmatulin - - svn:r692 - -commit cb50f615d4902a0703a604bf64b1a5d014bcbb70 -Author: Niels Provos -Date: Tue Mar 11 05:26:30 2008 +0000 - - rename lock create callback functions; as suggested by nick - - svn:r691 - -commit c182baca1028af0b12142e26a571e180232039b1 -Author: Niels Provos -Date: Mon Mar 10 03:17:20 2008 +0000 - - switch thread support so that locks get allocated as they are needed. - - svn:r690 - -commit 6a92ec0b0f43d7b074f856152d24a1f45384c787 -Author: Nick Mathewson -Date: Tue Mar 4 19:47:01 2008 +0000 - - r18547@catbus: nickm | 2008-03-04 14:46:42 -0500 - Fix compilation with --enable-gcc-warnings - - - svn:r689 - -commit 0c49e456f1c80fed988342b90cf28bb1f88273e8 -Author: Niels Provos -Date: Tue Mar 4 05:42:20 2008 +0000 - - document thread functions - - svn:r688 - -commit d5c15b2ebb609414358216cd62ca135b5658c104 -Author: Niels Provos -Date: Mon Mar 3 03:36:51 2008 +0000 - - make event_rpcgen.py generate code include event-config.h - - svn:r686 - -commit 968fd5c06fc8dc5cf3cf6cad48fe7bc517d1fe99 -Author: Niels Provos -Date: Sun Mar 2 21:39:49 2008 +0000 - - forgot this header file - - svn:r685 - -commit 558de9b3776bf378fe2416c1c86639bc7abef3db -Author: Niels Provos -Date: Sun Mar 2 21:18:33 2008 +0000 - - Provide OpenSSL style support for multiple threads accessing the same event_base - - svn:r684 - -commit 19dad16699ddf396c87e7c44c174e6716c0d160c -Author: Niels Provos -Date: Sun Mar 2 01:46:00 2008 +0000 - - Do not free the kqop file descriptor in other processes, also allow it to be 0; from Andrei Nigmatulin - - svn:r682 - -commit 593b5f99b334da9a5090792910d39b4de16d0f1f -Author: Nick Mathewson -Date: Fri Feb 29 22:33:01 2008 +0000 - - r18492@catbus: nickm | 2008-02-29 17:32:55 -0500 - Add another missing _REENTRANT. - - - svn:r681 - -commit 00382110b268891ced706f9d84ec80031213bc89 -Author: Niels Provos -Date: Fri Feb 29 05:23:49 2008 +0000 - - address nick's comments and make evbuffer_pullup more efficient - - svn:r680 - -commit 72105927770952445009742663e95f04ba702806 -Author: Nick Mathewson -Date: Thu Feb 28 20:57:01 2008 +0000 - - r18490@catbus: nickm | 2008-02-28 15:56:55 -0500 - Replace www.google.com with google.com; fix EVDNS_MAIN code. - - - svn:r679 - -commit 697177306f8dcf7781b5adc8bebe4dfae54f472a -Author: Nick Mathewson -Date: Thu Feb 28 20:41:34 2008 +0000 - - r18488@catbus: nickm | 2008-02-28 15:41:27 -0500 - Define reentrant in evdns.c so that we get a declaration for strtok_r - - - svn:r678 - -commit 0322ce0a3ba144cbf00f0a359c21aaf76e9f2063 -Author: Nick Mathewson -Date: Thu Feb 28 18:36:03 2008 +0000 - - r18486@catbus: nickm | 2008-02-28 13:35:53 -0500 - Make offsetof into evutil_offsetof. Be a little more willing to call evbuffer_chain_align() from evbuffer_expand(). Clarify some docs, and add some XXX comments to note questionable areas. - - - svn:r677 - -commit d71da6f73748c063814c07c47c0d6fad90b2e8dd -Author: Nick Mathewson -Date: Thu Feb 28 17:47:30 2008 +0000 - - r18484@catbus: nickm | 2008-02-28 12:47:20 -0500 - Use event_warn() function, not fprintf-to-stderr. - - - svn:r676 - -commit 0e7cbe6508a296952a05ddc9cb883fef0a13cf1e -Author: Nick Mathewson -Date: Thu Feb 28 17:38:52 2008 +0000 - - r18482@catbus: nickm | 2008-02-28 12:38:40 -0500 - Fix GCC 4.2 warnings; fix includes in subdirs. - - - svn:r675 - -commit 5c70ea4c9d8720525405063658ccd3e24b6966b1 -Author: Niels Provos -Date: Thu Feb 28 02:47:43 2008 +0000 - - improved code for evbuffer; avoids memcpy - - svn:r674 - -commit eb9b958089bcf59ad712c747e294da95c6baf20c -Author: Niels Provos -Date: Wed Feb 27 06:20:48 2008 +0000 - - add some basic tests for DELETE/PUT; from Josh Rotenberg - - svn:r673 - -commit e7ad5493908731707df6c9434decb0fecb7767eb -Author: Nick Mathewson -Date: Tue Feb 26 20:24:29 2008 +0000 - - r14507@tombo: nickm | 2008-02-26 15:23:44 -0500 - Patch from Tani Hosokawa: make some functions in http.c threadsafe. Also, note some functions in http.c that still are not threadsafe. - - - svn:r671 - -commit bd31d00fc19e426ed98a1483274e093789789f87 -Author: Niels Provos -Date: Tue Feb 26 04:54:19 2008 +0000 - - move signal callbacks closer to test code - - svn:r670 - -commit 7470ce52c5670bae0ef2a9aa6a77988e0a77e0cb -Author: Niels Provos -Date: Tue Feb 26 03:49:00 2008 +0000 - - increase listen queue for http sockets to 128 - - svn:r669 - -commit 960be58869f63c2a7814a984f7a34d69c159fbc3 -Author: Niels Provos -Date: Tue Feb 26 03:29:36 2008 +0000 - - deal correctly with http/1.0 and keep-alive - - svn:r667 - -commit 0b114da2b64eac386b43933d3243100b4abf82ee -Author: Niels Provos -Date: Tue Feb 26 03:12:07 2008 +0000 - - introduce evhttp_accept_socket() to accept from an already created socket - - svn:r666 - -commit b14cd655d1eac14eed28ca749a4abf6889e2afca -Author: Niels Provos -Date: Mon Feb 25 07:49:22 2008 +0000 - - add support (without tests!) to PUT/DELETE requests; from Josh Rotenberg - - svn:r662 - -commit bb914ed9af5f509f80f72c289178c0e467864aed -Author: Niels Provos -Date: Mon Feb 25 07:34:07 2008 +0000 - - do not insert event into list when evsel->add fails - - svn:r660 - -commit 5a2ece1895d5cf4b3f07aad52ba88dc0edcb4990 -Author: Nick Mathewson -Date: Sat Feb 23 19:04:26 2008 +0000 - - r18370@catbus: nickm | 2008-02-23 14:04:00 -0500 - clean up some corner cases in evutil.h. - - - svn:r655 - -commit 67bf29ad72572aaa433350438534ad78f0d0ec41 -Author: Niels Provos -Date: Sat Feb 23 06:02:04 2008 +0000 - - simplify evbuffer by removing orig_buffer - - svn:r654 - -commit 87bef9e9740cba70007209eed70e3f55985d9a06 -Author: Niels Provos -Date: Wed Feb 20 21:49:09 2008 +0000 - - update event_base_loop documentation; from Tani Hosokawa - - svn:r652 - -commit 0d26f1605f54527afb26d64e4fbfa2ff42bdb06e -Author: Nick Mathewson -Date: Mon Feb 18 20:13:27 2008 +0000 - - r18169@catbus: nickm | 2008-02-18 15:13:20 -0500 - Rebuild and re-run configure etc when configure.in or Makefile.am changes. Also, have automake do its dependency tracking. - - - svn:r651 - -commit 11230f7e1620c663842e9993ac3cdaa29afec7c2 -Author: Nick Mathewson -Date: Mon Feb 18 20:04:01 2008 +0000 - - r18145@catbus: nickm | 2008-02-18 15:02:20 -0500 - Stop using deprecated autoconf code to set integer types; detect actual files to include more thoroughly. This should make us work on solaris 9 again. This should be a backport candidate, if it works. Also, make all libevent code use ev_uint32_t etc, rather than uint_32_t. - - - svn:r649 - -commit 506d4dbcf469f100ffd490098647384c294e82e1 -Author: Niels Provos -Date: Sun Feb 17 01:31:31 2008 +0000 - - remove NDEBUG ifdefs from evdns.c - - svn:r647 - -commit 23ef0d093661a0a0219190b2bbbdf8254af0000b -Author: Niels Provos -Date: Sun Feb 17 01:15:36 2008 +0000 - - allow regression code to be build even without Python installed - - svn:r645 - -commit f09e9d91b14e549b0b98d26c2c248e283bf8a85f -Author: Niels Provos -Date: Sun Feb 17 01:12:09 2008 +0000 - - 1.3.99-trunk -> 1.4.99-trunk - - svn:r644 - -commit d47907a73036b07ce61c7ce81d19cde6bc2c4056 -Author: Nick Mathewson -Date: Sat Feb 16 20:50:02 2008 +0000 - - r14213@tombo: nickm | 2008-02-16 15:48:07 -0500 - Patch from Scott Lamb: make http content length into a 64-bit value. - - - svn:r641 - -commit 807ab182d08971651b3cff66353e3145fb8e4ef2 -Author: Nick Mathewson -Date: Sat Feb 16 20:49:47 2008 +0000 - - r14211@tombo: nickm | 2008-02-16 15:28:54 -0500 - Add new evutil_strtoll() function so we can apply 64-bit content-length patch from Scott Lamb in a portable way. - - - svn:r640 - -commit 677a95864be43749c82705f9f8f3f56f0b8a1f4b -Author: Nick Mathewson -Date: Sat Feb 16 16:56:34 2008 +0000 - - r14205@tombo: nickm | 2008-02-16 11:55:57 -0500 - Fix bug 1894184: add a CRLF after each chunk when sending chunked HTTP data. Original patch from propanbutan. - - - svn:r637 - -commit 8ab618916fc9ba06ff5e84d3ea858a8b4eec9f1b -Author: Niels Provos -Date: Sat Feb 16 06:09:39 2008 +0000 - - event_base_get_method; from Springande Ulv - - svn:r635 - -commit f38aec8bb733c57b5257bede429fa7f992131270 -Author: Niels Provos -Date: Tue Feb 12 06:01:46 2008 +0000 - - devpoll and evport need reinit; tested by W.C.A. Wijngaards - - svn:r633 - -commit 2fde2217592db3be65a5b0d53e3ee054724139c4 -Author: Niels Provos -Date: Sat Feb 9 16:03:01 2008 +0000 - - address some compiler warnings in debug mode - - svn:r630 - -commit 6baff52296073f668322e74f397e91ebb29030b9 -Author: Niels Provos -Date: Wed Feb 6 16:14:42 2008 +0000 - - EAGAIN check for event ports; from Wijngaards - - svn:r629 - -commit 8c66d4e289290c58cfd34865e0405b549320d532 -Author: Niels Provos -Date: Sat Jan 26 07:29:57 2008 +0000 - - remove pending timeouts on event_base_free - - svn:r627 - -commit 9859bc783adcd51729b3d7563902ac8caca67b42 -Author: Nick Mathewson -Date: Mon Dec 31 20:47:12 2007 +0000 - - r15764@tombo: nickm | 2007-12-31 15:46:16 -0500 - Forward-port from 1.4 branch: Make generated rpc files build-depend on event_rpcgen. - - - svn:r626 - -commit 992bc85b96b3ca3eeff05e030468392894cc7195 -Author: Niels Provos -Date: Mon Dec 31 20:42:21 2007 +0000 - - dereference the right field and associate the right connection - - svn:r624 - -commit 2460aa5939c91fe75761c75c3d0a90f32b9a73b2 -Author: Niels Provos -Date: Mon Dec 31 19:33:30 2007 +0000 - - allow hooks to get access to the connection object - - svn:r623 - -commit 5a5609c75317a8c011b02daf3853ebd3b6bab9fc -Author: Niels Provos -Date: Sat Dec 29 22:45:54 2007 +0000 - - allow association of meta data with RPC requests for hook processing - - svn:r622 - -commit 024804cce7101c5d09bb58e85d4ca7cc83f3e44d -Author: Niels Provos -Date: Fri Dec 28 07:58:29 2007 +0000 - - the win32 changes for regress_http broke the regression test under unix. making the socket non-blocking can return -1 on connect; so now, we need to check the errno; not sure if that is supported under windows. - - - svn:r621 - -commit 955c6abf5327f3ebfa01d58a870a458f6aca0504 -Author: Niels Provos -Date: Fri Dec 28 00:36:47 2007 +0000 - - pausing an rpc via a hook needs to deal with the fact that http callbacks free the request after they return; provide a way for a callback to take ownership of the request structure; the user then needs to explicitly free it. - - - svn:r620 - -commit 6d291da240607b5ab6a3931ae761439c1880a9a4 -Author: Nick Mathewson -Date: Fri Dec 28 00:34:05 2007 +0000 - - Fix at least two bugs that are keeping the HTTP regression tests from running on windows. There are some more bugs somewhere, since the HTTP regression tests still fail on windows. But now they fail less. - - svn:r619 - -commit 819d4a33d766d1d585f73abb9d7c77d4f862970f -Author: Niels Provos -Date: Thu Dec 27 23:17:24 2007 +0000 - - allow hooks to pause RPC processing; this will allow hooks to do meaningful work before resuming the - RPC processing; this is not backwards compatible. - - - svn:r617 - -commit 76945273c674d51f1c2f12e646a5248a2f52ed0b -Author: Nick Mathewson -Date: Thu Dec 27 21:37:52 2007 +0000 - - r15733@tombo: nickm | 2007-12-27 16:37:33 -0500 - Add another "what's new" file -- this one for svn trunk - - - svn:r616 - -commit 616a64c87cd8c8f0348e2bee1cba5b87b3e760c4 -Author: Niels Provos -Date: Thu Dec 27 20:08:21 2007 +0000 - - additional add argument was missing const qualifier - - - svn:r615 - -commit 7e3a7af7d068a9b97d5d802d104cb30dd75a0e07 -Author: Niels Provos -Date: Mon Dec 24 23:59:41 2007 +0000 - - support string arrays in event_rpcgen - - svn:r613 - -commit 03589ccb12c61e4ec9879298ddcceb80c930c008 -Author: Niels Provos -Date: Mon Dec 24 22:49:30 2007 +0000 - - rollback r594: restructuring to make event activation independent. - changes are going to wait for api design - - - svn:r612 - -commit 68725dc8bddb083ede57a89ca5bba27ea905838b -Author: Niels Provos -Date: Sun Dec 23 07:38:11 2007 +0000 - - support integer arrays in rpc structures; this involved some refactoring of the event_rpcgen code, so that other types should be able to get arrays fairly easily - - - svn:r609 - -commit a5176a65ccfcec344d4827ab4ea1cb816bdba778 -Author: Nick Mathewson -Date: Thu Dec 20 22:45:30 2007 +0000 - - Fix a win32 warning in regress.c - - svn:r608 - -commit 127888bded88781b93be0b95b27737433ba7d516 -Author: Nick Mathewson -Date: Thu Dec 20 22:20:06 2007 +0000 - - r17291@catbus: nickm | 2007-12-20 17:19:55 -0500 - Add tree.h to distributed files in trunk. - - - svn:r607 - -commit fdafb66bb56d5982fa88243d4fd6930c28aba4ee -Author: Niels Provos -Date: Wed Dec 19 06:33:05 2007 +0000 - - removed linger from http server socket; reported by Ilya Martynov - - - svn:r604 - -commit d4bdbca847ff1c788d6467e915d0b94e57da35bb -Author: Niels Provos -Date: Tue Dec 18 03:54:19 2007 +0000 - - add -Wstrict-aliasing and remove bogus evtag_test from event.h - - - svn:r602 - -commit d80c1c368959de2b5383eb3c2a921699e04e809d -Author: Nick Mathewson -Date: Sun Dec 16 19:34:09 2007 +0000 - - r17185@catbus: nickm | 2007-12-16 14:33:40 -0500 - Fix compilation with --enable-gcc-warnings enabled. - - - svn:r599 - -commit d56a34e4669afa708831554e78afe1759ff774d9 -Author: Nick Mathewson -Date: Sun Dec 16 19:33:52 2007 +0000 - - r16991@catbus: nickm | 2007-12-06 15:05:56 -0500 - Move event_init in regress.c to the function that actually messed up the current_base value. - - - svn:r598 - -commit 7ab26a2c3296738fd96842f526858271380cce38 -Author: Nick Mathewson -Date: Sun Dec 16 18:55:16 2007 +0000 - - r15519@tombo: nickm | 2007-12-16 13:54:12 -0500 - Fix for bug 1846282: accept as well-formed DNS replies with questions but no answers. - - - svn:r595 - -commit 7aa845b73b93f84bf46276bb5669ee0cb5e81b6c -Author: Niels Provos -Date: Sun Dec 16 04:10:30 2007 +0000 - - restructure the code to make event activation independent of regular event logic - - svn:r594 - -commit 622f69cc5a2d3e40e60c203bdf2c3a8c68539609 -Author: Niels Provos -Date: Fri Dec 14 07:12:05 2007 +0000 - - forgot to make new member optional - - svn:r590 - -commit 850534734be9e18ed24630d506bc252816229b77 -Author: Niels Provos -Date: Thu Dec 13 06:36:54 2007 +0000 - - fix a bug with event_rpcgen for integers - - svn:r588 - -commit ffd606cd6dbb0df57a2d3c7f2ae4e68268ca4ea6 -Author: Niels Provos -Date: Thu Dec 13 06:14:18 2007 +0000 - - prefix {encode,decode}_tag functions with evtag to avoid collisions - - svn:r587 - -commit 3b345f3e2d7870ce23a14e1c11217dbd7aa62d8e -Author: Niels Provos -Date: Wed Dec 12 07:02:55 2007 +0000 - - pull setters/getters out of RPC structures to reduce their memory footprint - - - svn:r585 - -commit ba48719946f2f1ea80db28b77dc23b27010e01e5 -Author: Niels Provos -Date: Wed Dec 12 04:39:42 2007 +0000 - - support for 32-bit tag numbers in rpc structures - - svn:r583 - -commit e8b916c36e4b042e14154242d548e0401bba7832 -Author: Niels Provos -Date: Sun Dec 9 05:07:48 2007 +0000 - - update ChangeLog; forgot about it - - svn:r582 - -commit fbe24f43ab56deb2fd50fa4ca1756069c2c9123e -Author: Niels Provos -Date: Sun Dec 9 05:07:20 2007 +0000 - - remove obsoleted recalc code - - svn:r581 - -commit fa89d661d91b584df308c097c0eec2d949b6fc55 -Author: Nick Mathewson -Date: Thu Dec 6 19:40:49 2007 +0000 - - Adjust more unit tests to pass on win32. - - svn:r580 - -commit fd418645ffe8e0cd0002efaa1ad4cba3dc183af3 -Author: Nick Mathewson -Date: Thu Dec 6 19:36:49 2007 +0000 - - Add winsock init functions to bench.c so it can run on win32. - - svn:r579 - -commit 9cc67e5f78c9d9f783a6a55514e2b604198de09e -Author: Nick Mathewson -Date: Thu Dec 6 19:35:55 2007 +0000 - - Compile regression tests by default even on win32. - - svn:r578 - -commit 77861fa7f177586d361059563987f691e8b7d143 -Author: Nick Mathewson -Date: Thu Dec 6 19:20:24 2007 +0000 - - r16931@catbus: nickm | 2007-12-06 14:19:58 -0500 - Fix warnings in debug messages - - - svn:r577 - -commit cd666f8071baee5cc4834738253d82d86a5307a1 -Author: Nick Mathewson -Date: Thu Dec 6 19:18:14 2007 +0000 - - Debug new win32 code: make bufferevents test pass. - - svn:r576 - -commit 78d0de30b8e08429c57ccfbf667655e334042ab3 -Author: Nick Mathewson -Date: Thu Dec 6 18:38:50 2007 +0000 - - Fix compile warnings and errors in win32 build. - - svn:r575 - -commit 2e2104f4cea0932a04d98452ab36f2c41786c5d7 -Author: Nick Mathewson -Date: Thu Dec 6 18:13:03 2007 +0000 - - r15172@tombo: nickm | 2007-12-06 12:54:37 -0500 - Rewrite win32.c to use a red-black tree to map sockets to events. This changes the performance from O(N^2) to O(N lg N). Needs testing. (This was made possible by recent changes to the implementation of non-persistent events.) - - - svn:r574 - -commit 3206bbca46f55e4eb4570566a9566dd10c182c6d -Author: Nick Mathewson -Date: Thu Dec 6 18:12:56 2007 +0000 - - r15171@tombo: nickm | 2007-12-06 12:47:47 -0500 - Use GCC attributes (where available) to verify printf type-correctness. Fix some bugs this turned up. - - - svn:r573 - -commit 1e435af17e658c973f644c9c751ab58296413fcb -Author: Nick Mathewson -Date: Thu Dec 6 18:12:44 2007 +0000 - - r15170@tombo: nickm | 2007-12-06 12:38:03 -0500 - Fix a warning in regress.c - - - svn:r572 - -commit 5482192bb3cd0d4ece6fdcc641f85ec852c0437d -Author: Nick Mathewson -Date: Thu Dec 6 04:36:18 2007 +0000 - - r15166@tombo: nickm | 2007-12-05 23:35:10 -0500 - Apply patch from bug 1841036: set the base of the correct event in evhttp_connection_start_detectclose() - - - svn:r571 - -commit 60103d25a96c46043386edaa3b78175225ff0189 -Author: Niels Provos -Date: Sat Dec 1 16:36:00 2007 +0000 - - remove duplicate submit of test_evbuffer_readln - - svn:r569 - -commit 395dd198cb64f03bf0fc12a4dbb33999906dc9d7 -Author: Nick Mathewson -Date: Sat Dec 1 09:30:07 2007 +0000 - - r15096@tombo: nickm | 2007-12-01 04:29:39 -0500 - Test for corner-cases of re-adding non-persistent events from one another's handlers - - - svn:r568 - -commit d73cf1e1f28c7df624488749276f9ebc1e13f4d3 -Author: Nick Mathewson -Date: Sat Dec 1 09:29:52 2007 +0000 - - svn:r567 - -commit 876c3af7b042624a9c0efd70e1cc571e0a852fe6 -Author: Niels Provos -Date: Fri Nov 30 02:21:33 2007 +0000 - - add another benchmark that tests cascading events - - svn:r566 - -commit 74b3db50ae9cdbc9ffcafd761251935d7f1a2216 -Author: Niels Provos -Date: Thu Nov 29 06:08:24 2007 +0000 - - always generate Date and Content-Length headers for HTTP/1.1 - - svn:r564 - -commit f175befac9e6c8a26ce1f99810816e2d03b5cd86 -Author: Niels Provos -Date: Thu Nov 29 04:03:36 2007 +0000 - - small improvements to evhttp documentation - - svn:r562 - -commit eeb5e4cd883536ac95c746d42cd844047590f45b -Author: Niels Provos -Date: Thu Nov 29 02:52:32 2007 +0000 - - a bug in the regression test of event_reinit caused epoll to fail - - svn:r560 - -commit ef085e84c6614fef3110c6c3448874d0f7ab44f1 -Author: Niels Provos -Date: Tue Nov 27 06:45:25 2007 +0000 - - we need to pass the evbase to evsel->add - - svn:r558 - -commit e2e4cf1f6c847a3987af140c21b54903659e1127 -Author: Niels Provos -Date: Tue Nov 27 06:11:28 2007 +0000 - - more complete test for forking behavior - - svn:r556 - -commit 5f3e31596b1a231a6041b9a1302d8059293a9b02 -Author: Niels Provos -Date: Tue Nov 27 01:39:10 2007 +0000 - - move EV_PERSIST handling out of the event backends - - svn:r555 - -commit a7a7a1904507bb7fcc22a3c045c030d2837c3510 -Author: Nick Mathewson -Date: Mon Nov 26 19:25:09 2007 +0000 - - r16735@catbus: nickm | 2007-11-26 14:24:58 -0500 - Fix test for EVBUFFER_LENGTH in evhttp_make_header(). Since appending an empty buffer to another is a no-op, this is not really a bug-fix. - - - svn:r554 - -commit ce4ee418d2fffd0a5ce7208e35a19a2fc7205826 -Author: Nick Mathewson -Date: Mon Nov 26 19:18:49 2007 +0000 - - r16733@catbus: nickm | 2007-11-26 14:18:25 -0500 - Add an --enable-gcc-warnings option (lifted from Tor) to the configure script. When provided, and when we are using GCC, we enable a bunch of extra GCC warnings in the compiler. Also, make the code all build happily with these warnings. - - - svn:r553 - -commit 1120f04f3eaafe98259ef286eecb648337b2214f -Author: Nick Mathewson -Date: Sun Nov 25 21:53:06 2007 +0000 - - r16731@catbus: nickm | 2007-11-25 16:52:53 -0500 - Replace all fds on non-unix-specific APIs with evutil_socket_t, which is int on unix and intptr_t on win32. - - - svn:r552 - -commit cbf9cfdf4507651ba39489158b17cf11703bb43d -Author: Nick Mathewson -Date: Sun Nov 25 21:35:02 2007 +0000 - - r16729@catbus: nickm | 2007-11-25 16:34:50 -0500 - Add missing changelog entry for last commit. - - - svn:r551 - -commit 6773a59721365a793bfbf8da91c512a449bdaf4f -Author: Nick Mathewson -Date: Sun Nov 25 21:32:26 2007 +0000 - - r14953@tombo: nickm | 2007-11-25 15:56:40 -0500 - Replace evbuffer_readline with a more powerful evbuffer_readln that can handle more EOL styles, and that can give useful results when there are NUL characters inside the returned values. Includes regression tests. - - - svn:r550 - -commit ab010e161f5877f99a3122bf2726f3a40ceb3204 -Author: Nick Mathewson -Date: Sun Nov 25 21:32:15 2007 +0000 - - r14952@tombo: nickm | 2007-11-25 14:47:45 -0500 - Fix an unused variable warning. - - - svn:r549 - -commit d1ad9403cb39da4c5daae9bd7ab0fc3e6b4da4b9 -Author: Nick Mathewson -Date: Sun Nov 25 21:28:51 2007 +0000 - - svn:r547 - -commit fa95fe469aa666de53505f565bb69c8cd16ae6d8 -Author: Nick Mathewson -Date: Sun Nov 25 21:28:43 2007 +0000 - - r16704@catbus: nickm | 2007-11-19 15:58:54 -0500 - Check return value of event_add in signal.c - - - svn:r546 - -commit 2823cb057927110719a7203c2346d6be8aa8468f -Author: Nick Mathewson -Date: Sun Nov 25 17:15:28 2007 +0000 - - r14944@tombo: nickm | 2007-11-25 12:12:28 -0500 - Make kqueue pass more unit tests. - - - svn:r544 - -commit 566ca340224c39e517f14d7a45cde68b874acde1 -Author: Nick Mathewson -Date: Sun Nov 25 17:15:17 2007 +0000 - - svn:r543 - -commit 555e300ab282812f6fe4d776908584275993ba76 -Author: Nick Mathewson -Date: Sun Nov 25 17:14:24 2007 +0000 - - r14940@tombo: nickm | 2007-11-25 12:01:37 -0500 - New mm-internal.h header that includes internal memory management functions. - - - svn:r542 - -commit 7eb250e9c52813f30fef256b97f08a6871fd381a -Author: Nick Mathewson -Date: Sun Nov 25 17:14:19 2007 +0000 - - r14939@tombo: nickm | 2007-11-25 11:59:26 -0500 - New function event_set_mem_functions to replace internal calls to malloc, free, etc with a user-supplied functions. - - - svn:r541 - -commit 98b5453ecdd6a474ba8c3495285e607d5b7a8e57 -Author: Niels Provos -Date: Sun Nov 25 07:11:59 2007 +0000 - - forgot to dealloc previous base - - svn:r540 - -commit 88897852fc72c2cd43c057f2fc550b5842d5b857 -Author: Niels Provos -Date: Sun Nov 25 06:57:59 2007 +0000 - - provide event_reinit() to reinitialized an event_base after fork - necessary for epoll/kqueue - - svn:r539 - -commit 8c3396b0c60bd6c0dcc4f8baeb9174810247e557 -Author: Nick Mathewson -Date: Thu Nov 22 16:41:29 2007 +0000 - - r14935@tombo: nickm | 2007-11-22 11:36:54 -0500 - Always set test_ok to zero after finishing a test, and before starting one. This turns up some failures we had been missing. - - - svn:r537 - -commit 1c23e219527b8342639f49e0884e209f7232502a -Author: Nick Mathewson -Date: Sat Nov 17 22:21:42 2007 +0000 - - r14931@tombo: nickm | 2007-11-17 17:21:09 -0500 - Patch from Scott Lamb: Implement event_{base_}loopbreak. Includes documentation and tests. From sf.net Feature Request 1826546. - - - svn:r535 - -commit 70248ca8ad0dd426798d1e11328970b1f537e505 -Author: Nick Mathewson -Date: Sat Nov 17 22:21:33 2007 +0000 - - r14930@tombo: nickm | 2007-11-17 17:01:14 -0500 - documentation fix on loopexit and elsewhere from Scott Lamb. - - - svn:r534 - -commit af6f331a0b777bedab38bfed254310134617c9e4 -Author: Niels Provos -Date: Sat Nov 17 01:32:30 2007 +0000 - - use a const pointer for bufferevent_write - - svn:r531 - -commit f586f42885b7558b1617396f53f19299f7c46ba8 -Author: Niels Provos -Date: Wed Nov 14 17:52:21 2007 +0000 - - provide event_base_new() as a mechanism for not setting the current_global - - - svn:r529 - -commit 56934d5d977892afa1342c8c3f55035989626bc5 -Author: Niels Provos -Date: Tue Nov 13 17:36:58 2007 +0000 - - debug cleanups in signal.c; from Christopher Layne - - svn:r527 - -commit d50afbb3700f6938387128c0e9283b9b4987d3c9 -Author: Niels Provos -Date: Tue Nov 13 03:32:10 2007 +0000 - - free minheap; from Christopher Layne - - svn:r525 - -commit d1e03054a30a79ee0574d8d2b98395f6445d63a7 -Author: Niels Provos -Date: Mon Nov 12 07:34:29 2007 +0000 - - clean up event-config.h to fix make distcheck; from sourceforge tracker - - svn:r521 - -commit 3742868ab54c82bc77686f8f89f3cae7191a2fe1 -Author: Niels Provos -Date: Mon Nov 12 06:54:35 2007 +0000 - - We do not need to specially remove a timeout before calling event_del; patch from Christopher Layne. - - svn:r519 - -commit 568095bfa1ba6c9fffe93250420471baf13c574f -Author: Niels Provos -Date: Mon Nov 12 05:34:10 2007 +0000 - - srcdir for verify; from Christopher Layne - - svn:r516 - -commit 7add3d364197ff8ec3dce91cd8110a1f3fcf231e -Author: Niels Provos -Date: Mon Nov 12 02:44:02 2007 +0000 - - stick autogen.sh into EXTRA_DIST - - svn:r515 - -commit df667b96ea57a2d00b5c3cdd150a675591ffacac -Author: Niels Provos -Date: Mon Nov 12 02:32:35 2007 +0000 - - we no longer need acconfig.h - - svn:r510 - -commit 4a1a2e0d52a83a3b38f651a4480af3d8f7dcf435 -Author: Niels Provos -Date: Mon Nov 12 02:31:07 2007 +0000 - - Make the logic for active events work better with internal events; patch from Christopher Layne - - svn:r509 - -commit bbed0954b18de634a8fed50b8b08af6ea3bf3dae -Author: Niels Provos -Date: Sun Nov 11 03:05:03 2007 +0000 - - revert r505; it introduced errors in epoll - - svn:r508 - -commit 97917e68e7b225ee0d2d77963e30290d095a74e6 -Author: Nick Mathewson -Date: Sat Nov 10 07:49:13 2007 +0000 - - r16588@catbus: nickm | 2007-11-10 02:47:14 -0500 - Another include for sample. Patch from Christopher Layne. - - - svn:r507 - -commit 321dfd55d4d37ad7060272abf933adaf9d22f7b6 -Author: Nick Mathewson -Date: Sat Nov 10 05:18:17 2007 +0000 - - r16585@catbus: nickm | 2007-11-10 00:16:11 -0500 - Patch from Christopher Layne: Make event_del() restore previous signal handlers, not the default. - - - svn:r506 - -commit 9f0f3d6da29f5e323c025f2955a9d21a0efa4af0 -Author: Nick Mathewson -Date: Sat Nov 10 05:18:11 2007 +0000 - - r16584@catbus: nickm | 2007-11-10 00:00:59 -0500 - Patch from Christopher Lane: reduce branch count in epoll_dispatch.c and generally improve clarity. - - - svn:r505 - -commit cabcd62f38345d31a37b62b08fb166f34c8bc4f5 -Author: Nick Mathewson -Date: Thu Nov 8 17:36:28 2007 +0000 - - r16578@catbus: nickm | 2007-11-08 12:34:51 -0500 - The == operator in shell is a bash-ism; do not use it in autogen.sh - - - svn:r503 - -commit 8fd2124ef9e12228f41023bcf02bdbdf6800a208 -Author: Nick Mathewson -Date: Wed Nov 7 22:57:08 2007 +0000 - - r16556@catbus: nickm | 2007-11-07 17:55:39 -0500 - MSVC6 does not seem to define a useful "what is the name of this function" macro - - - svn:r502 - -commit 74e5e8f439f86e6e5ac699f0513beb4a19d115de -Author: Nick Mathewson -Date: Wed Nov 7 22:35:15 2007 +0000 - - r16554@catbus: nickm | 2007-11-07 17:33:49 -0500 - Mention autogen.sh in the README, now that we are more vocally encouraging people to try svn. - - - svn:r501 - -commit 92cd548f80336e26fb44b519248476bf345be0aa -Author: Nick Mathewson -Date: Wed Nov 7 21:14:04 2007 +0000 - - r16544@catbus: nickm | 2007-11-07 16:12:37 -0500 - Oops; forgot the log entry. - - - svn:r500 - -commit 4e1ec3e05e39699025e087929b84f3634929ae4c -Author: Nick Mathewson -Date: Wed Nov 7 21:01:26 2007 +0000 - - Make all the C files in the libraries compile under MSVC 2005 Express. There are still a few warnings, and probably some subtle issues, but it's better than nothing. - - svn:r499 - -commit 45c7ab25de2dea155332cc144c1f94f5c073c919 -Author: Nick Mathewson -Date: Wed Nov 7 07:33:36 2007 +0000 - - r16510@catbus: nickm | 2007-11-07 02:29:42 -0500 - Try not to shadow local variables or function arguments. - - - svn:r498 - -commit e72661d2ff04ce1020fce74ecb97130fb5ea9aab -Author: Nick Mathewson -Date: Wed Nov 7 07:33:31 2007 +0000 - - r16509@catbus: nickm | 2007-11-07 02:08:32 -0500 - Stop using C++ style comments. - - - svn:r497 - -commit 1f50f412834c8b150a37bb5742f6702537093d52 -Author: Nick Mathewson -Date: Wed Nov 7 07:33:26 2007 +0000 - - r16508@catbus: nickm | 2007-11-07 02:01:03 -0500 - Note a dubious point in http.c - - - svn:r496 - -commit 7feba57010f4d5024083abc055864f292f9a6063 -Author: Nick Mathewson -Date: Wed Nov 7 07:33:21 2007 +0000 - - r16507@catbus: nickm | 2007-11-07 01:34:55 -0500 - Never assign a string constant to a non-const char *. - - - svn:r495 - -commit a3f122d66756626bdd69ad00757ea8208cc38021 -Author: Nick Mathewson -Date: Wed Nov 7 07:33:16 2007 +0000 - - r16506@catbus: nickm | 2007-11-07 01:29:59 -0500 - Make all rpc and http functions not prototyped in evrpc.h and evhttp.h into static functions. I believe that these functions were meant to be private, yes? - - - svn:r494 - -commit 794857242f09a687f73200d5e95e6d7311900eb4 -Author: Nick Mathewson -Date: Wed Nov 7 06:07:54 2007 +0000 - - Remove spurious #include in win32.c. - - svn:r493 - -commit f74e7258fd29a341b4ecf08dfdb83e50aaee3255 -Author: Nick Mathewson -Date: Wed Nov 7 06:01:57 2007 +0000 - - r16501@catbus: nickm | 2007-11-07 01:00:31 -0500 - This is one of those patches which will either make matters far - simpler after the bugs shake out, or will get reverted pretty quick - once we realize that it is a stupid idea. - - We now post-process the config.h file into a new event-config.h file, - whose macros are prefixed with _EVENT_ and which is thus safe for - headers to include. Using this, we can define replacement timeval - manipulation functions in evutil.h, and use them uniformly through our - code. We can also detect which headers are needful in event.h, and - include them as required. - - This is also the perfect time to remove the long-deprecated acconfig.h - file, so that autoheader no longer warns. - - Should resolve the following issues: - - [ 1826530 ] Header files should have access to autoconf output. - [ 1826545 ] acconfig.h is deprecated. - [ 1826564 ] On some platforms, event.h can't be included alone. - - - - svn:r492 - -commit d0ce7d4ed7f6f269fdc93039d739fecf28495c24 -Author: Nick Mathewson -Date: Wed Nov 7 06:01:45 2007 +0000 - - r16500@catbus: nickm | 2007-11-07 00:27:44 -0500 - Remove from the (deprecated) acconfig.h file stubs that are already generated by autoheader. - - - svn:r491 - -commit 206d43363817c4dc77976f85a9df04a411c7913c -Author: Nick Mathewson -Date: Wed Nov 7 05:02:21 2007 +0000 - - r16497@catbus: nickm | 2007-11-07 00:01:02 -0500 - Resolve issue 1826588: make event_base_free() succeed even if there are pending non-INTERNAL events still in the base. This can leak memory and fds if used injudiciously, but at least it no longer crashes. - - - svn:r490 - -commit 29420339dcf85d133313083823db7cf68c21fd32 -Author: Nick Mathewson -Date: Wed Nov 7 05:02:14 2007 +0000 - - r16496@catbus: nickm | 2007-11-06 23:58:52 -0500 - Clarify some doxygen in event.h - - - svn:r489 - -commit bab0e6d440f1c5dc6615bd1b72712c663929b87f -Author: Nick Mathewson -Date: Wed Nov 7 04:28:54 2007 +0000 - - r16492@catbus: nickm | 2007-11-06 23:27:32 -0500 - Fix unit tests so that an outdated nameserver means "Skip IPv6 tests", not "Abort." - - - svn:r487 - -commit 7c507668d7ba0e4488730ce1d607673dd2585f73 -Author: Nick Mathewson -Date: Wed Nov 7 03:52:20 2007 +0000 - - r16489@catbus: nickm | 2007-11-06 22:51:05 -0500 - Do not use "class" as identifier in evdns.h; but use a backward-compatible fix. (Should fix bug 1826515, originally reported by Roger Clark) - - - svn:r486 - -commit e9564eceb349d76cf83cffb2291b34d59ac9a4a0 -Author: Nick Mathewson -Date: Wed Nov 7 03:40:26 2007 +0000 - - r16487@catbus: nickm | 2007-11-06 22:38:44 -0500 - Remove rtsig method, as discussed in July. It hasn't compiled for quite a while, and nobody has seemed to miss it much. Please let us know if this was a bad call. [Tracker issue 1826539]. - - - svn:r485 - -commit 4555f755094e25e5bd1b6483e09a5bfc9984764f -Author: Niels Provos -Date: Wed Nov 7 03:25:03 2007 +0000 - - remove tree.h from EXTRA_DIST; from Charles Kerr - - svn:r484 - -commit 3c1bbca672a43f6457fad0b0d6d6649a17375368 -Author: Nick Mathewson -Date: Wed Nov 7 02:30:17 2007 +0000 - - r14744@tombo: nickm | 2007-11-06 21:30:11 -0500 - Fix coding error: patch from Charles Kerr. - - - svn:r483 - -commit a527151846e06aac3674fae5b79d5ba6ec75154a -Author: Niels Provos -Date: Wed Nov 7 01:48:44 2007 +0000 - - make event_init should return struct event_base * - - svn:r481 - -commit 81802bf98c2608ec96c8fa299ecb761a26b0755c -Author: Nick Mathewson -Date: Tue Nov 6 20:57:37 2007 +0000 - - r16473@catbus: nickm | 2007-11-06 15:55:35 -0500 - Increment MAX_ADDRS in evdns so as to be quite large. This is not as good as a general solution, but it may be good enough for practical use. - - - svn:r479 - -commit d257a4c0d6527fff60bfa19f05b7937213375695 -Author: Nick Mathewson -Date: Tue Nov 6 20:57:32 2007 +0000 - - r16454@catbus: nickm | 2007-11-06 09:59:45 -0500 - Small code cleanups in epoll_dispatch(): remove a needless variable and some redundant conditionals. - - - svn:r478 - -commit d7d91461c853d87fa78b467d6c5fdf386d9c10e1 -Author: Nick Mathewson -Date: Tue Nov 6 03:04:49 2007 +0000 - - r14732@tombo: nickm | 2007-11-05 22:03:28 -0500 - Quick hack to make evhttp.h build when there is no TAILQ to be found. Based on patch from Paul Fisher. We could perhaps do this more elegantly, but it _does_ need to be done. - - - svn:r475 - -commit dc2317f921f6d0041ae387cccdf7e0368f4920b0 -Author: Niels Provos -Date: Sun Nov 4 06:35:29 2007 +0000 - - improve doxygen documentation - - svn:r473 - -commit 1bcb112b20ae193f05a9e3381e6fe13f36ccc7b1 -Author: Nick Mathewson -Date: Sun Nov 4 02:21:31 2007 +0000 - - r14698@tombo: nickm | 2007-11-03 22:20:23 -0400 - Use libtool versioning correctly. Add comment to Makefile.am explaining how to keep this working. - - - svn:r472 - -commit 22bd8b00942732ae1ac8a77523a509c327a26623 -Author: Niels Provos -Date: Sat Nov 3 23:54:27 2007 +0000 - - remove last vestiges of RBTREE - - svn:r471 - -commit 2026b21598d8f6f47148db088dbb76a6cc9e0a59 -Author: Niels Provos -Date: Sat Nov 3 23:53:49 2007 +0000 - - remove last vestiges of RBTREE - - svn:r470 - -commit 881731028b90bb196450105ea04b3d22107052d8 -Author: Niels Provos -Date: Sat Nov 3 23:45:38 2007 +0000 - - split libevent into two extra libraries libevent_core and libevent_extra - - - svn:r469 - -commit 1d3a008af3433485256d8386366ceaac4d48af5f -Author: Niels Provos -Date: Sat Nov 3 22:51:26 2007 +0000 - - provide hooks for outgoing pools; associate a base with a pool - - svn:r468 - -commit 30ae40cc52300a79b8153db3ca40b77c544de76c -Author: Niels Provos -Date: Sat Nov 3 18:04:53 2007 +0000 - - switch timeouts to a min heap; from Maxim Yegorushkin - - svn:r467 - -commit 65236aa8578aeb17c088b41818da17311672aed1 -Author: Niels Provos -Date: Fri Nov 2 06:34:04 2007 +0000 - - simple hooks for processing incoming and outgoing rpcs - - - svn:r466 - -commit 18ac92486fc7b4f2ac7092ce56dc89ebad41c729 -Author: Niels Provos -Date: Sat Oct 27 17:50:07 2007 +0000 - - Solaris event port improvements - - - svn:r464 - -commit ccdc59905b36686d3331607362197e08f1c8b0ae -Author: Nick Mathewson -Date: Thu Oct 18 17:49:52 2007 +0000 - - r15922@catbus: nickm | 2007-10-18 13:48:46 -0400 - Patch to event.3 from Christopher Lane. - - - svn:r463 - -commit c91794e25dc412ff102b700eeba3c1e519e485dc -Author: Nick Mathewson -Date: Fri Oct 12 18:02:56 2007 +0000 - - Instead of read/write in regress.c, use send/recv. Now all of the win32 regression tests pass, except for http and rpc. - - svn:r461 - -commit e1f09dfe5c7fa0736318ec42e77d7884db390085 -Author: Nick Mathewson -Date: Fri Oct 12 17:55:37 2007 +0000 - - Fix evutil code to use correct EVUTIL_SET_SOCKET_ERROR macro. - - svn:r460 - -commit 49ede3be00c7461d54fa289005db8ef6e8e76225 -Author: Nick Mathewson -Date: Wed Oct 3 17:19:22 2007 +0000 - - r15517@catbus: nickm | 2007-10-03 13:14:05 -0400 - Correct the pointer manipulation in fake_getaddrinfo(), and do the right thing for fake_getaddrinfo(NULL,&ai). Based on a patch by Lubmir Marinov, hacked until the unit tests passed on Linux with #undef HAVE_GETADDRINFO. - - - svn:r459 - -commit bc7b7c249c470fe916c337b03605410f32dcd7fa -Author: Nick Mathewson -Date: Wed Oct 3 04:14:54 2007 +0000 - - Fix implementation of strsep. - - svn:r457 - -commit 4ed4867375f26dc01af1db00de43624bcbba6f7b -Author: Nick Mathewson -Date: Tue Oct 2 19:11:41 2007 +0000 - - r15496@catbus: nickm | 2007-10-02 15:06:22 -0400 - Move end of "extern C {" block to the end of evdns.h. - - - svn:r456 - -commit 3550be9387dd451da3c32caff29dddb0ff0bd112 -Author: Nick Mathewson -Date: Tue Sep 25 15:50:50 2007 +0000 - - r15331@catbus: nickm | 2007-09-25 11:46:52 -0400 - Add EVPORT to test.sh script. Patch from Trond Norbye. - - - svn:r454 - -commit fe4829776bacef6f75790337a0fd5c0b0e18890b -Author: Nick Mathewson -Date: Mon Sep 24 16:26:11 2007 +0000 - - r15324@catbus: nickm | 2007-09-24 12:22:21 -0400 - New evutil.h macros to manipulate winsock errors. Use them in http.c and in evutil_socketpair(). - - - svn:r451 - -commit 3c1a6a68d2b9938a387c694928ab97b948eb09de -Author: Niels Provos -Date: Sun Sep 23 03:49:28 2007 +0000 - - first attempts at refactoring this code to make it more readable; - mostly changing to dictionaries for format strings - - - svn:r450 - -commit a4cc3d148a7b346143a0143f46589104bc50bea5 -Author: Niels Provos -Date: Sat Sep 22 23:57:11 2007 +0000 - - rename the rpc member from kill to attack; that way the - structure does not have the same name. might find some - bugs. - - - svn:r449 - -commit db43c1e111f1fb7a6c5912154dce4a46034eed7a -Author: Nick Mathewson -Date: Thu Sep 20 19:36:03 2007 +0000 - - On win32, sockets apparently can't be used with ReadFile and WriteFile: You need send() and recv() instead. Also, you need to use ioctlsocket() with sockets, not ioctl. [Fixes evbuffer regression tests.] - - svn:r448 - -commit 1e1f77c5b02fca9622e9e1d249adec4b5428a245 -Author: Nick Mathewson -Date: Thu Sep 20 19:08:20 2007 +0000 - - Make the test/ subdirectory buildable under Windows. Well, mingw at least. The tests still don't all pass, but at least now we know that. - - svn:r447 - -commit d85bce4e96eeadf3248b9298926c957e39851504 -Author: Nick Mathewson -Date: Thu Sep 20 18:38:31 2007 +0000 - - Remove gratuitous tor-isms in evutil_socketpair(); fix a windows warning in http.c. - - svn:r446 - -commit f4c84e862877a0f2f13aa33665b8b4d5adb795ca -Author: Nick Mathewson -Date: Thu Sep 20 18:27:01 2007 +0000 - - r15220@catbus: nickm | 2007-09-20 14:22:57 -0400 - Another patch from Trond: Skip calling gettime() in timeout_process if we have no events in the timetree. - - - svn:r445 - -commit 5a0d671f0e05af014c55447e28e8b1b8be4a84ee -Author: Nick Mathewson -Date: Thu Sep 20 18:26:56 2007 +0000 - - r15219@catbus: nickm | 2007-09-20 14:17:32 -0400 - Apply patch from Trond Norbye with recommendations from Magne Mahre and Hannah Schroeter: make autogen.sh work on systems where /bin/sh is not bash. - - - svn:r444 - -commit 8b256b8e86bfcf38e79fb17975d903f892572386 -Author: Nick Mathewson -Date: Thu Sep 20 18:26:51 2007 +0000 - - r15218@catbus: nickm | 2007-09-20 14:14:05 -0400 - More win32 fixes: Use evutil_make_socket_nonblocking and EVUTIL_CLOSESOCKET consistently throughout the code. - - - svn:r443 - -commit f0e06d75e50913ce9786a675ff69dee68d41c3f5 -Author: Nick Mathewson -Date: Thu Sep 20 18:26:46 2007 +0000 - - r15217@catbus: nickm | 2007-09-20 14:04:32 -0400 - Fix win32 signals: teach win32 that we have per-base signal queues; teach signal.c that not everybody has sigaction(). - - - svn:r442 - -commit 250071830a701193c72aa8a65bd9afa5f74692fe -Author: Nick Mathewson -Date: Thu Sep 20 18:26:40 2007 +0000 - - r15216@catbus: nickm | 2007-09-20 13:58:23 -0400 - Add a new evutil module to contain the usual cross-platform hacks: socketpair, closesocket, and make_socket_nonblocking() - - - svn:r441 - -commit 626cc5f982f648e4d669178dc5e0bbb1f4ddb6d6 -Author: Nick Mathewson -Date: Wed Sep 19 15:27:53 2007 +0000 - - r15168@catbus: nickm | 2007-09-19 11:24:30 -0400 - Add a new function to evdns to override the default transaction ID generation code. - - - svn:r440 - -commit 7f57289f99900ee5210f62be55b7109f016eab85 -Author: Nick Mathewson -Date: Tue Sep 18 15:16:23 2007 +0000 - - r15103@catbus: nickm | 2007-09-18 11:13:09 -0400 - Use a dummy target to ensure that doxygen gets rebuilt every time we "make doxygen". - - - svn:r439 - -commit 47ed792cb6ac47b629786157e0b5ccdd7c100410 -Author: Nick Mathewson -Date: Tue Sep 18 15:16:17 2007 +0000 - - r15102@catbus: nickm | 2007-09-18 11:12:43 -0400 - Make the autogen.sh script executable. - - - svn:r438 - -commit d69a4c9ec4158b6f09bfc6bf3c646e06fc6554ac -Author: Nick Mathewson -Date: Tue Sep 18 15:12:20 2007 +0000 - - r15097@catbus: nickm | 2007-09-18 11:08:42 -0400 - Wrap all newly-added Doxygen comments to fit in a consistent 80 columns, and remove all their trailing whitespace. - - - svn:r437 - -commit 7135ffb6fc4fe231f2cbdb8a0b4188b6b7d65a9f -Author: Nick Mathewson -Date: Tue Sep 18 15:12:09 2007 +0000 - - r15096@catbus: nickm | 2007-09-18 11:02:12 -0400 - Add Doxygen documentation to header files; patch from Mark Heily. - - - svn:r436 - -commit c895ee46180e1b8bbfea0e37a05b3a5e122cf385 -Author: Nick Mathewson -Date: Tue Sep 18 15:11:53 2007 +0000 - - r15094@catbus: nickm | 2007-09-18 10:52:11 -0400 - Patch from Christopher Lane: Make regress.gen.* buildable from outside source directory. - - - svn:r434 - -commit 7b7742fce7b694977579b9f2e11bc974b1c346da -Author: Niels Provos -Date: Sun Sep 16 02:26:37 2007 +0000 - - optimize by removing a variable - - svn:r433 - -commit bfd27f58da9d5fba6e2ed0c0d4f436fa240dbc47 -Author: Nick Mathewson -Date: Sat Sep 15 18:45:57 2007 +0000 - - r15086@catbus: nickm | 2007-09-15 14:42:55 -0400 - Patch from Trond Norbye: Fix two solaris bugs. - - - svn:r432 - -commit b835ee085f537aa6a45df865930626688e984009 -Author: Niels Provos -Date: Sat Sep 15 15:50:11 2007 +0000 - - fix http.c to compile properly with USE_DEBUG; from Christopher Layne - - - svn:r430 - -commit 640c61bac92550c97c3ad2b04d437c559df5c119 -Author: Niels Provos -Date: Sat Sep 15 00:53:47 2007 +0000 - - deal with out of memory situations for realloc - - svn:r429 - -commit 82153e6e92117d092b1ea0630f2ba96ebb006fe7 -Author: Nick Mathewson -Date: Mon Sep 10 14:56:00 2007 +0000 - - r15025@catbus: nickm | 2007-09-10 10:54:46 -0400 - More DNS standard correctness changes: we preserve the CD flag,not the TC flag on responses. When we get a nonstandard query, we should say "NOTIMPL" rather than ignoring it. - - - svn:r428 - -commit 8b39254926c96587e74ec334f001d17f4d09f4d8 -Author: Nick Mathewson -Date: Mon Sep 10 14:55:55 2007 +0000 - - r15024@catbus: nickm | 2007-09-10 10:49:15 -0400 - Fix evdns_resolve_reverse_ipv6() so buffer is bug enough, and so the string ends with ".ip6.arpa" rather than "..ip6.arpa". - - - svn:r427 - -commit c396c767e2abf4d15ce8bf485588f67dbe10c14e -Author: Nick Mathewson -Date: Mon Sep 10 14:55:50 2007 +0000 - - r15023@catbus: nickm | 2007-09-10 10:46:16 -0400 - Add a missing begin-comment to the DNS_USE_OPENSSL_FOR_ID code in evdns.c. - - - svn:r426 - -commit fc1211ed8a8c0ba7f167f92796c3887d659b2f1d -Author: Niels Provos -Date: Mon Sep 10 01:37:57 2007 +0000 - - fix another memory leak - - svn:r424 - -commit 7c66bf33e18939d7ee6fabc47ed624c8caa6c46c -Author: Niels Provos -Date: Mon Sep 10 01:30:11 2007 +0000 - - fix a memory leak in the dns server; found by valgrind - - svn:r422 - -commit babd622f7ab9e8d3cb4004700fcf2f9dadd4bd4b -Author: Niels Provos -Date: Sun Sep 9 03:10:16 2007 +0000 - - make allocating array members in event_rpcgen more efficient, but doubling the size of - available slots every time we run out. - - - svn:r421 - -commit e2f564116e1bcdcf2c6500c1552fcc25de810c53 -Author: Niels Provos -Date: Sun Sep 9 02:33:10 2007 +0000 - - Fix a memory leak in which failed HTTP connections whould not free the request object - - svn:r419 - -commit 8ee20a3fa46f7d603f5fa98cd47992fcdbb3beb6 -Author: Niels Provos -Date: Sun Sep 9 02:15:34 2007 +0000 - - fix memory leaks/unitialized memory found by valgrind - - svn:r418 - -commit e678f009a82b38745baac9874a3573136d0658b6 -Author: Niels Provos -Date: Sun Sep 9 01:46:35 2007 +0000 - - fix a couple memory leaks; time buffer marshaling - - svn:r417 - -commit 98f9616bf45951901f264b75269d1c554d50511e -Author: Niels Provos -Date: Fri Sep 7 02:49:46 2007 +0000 - - support setting local address on an evhttp_connection - - - svn:r416 - -commit 23866b765739016f0723fae22b688a82c14a2b5d -Author: Nick Mathewson -Date: Fri Sep 7 01:18:53 2007 +0000 - - Another tweak on the date patch: win32 has no gmtime_r, but its gmtime() function uses thread-local storage for safety. Backportable. - - svn:r414 - -commit 003698c0dfcb29fc435d7d2d862ff838d797d3d8 -Author: Nick Mathewson -Date: Fri Sep 7 01:03:01 2007 +0000 - - r14975@catbus: nickm | 2007-09-06 21:00:38 -0400 - Oops; we were already including sys/time.h. Remove the redundant include. - - - svn:r413 - -commit 8d5ef326baa461201b1c948f9b29c5c4ae22533c -Author: Nick Mathewson -Date: Fri Sep 7 01:02:56 2007 +0000 - - r14974@catbus: nickm | 2007-09-06 20:59:14 -0400 - Changes to http.c: Add a Date header on replies if there is none already set. Also, include time.h unconditionally to be sure that struct tm is declared: every platform has time.h; the conditional should have been for sys/time.h. - - - svn:r412 - -commit 9c3ac4e444bdacff2b904b1d175e4ac3cb2f7da5 -Author: Nick Mathewson -Date: Fri Sep 7 00:10:15 2007 +0000 - - r14970@catbus: nickm | 2007-09-06 20:09:39 -0400 - Fix compilation on Solaris; Patch from Magne Mahre. - - - svn:r409 - -commit ff9e1af68f2fc7e808fbaca5d7e45f10f616fa8c -Author: Niels Provos -Date: Sun Sep 2 01:33:38 2007 +0000 - - demote most warnings to debug messages; - execute callback later to allow freeing of connection object - - - svn:r407 - -commit 11a0a9e42fd74f723c6d4670ef403eb10d9abeb5 -Author: Niels Provos -Date: Sat Aug 25 18:47:22 2007 +0000 - - allow \r or \n individually to separate HTTP headers instead of - the standard "\r\n"; from Charles Kerr. - - - svn:r406 - -commit 49e01ff789ae1aa0a5666ac62062f27cce2cbb46 -Author: Niels Provos -Date: Sat Aug 25 18:42:42 2007 +0000 - - include event.h in evhttp.h; found by Charles Kerr - - svn:r404 - -commit 5f04e3b7b5b234e6ccfc3ced1321619d209928b7 -Author: Nick Mathewson -Date: Fri Aug 24 01:08:39 2007 +0000 - - Bump version number in svn trunk to 1.3.99. - - svn:r403 - -commit 9a99bab0db8f13f12ea1829e8af8d5d0b66a4cad -Author: Niels Provos -Date: Thu Aug 23 15:36:38 2007 +0000 - - let's try to keep a log of changes; as suggested by Nick - - - svn:r401 - -commit a36d4a930d75bc9ed6caf1cbfa86e02bc68f7df7 -Author: Nick Mathewson -Date: Mon Aug 20 14:44:15 2007 +0000 - - r14699@catbus: nickm | 2007-08-20 10:42:57 -0400 - Use $top_srcdir and $srcdir variables to refer to source paths in Makefile.am. This makes it possible to build libevent from a separate directory. Patch from Kelly Anderson. - - - svn:r400 - -commit 41c69fc335e116de8b9a6889798a7dd5bc295fd3 -Author: Niels Provos -Date: Sun Aug 19 17:26:02 2007 +0000 - - fix typo in comments - - svn:r399 - -commit 3d2320b2187f5e4635f829c0de417c961f02f007 -Author: Nick Mathewson -Date: Sun Aug 19 17:25:52 2007 +0000 - - r14697@catbus: nickm | 2007-08-19 13:24:39 -0400 - Remove redundant typedef of socklen_t in evdns.c: On windows, it is already defined by autoconf in config.h. - - - svn:r398 - -commit 67947ce38192f31fd67d9cac63ba5baaf112885b -Author: Niels Provos -Date: Sun Aug 19 02:41:23 2007 +0000 - - provide evhttp_new and evhttp_bind_socket instead of evhttp_start; - using evhttp_new, it is possible to associate an event_base with - the http server so that multi-threaded applications can have their - own http server per thread; add appropriate testing. - - - svn:r397 - -commit 35983cd60ff2972add1db2c7236b3c7b244c7968 -Author: Nick Mathewson -Date: Thu Aug 16 21:12:53 2007 +0000 - - r14618@catbus: nickm | 2007-08-16 17:11:47 -0400 - In ANSI C, int func() is a function with unspecified arguments, whereas int func(void) is a function that takes no arguments. Using int func() to mean a function with no arguments is a C++ism, so let's not use or generate it. - - - svn:r395 - -commit 12fe087e124f2f66049e4dffe9402baf7881f284 -Author: Nick Mathewson -Date: Fri Aug 10 16:37:33 2007 +0000 - - r14505@catbus: nickm | 2007-08-10 12:35:52 -0400 - Fix win32 build errors (reported by Phobos): mingw gcc seems to dislike unnamed function parameters. - - - svn:r390 - -commit 7d821580e81072e0eba32d4789fdadca6683329b -Author: Nick Mathewson -Date: Fri Aug 10 16:31:02 2007 +0000 - - Fix compile warning on osx: the udata field in struct kevent is supposed to be void*, not intptr_t. - - svn:r387 - -commit 21a7e7ed67979b9f2444f4671d9bd668ef2ebabf -Author: Nick Mathewson -Date: Fri Aug 10 15:59:31 2007 +0000 - - r14498@catbus: nickm | 2007-08-10 11:58:32 -0400 - Fix compilation warnings in trunk on linux with gcc 4.1.2. In time-test.c, always include time.h, so that time() is defined. In test/Makefile.am, put -I../compat in CPPFLAGS, and fix a typo. In test/regress.c, cast unsigned char pointers to char* before passing them to str[n]cmp. - - - svn:r385 - -commit cd6dd9516d8bd7a7b94bf7a9ed6f5e63643b7c34 -Author: Niels Provos -Date: Mon Aug 6 21:00:49 2007 +0000 - - add a proper test for filtering new lines in headers - - - svn:r384 - -commit 073d35906117ce1276b16cdfc70d744deb04575d -Author: Niels Provos -Date: Mon Aug 6 20:53:33 2007 +0000 - - fix an embarassing bug where strchr was used with a cstring instead of a char - - - svn:r383 - -commit 8ea5ffefc32e5950beeec8db0cd862e6bd9eab76 -Author: Niels Provos -Date: Sun Aug 5 02:15:10 2007 +0000 - - request dispatching fix from Elliot Foster - - - svn:r382 - -commit b7ff0248c7993bf1b437598f53ce7ec56a0f2bdb -Author: Niels Provos -Date: Tue Jul 31 00:32:00 2007 +0000 - - fix memory leak; found by Elliot F - - - svn:r378 - -commit 5e0ac7f239457e6fceac199ad649d762950e0c9b -Author: Niels Provos -Date: Tue Jul 31 00:25:22 2007 +0000 - - check for sys/select.h - - - svn:r377 - -commit aa106169a0e5b960c2a82958912bc41a1e76b4c5 -Author: Niels Provos -Date: Tue Jul 31 00:21:04 2007 +0000 - - use AM_CLFAGS from Jan Kneschke - - - svn:r376 - -commit 9e0333a8d56970514acbdb792a04e6db2b0d56fe -Author: Niels Provos -Date: Mon Jul 30 23:56:05 2007 +0000 - - include config.h if HAVE_CONFIG_H from Jan Kneschke - - - svn:r375 - -commit 72c479e76a6dacaa47482f418b00b3dee3998336 -Author: Niels Provos -Date: Mon Jul 30 23:54:25 2007 +0000 - - remove c99 variable declarations; from Jan Kneschke - - - svn:r374 - -commit 7c6df310c98cd50aac9e34839b6f475020939c98 -Author: Niels Provos -Date: Mon Jul 30 23:53:10 2007 +0000 - - remove c++ comments from Jan Kneschke - - - svn:r373 - -commit 10267216a6ff7d94db7deb3269e379c94adc190d -Author: Niels Provos -Date: Mon Jul 30 23:49:00 2007 +0000 - - initalize ev_res from Scott Lamb - - - svn:r372 - -commit 3ad6b47e03993f688e92fb202c89e3be984a8f56 -Author: Niels Provos -Date: Mon Jul 30 22:41:00 2007 +0000 - - make clock_monotonic work; do not use default timeout; - from Scott Lamb, plus some fixes from me. - - - svn:r371 - -commit d7918e7963db292b49d575fbd3b9c47f4d59c9cf -Author: Niels Provos -Date: Mon Jul 30 21:27:33 2007 +0000 - - drop illegal header values - - - svn:r370 - -commit b15d715cbc77f5ce9b8da27938ad07426f7f2e57 -Author: Niels Provos -Date: Fri Jul 6 03:36:31 2007 +0000 - - make event_rpcgen.py use the uint_ types; - make event.h include stdint.h (wonder which OS that will break) - - - svn:r369 - -commit 753ffa563b67feee30069d8637c920da809107da -Author: Niels Provos -Date: Sat Jun 30 19:08:46 2007 +0000 - - convert u_int8_t types to uint8_t types - - - svn:r368 - -commit f0ff792afabecc032bc9f92e504ff6601057b415 -Author: Niels Provos -Date: Sat Jun 30 18:58:34 2007 +0000 - - fixes from Joerg Sonnenberger: - http.c is a violation of the ctype(3) interface and an unused function. - - test/regress_http.c are incorrect format strings. - - test/regress.c uses raise(3) from signal.h. - - evdns.c: evdns_error_strings is unused. The GET* macros can eat the - semicolon from the expression. pos is passed in as off_t, so just pass - that down. When assigning negativ values to unsigned variables, an - explicit cast is considered good style. - - - svn:r367 - -commit aa5c8068888ffa501c81d191b93ca1b5765b54b7 -Author: Niels Provos -Date: Sat Jun 16 03:23:15 2007 +0000 - - make it compile on solaris; from Andrei Nigmatulin - - - svn:r366 - -commit d1848a8872c9596d1f30a5edbd1f9050e8124611 -Author: Niels Provos -Date: Thu Jun 14 04:38:42 2007 +0000 - - include config.h - - - svn:r365 - -commit cf5c1fcebbb698a39603c92ea0928d1c603abbd5 -Author: Niels Provos -Date: Fri Jun 8 16:06:23 2007 +0000 - - made the wrong fd non-blocking in accept_socket; from szjwwu - - - svn:r364 - -commit 3794534feb99f94e052359c7cce61462ed909383 -Author: Niels Provos -Date: Tue May 29 05:38:58 2007 +0000 - - change the signature of the client rpc callback to pass in an rpc status; the status - allows us to determine if an error happened. - - - svn:r363 - -commit f0d0559c3e01bc378c3cb960013fc34245128291 -Author: Niels Provos -Date: Mon May 28 21:21:59 2007 +0000 - - allow DNS server to get access to the IP address for the requestor; from tor cvs via Nick Mathewson - - - svn:r362 - -commit 5d3b6a83870d68c0ec4ed4fc60a6710d8ad938df -Author: Niels Provos -Date: Mon May 28 21:20:57 2007 +0000 - - fail quicker on bad replies; from tor cvs via Nick Mathewson - - - svn:r361 - -commit d06ab8569e26b3535967be5c8fcc5efad6850e85 -Author: Niels Provos -Date: Mon May 28 21:19:18 2007 +0000 - - fix bug where req was freed and dereferenced afterwards; from tor cvs via Nick Mathewson - - - svn:r360 - -commit 28246587c0520a9e812fc6ed64b3d7c173864789 -Author: Niels Provos -Date: Mon May 28 21:17:35 2007 +0000 - - treat SERVERFAILED as a timeout; from tor cvs via Nick Mathewson - - - svn:r359 - -commit 5be24333aec311d776e7d6c5fde9e74fcf04217d -Author: Niels Provos -Date: Mon May 28 21:09:00 2007 +0000 - - solaris may return short reads on resolve.conf; fix from tor cvs via Nick Mathewson - - - svn:r358 - -commit d0111a29e9e53899e0ea2e529b43f2f26353b853 -Author: Niels Provos -Date: Sun May 27 06:27:11 2007 +0000 - - evdns_shutdown fix from Adam Langley - - - svn:r357 - -commit 621a1b2947b39d662123c98c49404fe71353c241 -Author: Niels Provos -Date: Wed May 23 05:31:33 2007 +0000 - - support freeing of evrpc base - - - svn:r356 - -commit 0c2808246a5db1515f0392ef6f65a557e5832ccb -Author: Niels Provos -Date: Wed May 23 05:20:59 2007 +0000 - - support removing of http callbacks and removing of registered RPCs - - - svn:r355 - -commit 5b5400f66bb3959dbed81f6f544aa6f392ca18f5 -Author: Niels Provos -Date: Sat May 12 06:23:52 2007 +0000 - - permit connection free from callback; from Ben Rigas - - - - svn:r354 - -commit 4408a5f8fc5028c67fc847e34a10891cb3523351 -Author: Niels Provos -Date: Thu Apr 19 03:13:12 2007 +0000 - - fix evbuffer_find off by one; found by Ken Cox; regression test by him - and fix by me - - - svn:r353 - -commit f5aa65c9b369a6b34be7eb019087e06b64cd1e5b -Author: Niels Provos -Date: Thu Mar 22 15:09:30 2007 +0000 - - man page fixes from todd miller - - - svn:r352 - -commit 41b7cbc38105a540ade7d02bb6137898a94abc89 -Author: Niels Provos -Date: Sat Mar 10 06:37:53 2007 +0000 - - more the signal base into the event base; this removes global state and makes signals - work better with threading; from Wouter Wijngaards - small fixes for kqueue and style by me - - - svn:r351 - -commit a968da742598e9e6720c883cb78b1f0f6e912ae2 -Author: Niels Provos -Date: Tue Mar 6 06:26:10 2007 +0000 - - split finding of callbacks out of code - - - - svn:r350 - -commit 50edb19f17555389f18c0d2cef488eed2a643497 -Author: Niels Provos -Date: Mon Mar 5 07:28:15 2007 +0000 - - EVRPC_MAKE_REQUEST needs the pool argument - - - svn:r349 - -commit fcd55934ae57b3af2e67ba2d4c47da8342348260 -Author: Niels Provos -Date: Mon Mar 5 06:49:45 2007 +0000 - - spell Oleson correctly - - - svn:r348 - -commit 729487deb380bd8f0fa6591a8f6184595080a490 -Author: Niels Provos -Date: Sat Mar 3 08:27:52 2007 +0000 - - better conversion; cannot use event_err here. - - - svn:r344 - -commit 660662517c717b53d7340ed0198bffbe154ef0b1 -Author: Niels Provos -Date: Sat Mar 3 08:18:20 2007 +0000 - - proper casting for conversion - - svn:r343 - -commit 74f7118d66e2b31d2d113bcb3674bb8074676165 -Author: Niels Provos -Date: Sat Mar 3 08:16:40 2007 +0000 - - install evrpc.h header - - svn:r342 - -commit b5d2f9a255dbd5eb7d650cd8d829fb85c9c69f2c -Author: Niels Provos -Date: Thu Mar 1 06:25:18 2007 +0000 - - rolling back r339: evconfig.h does not work - - svn:r341 - -commit 8d94bd03ebac666171fbbc75a598ef01f63390f5 -Author: Niels Provos -Date: Wed Feb 28 04:29:18 2007 +0000 - - signal fixes from scott lamb - - - svn:r340 - -commit 127c260bb7f8e972fffab9bc72bd1f53eae48730 -Author: Niels Provos -Date: Wed Feb 28 04:02:29 2007 +0000 - - make evconfig.h available as installed header file; not - really ideal but good enough for me; from Nick Mathewson - - - svn:r339 - -commit 995a58a374c4b1ce28c214d22dfdf00329b28957 -Author: Niels Provos -Date: Tue Feb 27 08:16:50 2007 +0000 - - missing return (-1) for failures on make_socket - - - svn:r338 - -commit f86cead09999380887752d9a391e0ebd3ee38807 -Author: Niels Provos -Date: Sat Feb 24 08:33:07 2007 +0000 - - remove artifical 16-bit restriction on evrpc entries - - - svn:r337 - -commit 4356b6813376ae48478ab7af0f593d34e1af9c26 -Author: Niels Provos -Date: Tue Feb 20 03:35:31 2007 +0000 - - remove redundant \n from event_warn - - - svn:r336 - -commit 72a3f29da36a8d9fa49dce8eaa8e5f5a86cb4e7f -Author: Niels Provos -Date: Sun Feb 18 19:33:19 2007 +0000 - - 1.3a on trunk? - - svn:r333 - -commit 06d0f8c0824651631e68c5c593051098c4008753 -Author: Niels Provos -Date: Fri Feb 16 08:48:55 2007 +0000 - - O(n^2) is bad - - - svn:r332 - -commit 7398790296fa8e8fdb226cd8f6d76c8705d4e366 -Author: Niels Provos -Date: Thu Feb 15 22:46:04 2007 +0000 - - missing reference to strlcpy-internal - - - svn:r330 - -commit fe2662384db52b1e4c500bbb9939a97545178c46 -Author: Niels Provos -Date: Thu Feb 15 02:16:07 2007 +0000 - - try to make it work with proxy-connections - - - svn:r329 - -commit 58f42c79e7df54dd5f7136b6c006ba67b55f624f -Author: Niels Provos -Date: Wed Feb 14 16:59:47 2007 +0000 - - fix handling of chunked requests - - - svn:r328 - -commit 8901c141c9bef59baf308764c8c0f4dcadc6a487 -Author: Niels Provos -Date: Wed Feb 14 06:10:32 2007 +0000 - - make chunked requests work correctly; this is done by providing - a separate callback for invidiual chunks. if this callback is - not set, all the data is going to be delivered at the end. - - - svn:r327 - -commit 36950cef58fc02495dffcc143bb2ec147dc7e9ad -Author: Niels Provos -Date: Tue Feb 13 06:25:16 2007 +0000 - - close connections for http/1.0 unless there is keep-alive - - - svn:r326 - -commit 19373b3dda45af29663926cdbc4121f8289e2f0e -Author: Niels Provos -Date: Tue Feb 13 06:14:42 2007 +0000 - - when parsing query parameters, we automatically unquote them - - - svn:r325 - -commit 9a65d0135fd39753858686dbb0eec2d807c29583 -Author: Niels Provos -Date: Sun Feb 11 07:58:39 2007 +0000 - - set content length even if content-type is specified - - svn:r324 - -commit ba748012bacf371824a961efddc2e4db024303d2 -Author: Niels Provos -Date: Fri Feb 9 07:52:04 2007 +0000 - - add prototype for bufferevent_base_set; from thorsten glaser - - - svn:r323 - -commit bfb9f44f370ab0afa230f9e7795236043da7a5ea -Author: Niels Provos -Date: Fri Feb 9 07:49:55 2007 +0000 - - make mingw happy; from Nick Mathewson - - - svn:r322 - -commit faf5f73a694ecfa720a7af4405298f5cb40349f0 -Author: Niels Provos -Date: Thu Feb 8 16:39:15 2007 +0000 - - dns server support from Nick Mathewson; tiny tweaks - to the regression test from me to make it run on - systems where stack variables get initialized with - trash. - - - svn:r321 - -commit 3b8e27a58f240e38040a2c15a9592d6ce7fbae28 -Author: Niels Provos -Date: Thu Feb 8 16:27:26 2007 +0000 - - add people I forgot to give credit to; but in alphabetical order; - from dug song (he had to remind me of this; how embarassing) - - - svn:r320 - -commit 121efe6530075e1e0d64956cd5b00600218407a6 -Author: Niels Provos -Date: Sat Jan 27 08:38:51 2007 +0000 - - small bug fixes to AAAA resolution and regression test; from Nick Mathewson! - - we love regresson tests. - - - - svn:r319 - -commit 78f2aa300c941029c7cf808755df9b1e7007fc05 -Author: Niels Provos -Date: Sat Jan 27 04:27:59 2007 +0000 - - Allow setting of more DNS options via API; from Nick Mathewson!!! - - - svn:r318 - -commit b776b2da7282414d9bf42bb21c7c1fd4293cbd02 -Author: Niels Provos -Date: Sat Jan 27 04:25:46 2007 +0000 - - dns name compression; from Nick Mathewson!! - - - - svn:r317 - -commit 5baf8ecf6916fa9b91c59bb7e1307b7a94d26195 -Author: Niels Provos -Date: Sat Jan 27 04:23:33 2007 +0000 - - minor fixes; spelling corrections; compatibility from Nick Mathewson! - - - svn:r316 - -commit 6318fca29e9d3ebe9300a229d0b84e16ec5e5626 -Author: Niels Provos -Date: Sat Jan 27 04:22:36 2007 +0000 - - AAAA support for DNS; from Nick Mathewson. - - unfortunately, no regression test - - - - svn:r315 - -commit 22e53c7a849b95f2f32640b846e2fc98dc3bcc1c -Author: Niels Provos -Date: Sat Jan 27 04:10:08 2007 +0000 - - make it work on freebsd; from phil oleson - - - svn:r314 - -commit 4922f342fcbad0f56c6de5f40a00b029d6757823 -Author: Niels Provos -Date: Sat Jan 27 04:06:52 2007 +0000 - - extern "C" guard for header file. - - assert activeq in event.c; - - from Phil Oelson. - - - - svn:r313 - -commit b04043ae51589899021d306af299dbad6668a621 -Author: Niels Provos -Date: Sun Jan 21 17:28:55 2007 +0000 - - fix ddos in dns parsing due to infinite loop; - patch from Nick Mathewson; also received - notification from Jon Oberheide. - - - svn:r311 - -commit d5d04949e3550823c2935562f5e07b423de46871 -Author: Niels Provos -Date: Thu Jan 18 06:28:42 2007 +0000 - - fix http server so it can accept on high ports; - better warning messages for getnameinfo; - from Philip Lewis - - - svn:r310 - -commit ff12220703d4bd45169fb2f1aab61c4979340df9 -Author: Niels Provos -Date: Wed Jan 10 02:42:29 2007 +0000 - - make accept socket non-blocking; from dug song - - - svn:r309 - -commit de4e25f1d0a27a4d603d1834b090437237323d06 -Author: Niels Provos -Date: Sat Jan 6 02:25:50 2007 +0000 - - evbuffer_find fix from Dug Song - - - svn:r308 - -commit ba8289bea55a2b0013fc4c2cfd6ffda9a6a82c21 -Author: Niels Provos -Date: Thu Jan 4 18:05:17 2007 +0000 - - from dug song: - the original code failed in the case of a large single client - request+body write - for instance, over loopback (with a larger MTU - exceeding EVBUFFER_MAX_READ). - - - - svn:r307 - -commit 0db257b828ff7d9b480c6499651e469d2b20154b -Author: Niels Provos -Date: Wed Jan 3 07:11:17 2007 +0000 - - rename strlcpy so that it does not conflict with other tests; from - Nick Mathewson. - - - svn:r306 - -commit 894b63654303649ee1b0fc888cbfded616e6d54e -Author: Niels Provos -Date: Sat Dec 23 07:30:10 2006 +0000 - - fix a bug in an assert; from Weston Andros Adamson - - - svn:r305 - -commit 557e0f62be87b54db604bb95b063a7838b7a4164 -Author: Niels Provos -Date: Mon Dec 18 15:26:19 2006 +0000 - - http chunking support from dug song; - some refactoring and extra error checking by me - - - svn:r304 - -commit 0147ef3ac71cb393443af2250fe658940020f880 -Author: Niels Provos -Date: Tue Dec 12 04:02:07 2006 +0000 - - From Nick Mathewson: - This patch resets the successive timeout count to zero when: - - A nameserver comes up - - We receive a reply from a nameserver - - We decide to not use the nameserver for a while because of its - timeout count. - - This patch also changes the timeout threshold from 3 to 5 seconds. - - - svn:r303 - -commit a91d2b2b8ce9ce4a1dd437c30a8c88b5609fa653 -Author: Niels Provos -Date: Tue Dec 12 03:51:30 2006 +0000 - - do close-detection via a separate event - - - svn:r301 - -commit 04bdb2488c61489f91f67c68f308b0cfc84076f1 -Author: Niels Provos -Date: Sat Dec 9 05:14:37 2006 +0000 - - detect if a client to a streaming reply hangs up; from dug song - comments from me :-) - - - svn:r300 - -commit de7db33a61f13f94fe3b60a084d20735b06bd72f -Author: Niels Provos -Date: Sat Dec 9 02:58:12 2006 +0000 - - low-level interfaces for streaming; from dug song - i applied some bug fixes and slight re-arranged the logic - on when to call the close notification callback; - i also don't like the streaming interface; i'd rather - see it do the chunked response formatting explicitly. - - - svn:r298 - -commit 852d05a3c093ecaaacffb5ee339307782f706c96 -Author: Niels Provos -Date: Sat Dec 9 01:41:57 2006 +0000 - - support retrying for connections; from dug song - small tweaks from me. - - - svn:r297 - -commit 2225eec22b1e62c6b24113e7e8915de3ef26a209 -Author: Niels Provos -Date: Sat Dec 9 01:33:03 2006 +0000 - - decode uri when sending a request; from dug song - - - svn:r296 - -commit 785923704c6d55af0fa1f06086349d1d707fea37 -Author: Niels Provos -Date: Wed Dec 6 04:12:11 2006 +0000 - - fix a bug where event_set was called on a pending event; - don't read body for return codes that do not require a body; - from dug song. - - - svn:r294 - -commit c6e285d31a1892a6bbfdab2137d83c5041f97742 -Author: Niels Provos -Date: Wed Dec 6 03:38:41 2006 +0000 - - allow gotsig to terminate active event loop; - free http connection on failed incoming connections; - bugs pointed out by Dug Song. - - - svn:r293 - -commit ec0679199fbdddcb3308a72a90a15b342cc3c0a3 -Author: Niels Provos -Date: Sat Dec 2 21:28:39 2006 +0000 - - fix cases where there is no content or transfer encoding was specified - from Dug Song - - - svn:r291 - -commit 7fe5edf50c5ccad3c4dddc2a8756ea241fd94b89 -Author: Niels Provos -Date: Sat Dec 2 21:25:21 2006 +0000 - - use CLOCK_REALTIME when CLOCK_MONOTONIC is not available; from Phil Oleson - - - svn:r290 - -commit c1aa5480de538c63e6015f690226a84e7569e3f7 -Author: Niels Provos -Date: Sun Nov 26 16:13:17 2006 +0000 - - support #define in .rpc descriptions - - - svn:r278 - -commit 942656bb5cd89b131ad119e395a770e6a1488e9b -Author: Niels Provos -Date: Thu Nov 23 06:32:20 2006 +0000 - - persistent connections are somewhat complicated; detect on the client side if the - server closes a persistent connection. previously, we would have failed the next - request on that connection. provide test case. - - - svn:r277 - -commit 3882669d3e20bcbca991e6775d0d05401d58a1b6 -Author: Niels Provos -Date: Thu Nov 23 05:27:15 2006 +0000 - - transaction id fixes from richard nyberg; return correct - error code when file for resolv.conf cannot be found. - - - svn:r276 - -commit 30a49b57dab3baa8b53775563ff03210b357db03 -Author: Niels Provos -Date: Wed Nov 22 07:30:34 2006 +0000 - - test that rpc timeouts work correctly - - - svn:r275 - -commit 2d028ef6c189a2c53d64ca9d1ceff813d62755f0 -Author: Niels Provos -Date: Wed Nov 22 06:54:28 2006 +0000 - - fix a bug where rpc would not be scheduled when they were queued; test for it. - allow a configurable timeout for connections and RPCs. - - - svn:r274 - -commit ce436242ad05172d2abe53ed83ab46f956edc789 -Author: Niels Provos -Date: Wed Nov 22 05:03:02 2006 +0000 - - an attempt at differentiated error handling for timeouts and eof. - really this needs to be propagated all the way to the callback. - - - svn:r273 - -commit 51fde16666a3402959cab77cd0313c9ff4b4c66a -Author: Niels Provos -Date: Wed Nov 22 04:35:56 2006 +0000 - - forgot to add this - - - svn:r272 - -commit 868f10e7c9abe1cb38cd3cc84e6dd4a9b1d966cc -Author: Niels Provos -Date: Wed Nov 22 01:21:10 2006 +0000 - - mingw fixes from Nick - - - svn:r271 - -commit 4aa780d6adf37a23985aa8f544087bc3b14aba9b -Author: Niels Provos -Date: Mon Nov 20 07:57:36 2006 +0000 - - don't require string literal for message name - - - svn:r270 - -commit ff43ed5b3379125e3b57044016ca71b9b8f4739f -Author: Niels Provos -Date: Mon Nov 20 07:44:37 2006 +0000 - - finish RPC client support - - - svn:r269 - -commit fda1216b6e18df98b8f3c32ce4132f955c346a90 -Author: Niels Provos -Date: Mon Nov 20 03:32:53 2006 +0000 - - generate client request code via macro; flesh out the pools a little bit. - - - svn:r268 - -commit 3a15f7d4e4f3de810e2b81634b4e60f286605066 -Author: Niels Provos -Date: Sun Nov 19 02:03:43 2006 +0000 - - make it work with python2.2 - - - svn:r267 - -commit 226fd50a99761f5e874e7376d99674ae54b1aeed -Author: Niels Provos -Date: Sat Nov 18 21:27:42 2006 +0000 - - use more python builtins; dont use reserved keywords - - - svn:r266 - -commit 31ba30abfee720e49c19e7a4790854cfbe0e9d5e -Author: Niels Provos -Date: Sat Nov 18 08:51:12 2006 +0000 - - make regression test work for poll and select - - - svn:r265 - -commit 1a64c982eb0f8f72e5e2766a5eec88d350fdfb06 -Author: Niels Provos -Date: Sat Nov 18 07:30:21 2006 +0000 - - some compilers don't like C99 inline variable declaration - - - svn:r264 - -commit ddf70659ad7db0f4bdf8c4f8aa0259fd36abeab3 -Author: Niels Provos -Date: Sat Nov 18 03:52:27 2006 +0000 - - forgot ifdef guard around stdint.h - - - svn:r263 - -commit 9d81ac48f8031e6a49afb1c7c35358d9751f414c -Author: Niels Provos -Date: Sat Nov 18 03:43:26 2006 +0000 - - test both piplining on persistent and non-persistent connections - - - svn:r262 - -commit 36212f9df0664c3d9056d18d962ef37acf9a45e3 -Author: Niels Provos -Date: Sat Nov 18 03:05:26 2006 +0000 - - make persistent connections work; needs more testing - - - svn:r261 - -commit d2c27da1145e81267737e9a52dd9cf2fd45721f9 -Author: Niels Provos -Date: Sat Nov 18 02:10:25 2006 +0000 - - introduce is connection close - - - svn:r260 - -commit a67d9cb1153a16bd314471a22eb86782fac41dc0 -Author: Niels Provos -Date: Fri Nov 17 07:45:42 2006 +0000 - - add "Connection: close" to the output headers of the HTTP server reply; - we don't currently support persistent connections; although that's going - to be easy to add. - - - svn:r259 - -commit c4836d10539e9937d2ee0afce2675362dce01e00 -Author: Niels Provos -Date: Fri Nov 17 06:06:17 2006 +0000 - - make sure that the rpc callback receives an unmarshaled payload; - make sure that the rpc reply contains a good rpc structure, too. - - - svn:r258 - -commit 1caff9bcc8f26223ddfd9056d99e7581bc484805 -Author: Niels Provos -Date: Thu Nov 16 15:59:42 2006 +0000 - - we indicate a failed request by removing the uri from the request object - - - svn:r257 - -commit 44bd5ab4e03a7fd943520243dd07bc3e6fdba249 -Author: Niels Provos -Date: Thu Nov 16 08:49:26 2006 +0000 - - prefix was missing /; malformed request caused server to crash - - - svn:r256 - -commit 9d9d60b1ff0b588ee20b1b7a4f73ea409fad232d -Author: Niels Provos -Date: Thu Nov 16 08:21:27 2006 +0000 - - forgot to add file - - - svn:r255 - -commit f554234f74e9e80c0faabe385dd8537fc7b1ab9f -Author: Niels Provos -Date: Thu Nov 16 07:36:20 2006 +0000 - - first stab at an rpc layer; this breaks the regression test. - - - svn:r254 - -commit 768aa15c77073b5799033854c332553eea4929fd -Author: Niels Provos -Date: Sun Nov 12 00:59:56 2006 +0000 - - don't need to include getopt here - - - svn:r253 - -commit 79d2ca8cac2ebb3f8be06d93376b036d5e73ef50 -Author: Niels Provos -Date: Fri Nov 10 02:16:16 2006 +0000 - - fix a potential problem in multiple handling of va_list; use va_copy instead; - from Alejo. - - - svn:r251 - -commit 025b009bb67e402c75dcb92bd06485f8c0ed8097 -Author: Niels Provos -Date: Sun Nov 5 17:24:24 2006 +0000 - - fail without leaking memory when poll set extension fails - - - svn:r249 - -commit d6989659281f67acc88bd6255f67680f9004e7f9 -Author: Niels Provos -Date: Sat Oct 28 03:20:22 2006 +0000 - - fix a potential memory leak in event_once from Scott Lamb - - - svn:r244 - -commit 3eec7f7c64c2356157ed123e5ad2ce8e75a6ae16 -Author: Niels Provos -Date: Sun Oct 15 21:55:13 2006 +0000 - - make it 1.2; fix some size issues for printf in regression code - - - svn:r242 - -commit ea52d9fd8d12126643f21007f279ef2e03dfca1e -Author: Niels Provos -Date: Sun Oct 15 21:41:56 2006 +0000 - - improved nroff mdoc for the man page - - - svn:r241 - -commit 152f570047d7cdcb8d2e437c0d5751a7ddd3fa83 -Author: Niels Provos -Date: Mon Oct 9 01:55:23 2006 +0000 - - install evdns.3 man page - - - svn:r240 - -commit cf47f86b74fe5f60b21458f14503657e6f6a4476 -Author: Niels Provos -Date: Mon Oct 9 00:48:42 2006 +0000 - - put the evdns documentation into the header file. pathetic start of evdns manpage. a little bit - more testing and debug output for the DNS regression test. add a BSD copyright to evdns.h with - appropriate explanations. - - - svn:r239 - -commit fe1dfe0f40776ef18f5318149f981387d386b962 -Author: Niels Provos -Date: Thu Oct 5 22:59:44 2006 +0000 - - sync evdns changes with tor - from Nick Mathewson - - - svn:r238 - -commit b6b933af5c3405e44f8fe134e989193cc369afa9 -Author: Niels Provos -Date: Wed Oct 4 03:45:10 2006 +0000 - - Protect EVENT_* macros - () were missing - - - - svn:r237 - -commit 9f7d28bb81b65094dd63a65607bbb9972f1af006 -Author: Niels Provos -Date: Wed Sep 27 03:07:38 2006 +0000 - - make it compile with mingw; from Nick - - - svn:r235 - -commit 64c76fbea4fe4443cfa70876b7a289c117101f35 -Author: Niels Provos -Date: Sun Sep 3 21:12:59 2006 +0000 - - typo in kqueue delete; from Bert JW Regeer - - - - svn:r232 - -commit e9c1e3f7f0c262c529300e58e1f5724c52ab76d2 -Author: Niels Provos -Date: Mon Aug 28 00:57:49 2006 +0000 - - introduce evdns_init() which works on windows and unix. - - - svn:r231 - -commit 07c3fb50675fa9a80b928f24028431e92358df3c -Author: Niels Provos -Date: Sun Aug 27 20:04:20 2006 +0000 - - add a simple regression test for the DNS resolver; requires internet access. - do some KNF on evdns.c; add checks to prevent potential buffer overflows. - fix one memory leak. - - - svn:r230 - -commit e80e52ceb7846d4f081e5106a19a767d2aa51dab -Author: Niels Provos -Date: Sun Aug 27 19:43:00 2006 +0000 - - include evdns.h header - fix windows distribution files - - - svn:r229 - -commit b0b5e2c2acfb13a67935c12187dca84e16ead9bb -Author: Niels Provos -Date: Sat Aug 26 04:34:43 2006 +0000 - - document that read and write callbacks may be NULL. - - - svn:r228 - -commit c1eec7aae52af93d5c763859e4b8dab8e780e329 -Author: Niels Provos -Date: Sat Aug 26 04:32:31 2006 +0000 - - allow both read and write callbacks for bufferevents to be NULL - - - svn:r227 - -commit 52bfcab894c0644318dc9e067a87931d16b7e061 -Author: Niels Provos -Date: Thu Aug 24 06:10:50 2006 +0000 - - rename eventdns to evdns to match libevent naming scheme - - - svn:r226 - -commit d0d8f9b468a5401d9c3da770d1b14572e384843e -Author: Niels Provos -Date: Sun Aug 13 06:59:37 2006 +0000 - - configure evdns and make it compile - - - svn:r225 - -commit cca7249ed6ad71eb8d0be56891451b26bedb7a5a -Author: Niels Provos -Date: Sun Aug 13 06:33:45 2006 +0000 - - unmodified eventdns from Adam Langley via tor repository - - - svn:r224 - -commit 296739e022dc8d6415a573b8dda557b280caff3d -Author: Niels Provos -Date: Sun Aug 13 00:03:35 2006 +0000 - - fix regression test - - svn:r223 - -commit 4596f82e1733df39fce93384b4c375aa4e924f3b -Author: Niels Provos -Date: Fri Aug 11 15:20:10 2006 +0000 - - windows makefile fixes from branch - - svn:r222 - -commit 49ef242f6e524e7d3a4f70cc280daa6b9220b184 -Author: Niels Provos -Date: Wed Aug 9 01:04:12 2006 +0000 - - add back the original sun copyright block - - - svn:r219 - -commit 94af961f362dc654c77524e2b51c590d6628ebda -Author: Niels Provos -Date: Tue Jul 18 06:35:48 2006 +0000 - - get rid of err.h - - - svn:r218 - -commit ba7262ebdf82da9c285f39200d69aac54013c16a -Author: Niels Provos -Date: Mon Jul 17 00:33:57 2006 +0000 - - reorganization of the http functionality; we separate http handling into a - connection object and a request object; also make it clear which buffers are - used for input and output; unittests not complete yet. - - - svn:r217 - -commit 00bc7e37fd8f9cc5c749fa83d4152c3395e14975 -Author: Niels Provos -Date: Sat Jul 15 02:55:57 2006 +0000 - - 1.2-rc1; Solaris' event port support from Dave Pacheco - - - svn:r216 - -commit f0ecf50727b291356ed2776d7b03a69cbc9f35b1 -Author: Niels Provos -Date: Sat Jul 15 02:39:31 2006 +0000 - - need to report one less file descriptor to solaris then the limit; reported - by Dave Pacheco - - - svn:r215 - -commit 6813af3f11c4fdffa68efce687d46023aa195773 -Author: Niels Provos -Date: Sat Jun 10 22:37:21 2006 +0000 - - move http related prototypes to evhttp.h - - - svn:r214 - -commit 147b71e33c34bd8fae7ea339b7ecdb742768656f -Author: Niels Provos -Date: Sat Jun 10 22:28:21 2006 +0000 - - rename http.h to http-internal.h - i wish there were decent refactoring tools - for open source programmers. - - - svn:r213 - -commit ebf5333f97a342fc0e53a985daa54b1b57794fea -Author: Niels Provos -Date: Wed May 17 13:13:31 2006 +0000 - - oops. the enums were actually creating symbols - - - svn:r212 - -commit 71108cd98b6485fabdecc0522ca0a1918f303dd5 -Author: Niels Provos -Date: Tue Mar 28 16:57:19 2006 +0000 - - uhm - i obliterated a gettimeofday that was required for remapping the - timeouts to "real" time. thanks to claudio for pointing that out. - - - svn:r211 - -commit 2e8051f593abd20b961e85c3f99dfa0ac0ee375d -Author: Niels Provos -Date: Tue Mar 28 04:40:54 2006 +0000 - - introduce a way to free the base from Nick Mathewson - - - svn:r210 - -commit 571ac95430c344d4688c28adaa8aa53956cd12a7 -Author: Niels Provos -Date: Tue Mar 28 04:33:41 2006 +0000 - - use clock_gettime if available from Claudio Jeker - - - svn:r209 - -commit a32839c8ecfee948bc8c051857c9ea454de937e6 -Author: Niels Provos -Date: Tue Mar 28 04:17:51 2006 +0000 - - some nit-picking from poul-henning kamp - - - svn:r208 - -commit 7517ef2a81eab41b8aeda699dc8ed050c01092b6 -Author: Niels Provos -Date: Tue Mar 28 04:16:14 2006 +0000 - - some fixes from openbsd via brad - - - svn:r207 - -commit 682d598ada027ef7713168b776955143d07417de -Author: Niels Provos -Date: Mon Feb 27 02:33:02 2006 +0000 - - add log.c to build file; remove err.c; reported by Sreekant Sreedharan - - - svn:r206 - -commit 38b33048ebbef976bb1e77499a9487ee9bfc072c -Author: Niels Provos -Date: Mon Feb 27 02:27:37 2006 +0000 - - make a simple test for HTTP POST requests - - - svn:r205 - -commit 60192b462563034cfa179c98f50a1bf51e0f3859 -Author: Niels Provos -Date: Sun Feb 26 20:18:35 2006 +0000 - - improved/well-completely rewritten rtsig support by Mathew Mills; fix some - cases where regress would not pass on Linux - - - svn:r204 - -commit f6550f407c6c74386f3bdcabf0a5e211a9b98e04 -Author: Niels Provos -Date: Sun Feb 26 20:13:04 2006 +0000 - - provide strlcpy for the unenlightened libcs - - - svn:r203 - -commit 88bd79439d0c37468e9da9ee7354cd2405fba532 -Author: Niels Provos -Date: Mon Feb 13 04:53:58 2006 +0000 - - make it compile on mac os x - - - svn:r202 - -commit 896bf3a2607c25ded5b732de35da63bd8016f9ed -Author: Niels Provos -Date: Mon Feb 13 02:22:48 2006 +0000 - - many changes for fixing a small bug: post requests would not send the post - data. I took the opportunity to reorganize a bit. - - - svn:r201 - -commit 7b78c82823a8d65338503b8aabd3a606116d7cfc -Author: Niels Provos -Date: Mon Feb 13 01:51:58 2006 +0000 - - limit the amount of data bufferevents are going to consume to something - reasonable; in some circumstances it could happen that libevent happily - allocated 100MB in read buffers without telling the user; found by - christopher maxwell - parts of these changes are from his patch. - - - svn:r200 - -commit f296e6336ac80c8c46e563e84372501434d8884b -Author: Niels Provos -Date: Fri Feb 3 19:26:06 2006 +0000 - - allow setting an event base for bufferevents; from phil oleson - - - svn:r199 - -commit 6717cf313ac8b06f8f588f071d333854a6e1fe1e -Author: Niels Provos -Date: Fri Feb 3 19:24:28 2006 +0000 - - fix a compile problem when USE_DEBUG is enabled - - - svn:r198 - -commit c398d788119564faf16ef856aef897b4c02b4839 -Author: Niels Provos -Date: Thu Feb 2 22:36:37 2006 +0000 - - disable bufferevent after we have received the data that we care for. - - - svn:r197 - -commit a3bb4a035fe27dcdf52158d115c4caea153dabf5 -Author: Niels Provos -Date: Sun Jan 22 05:08:50 2006 +0000 - - I often need some very simple HTTP functionality, so this is a first stab - at integrating something really simple with HTTP. The interface is still - evolving as I start messing with it. Not all the interfaces are properly - exported yet. - - I am also trying to figure out how to intelligently hide the details about - the different structures from users, so that that things can be changed - around later. - - - svn:r196 - -commit 8af2db10d95a3bcae2702b25ded991e6ed3be12a -Author: Niels Provos -Date: Sun Jan 22 05:06:29 2006 +0000 - - version 1.2 - - - svn:r195 - -commit 36bedaef19b18ba1d6633c94622e9134a463b6ef -Author: Niels Provos -Date: Sun Jan 22 05:06:14 2006 +0000 - - another fix from art - - - svn:r194 - -commit 3c74f06f428c83c400146cdaace47e52347b72d6 -Author: Niels Provos -Date: Sat Jan 21 03:04:31 2006 +0000 - - improved manpage from Phil Oleson - - - svn:r193 - -commit 1d308e88139bd549b99cddae4025ce4d499070b7 -Author: Niels Provos -Date: Sat Dec 17 20:25:22 2005 +0000 - - mostly whitespace fixes from OpenBSD via Brad - - - svn:r192 - -commit 686dede71bd2da2e6352c2e59efc7b99d692a937 -Author: Niels Provos -Date: Sat Dec 17 20:18:10 2005 +0000 - - do not undefine USE_DEBUG in header file; allow CFLAGS specification; from - Stas Bekman - - - svn:r191 - -commit 139e862e32d76d0fd04f754eaf532c1608faebe7 -Author: Niels Provos -Date: Sat Dec 17 20:15:25 2005 +0000 - - do not remove kq inkernel flag before event_del gets to it; bug reported by - Tassilo von Parseval; also add a test for this behavior. - - - svn:r190 - -commit 0c48c70680727ea0d6aed694b271d40019f2aa15 -Author: Niels Provos -Date: Thu Dec 8 23:05:42 2005 +0000 - - windows memory corruption bug fix from I-M Weasel via Nick Mathewson. - - - svn:r189 - -commit 8d1317d71c46e27c5073d3429a64af69de0351a6 -Author: Niels Provos -Date: Tue Dec 6 03:26:28 2005 +0000 - - add evbuffer_add_vprintf interface from artur grabowski; add some testing - - - svn:r188 - -commit 9c9f0651842bbb84d16e301640d8e5e6a1c34297 -Author: Niels Provos -Date: Sat Dec 3 20:51:23 2005 +0000 - - avoid double recacle when loop_once is used; from Richard Nyberg - - - svn:r187 - -commit 68292e2f45dabe21a301c0bb5864e2c2026176f3 -Author: Niels Provos -Date: Sat Dec 3 17:52:47 2005 +0000 - - signal handler satefy improvements from Theo DeRaadt - - - svn:r186 - -commit 65644dfb80f4aa1b0501d300f015efeb3bd35dd7 -Author: Niels Provos -Date: Sat Nov 12 19:04:17 2005 +0000 - - solaris kernel changes are not backwards compatible - how retarded. problem - pointed out by: Geoffrey Giesemann - - - svn:r185 - -commit 11a40d478efcc69a379a07f005beb0415f6954e6 -Author: Niels Provos -Date: Tue Sep 20 15:59:00 2005 +0000 - - event.3 - - - svn:r184 - -commit 50f7aaef6b7742263a3212264cb746f456d55168 -Author: Niels Provos -Date: Fri Sep 9 06:56:12 2005 +0000 - - make it compile on mac os x - - - svn:r183 - -commit 3b9b3f6b7e7325c380bddec6ff86e1ead63dd582 -Author: Niels Provos -Date: Fri Sep 2 05:34:14 2005 +0000 - - don't spam on stderr - - - svn:r182 - -commit acafd9942f4829205229b80ee32f1c3edfc071a6 -Author: Niels Provos -Date: Fri Sep 2 05:34:01 2005 +0000 - - make it run on older shells; from tor user via Nick Mathewson - - - svn:r181 - -commit 7000fe664d16094741e6e6728f7998a2c45b7eb2 -Author: Niels Provos -Date: Tue Aug 30 06:02:09 2005 +0000 - - remove dos opportunity - - - svn:r180 - -commit 5c5145dc1ca44fab0e6f543dbb2cbf95583e0bbf -Author: Niels Provos -Date: Mon Aug 29 07:23:51 2005 +0000 - - oops forgot this one - - - svn:r179 - -commit b4ab56dc045e2d8a04600a8579e35b52532d3859 -Author: Niels Provos -Date: Sun Aug 28 23:48:16 2005 +0000 - - support for arrays on structs. - - - svn:r178 - -commit 32acc283c8ae44d9c4e306dbaf6a9fead5e71952 -Author: Niels Provos -Date: Sat Aug 27 06:29:52 2005 +0000 - - a few more bug fixes - - - svn:r177 - -commit 2813f1b0f14967cabb0c59fc44518670f38bec37 -Author: Niels Provos -Date: Fri Aug 26 02:15:54 2005 +0000 - - constify - - - svn:r176 - -commit aaf56fb61e0a8f2299e758f44cac93ba60cd9807 -Author: Niels Provos -Date: Tue Aug 23 07:43:11 2005 +0000 - - fix API problems for get in some types - - - svn:r175 - -commit 6e55da606ced033562be6d8a023b89c6ca484c4b -Author: Niels Provos -Date: Mon Aug 22 01:39:54 2005 +0000 - - typo - - - svn:r174 - -commit e5ab86a726c26fc775589182d4290603df7e12d3 -Author: Niels Provos -Date: Mon Aug 22 01:38:23 2005 +0000 - - make use of the built in warn/err code - - - svn:r173 - -commit c4e60994a2cf955908f236b4945ea7288950ec45 -Author: Niels Provos -Date: Mon Aug 22 01:34:34 2005 +0000 - - including the tagging code that is required by event_rpcgen.py; test the - new functionality. - - - svn:r172 - -commit 949cbd12fa314a1d0f4296985cdfaa6ec63e960b -Author: Niels Provos -Date: Sun Aug 21 16:25:02 2005 +0000 - - generate marshalling code based on libevent - - - svn:r171 - -commit fbee901e2326effd07d8c29f07621148648c17a7 -Author: Niels Provos -Date: Thu Jul 14 04:09:55 2005 +0000 - - correctly test against SIG_ERR - - - svn:r170 - -commit e1759c7bbde90093709b70020fadc8a9f90416d5 -Author: Niels Provos -Date: Sun Jun 19 20:28:20 2005 +0000 - - fix issue with signedness warnings; from Alexander von Gernler - - - svn:r169 - -commit 9938aaf5114110c60a8a4f59866be3de5cd88c48 -Author: Niels Provos -Date: Sat Jun 11 21:15:22 2005 +0000 - - treate EINVAL as per fd error in kqueue; use argument for debug macros in - poll; version 1.1a; EINVAL fix from Nick Mathewson - - - svn:r168 - -commit 81bd0a0687f1350f5d1a427ca2ed5858fcfa3af4 -Author: Niels Provos -Date: Fri Jun 10 07:42:14 2005 +0000 - - bufferevents would not correctly detect EOF on read; reported by - Jonathan Brannan - - - svn:r167 - -commit 7a0c530b5645ea0b50e7524eae9ddab170293a18 -Author: Niels Provos -Date: Wed May 11 04:08:51 2005 +0000 - - performance improvements of select handler by Nick Mathewson; I added - better recovery when memory allocation fails; something that needs to be - done for the poll improvements, too. - - - svn:r166 - -commit 57fafe6b5f9b416367f01e77540c7f72ae019c5d -Author: Niels Provos -Date: Wed May 11 03:34:42 2005 +0000 - - detect kqueue bug in Mac OS X 10.4; from Nick Mathewson - - - svn:r165 - -commit 145c11fd6d69b52f3549698a2084b9c32bdeabee -Author: Niels Provos -Date: Tue May 10 17:27:58 2005 +0000 - - more credits - - - svn:r164 - -commit dc816fdc7adeb3703b0ad548ce4023fd9714721b -Author: Niels Provos -Date: Tue May 10 17:27:11 2005 +0000 - - type; from Alexander von Gernler - - - svn:r163 - -commit cdcfae7fc1c2fe974094caef649ab9ba9a8f139a -Author: Niels Provos -Date: Tue May 10 08:14:39 2005 +0000 - - call epoll_ctl after changing our state table; in case that epoll_ctl fails - we need to make sure that the table is consistent. from William Ahern - - - svn:r162 - -commit c15db0349af138302a2749b5a80390941a428b6d -Author: Niels Provos -Date: Tue May 10 04:40:03 2005 +0000 - - performance improvements by Nick Mathewson; we modify the arrays directly - in poll_add and poll_del; some minor tweaks by me. earmark this as 1.0f - - - svn:r161 - -commit d6e56988a769f97653205f57d32bdd48091642b5 -Author: Niels Provos -Date: Tue May 10 04:16:17 2005 +0000 - - sync - - - svn:r160 - -commit e444040f3d4aa96f7e0e726fc9542f596910d938 -Author: Niels Provos -Date: Fri Apr 29 02:55:20 2005 +0000 - - fix rule that depended on obsolete libevent.a - - - svn:r159 - -commit 1585013558c04d7e366d8db260c0c1f102731e8c -Author: Niels Provos -Date: Tue Apr 26 15:48:42 2005 +0000 - - prototype addition; from Alexander von Gernler - - - svn:r158 - -commit dfe4e16e138a48c8593c03a5db0b9a67a83ddeb4 -Author: Niels Provos -Date: Tue Apr 26 07:17:42 2005 +0000 - - pointer arithmetic bug; from Nick Mathewson - - - svn:r157 - -commit 0f5b0389e54990972e36a062dd443d163f5d1edc -Author: Niels Provos -Date: Sat Apr 23 15:40:14 2005 +0000 - - fix memory leak; from Andrey Matveev - - - svn:r156 - -commit c09a817563b505a7ebe7b1ceb75e829a70d7ebb2 -Author: Niels Provos -Date: Sat Apr 23 03:03:28 2005 +0000 - - 1.0d - - - svn:r155 - -commit 425fc0d5747936ebe4af7f46571bab0e427cc243 -Author: Niels Provos -Date: Sat Apr 23 02:53:39 2005 +0000 - - provide a function to read lines from buffers; comes in handy for many - AscII protocols. - - - svn:r154 - -commit fdfa743ccc7466e0532411098ee1ad655dfe393b -Author: Niels Provos -Date: Sat Apr 23 02:48:49 2005 +0000 - - libtoolize; from Nick Mathewson - - - svn:r153 - -commit 0cce9a01d72b65a95175ff2b48868fc5d0cbc853 -Author: Niels Provos -Date: Sat Apr 23 02:48:27 2005 +0000 - - better comment - - - svn:r152 - -commit 2fa38549d7b33b94994894bcb6d696127bd946dc -Author: Niels Provos -Date: Sat Apr 23 02:40:26 2005 +0000 - - compress read and write events for the same file descriptor into on poll - descriptor; from Nick Mathewson plus bug fixes from me. - - - svn:r151 - -commit bca504e41cd146f39b1fdf749ee6ea3718c34f02 -Author: Niels Provos -Date: Sat Apr 23 02:38:30 2005 +0000 - - fix typos - - - svn:r150 - -commit 1d0d4bc66e96e9782db3c53dfea6ba41f1c3b944 -Author: Niels Provos -Date: Sun Apr 17 06:51:10 2005 +0000 - - make gotsig volatile. from Alexander von Gernler - - - svn:r149 - -commit 5e2ba12a89b47a0d075e51e526b57333e712fa0e -Author: Niels Provos -Date: Thu Apr 14 23:28:06 2005 +0000 - - fixes from alexander von gernler - - - svn:r148 - -commit bc2c695b7672490e320b28f602e8207ce2dd3cac -Author: Niels Provos -Date: Sun Apr 10 07:18:18 2005 +0000 - - type; set the priorities based on the correct base; reported by Vinh D. Lee - - - svn:r147 - -commit 6ba5e0d03ed6db885ceec5313e66e02c5aaa8db1 -Author: Niels Provos -Date: Sat Apr 9 03:32:11 2005 +0000 - - fix a windows bug; from nick mathewson - - - svn:r146 - -commit d47798be5a106177a7ce99b314878d8d77fa8a96 -Author: Niels Provos -Date: Thu Apr 7 03:35:56 2005 +0000 - - return error code when kqueue fails on a specific fd; from alexander von - gernler. - - - svn:r145 - -commit 8f0541af3e0c0126ad4b1997a102ca162d936355 -Author: Niels Provos -Date: Mon Apr 4 00:37:26 2005 +0000 - - forgot - - - svn:r144 - -commit 4157d33ee9456e4468ffc3ad1de3d6b6d6a43a8f -Author: Niels Provos -Date: Mon Apr 4 00:35:14 2005 +0000 - - acknowledgements and new version - - - svn:r143 - -commit bc9b24876b41077e567655ccbc6011f4be951f0d -Author: Niels Provos -Date: Mon Apr 4 00:10:17 2005 +0000 - - make it compile on solaris - - - svn:r142 - -commit 1e128e2d05888c86a2058ab5979607450c605c64 -Author: Niels Provos -Date: Sun Apr 3 07:46:27 2005 +0000 - - fix bug that broke poll/select stuff - - - svn:r141 - -commit 720f7fcc0d313af430d8a4ac1b4ed8e5bc53c5fc -Author: Niels Provos -Date: Sat Apr 2 08:43:55 2005 +0000 - - event_base_loop and some event logging fixes. - - - svn:r140 - -commit 32bed8f9b640757766937dec613ca9b1feb704a4 -Author: Niels Provos -Date: Fri Apr 1 04:20:39 2005 +0000 - - build fixes from nick mathewson - - - svn:r139 - -commit 1919a4aed60dc9c95aef10974dc6945f01832377 -Author: Niels Provos -Date: Thu Mar 31 19:53:06 2005 +0000 - - suppress valgrind warnings from knew -a- pimb.org - - - svn:r138 - -commit d85d47f8ca128f4b4f8b9cae1dfb2be5da0f4173 -Author: Niels Provos -Date: Tue Mar 29 07:16:52 2005 +0000 - - devpoll improvements from Andrew Danforth - - - svn:r137 - -commit fbdaf3ab6229f036c0561a347f06b7f913a2b165 -Author: Niels Provos -Date: Tue Mar 29 07:03:10 2005 +0000 - - debugging callbacks from Nick Mathewson - - - svn:r136 - -commit 99442c6f00c16502afa517e063ff15e20c00212a -Author: Niels Provos -Date: Tue Mar 29 06:54:36 2005 +0000 - - windows fixes from Nick Mathewson - - - svn:r135 - -commit da971e5fc81c86038bb99513e993171d9d5a0c43 -Author: Niels Provos -Date: Sat Mar 12 02:30:32 2005 +0000 - - bug fix in event_once by Jody Belka - - - svn:r134 - -commit c5e4eee03b7852754f7a843ee0f9350ef2579fcb -Author: Niels Provos -Date: Fri Feb 25 05:28:57 2005 +0000 - - event_get_version() and event_get_method() from - Nick Mathewson - - - svn:r133 - -commit a46c2609bfa4d68e78665dd55461af9b1ce9651b -Author: Niels Provos -Date: Tue Feb 22 16:12:34 2005 +0000 - - compilation fixes for IRIX; from Nick Mathewson - - - svn:r132 - -commit 905ee67d0032eb86e4de37878c45cc4bd67cda47 -Author: Niels Provos -Date: Tue Feb 22 15:47:53 2005 +0000 - - provide maintainer mode in automake; put event_gotsig back into global - state; return proper error code - - - svn:r131 - -commit 42b97958672d382435ed2db47468176e3518cb77 -Author: Niels Provos -Date: Fri Feb 4 11:17:18 2005 +0000 - - make it compile again; from dug song - - - svn:r130 - -commit 3ba224dbd5e5e482bb2be47fa704beff46540a28 -Author: Niels Provos -Date: Mon Jan 3 18:58:40 2005 +0000 - - fixes for threaded operations from Andrew Danforth - - - svn:r129 - -commit bd6999b4a2b60fdd4e2e317ca84d382f2b9b0ace -Author: Niels Provos -Date: Tue Dec 14 03:36:12 2004 +0000 - - fix issue where event_del is called before event_set. bad bad thing to do. - pointed out by Mark Kidwell - - - svn:r128 - -commit d9cf6fe2f16eae6d97251b905473aea4e57ed0c6 -Author: Niels Provos -Date: Sun Dec 5 22:16:35 2004 +0000 - - version 1.0 - - - svn:r127 - -commit cacd83983f20af59b9a137886131a63f834a06e9 -Author: Niels Provos -Date: Wed Dec 1 20:10:16 2004 +0000 - - documentation on thread safe events - - - svn:r126 - -commit 256460459e6e9a8358337f64b8080c6665f34c1a -Author: Niels Provos -Date: Wed Dec 1 20:04:54 2004 +0000 - - provide more base-based functions :-) - - - svn:r125 - -commit f5a62ed30e895fb622db889b24184851f8f7ea04 -Author: Niels Provos -Date: Wed Dec 1 19:59:00 2004 +0000 - - make a separate verify target - - - svn:r124 - -commit b011b734eb6cfe3ea15f926dbfa696a262d7cff7 -Author: Niels Provos -Date: Thu Nov 25 09:54:33 2004 +0000 - - forgot printf parameter - - - svn:r123 - -commit 8773c4c96c47078ee502030daef36078bc0e75a4 -Author: Niels Provos -Date: Thu Nov 25 09:50:18 2004 +0000 - - make libevent thread-safe; first cut - - - svn:r122 - -commit 96a25ae6a2d4f63f1df483cd3d49b779175031b0 -Author: Niels Provos -Date: Sun Sep 19 22:38:34 2004 +0000 - - when converting usec to msec round up; so that libevent does not spin until - the time conversion has caught up; from Aaron Hopkins - - - svn:r121 - -commit fa6c304d9e11982058ea8fc1b6f970924c599f52 -Author: Niels Provos -Date: Sun Sep 19 21:08:09 2004 +0000 - - support for event priorities; active events are scheduled into priority queues; - lower priorities get always processed before higher priorities - - - svn:r120 - -commit 6df2ede5f5e2b3db8c2647327274e83cc485600b -Author: Niels Provos -Date: Tue Aug 10 18:29:37 2004 +0000 - - close file descriptors on exec(); suggested by aaron at die.net - - - svn:r119 - -commit 6d4bafd03c84b03b1f904ca466ac2ac173a9626f -Author: Niels Provos -Date: Tue Aug 10 17:49:53 2004 +0000 - - work around a bug in Solaris by using pwrite instead of write; reported by - michael.wookey at citrix.com.au - - - svn:r118 - -commit 60216e8b1d3cad7992923335fbdb21446386d476 -Author: Niels Provos -Date: Fri Jul 30 05:15:59 2004 +0000 - - mention devpoll - - - svn:r117 - -commit 5de7f4eea5d629b27359897a351ebae1c484a426 -Author: Niels Provos -Date: Fri Jul 30 05:04:36 2004 +0000 - - devpoll support. weeh - - - svn:r116 - -commit 98c14269929187c1abab83737a15e19d92a74b78 -Author: Niels Provos -Date: Fri Jul 30 05:03:55 2004 +0000 - - fix compiler warning - - - svn:r115 - -commit d829ccea3d25ce1f7ec4514d1735c26182b3beff -Author: Niels Provos -Date: Fri Jul 30 05:00:44 2004 +0000 - - fix a warning on freebsd; - - - svn:r114 - -commit 06aaa92fe298e376d432947c6eef9ddabfd5faec -Author: Niels Provos -Date: Fri Jul 30 04:57:21 2004 +0000 - - devpoll support - - - svn:r113 - -commit 6f2f98bd26a04476387e26132fd3ef406b387981 -Author: Niels Provos -Date: Tue Jul 20 06:12:30 2004 +0000 - - make it compile on solaris - - - svn:r112 - -commit 6db3da27e2ef340b7547db2be0c0559d410575c2 -Author: Niels Provos -Date: Mon Jul 19 06:18:10 2004 +0000 - - should work a little bit better with solaris compiler - - - svn:r111 - -commit 44d88ea6068f5926f8d04b837819216235a7779d -Author: Niels Provos -Date: Tue Jul 13 08:02:45 2004 +0000 - - change evbuffer_read so that it reads directly into the memory allocated to - the evbuffer; this avoids one unnecessary data copy. - - - svn:r110 - -commit ee739151a155d358edc48c4ddf88a63b9e0132f0 -Author: Niels Provos -Date: Tue Jul 13 08:01:05 2004 +0000 - - make the sockets non-blocking; increase the data size for bufferevent - testing - - - svn:r109 - -commit a78472da72d9b3ac765997a9ce1dba7cca436618 -Author: Niels Provos -Date: Tue Jul 13 07:55:01 2004 +0000 - - fix a bug for persistent events when using select() - - - svn:r108 - -commit de5fc61928cd202ef35c860039ab16000b89fd5b -Author: Niels Provos -Date: Fri Jun 11 04:42:56 2004 +0000 - - make it compile on systems without vasprintf - - - svn:r107 - -commit 49dbb7ea4c0938da3c5a0a531030452e6a8b400b -Author: Niels Provos -Date: Fri Jun 11 04:39:11 2004 +0000 - - reformat comment - - - svn:r106 - -commit 025d1bc2206c5b7edb2fb0c2ad58e7322f4b8b4d -Author: Niels Provos -Date: Mon May 24 00:19:52 2004 +0000 - - fix some of the windows compile issues; make buffer.c faster; support - signals via pipes. - - - svn:r105 - -commit 849d5249120e6d6c95b655672900b1381d8f7613 -Author: Niels Provos -Date: Tue Apr 13 06:22:48 2004 +0000 - - license - - - svn:r104 - -commit 24ffe1cb5571506e1b9ae212ef1b17b45a7ea396 -Author: Niels Provos -Date: Sun Apr 4 04:04:16 2004 +0000 - - add a section about BUGS - - - svn:r103 - -commit 8f2e1f6d3ac14c67d38c86edfd8efb50d83039a0 -Author: Niels Provos -Date: Sun Apr 4 03:59:22 2004 +0000 - - add section about buffered events - - - svn:r102 - -commit fbf01c7f044f143046df7b9c566b5f49770ba0cb -Author: Niels Provos -Date: Sun Apr 4 02:20:21 2004 +0000 - - support for low and high watermarks - - - svn:r101 - -commit 3772ec8e95d2c5eed60ff37024fe2ab04326b0ec -Author: Niels Provos -Date: Sun Apr 4 02:19:52 2004 +0000 - - add new functions - - - svn:r100 - -commit 8f7a7a910c4b940e3bac0923df6661d6eada619a -Author: Niels Provos -Date: Sun Apr 4 02:19:39 2004 +0000 - - version 0.8 - - - svn:r99 - -commit 57a51a161dd9a453bc1abf2ffa9b6149d1ce9ae2 -Author: Niels Provos -Date: Sun Apr 4 02:19:08 2004 +0000 - - provide more regression tests - - - svn:r98 - -commit 85fbdbb243a17da6fb804b14a4782d2795889c82 -Author: Niels Provos -Date: Sat Mar 27 17:42:49 2004 +0000 - - faster insertion of timeouts; ensure uniqueness in RB-tree compare function - - - svn:r97 - -commit 246d8583c08dc31d70479d538c8b1f4056f49c43 -Author: Niels Provos -Date: Tue Mar 23 04:05:37 2004 +0000 - - allow the write callback to called even if there is no buffered data - - - svn:r96 - -commit 5908bd721368a9aebc752fffbe6ec5b753ed7e3a -Author: Niels Provos -Date: Tue Mar 23 03:43:53 2004 +0000 - - provided buffered events - - - svn:r95 - -commit cd699abf44d6da49dffff09f72f843bbb0211aae -Author: Niels Provos -Date: Mon Mar 22 21:46:45 2004 +0000 - - support event_loopexit(); idea from marius; and fix event_once() - - - svn:r94 - -commit ec2c1db47e2931fc4be55f9653b3b4182d674cc7 -Author: Niels Provos -Date: Sun Feb 22 21:17:23 2004 +0000 - - new event_once interface; start of buffering interface for buffered events - - - svn:r93 - -commit 1b974101b9617b0fdceac534e7e0fd73ab6c90d8 -Author: Niels Provos -Date: Sat Dec 20 20:05:17 2003 +0000 - - fix kqueue behaviour; requires special kernel patch to make kqueue - semantics consistent; from marius@umich.edu - - - svn:r92 - -commit 8a92823c67843cf7ab8f7735adc3aac5dcd4b9c8 -Author: Niels Provos -Date: Sat Oct 25 21:59:24 2003 +0000 - - make rtsig optional - - - svn:r91 - -commit e1cd86d73e9959f50fa24ac39dbb6cea9a14b386 -Author: Niels Provos -Date: Sat Oct 25 21:58:33 2003 +0000 - - fixes to handle error cases by Anatoly Vorobey at pobox.com - - - svn:r90 - -commit d780375fc486b189c64c13e5cf6bd5e0559bde61 -Author: Niels Provos -Date: Sat Oct 25 21:49:44 2003 +0000 - - fix source files - - - svn:r89 - -commit e2f06f4f6a6b76e217cb290a6d47918521da6f1e -Author: Niels Provos -Date: Sat Oct 25 21:49:25 2003 +0000 - - fix license - - - svn:r88 - -commit e9cd9b56a3fbf5f19f5f241c730666c7f3d89bcd -Author: Niels Provos -Date: Sat Oct 11 02:54:41 2003 +0000 - - bad realloc; found by awohl at chessclub - - - svn:r87 - -commit 1d66008bbf3ce97ec23e7193cb4daefda06d1955 -Author: Niels Provos -Date: Sun Oct 5 22:02:49 2003 +0000 - - make it work with more shells - - - svn:r86 - -commit 98af43a351fe571c5d562a8c63de5b3839a0e897 -Author: Niels Provos -Date: Sat Oct 4 23:33:04 2003 +0000 - - 3-clause license and changes to the benchmark by davide - - - svn:r85 - -commit c3f496c71b598194ee9efe74906ecfe57155678b -Author: Niels Provos -Date: Sat Oct 4 23:27:26 2003 +0000 - - minor corrections; change license to 3-clause BSD license - - - svn:r84 - -commit 763f6a77307f0ff66755f1e0732cb9f7cf3b43c3 -Author: Niels Provos -Date: Thu Sep 25 23:18:52 2003 +0000 - - proper rtsig - - - svn:r83 - -commit f08bf5325eb9bb2afa3b68f629a69de59920406b -Author: Niels Provos -Date: Thu Sep 25 23:07:09 2003 +0000 - - fix poll hup support - - - svn:r82 - -commit ec70653b61cdf20f4640a9e3d445a2f77c63e738 -Author: Niels Provos -Date: Thu Sep 25 17:55:17 2003 +0000 - - more tests - - - svn:r81 - -commit c61a2547e26d073d8acf7b9503d9633bbadb3c48 -Author: Niels Provos -Date: Thu Sep 25 03:30:49 2003 +0000 - - __FUNCTION__ -> __func__ - - - svn:r80 - -commit 9d26a46c39b312985988c849f519d330b1177405 -Author: Niels Provos -Date: Thu Sep 25 03:29:37 2003 +0000 - - windows support - - - svn:r79 - -commit e0216ed7096c05356fb18f394dcf454a6314d036 -Author: Niels Provos -Date: Thu Sep 25 03:28:43 2003 +0000 - - credits - - - svn:r78 - -commit e506eaf79e11f34a15efa8d91aab883d7dff3160 -Author: Niels Provos -Date: Thu Sep 25 03:26:53 2003 +0000 - - constify; some windows stuff by mike davis; fix a poll bug - - - svn:r77 - -commit dd0b36ab03d0fd966f694f5152220987d84b2c5d -Author: Niels Provos -Date: Thu Sep 25 03:25:17 2003 +0000 - - update build stuff - - - svn:r76 - -commit 2bf53326c06f0ddee544e64c9281192253767aac -Author: Niels Provos -Date: Thu Sep 25 02:53:39 2003 +0000 - - Real time signal support from Taral - - - svn:r75 - -commit ee8cc84e9f4d3a5d5b9f4d7e67e9c2f2b2adf037 -Author: Niels Provos -Date: Tue Sep 23 22:28:01 2003 +0000 - - Windows support from Mike Davis - - - svn:r74 - -commit cde427c1ecd987401f4407fef4d87bc4d77633e2 -Author: Niels Provos -Date: Tue Jun 24 14:45:21 2003 +0000 - - found a bug where specifying both read|write for a single event let to - a crash; found by Bruno Achauer - - - svn:r73 - -commit 6ce5b876ea564782600a92ef482485f60d5ae5d5 -Author: Niels Provos -Date: Thu Jun 12 23:33:19 2003 +0000 - - clean up from NetBSD integration - - - svn:r72 - -commit 6551780aefb8f0a8b4d41dc5641b136338fbb2d8 -Author: Niels Provos -Date: Mon Jun 2 19:37:13 2003 +0000 - - bug fix from Ira Lee - - - svn:r71 - -commit 6809f060b2ab9172e0a71cf17b7f4cbdae4be514 -Author: Niels Provos -Date: Mon Jun 2 19:36:52 2003 +0000 - - bug fix from Pierre Phaneuf - - - svn:r70 - -commit b6b1e4ebe9c463767a37eb882a56b359d7251614 -Author: Niels Provos -Date: Mon Jun 2 19:36:22 2003 +0000 - - forgot - - - svn:r69 - -commit 833f0c095d50627b38451de9e887aab07e8464b9 -Author: Niels Provos -Date: Wed Apr 30 19:23:27 2003 +0000 - - fix a bug where a event fires twice due to bad active list handling - - - svn:r68 - -commit bdf5a68b95d61051687507abe29349494c3fcc18 -Author: Niels Provos -Date: Tue Apr 29 18:29:16 2003 +0000 - - updated tree code - - - svn:r67 - -commit 670b94e479791707584b38f8473b51ca4fc11569 -Author: Niels Provos -Date: Mon Apr 14 17:32:19 2003 +0000 - - version 0.7 - - - svn:r66 - -commit f9e0c44925d28fd719cd96b7b64927d5af4857a0 -Author: Niels Provos -Date: Thu Apr 10 19:14:03 2003 +0000 - - if a timeout on the active list is rescheduled before it can execute it - gets removed from the active list; bug report from Jon Poland AT arbor.net - - - svn:r65 - -commit 30eff294f0d0c469b762db95f2a21f6b3eee1f9d -Author: Niels Provos -Date: Wed Apr 9 18:16:07 2003 +0000 - - document environment variables - - - svn:r64 - -commit b0b72eb05eb1567ddd56bfafbc056a535c97b728 -Author: Niels Provos -Date: Wed Apr 9 18:12:11 2003 +0000 - - use maximum number of fds for epoll_create; from Davide Libenzi - - - svn:r63 - -commit 9eb31e5307cab71aa5ede2f835b3e388061c0457 -Author: Niels Provos -Date: Wed Apr 9 18:11:31 2003 +0000 - - proper indent - - - svn:r62 - -commit 7e4e52045e898f2f5bc3412582140e04c30da805 -Author: Niels Provos -Date: Wed Apr 9 18:11:06 2003 +0000 - - add some timer macros for operating systems that dont support them - - - svn:r61 - -commit 04153adb66e1456de3efad0e9ce183e57f99b47d -Author: Niels Provos -Date: Sun Mar 30 20:19:07 2003 +0000 - - EVENT_SHOW_METHOD environment prints which event mechanism we are using; - from Davide Libenzi - - - svn:r60 - -commit 012a0b53e1b4f3136f3b08ba0742e71b48fadc32 -Author: Niels Provos -Date: Mon Mar 10 05:39:41 2003 +0000 - - add benchmark - - - svn:r59 - -commit 1ed00256d50d5ea4a04e9a864664a4d40aedf23f -Author: Niels Provos -Date: Mon Mar 10 05:13:02 2003 +0000 - - fix type - - - svn:r58 - -commit ebb73c0db86a39d3aba49f3c5a174f562ce82a8e -Author: Niels Provos -Date: Mon Mar 10 04:56:41 2003 +0000 - - simple bench mark - - - svn:r57 - -commit 34d794b293a7103a77cf8bfb78a8af90484b4dad -Author: Niels Provos -Date: Sun Mar 9 23:29:57 2003 +0000 - - some cleanup - - - svn:r56 - -commit d5009e8ad6787274337673b0bb75a566a5dfef2e -Author: Niels Provos -Date: Sun Mar 9 23:29:26 2003 +0000 - - -g - - - svn:r55 - -commit eb646205bdb48129d1fbcdfda657331a64dd8fc3 -Author: Niels Provos -Date: Sun Mar 9 23:29:04 2003 +0000 - - style - - - svn:r54 - -commit adf0bb84cde497f7ae6c4e4af73be0d5fff720bb -Author: Niels Provos -Date: Sat Mar 8 20:14:39 2003 +0000 - - another test - - - svn:r53 - -commit 28d248e0067fb91917ab5e60633e71687974a6ed -Author: Niels Provos -Date: Sat Mar 8 16:50:27 2003 +0000 - - copyright - - - svn:r52 - -commit c48e71d839977ced6aff4eb52ca7e01f7d410d83 -Author: Niels Provos -Date: Sat Mar 8 16:44:51 2003 +0000 - - oneshot means that its removed from the kernel list already - - - svn:r51 - -commit 0036d79ab6d7663618c76ca49ca5173b2ab4424a -Author: Niels Provos -Date: Sat Mar 8 16:33:18 2003 +0000 - - fix kqueue problem - - - svn:r50 - -commit 33b1c6c4745a769c1d14454d1f22e378757fe80f -Author: Niels Provos -Date: Sat Mar 8 14:44:08 2003 +0000 - - include config.h - - - svn:r49 - -commit 251c7f6808fc0ab338e1e03402fb043a7670f2e0 -Author: Niels Provos -Date: Sat Mar 8 14:41:00 2003 +0000 - - sync - - - svn:r48 - -commit 481799afd2d4b3161d97399a67f219bb33f17b84 -Author: Niels Provos -Date: Sat Mar 8 14:21:14 2003 +0000 - - add persist test - - - svn:r47 - -commit bedded8230ff24d96629f912ee8ab659e1bfa6b5 -Author: Niels Provos -Date: Sat Mar 8 06:39:30 2003 +0000 - - more comprehensive regression test - - - svn:r46 - -commit cde7a3528d38baf89b1c1022191397904bec9ed0 -Author: Niels Provos -Date: Sat Mar 8 06:37:56 2003 +0000 - - fix signal usage - - - svn:r45 - -commit ea1d95d2fb03801de52ab3a369bad87c8eb3b132 -Author: Niels Provos -Date: Sat Mar 8 05:24:26 2003 +0000 - - automake-ify test dir, too - - - svn:r44 - -commit 71e513296d99948e350e68bd0885af73c0bc7c6a -Author: Niels Provos -Date: Fri Mar 7 23:21:01 2003 +0000 - - check for linux eventpoll - - - svn:r43 - -commit 3e41f17afacd87c3bf0a48adc395c3f7e4b7d8bf -Author: Niels Provos -Date: Fri Mar 7 23:20:36 2003 +0000 - - support for Linux eventpoll mechanism - - - svn:r42 - -commit 01a932fe1fd385fdb961efdbac991dd4b481fc49 -Author: Niels Provos -Date: Fri Mar 7 23:19:05 2003 +0000 - - fix signal usage - - - svn:r41 - -commit e72dff13d9ecfee512aa03bfcbdba39ea84bde48 -Author: Niels Provos -Date: Sat Mar 1 20:31:28 2003 +0000 - - replace references to __FUNCTION__ with __func__ - - - svn:r40 - -commit 3c2916aa1318bfd9f5031ddd34f5fa3326d685da -Author: Niels Provos -Date: Sat Mar 1 19:48:05 2003 +0000 - - ifdef config.h - - - svn:r39 - -commit b5b585c1f9a13577e28549436bb7b95c0c427f6b -Author: Niels Provos -Date: Sat Mar 1 19:46:27 2003 +0000 - - support disabling of event mechanisms via the environment; error out - if no event mechanism is available - - - svn:r38 - -commit b3d1c6a854e10d00bd79403ccd2f1b6790512f81 -Author: Niels Provos -Date: Fri Feb 28 22:38:30 2003 +0000 - - support poll(2) and split out the signal handling - - - svn:r37 - -commit ac44ddda99627b82012db5b0c097bb9aa9dd9703 -Author: Niels Provos -Date: Mon Oct 7 17:56:25 2002 +0000 - - grammar from jsyn@nthought.com - - - svn:r36 - -commit 9d2401fffcc6694bb59a2ac42c338ff943cb073a -Author: Niels Provos -Date: Mon Oct 7 00:47:34 2002 +0000 - - portability fixes from marius@umich.edu. - - - svn:r35 - -commit acf7a8e321a482434f9e179528a554018a1e6ca9 -Author: Niels Provos -Date: Sun Sep 15 19:01:42 2002 +0000 - - version 0.6 - - - svn:r34 - -commit 2ccd77d4778f4b8a00ee18c121c392253523a8fe -Author: Niels Provos -Date: Sun Sep 15 18:55:21 2002 +0000 - - test timeouts - - - svn:r33 - -commit e0ca1ef203a00670c7863d0981c5c07fd96adee5 -Author: Niels Provos -Date: Sun Sep 15 18:52:28 2002 +0000 - - signal fixes from ericj@monkey.org via dugsong@monkey.org - - - svn:r32 - -commit eb15f4d86639b37362e19564b536661661aba091 -Author: Niels Provos -Date: Sun Sep 8 02:46:44 2002 +0000 - - fix from marius@umich.edu - - - svn:r31 - -commit f1cf632254f290b88120b49b12108a9d4b6e73ac -Author: Niels Provos -Date: Fri Sep 6 17:13:08 2002 +0000 - - add timeout_ defines back for backward compatibility. - - - svn:r30 - -commit 5f8658582ec1ee084e1f1a9da6c9d0a0f40ac9b5 -Author: Niels Provos -Date: Fri Jul 26 14:45:50 2002 +0000 - - sync with openbsd; API change: timeout_ is now evtimer_ - - - svn:r29 - -commit 8bb9fd5842dea6af0893e68db0c093103a3db391 -Author: Niels Provos -Date: Thu Jun 13 01:58:34 2002 +0000 - - version 0.5 - - - svn:r28 - -commit 3821c7e2015e95f7b6479fe94c15940186db9017 -Author: Niels Provos -Date: Thu Jun 13 01:54:07 2002 +0000 - - make kqueue signal callback work with sigchld. cast and better timeout. - - - svn:r27 - -commit 484e594e5cee77a4fc7b5c3c70809a8ae5aa9784 -Author: Niels Provos -Date: Tue Jun 11 18:38:37 2002 +0000 - - make kqueue work for callbacks that use both read and write events - simultaneously - - - svn:r26 - -commit 3107493c971bc11e09649a448282331f697dfb78 -Author: Niels Provos -Date: Mon May 20 21:51:53 2002 +0000 - - signal fix from dugsong@monkey.org - - - svn:r25 - -commit cc32570a080e176def54ab37bcb74df4c803babc -Author: Niels Provos -Date: Mon May 20 21:47:04 2002 +0000 - - updating a timeout might corrupt RB tree. Remove before changing time. - - - svn:r24 - -commit 4ec4cddecee9100da65c4f7874fbb36ae5ec31ba -Author: Niels Provos -Date: Wed Apr 17 02:07:31 2002 +0000 - - forgot to initialize elements - - - svn:r23 - -commit dcf6cbe45d2652df57b173be65e6d712f6bcdc25 -Author: Niels Provos -Date: Tue Apr 16 14:09:21 2002 +0000 - - correct date - - - svn:r22 - -commit 409fcdd2fa94d25719af65e8a1c5f78c8a22f717 -Author: Niels Provos -Date: Wed Apr 10 14:48:31 2002 +0000 - - remove queue.h include - - - svn:r21 - -commit 59137c119f9deaca9244811040aa3fee2f7b293c -Author: Niels Provos -Date: Wed Apr 10 03:15:19 2002 +0000 - - deal correctly with deleting an event, now that we allow multiple callbacks - for signal delivery. - - - svn:r20 - -commit 06630e311655f1fde0f9d7fb42a197340caaa133 -Author: Niels Provos -Date: Wed Apr 10 02:20:26 2002 +0000 - - describe signal_* - - - svn:r19 - -commit d10f85dbce67c2835eb09c712da691a46d319aac -Author: Niels Provos -Date: Wed Apr 10 02:10:47 2002 +0000 - - signal support for kqueue; support of EV_PERSIST flag to event_set - - - svn:r18 - -commit b855bc55000e64d0adb12822fcf8b8117e8f3309 -Author: Niels Provos -Date: Wed Apr 10 00:31:31 2002 +0000 - - initial support for signals (only for select now) based on code from - Dug Song - - - svn:r17 - -commit dbaa408ea5bbbdeeb60bd2bd69b6c7ec93fa0177 -Author: Niels Provos -Date: Tue Apr 9 19:30:22 2002 +0000 - - port to solaris - - - svn:r16 - -commit db48ac015458237170e27952cc62cdb99cc7a336 -Author: Niels Provos -Date: Tue Apr 9 19:21:39 2002 +0000 - - change includes - - - svn:r15 - -commit 361c1cc0b7f9d78bc86bb3af699a8127c079061d -Author: Niels Provos -Date: Tue Apr 9 19:09:32 2002 +0000 - - add compat dir to includes - - - svn:r14 - -commit 409c7ff72d121a6b8673ea6ebe053413038628d4 -Author: Niels Provos -Date: Tue Apr 9 19:06:18 2002 +0000 - - another one - - - svn:r13 - -commit abef3b7e64539f82ceac9bbe145aa3ffef2a3db8 -Author: Niels Provos -Date: Tue Apr 9 19:03:24 2002 +0000 - - one more file required by automake - - - svn:r12 - -commit 4cbc77da52f7fbf34cff95e3c52edd7515df9c69 -Author: Niels Provos -Date: Tue Apr 9 17:52:23 2002 +0000 - - missing files - - - svn:r11 - -commit 5b27aa0323a4c51442ce040dcfe5844d0b39ad92 -Author: Niels Provos -Date: Tue Apr 9 17:42:15 2002 +0000 - - further automake conversion - - - svn:r10 - -commit 6c6c936bcbfb3e83599e5fef96e59dc5c6326094 -Author: Niels Provos -Date: Tue Apr 9 17:02:38 2002 +0000 - - change to automake - - - svn:r9 - -commit 61cb68467cff31416295b3e548a3061a3a42e45c -Author: Niels Provos -Date: Tue Apr 9 16:35:06 2002 +0000 - - move stuff - - - svn:r8 - -commit e99653d0286249761e688782cdbba46209f10930 -Author: Niels Provos -Date: Tue Apr 9 15:29:12 2002 +0000 - - type - - - svn:r7 - -commit aa6567fe6475d3230c7c745a7ca208735af0c331 -Author: Niels Provos -Date: Tue Apr 9 15:14:06 2002 +0000 - - Initial revision - - - svn:r2 diff --git a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/evconfig-private.h b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/evconfig-private.h deleted file mode 100644 index 97c8cd53c414..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/evconfig-private.h +++ /dev/null @@ -1,8 +0,0 @@ -/* $NetBSD: evconfig-private.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ - -#if !defined(EVENT_EVCONFIG__PRIVATE_H_) && !defined(__MINGW32__) -#define EVENT_EVCONFIG__PRIVATE_H_ - -/* Nothing to see here. Move along. */ - -#endif diff --git a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/event2/event-config.h b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/event2/event-config.h deleted file mode 100644 index 0be900b53a52..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/event2/event-config.h +++ /dev/null @@ -1,365 +0,0 @@ -/* $NetBSD: event-config.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ - -/* event2/event-config.h - * - * This file was generated by autoconf when libevent was built, and post- - * processed by Libevent so that its macros would have a uniform prefix. - * - * DO NOT EDIT THIS FILE. - * - * Do not rely on macros in this file existing in later versions. - */ -#ifndef EVENT_CONFIG_H__ -#define EVENT_CONFIG_H__ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define if libevent should not allow replacing the mm functions */ -/* #undef EVENT__DISABLE_MM_REPLACEMENT */ - -/* Define if libevent should not be compiled with thread support */ -/* #undef EVENT__DISABLE_THREAD_SUPPORT */ - -/* Define if clock_gettime is available in libc */ -/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */ - -/* Define is no secure id variant is available */ -/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */ -#define EVENT_DNS_USE_FTIME_FOR_ID_ 1 - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_ARPA_INET_H */ - -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef EVENT__HAVE_CLOCK_GETTIME */ - -/* Define if /dev/poll is available */ -/* #undef EVENT__HAVE_DEVPOLL */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_DLFCN_H */ - -/* Define if your system supports the epoll system calls */ -/* #undef EVENT__HAVE_EPOLL */ - -/* Define to 1 if you have the `epoll_ctl' function. */ -/* #undef EVENT__HAVE_EPOLL_CTL */ - -/* Define to 1 if you have the `eventfd' function. */ -/* #undef EVENT__HAVE_EVENTFD */ - -/* Define if your system supports event ports */ -/* #undef EVENT__HAVE_EVENT_PORTS */ - -/* Define to 1 if you have the `fcntl' function. */ -/* #undef EVENT__HAVE_FCNTL */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define EVENT__HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `getnameinfo' function. */ -#define EVENT__HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `getprotobynumber' function. */ -#define EVENT__HAVE_GETPROTOBYNUMBER 1 - -/* Define to 1 if you have the `getservbyname' function. */ -#define EVENT__HAVE_GETSERVBYNAME 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #define EVENT__HAVE_GETTIMEOFDAY 1 */ - -/* Define to 1 if you have the `inet_aton' function. */ -/* #undef EVENT__HAVE_INET_ATON */ - -/* Define to 1 if you have the `inet_ntop' function. */ -/* #undef EVENT__HAVE_INET_NTOP */ - -/* Define to 1 if you have the `inet_pton' function. */ -/* #undef EVENT__HAVE_INET_PTON */ - -/* Define to 1 if you have the header file. */ -/* #define EVENT__HAVE_INTTYPES_H 1 */ - -/* Define to 1 if you have the `kqueue' function. */ -/* #undef EVENT__HAVE_KQUEUE */ - -/* Define if the system has zlib */ -/* #undef EVENT__HAVE_LIBZ */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mmap' function. */ -/* #undef EVENT__HAVE_MMAP */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_NETINET_IN6_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_NETINET_IN_H */ - -/* Define to 1 if you have the `pipe' function. */ -/* #undef EVENT__HAVE_PIPE */ - -/* Define to 1 if you have the `poll' function. */ -/* #undef EVENT__HAVE_POLL */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_POLL_H */ - -/* Define to 1 if you have the `port_create' function. */ -/* #undef EVENT__HAVE_PORT_CREATE */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_PORT_H */ - -/* Define if you have POSIX threads libraries and header files. */ -/* #undef EVENT__HAVE_PTHREAD */ - -/* Define if we have pthreads on this system */ -/* #undef EVENT__HAVE_PTHREADS */ - -/* Define to 1 if the system has the type `sa_family_t'. */ -/* #undef EVENT__HAVE_SA_FAMILY_T */ - -/* Define to 1 if you have the `select' function. */ -/* #undef EVENT__HAVE_SELECT */ - -/* Define to 1 if you have the `sendfile' function. */ -/* #undef EVENT__HAVE_SENDFILE */ - -/* Define if F_SETFD is defined in */ -/* #undef EVENT__HAVE_SETFD */ - -/* Define to 1 if you have the `sigaction' function. */ -/* #undef EVENT__HAVE_SIGACTION */ - -/* Define to 1 if you have the `signal' function. */ -#define EVENT__HAVE_SIGNAL 1 - -/* Define to 1 if you have the `splice' function. */ -/* #undef EVENT__HAVE_SPLICE */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_STDARG_H 1 - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -/* #define EVENT__HAVE_STDINT_H 1 */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_STRING_H 1 - -/* Define to 1 if you have the `strlcpy' function. */ -/* #undef EVENT__HAVE_STRLCPY */ - -/* Define to 1 if you have the `strsep' function. */ -/* #undef EVENT__HAVE_STRSEP */ - -/* Define to 1 if you have the `strtok_r' function. */ -/* #undef EVENT__HAVE_STRTOK_R */ - -/* Define to 1 if you have the `strtoll' function. */ -/* #define EVENT__HAVE_STRTOLL 1 */ - -#define EVENT__HAVE_STRUCT_ADDRINFO 1 - -/* Define to 1 if the system has the type `struct in6_addr'. */ -#define EVENT__HAVE_STRUCT_IN6_ADDR 1 - -/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */ -#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1 - -/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */ -#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1 - -/* Define to 1 if the system has the type `struct sockaddr_in6'. */ -#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1 - -/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */ -/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN */ - -/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */ -/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */ - -/* Define to 1 if the system has the type `struct sockaddr_storage'. */ -#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1 - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_DEVPOLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_EPOLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_EVENTFD_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_EVENT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file. */ -/* #define EVENT__HAVE_SYS_PARAM_H 1 */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_QUEUE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_SELECT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_SENDFILE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_SOCKET_H */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #define EVENT__HAVE_SYS_TIME_H 1 */ - -/* Define to 1 if you have the header file. */ -#define EVENT__HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef EVENT__HAVE_SYS_UIO_H */ - -/* Define if TAILQ_FOREACH is defined in */ -/* #undef EVENT__HAVE_TAILQFOREACH */ - -/* Define if timeradd is defined in */ -/* #undef EVENT__HAVE_TIMERADD */ - -/* Define if timerclear is defined in */ -#define EVENT__HAVE_TIMERCLEAR 1 - -/* Define if timercmp is defined in */ -#define EVENT__HAVE_TIMERCMP 1 - -/* Define if timerisset is defined in */ -#define EVENT__HAVE_TIMERISSET 1 - -/* Define to 1 if the system has the type `uint16_t'. */ -/* #define EVENT__HAVE_UINT16_T 1 */ - -/* Define to 1 if the system has the type `uint32_t'. */ -/* #define EVENT__HAVE_UINT32_T 1 */ - -/* Define to 1 if the system has the type `uint64_t'. */ -/* #define EVENT__HAVE_UINT64_T 1 */ - -/* Define to 1 if the system has the type `uint8_t'. */ -/* #define EVENT__HAVE_UINT8_T 1 */ - -/* Define to 1 if you have the header file. */ -/* #define EVENT__HAVE_UNISTD_H 1 */ - -/* Define to 1 if you have the `vasprintf' function. */ -/* #undef EVENT__HAVE_VASPRINTF */ - -/* Define if kqueue works correctly with pipes */ -/* #undef EVENT__HAVE_WORKING_KQUEUE */ - -/* Numeric representation of the version */ -#define EVENT__NUMERIC_VERSION 0x02010201 - -/* Name of package */ -#define EVENT__PACKAGE "libevent" - -/* Define to the address where bug reports for this package should be sent. */ -#define EVENT__PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define EVENT__PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define EVENT__PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define EVENT__PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define EVENT__PACKAGE_VERSION "" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef EVENT__PTHREAD_CREATE_JOINABLE */ - -/* The size of a `int', as computed by sizeof. */ -#define EVENT__SIZEOF_INT 4 - -/* The size of a `long', as computed by sizeof. */ -#define EVENT__SIZEOF_LONG 4 - -/* The size of a `long long', as computed by sizeof. */ -#define EVENT__SIZEOF_LONG_LONG 8 - -/* The size of a `short', as computed by sizeof. */ -#define EVENT__SIZEOF_SHORT 2 - -/* The size of `size_t', as computed by sizeof. */ -#ifdef _WIN64 -#define EVENT__SIZEOF_SIZE_T 8 -#else -#define EVENT__SIZEOF_SIZE_T 4 -#endif - -/* The size of `void *', as computed by sizeof. */ -#ifdef _WIN64 -#define EVENT__SIZEOF_VOID_P 8 -#else -#define EVENT__SIZEOF_VOID_P 4 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#define EVENT__STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#define EVENT__TIME_WITH_SYS_TIME 1 - -/* Version number of package */ -#define EVENT__VERSION "2.1.2-alpha-dev" - -/* Define to appropriate substitue if compiler doesnt have __func__ */ -#define EVENT____func__ __FUNCTION__ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef EVENT__const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef _EVENT___cplusplus -#define EVENT__inline __inline -#endif - -/* Define to `int' if does not define. */ -/* #undef EVENT__pid_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef EVENT__size_t */ - -/* Define to unsigned int if you dont have it */ -#define EVENT__socklen_t unsigned int - -/* Define to `int' if does not define. */ -#define EVENT__ssize_t SSIZE_T - -#endif diff --git a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/evconfig-private.h b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/evconfig-private.h index 7af2ea33138d..3bbd68f32697 100644 --- a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/evconfig-private.h +++ b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/evconfig-private.h @@ -1,4 +1,4 @@ -/* $NetBSD: evconfig-private.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: evconfig-private.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ #if !defined(EVENT_EVCONFIG__PRIVATE_H_) && !defined(__MINGW32__) #define EVENT_EVCONFIG__PRIVATE_H_ diff --git a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h index e8dce6605507..7ee578cbec66 100644 --- a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h +++ b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h @@ -1,4 +1,4 @@ -/* $NetBSD: event-config.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: event-config.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* event2/event-config.h * diff --git a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h index b66830ec6909..92fa26753633 100644 --- a/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h +++ b/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h @@ -1,4 +1,4 @@ -/* $NetBSD: tree.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: tree.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ /* diff --git a/external/bsd/ntp/dist/sntp/libevent/arc4random.c b/external/bsd/ntp/dist/sntp/libevent/arc4random.c index e2908add63ff..b6c702fd9b9b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/arc4random.c +++ b/external/bsd/ntp/dist/sntp/libevent/arc4random.c @@ -1,4 +1,4 @@ -/* $NetBSD: arc4random.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: arc4random.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* Portable arc4random.c based on arc4random.c from OpenBSD. * Portable version by Chris Davis, adapted for Libevent by Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/buffer.c b/external/bsd/ntp/dist/sntp/libevent/buffer.c index bf680ffa923e..2cdfd07fd391 100644 --- a/external/bsd/ntp/dist/sntp/libevent/buffer.c +++ b/external/bsd/ntp/dist/sntp/libevent/buffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: buffer.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: buffer.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/buffer_iocp.c b/external/bsd/ntp/dist/sntp/libevent/buffer_iocp.c index 7d92a1257fe1..9a016c4f1577 100644 --- a/external/bsd/ntp/dist/sntp/libevent/buffer_iocp.c +++ b/external/bsd/ntp/dist/sntp/libevent/buffer_iocp.c @@ -1,4 +1,4 @@ -/* $NetBSD: buffer_iocp.c,v 1.1.1.1 2013/12/27 23:31:24 christos Exp $ */ +/* $NetBSD: buffer_iocp.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent-internal.h b/external/bsd/ntp/dist/sntp/libevent/bufferevent-internal.h index 33854db7da42..73e90041f6fa 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent-internal.h,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: bufferevent-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent.c index beaf0255f9ee..f4d557768d1d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c index 5619c2177fc6..3ad4003fdf3d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_async.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent_async.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c index 741e5871f941..ca342360a886 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_filter.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent_filter.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c index fe902605e8c6..6bd25a08a608 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_openssl.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: bufferevent_openssl.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c index a9dfd2667830..997c59ccb5c4 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_pair.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: bufferevent_pair.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_ratelim.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_ratelim.c index b50d1d1f744b..5479af90fd90 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_ratelim.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_ratelim.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_ratelim.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: bufferevent_ratelim.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/bufferevent_sock.c b/external/bsd/ntp/dist/sntp/libevent/bufferevent_sock.c index 831f916ba2a6..c90812fca786 100644 --- a/external/bsd/ntp/dist/sntp/libevent/bufferevent_sock.c +++ b/external/bsd/ntp/dist/sntp/libevent/bufferevent_sock.c @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_sock.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent_sock.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/changelist-internal.h b/external/bsd/ntp/dist/sntp/libevent/changelist-internal.h index 056f31facf70..bfd774bcb26b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/changelist-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/changelist-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: changelist-internal.h,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: changelist-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h b/external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h index 1f85e0330be0..20c6fa4e9bf6 100644 --- a/external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h +++ b/external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h @@ -1,4 +1,4 @@ -/* $NetBSD: queue.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: queue.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* $OpenBSD: queue.h,v 1.16 2000/09/07 19:47:59 art Exp $ */ /* NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp */ diff --git a/external/bsd/ntp/dist/sntp/libevent/defer-internal.h b/external/bsd/ntp/dist/sntp/libevent/defer-internal.h index 9d610c1e73dc..cd5f2ea0b1ad 100644 --- a/external/bsd/ntp/dist/sntp/libevent/defer-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/defer-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: defer-internal.h,v 1.1.1.1 2013/12/27 23:31:17 christos Exp $ */ +/* $NetBSD: defer-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/devpoll.c b/external/bsd/ntp/dist/sntp/libevent/devpoll.c index ae46dbe60ae5..4ef36694c375 100644 --- a/external/bsd/ntp/dist/sntp/libevent/devpoll.c +++ b/external/bsd/ntp/dist/sntp/libevent/devpoll.c @@ -1,4 +1,4 @@ -/* $NetBSD: devpoll.c,v 1.1.1.1 2013/12/27 23:31:24 christos Exp $ */ +/* $NetBSD: devpoll.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2000-2009 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/epoll.c b/external/bsd/ntp/dist/sntp/libevent/epoll.c index 9b120f9bccd1..78589550ad40 100644 --- a/external/bsd/ntp/dist/sntp/libevent/epoll.c +++ b/external/bsd/ntp/dist/sntp/libevent/epoll.c @@ -1,4 +1,4 @@ -/* $NetBSD: epoll.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: epoll.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/epoll_sub.c b/external/bsd/ntp/dist/sntp/libevent/epoll_sub.c index 0806b0405423..de5f44c9b576 100644 --- a/external/bsd/ntp/dist/sntp/libevent/epoll_sub.c +++ b/external/bsd/ntp/dist/sntp/libevent/epoll_sub.c @@ -1,4 +1,4 @@ -/* $NetBSD: epoll_sub.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: epoll_sub.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2003-2009 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/epolltable-internal.h b/external/bsd/ntp/dist/sntp/libevent/epolltable-internal.h index 16a18f4060c4..3344d09ded95 100644 --- a/external/bsd/ntp/dist/sntp/libevent/epolltable-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/epolltable-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: epolltable-internal.h,v 1.1.1.1 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: epolltable-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h b/external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h index 6d64b70225ef..ffe44e32cb24 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: evbuffer-internal.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: evbuffer-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evconfig-private.h b/external/bsd/ntp/dist/sntp/libevent/evconfig-private.h index aa00a6a57875..86f40f0a82fb 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evconfig-private.h +++ b/external/bsd/ntp/dist/sntp/libevent/evconfig-private.h @@ -1,4 +1,4 @@ -/* $NetBSD: evconfig-private.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: evconfig-private.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* evconfig-private.h. Generated from evconfig-private.h.in by configure. */ /* evconfig-private.h template - see "Configuration Header Templates" */ diff --git a/external/bsd/ntp/dist/sntp/libevent/evdns.3 b/external/bsd/ntp/dist/sntp/libevent/evdns.3 deleted file mode 100644 index 10414fa2efbe..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/evdns.3 +++ /dev/null @@ -1,322 +0,0 @@ -.\" -.\" Copyright (c) 2006 Niels Provos -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd October 7, 2006 -.Dt EVDNS 3 -.Os -.Sh NAME -.Nm evdns_init -.Nm evdns_shutdown -.Nm evdns_err_to_string -.Nm evdns_nameserver_add -.Nm evdns_count_nameservers -.Nm evdns_clear_nameservers_and_suspend -.Nm evdns_resume -.Nm evdns_nameserver_ip_add -.Nm evdns_resolve_ipv4 -.Nm evdns_resolve_reverse -.Nm evdns_resolv_conf_parse -.Nm evdns_config_windows_nameservers -.Nm evdns_search_clear -.Nm evdns_search_add -.Nm evdns_search_ndots_set -.Nm evdns_set_log_fn -.Nd asynchronous functions for DNS resolution. -.Sh SYNOPSIS -.Fd #include -.Fd #include -.Fd #include -.Ft int -.Fn evdns_init -.Ft void -.Fn evdns_shutdown "int fail_requests" -.Ft "const char *" -.Fn evdns_err_to_string "int err" -.Ft int -.Fn evdns_nameserver_add "unsigned long int address" -.Ft int -.Fn evdns_count_nameservers -.Ft int -.Fn evdns_clear_nameservers_and_suspend -.Ft int -.Fn evdns_resume -.Ft int -.Fn evdns_nameserver_ip_add(const char *ip_as_string); -.Ft int -.Fn evdns_resolve_ipv4 "const char *name" "int flags" "evdns_callback_type callback" "void *ptr" -.Ft int -.Fn evdns_resolve_reverse "struct in_addr *in" "int flags" "evdns_callback_type callback" "void *ptr" -.Ft int -.Fn evdns_resolv_conf_parse "int flags" "const char *" -.Ft void -.Fn evdns_search_clear -.Ft void -.Fn evdns_search_add "const char *domain" -.Ft void -.Fn evdns_search_ndots_set "const int ndots" -.Ft void -.Fn evdns_set_log_fn "evdns_debug_log_fn_type fn" -.Ft int -.Fn evdns_config_windows_nameservers -.Sh DESCRIPTION -Welcome, gentle reader -.Pp -Async DNS lookups are really a whole lot harder than they should be, -mostly stemming from the fact that the libc resolver has never been -very good at them. Before you use this library you should see if libc -can do the job for you with the modern async call getaddrinfo_a -(see http://www.imperialviolet.org/page25.html#e498). Otherwise, -please continue. -.Pp -This code is based on libevent and you must call event_init before -any of the APIs in this file. You must also seed the OpenSSL random -source if you are using OpenSSL for ids (see below). -.Pp -This library is designed to be included and shipped with your source -code. You statically link with it. You should also test for the -existence of strtok_r and define HAVE_STRTOK_R if you have it. -.Pp -The DNS protocol requires a good source of id numbers and these -numbers should be unpredictable for spoofing reasons. There are -three methods for generating them here and you must define exactly -one of them. In increasing order of preference: -.Pp -.Bl -tag -width "DNS_USE_GETTIMEOFDAY_FOR_ID" -compact -offset indent -.It DNS_USE_GETTIMEOFDAY_FOR_ID -Using the bottom 16 bits of the usec result from gettimeofday. This -is a pretty poor solution but should work anywhere. -.It DNS_USE_CPU_CLOCK_FOR_ID -Using the bottom 16 bits of the nsec result from the CPU's time -counter. This is better, but may not work everywhere. Requires -POSIX realtime support and you'll need to link against -lrt on -glibc systems at least. -.It DNS_USE_OPENSSL_FOR_ID -Uses the OpenSSL RAND_bytes call to generate the data. You must -have seeded the pool before making any calls to this library. -.El -.Pp -The library keeps track of the state of nameservers and will avoid -them when they go down. Otherwise it will round robin between them. -.Pp -Quick start guide: - #include "evdns.h" - void callback(int result, char type, int count, int ttl, - void *addresses, void *arg); - evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf"); - evdns_resolve("www.hostname.com", 0, callback, NULL); -.Pp -When the lookup is complete the callback function is called. The -first argument will be one of the DNS_ERR_* defines in evdns.h. -Hopefully it will be DNS_ERR_NONE, in which case type will be -DNS_IPv4_A, count will be the number of IP addresses, ttl is the time -which the data can be cached for (in seconds), addresses will point -to an array of uint32_t's and arg will be whatever you passed to -evdns_resolve. -.Pp -Searching: -.Pp -In order for this library to be a good replacement for glibc's resolver it -supports searching. This involves setting a list of default domains, in -which names will be queried for. The number of dots in the query name -determines the order in which this list is used. -.Pp -Searching appears to be a single lookup from the point of view of the API, -although many DNS queries may be generated from a single call to -evdns_resolve. Searching can also drastically slow down the resolution -of names. -.Pp -To disable searching: -.Bl -enum -compact -offset indent -.It -Never set it up. If you never call -.Fn evdns_resolv_conf_parse, -.Fn evdns_init, -or -.Fn evdns_search_add -then no searching will occur. -.It -If you do call -.Fn evdns_resolv_conf_parse -then don't pass -.Va DNS_OPTION_SEARCH -(or -.Va DNS_OPTIONS_ALL, -which implies it). -.It -When calling -.Fn evdns_resolve, -pass the -.Va DNS_QUERY_NO_SEARCH -flag. -.El -.Pp -The order of searches depends on the number of dots in the name. If the -number is greater than the ndots setting then the names is first tried -globally. Otherwise each search domain is appended in turn. -.Pp -The ndots setting can either be set from a resolv.conf, or by calling -evdns_search_ndots_set. -.Pp -For example, with ndots set to 1 (the default) and a search domain list of -["myhome.net"]: - Query: www - Order: www.myhome.net, www. -.Pp - Query: www.abc - Order: www.abc., www.abc.myhome.net -.Pp -.Sh API reference -.Pp -.Bl -tag -width 0123456 -.It Ft int Fn evdns_init -Initializes support for non-blocking name resolution by calling -.Fn evdns_resolv_conf_parse -on UNIX and -.Fn evdns_config_windows_nameservers -on Windows. -.It Ft int Fn evdns_nameserver_add "unsigned long int address" -Add a nameserver. The address should be an IP address in -network byte order. The type of address is chosen so that -it matches in_addr.s_addr. -Returns non-zero on error. -.It Ft int Fn evdns_nameserver_ip_add "const char *ip_as_string" -This wraps the above function by parsing a string as an IP -address and adds it as a nameserver. -Returns non-zero on error -.It Ft int Fn evdns_resolve "const char *name" "int flags" "evdns_callback_type callback" "void *ptr" -Resolve a name. The name parameter should be a DNS name. -The flags parameter should be 0, or DNS_QUERY_NO_SEARCH -which disables searching for this query. (see defn of -searching above). -.Pp -The callback argument is a function which is called when -this query completes and ptr is an argument which is passed -to that callback function. -.Pp -Returns non-zero on error -.It Ft void Fn evdns_search_clear -Clears the list of search domains -.It Ft void Fn evdns_search_add "const char *domain" -Add a domain to the list of search domains -.It Ft void Fn evdns_search_ndots_set "int ndots" -Set the number of dots which, when found in a name, causes -the first query to be without any search domain. -.It Ft int Fn evdns_count_nameservers "void" -Return the number of configured nameservers (not necessarily the -number of running nameservers). This is useful for double-checking -whether our calls to the various nameserver configuration functions -have been successful. -.It Ft int Fn evdns_clear_nameservers_and_suspend "void" -Remove all currently configured nameservers, and suspend all pending -resolves. Resolves will not necessarily be re-attempted until -evdns_resume() is called. -.It Ft int Fn evdns_resume "void" -Re-attempt resolves left in limbo after an earlier call to -evdns_clear_nameservers_and_suspend(). -.It Ft int Fn evdns_config_windows_nameservers "void" -Attempt to configure a set of nameservers based on platform settings on -a win32 host. Preferentially tries to use GetNetworkParams; if that fails, -looks in the registry. Returns 0 on success, nonzero on failure. -.It Ft int Fn evdns_resolv_conf_parse "int flags" "const char *filename" -Parse a resolv.conf like file from the given filename. -.Pp -See the man page for resolv.conf for the format of this file. -The flags argument determines what information is parsed from -this file: -.Bl -tag -width "DNS_OPTION_NAMESERVERS" -offset indent -compact -nested -.It DNS_OPTION_SEARCH -domain, search and ndots options -.It DNS_OPTION_NAMESERVERS -nameserver lines -.It DNS_OPTION_MISC -timeout and attempts options -.It DNS_OPTIONS_ALL -all of the above -.El -.Pp -The following directives are not parsed from the file: - sortlist, rotate, no-check-names, inet6, debug -.Pp -Returns non-zero on error: -.Bl -tag -width "0" -offset indent -compact -nested -.It 0 -no errors -.It 1 -failed to open file -.It 2 -failed to stat file -.It 3 -file too large -.It 4 -out of memory -.It 5 -short read from file -.El -.El -.Sh Internals: -Requests are kept in two queues. The first is the inflight queue. In -this queue requests have an allocated transaction id and nameserver. -They will soon be transmitted if they haven't already been. -.Pp -The second is the waiting queue. The size of the inflight ring is -limited and all other requests wait in waiting queue for space. This -bounds the number of concurrent requests so that we don't flood the -nameserver. Several algorithms require a full walk of the inflight -queue and so bounding its size keeps thing going nicely under huge -(many thousands of requests) loads. -.Pp -If a nameserver loses too many requests it is considered down and we -try not to use it. After a while we send a probe to that nameserver -(a lookup for google.com) and, if it replies, we consider it working -again. If the nameserver fails a probe we wait longer to try again -with the next probe. -.Sh SEE ALSO -.Xr event 3 , -.Xr gethostbyname 3 , -.Xr resolv.conf 5 -.Sh HISTORY -The -.Nm evdns -API was developed by Adam Langley on top of the -.Nm libevent -API. -The code was integrate into -.Nm Tor -by Nick Mathewson and finally put into -.Nm libevent -itself by Niels Provos. -.Sh AUTHORS -The -.Nm evdns -API and code was written by Adam Langley with significant -contributions by Nick Mathewson. -.Sh BUGS -This documentation is neither complete nor authoritative. -If you are in doubt about the usage of this API then -check the source code to find out how it works, write -up the missing piece of documentation and send it to -me for inclusion in this man page. diff --git a/external/bsd/ntp/dist/sntp/libevent/evdns.c b/external/bsd/ntp/dist/sntp/libevent/evdns.c index 904c7ea92fd8..7674586107aa 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evdns.c +++ b/external/bsd/ntp/dist/sntp/libevent/evdns.c @@ -1,4 +1,4 @@ -/* $NetBSD: evdns.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: evdns.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* Copyright 2006-2007 Niels Provos * Copyright 2007-2012 Nick Mathewson and Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/event-internal.h b/external/bsd/ntp/dist/sntp/libevent/event-internal.h index 5d2966036761..c66d23c96854 100644 --- a/external/bsd/ntp/dist/sntp/libevent/event-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/event-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: event-internal.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: event-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/event.3 b/external/bsd/ntp/dist/sntp/libevent/event.3 deleted file mode 100644 index 5b33ec64a935..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/event.3 +++ /dev/null @@ -1,624 +0,0 @@ -.\" $OpenBSD: event.3,v 1.4 2002/07/12 18:50:48 provos Exp $ -.\" -.\" Copyright (c) 2000 Artur Grabowski -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd August 8, 2000 -.Dt EVENT 3 -.Os -.Sh NAME -.Nm event_init , -.Nm event_dispatch , -.Nm event_loop , -.Nm event_loopexit , -.Nm event_loopbreak , -.Nm event_set , -.Nm event_base_dispatch , -.Nm event_base_loop , -.Nm event_base_loopexit , -.Nm event_base_loopbreak , -.Nm event_base_set , -.Nm event_base_free , -.Nm event_add , -.Nm event_del , -.Nm event_once , -.Nm event_base_once , -.Nm event_pending , -.Nm event_initialized , -.Nm event_priority_init , -.Nm event_priority_set , -.Nm evtimer_set , -.Nm evtimer_add , -.Nm evtimer_del , -.Nm evtimer_pending , -.Nm evtimer_initialized , -.Nm signal_set , -.Nm signal_add , -.Nm signal_del , -.Nm signal_pending , -.Nm signal_initialized , -.Nm bufferevent_new , -.Nm bufferevent_free , -.Nm bufferevent_write , -.Nm bufferevent_write_buffer , -.Nm bufferevent_read , -.Nm bufferevent_enable , -.Nm bufferevent_disable , -.Nm bufferevent_settimeout , -.Nm bufferevent_base_set , -.Nm evbuffer_new , -.Nm evbuffer_free , -.Nm evbuffer_add , -.Nm evbuffer_add_buffer , -.Nm evbuffer_add_printf , -.Nm evbuffer_add_vprintf , -.Nm evbuffer_drain , -.Nm evbuffer_write , -.Nm evbuffer_read , -.Nm evbuffer_find , -.Nm evbuffer_readline , -.Nm evhttp_new , -.Nm evhttp_bind_socket , -.Nm evhttp_free -.Nd execute a function when a specific event occurs -.Sh SYNOPSIS -.Fd #include -.Fd #include -.Ft "struct event_base *" -.Fn "event_init" "void" -.Ft int -.Fn "event_dispatch" "void" -.Ft int -.Fn "event_loop" "int flags" -.Ft int -.Fn "event_loopexit" "struct timeval *tv" -.Ft int -.Fn "event_loopbreak" "void" -.Ft void -.Fn "event_set" "struct event *ev" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" -.Ft int -.Fn "event_base_dispatch" "struct event_base *base" -.Ft int -.Fn "event_base_loop" "struct event_base *base" "int flags" -.Ft int -.Fn "event_base_loopexit" "struct event_base *base" "struct timeval *tv" -.Ft int -.Fn "event_base_loopbreak" "struct event_base *base" -.Ft int -.Fn "event_base_set" "struct event_base *base" "struct event *" -.Ft void -.Fn "event_base_free" "struct event_base *base" -.Ft int -.Fn "event_add" "struct event *ev" "struct timeval *tv" -.Ft int -.Fn "event_del" "struct event *ev" -.Ft int -.Fn "event_once" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv" -.Ft int -.Fn "event_base_once" "struct event_base *base" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv" -.Ft int -.Fn "event_pending" "struct event *ev" "short event" "struct timeval *tv" -.Ft int -.Fn "event_initialized" "struct event *ev" -.Ft int -.Fn "event_priority_init" "int npriorities" -.Ft int -.Fn "event_priority_set" "struct event *ev" "int priority" -.Ft void -.Fn "evtimer_set" "struct event *ev" "void (*fn)(int, short, void *)" "void *arg" -.Ft void -.Fn "evtimer_add" "struct event *ev" "struct timeval *" -.Ft void -.Fn "evtimer_del" "struct event *ev" -.Ft int -.Fn "evtimer_pending" "struct event *ev" "struct timeval *tv" -.Ft int -.Fn "evtimer_initialized" "struct event *ev" -.Ft void -.Fn "signal_set" "struct event *ev" "int signal" "void (*fn)(int, short, void *)" "void *arg" -.Ft void -.Fn "signal_add" "struct event *ev" "struct timeval *" -.Ft void -.Fn "signal_del" "struct event *ev" -.Ft int -.Fn "signal_pending" "struct event *ev" "struct timeval *tv" -.Ft int -.Fn "signal_initialized" "struct event *ev" -.Ft "struct bufferevent *" -.Fn "bufferevent_new" "int fd" "evbuffercb readcb" "evbuffercb writecb" "everrorcb" "void *cbarg" -.Ft void -.Fn "bufferevent_free" "struct bufferevent *bufev" -.Ft int -.Fn "bufferevent_write" "struct bufferevent *bufev" "void *data" "size_t size" -.Ft int -.Fn "bufferevent_write_buffer" "struct bufferevent *bufev" "struct evbuffer *buf" -.Ft size_t -.Fn "bufferevent_read" "struct bufferevent *bufev" "void *data" "size_t size" -.Ft int -.Fn "bufferevent_enable" "struct bufferevent *bufev" "short event" -.Ft int -.Fn "bufferevent_disable" "struct bufferevent *bufev" "short event" -.Ft void -.Fn "bufferevent_settimeout" "struct bufferevent *bufev" "int timeout_read" "int timeout_write" -.Ft int -.Fn "bufferevent_base_set" "struct event_base *base" "struct bufferevent *bufev" -.Ft "struct evbuffer *" -.Fn "evbuffer_new" "void" -.Ft void -.Fn "evbuffer_free" "struct evbuffer *buf" -.Ft int -.Fn "evbuffer_add" "struct evbuffer *buf" "const void *data" "size_t size" -.Ft int -.Fn "evbuffer_add_buffer" "struct evbuffer *dst" "struct evbuffer *src" -.Ft int -.Fn "evbuffer_add_printf" "struct evbuffer *buf" "const char *fmt" "..." -.Ft int -.Fn "evbuffer_add_vprintf" "struct evbuffer *buf" "const char *fmt" "va_list ap" -.Ft void -.Fn "evbuffer_drain" "struct evbuffer *buf" "size_t size" -.Ft int -.Fn "evbuffer_write" "struct evbuffer *buf" "int fd" -.Ft int -.Fn "evbuffer_read" "struct evbuffer *buf" "int fd" "int size" -.Ft "u_char *" -.Fn "evbuffer_find" "struct evbuffer *buf" "const u_char *data" "size_t size" -.Ft "char *" -.Fn "evbuffer_readline" "struct evbuffer *buf" -.Ft "struct evhttp *" -.Fn "evhttp_new" "struct event_base *base" -.Ft int -.Fn "evhttp_bind_socket" "struct evhttp *http" "const char *address" "u_short port" -.Ft "void" -.Fn "evhttp_free" "struct evhttp *http" -.Ft int -.Fa (*event_sigcb)(void) ; -.Ft volatile sig_atomic_t -.Fa event_gotsig ; -.Sh DESCRIPTION -The -.Nm event -API provides a mechanism to execute a function when a specific event -on a file descriptor occurs or after a given time has passed. -.Pp -The -.Nm event -API needs to be initialized with -.Fn event_init -before it can be used. -.Pp -In order to process events, an application needs to call -.Fn event_dispatch . -This function only returns on error, and should replace the event core -of the application program. -.Pp -The function -.Fn event_set -prepares the event structure -.Fa ev -to be used in future calls to -.Fn event_add -and -.Fn event_del . -The event will be prepared to call the function specified by the -.Fa fn -argument with an -.Fa int -argument indicating the file descriptor, a -.Fa short -argument indicating the type of event, and a -.Fa void * -argument given in the -.Fa arg -argument. -The -.Fa fd -indicates the file descriptor that should be monitored for events. -The events can be either -.Va EV_READ , -.Va EV_WRITE , -or both, -indicating that an application can read or write from the file descriptor -respectively without blocking. -.Pp -The function -.Fa fn -will be called with the file descriptor that triggered the event and -the type of event which will be either -.Va EV_TIMEOUT , -.Va EV_SIGNAL , -.Va EV_READ , -or -.Va EV_WRITE . -Additionally, an event which has registered interest in more than one of the -preceeding events, via bitwise-OR to -.Fn event_set , -can provide its callback function with a bitwise-OR of more than one triggered -event. -The additional flag -.Va EV_PERSIST -makes an -.Fn event_add -persistent until -.Fn event_del -has been called. -.Pp -Once initialized, the -.Fa ev -structure can be used repeatedly with -.Fn event_add -and -.Fn event_del -and does not need to be reinitialized unless the function called and/or -the argument to it are to be changed. -However, when an -.Fa ev -structure has been added to libevent using -.Fn event_add -the structure must persist until the event occurs (assuming -.Fa EV_PERSIST -is not set) or is removed -using -.Fn event_del . -You may not reuse the same -.Fa ev -structure for multiple monitored descriptors; each descriptor -needs its own -.Fa ev . -.Pp -The function -.Fn event_add -schedules the execution of the -.Fa ev -event when the event specified in -.Fn event_set -occurs or in at least the time specified in the -.Fa tv . -If -.Fa tv -is -.Dv NULL , -no timeout occurs and the function will only be called -if a matching event occurs on the file descriptor. -The event in the -.Fa ev -argument must be already initialized by -.Fn event_set -and may not be used in calls to -.Fn event_set -until it has timed out or been removed with -.Fn event_del . -If the event in the -.Fa ev -argument already has a scheduled timeout, the old timeout will be -replaced by the new one. -.Pp -The function -.Fn event_del -will cancel the event in the argument -.Fa ev . -If the event has already executed or has never been added -the call will have no effect. -.Pp -The functions -.Fn evtimer_set , -.Fn evtimer_add , -.Fn evtimer_del , -.Fn evtimer_initialized , -and -.Fn evtimer_pending -are abbreviations for common situations where only a timeout is required. -The file descriptor passed will be \-1, and the event type will be -.Va EV_TIMEOUT . -.Pp -The functions -.Fn signal_set , -.Fn signal_add , -.Fn signal_del , -.Fn signal_initialized , -and -.Fn signal_pending -are abbreviations. -The event type will be a persistent -.Va EV_SIGNAL . -That means -.Fn signal_set -adds -.Va EV_PERSIST . -.Pp -In order to avoid races in signal handlers, the -.Nm event -API provides two variables: -.Va event_sigcb -and -.Va event_gotsig . -A signal handler -sets -.Va event_gotsig -to indicate that a signal has been received. -The application sets -.Va event_sigcb -to a callback function. -After the signal handler sets -.Va event_gotsig , -.Nm event_dispatch -will execute the callback function to process received signals. -The callback returns 1 when no events are registered any more. -It can return \-1 to indicate an error to the -.Nm event -library, causing -.Fn event_dispatch -to terminate with -.Va errno -set to -.Er EINTR . -.Pp -The function -.Fn event_once -is similar to -.Fn event_set . -However, it schedules a callback to be called exactly once and does not -require the caller to prepare an -.Fa event -structure. -This function supports -.Fa EV_TIMEOUT , -.Fa EV_READ , -and -.Fa EV_WRITE . -.Pp -The -.Fn event_pending -function can be used to check if the event specified by -.Fa event -is pending to run. -If -.Va EV_TIMEOUT -was specified and -.Fa tv -is not -.Dv NULL , -the expiration time of the event will be returned in -.Fa tv . -.Pp -The -.Fn event_initialized -macro can be used to check if an event has been initialized. -.Pp -The -.Nm event_loop -function provides an interface for single pass execution of pending -events. -The flags -.Va EVLOOP_ONCE -and -.Va EVLOOP_NONBLOCK -are recognized. -The -.Nm event_loopexit -function exits from the event loop. The next -.Fn event_loop -iteration after the -given timer expires will complete normally (handling all queued events) then -exit without blocking for events again. Subsequent invocations of -.Fn event_loop -will proceed normally. -The -.Nm event_loopbreak -function exits from the event loop immediately. -.Fn event_loop -will abort after the next event is completed; -.Fn event_loopbreak -is typically invoked from this event's callback. This behavior is analogous -to the "break;" statement. Subsequent invocations of -.Fn event_loop -will proceed normally. -.Pp -It is the responsibility of the caller to provide these functions with -pre-allocated event structures. -.Pp -.Sh EVENT PRIORITIES -By default -.Nm libevent -schedules all active events with the same priority. -However, sometimes it is desirable to process some events with a higher -priority than others. -For that reason, -.Nm libevent -supports strict priority queues. -Active events with a lower priority are always processed before events -with a higher priority. -.Pp -The number of different priorities can be set initially with the -.Fn event_priority_init -function. -This function should be called before the first call to -.Fn event_dispatch . -The -.Fn event_priority_set -function can be used to assign a priority to an event. -By default, -.Nm libevent -assigns the middle priority to all events unless their priority -is explicitly set. -.Sh THREAD SAFE EVENTS -.Nm Libevent -has experimental support for thread-safe events. -When initializing the library via -.Fn event_init , -an event base is returned. -This event base can be used in conjunction with calls to -.Fn event_base_set , -.Fn event_base_dispatch , -.Fn event_base_loop , -.Fn event_base_loopexit , -.Fn bufferevent_base_set -and -.Fn event_base_free . -.Fn event_base_set -should be called after preparing an event with -.Fn event_set , -as -.Fn event_set -assigns the provided event to the most recently created event base. -.Fn bufferevent_base_set -should be called after preparing a bufferevent with -.Fn bufferevent_new . -.Fn event_base_free -should be used to free memory associated with the event base -when it is no longer needed. -.Sh BUFFERED EVENTS -.Nm libevent -provides an abstraction on top of the regular event callbacks. -This abstraction is called a -.Va "buffered event" . -A buffered event provides input and output buffers that get filled -and drained automatically. -The user of a buffered event no longer deals directly with the IO, -but instead is reading from input and writing to output buffers. -.Pp -A new bufferevent is created by -.Fn bufferevent_new . -The parameter -.Fa fd -specifies the file descriptor from which data is read and written to. -This file descriptor is not allowed to be a -.Xr pipe 2 . -The next three parameters are callbacks. -The read and write callback have the following form: -.Ft void -.Fn "(*cb)" "struct bufferevent *bufev" "void *arg" . -The error callback has the following form: -.Ft void -.Fn "(*cb)" "struct bufferevent *bufev" "short what" "void *arg" . -The argument is specified by the fourth parameter -.Fa "cbarg" . -A -.Fa bufferevent struct -pointer is returned on success, NULL on error. -Both the read and the write callback may be NULL. -The error callback has to be always provided. -.Pp -Once initialized, the bufferevent structure can be used repeatedly with -bufferevent_enable() and bufferevent_disable(). -The flags parameter can be a combination of -.Va EV_READ -and -.Va EV_WRITE . -When read enabled the bufferevent will try to read from the file -descriptor and call the read callback. -The write callback is executed -whenever the output buffer is drained below the write low watermark, -which is -.Va 0 -by default. -.Pp -The -.Fn bufferevent_write -function can be used to write data to the file descriptor. -The data is appended to the output buffer and written to the descriptor -automatically as it becomes available for writing. -.Fn bufferevent_write -returns 0 on success or \-1 on failure. -The -.Fn bufferevent_read -function is used to read data from the input buffer, -returning the amount of data read. -.Pp -If multiple bases are in use, bufferevent_base_set() must be called before -enabling the bufferevent for the first time. -.Sh NON-BLOCKING HTTP SUPPORT -.Nm libevent -provides a very thin HTTP layer that can be used both to host an HTTP -server and also to make HTTP requests. -An HTTP server can be created by calling -.Fn evhttp_new . -It can be bound to any port and address with the -.Fn evhttp_bind_socket -function. -When the HTTP server is no longer used, it can be freed via -.Fn evhttp_free . -.Pp -To be notified of HTTP requests, a user needs to register callbacks with the -HTTP server. -This can be done by calling -.Fn evhttp_set_cb . -The second argument is the URI for which a callback is being registered. -The corresponding callback will receive an -.Va struct evhttp_request -object that contains all information about the request. -.Pp -This section does not document all the possible function calls; please -check -.Va event.h -for the public interfaces. -.Sh ADDITIONAL NOTES -It is possible to disable support for -.Va epoll , kqueue , devpoll , poll -or -.Va select -by setting the environment variable -.Va EVENT_NOEPOLL , EVENT_NOKQUEUE , EVENT_NODEVPOLL , EVENT_NOPOLL -or -.Va EVENT_NOSELECT , -respectively. -By setting the environment variable -.Va EVENT_SHOW_METHOD , -.Nm libevent -displays the kernel notification method that it uses. -.Sh RETURN VALUES -Upon successful completion -.Fn event_add -and -.Fn event_del -return 0. -Otherwise, \-1 is returned and the global variable errno is -set to indicate the error. -.Sh SEE ALSO -.Xr kqueue 2 , -.Xr poll 2 , -.Xr select 2 , -.Xr evdns 3 , -.Xr timeout 9 -.Sh HISTORY -The -.Nm event -API manpage is based on the -.Xr timeout 9 -manpage by Artur Grabowski. -The port of -.Nm libevent -to Windows is due to Michael A. Davis. -Support for real-time signals is due to Taral. -.Sh AUTHORS -The -.Nm event -library was written by Niels Provos. -.Sh BUGS -This documentation is neither complete nor authoritative. -If you are in doubt about the usage of this API then -check the source code to find out how it works, write -up the missing piece of documentation and send it to -me for inclusion in this man page. diff --git a/external/bsd/ntp/dist/sntp/libevent/event.c b/external/bsd/ntp/dist/sntp/libevent/event.c index ecb08725b48b..162dad510cda 100644 --- a/external/bsd/ntp/dist/sntp/libevent/event.c +++ b/external/bsd/ntp/dist/sntp/libevent/event.c @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: event.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/event_iocp.c b/external/bsd/ntp/dist/sntp/libevent/event_iocp.c index 6f46a8279f05..16f8825bc671 100644 --- a/external/bsd/ntp/dist/sntp/libevent/event_iocp.c +++ b/external/bsd/ntp/dist/sntp/libevent/event_iocp.c @@ -1,4 +1,4 @@ -/* $NetBSD: event_iocp.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: event_iocp.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/event_tagging.c b/external/bsd/ntp/dist/sntp/libevent/event_tagging.c index 84dfb1e7e200..53f3db783a7a 100644 --- a/external/bsd/ntp/dist/sntp/libevent/event_tagging.c +++ b/external/bsd/ntp/dist/sntp/libevent/event_tagging.c @@ -1,4 +1,4 @@ -/* $NetBSD: event_tagging.c,v 1.1.1.1 2013/12/27 23:31:16 christos Exp $ */ +/* $NetBSD: event_tagging.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2003-2009 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evmap-internal.h b/external/bsd/ntp/dist/sntp/libevent/evmap-internal.h index 42923ae66004..a5ed9012a5b9 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evmap-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/evmap-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: evmap-internal.h,v 1.1.1.1 2013/12/27 23:31:24 christos Exp $ */ +/* $NetBSD: evmap-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evmap.c b/external/bsd/ntp/dist/sntp/libevent/evmap.c index 422a93e9f023..37f541764031 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evmap.c +++ b/external/bsd/ntp/dist/sntp/libevent/evmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: evmap.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: evmap.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evport.c b/external/bsd/ntp/dist/sntp/libevent/evport.c index cfa78567451e..11a396bc5532 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evport.c +++ b/external/bsd/ntp/dist/sntp/libevent/evport.c @@ -1,4 +1,4 @@ -/* $NetBSD: evport.c,v 1.1.1.1 2013/12/27 23:31:21 christos Exp $ */ +/* $NetBSD: evport.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Submitted by David Pacheco (dp.spambait@gmail.com) diff --git a/external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h b/external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h index a7327c4df7e2..3cfe5e2bc4c7 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: evrpc-internal.h,v 1.1.1.1 2013/12/27 23:31:16 christos Exp $ */ +/* $NetBSD: evrpc-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evrpc.c b/external/bsd/ntp/dist/sntp/libevent/evrpc.c index b8557e2e7659..53c9e45c6eee 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evrpc.c +++ b/external/bsd/ntp/dist/sntp/libevent/evrpc.c @@ -1,4 +1,4 @@ -/* $NetBSD: evrpc.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: evrpc.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evsignal-internal.h b/external/bsd/ntp/dist/sntp/libevent/evsignal-internal.h index 2869e2ca4f16..4bb688e683f6 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evsignal-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/evsignal-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: evsignal-internal.h,v 1.1.1.1 2013/12/27 23:31:19 christos Exp $ */ +/* $NetBSD: evsignal-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/evthread-internal.h b/external/bsd/ntp/dist/sntp/libevent/evthread-internal.h index 31bfb045da68..c8b95bfb4e37 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evthread-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/evthread-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: evthread-internal.h,v 1.1.1.1 2013/12/27 23:31:24 christos Exp $ */ +/* $NetBSD: evthread-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evthread.c b/external/bsd/ntp/dist/sntp/libevent/evthread.c index ac0116270893..e3d3b0e0c89d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evthread.c +++ b/external/bsd/ntp/dist/sntp/libevent/evthread.c @@ -1,4 +1,4 @@ -/* $NetBSD: evthread.c,v 1.1.1.1 2013/12/27 23:31:18 christos Exp $ */ +/* $NetBSD: evthread.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evthread_pthread.c b/external/bsd/ntp/dist/sntp/libevent/evthread_pthread.c index b676a7cefefd..46fdedd73c8f 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evthread_pthread.c +++ b/external/bsd/ntp/dist/sntp/libevent/evthread_pthread.c @@ -1,4 +1,4 @@ -/* $NetBSD: evthread_pthread.c,v 1.1.1.1 2013/12/27 23:31:19 christos Exp $ */ +/* $NetBSD: evthread_pthread.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evthread_win32.c b/external/bsd/ntp/dist/sntp/libevent/evthread_win32.c index 4851ff4be1cd..98f59ef191e7 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evthread_win32.c +++ b/external/bsd/ntp/dist/sntp/libevent/evthread_win32.c @@ -1,4 +1,4 @@ -/* $NetBSD: evthread_win32.c,v 1.1.1.1 2013/12/27 23:31:19 christos Exp $ */ +/* $NetBSD: evthread_win32.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evutil.c b/external/bsd/ntp/dist/sntp/libevent/evutil.c index 36fb61d0bcd4..71e4a371cc01 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evutil.c +++ b/external/bsd/ntp/dist/sntp/libevent/evutil.c @@ -1,4 +1,4 @@ -/* $NetBSD: evutil.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: evutil.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evutil_rand.c b/external/bsd/ntp/dist/sntp/libevent/evutil_rand.c index 42b9a918b80f..3c592ce87474 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evutil_rand.c +++ b/external/bsd/ntp/dist/sntp/libevent/evutil_rand.c @@ -1,4 +1,4 @@ -/* $NetBSD: evutil_rand.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: evutil_rand.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/evutil_time.c b/external/bsd/ntp/dist/sntp/libevent/evutil_time.c index 1d0857e3a3e1..ea329d1ceb01 100644 --- a/external/bsd/ntp/dist/sntp/libevent/evutil_time.c +++ b/external/bsd/ntp/dist/sntp/libevent/evutil_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: evutil_time.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: evutil_time.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/ht-internal.h b/external/bsd/ntp/dist/sntp/libevent/ht-internal.h index 2f2e8b15c7a1..52c77e10be55 100644 --- a/external/bsd/ntp/dist/sntp/libevent/ht-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/ht-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: ht-internal.h,v 1.1.1.1 2013/12/27 23:31:17 christos Exp $ */ +/* $NetBSD: ht-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* Copyright 2002 Christopher Clark */ /* Copyright 2005-2012 Nick Mathewson */ diff --git a/external/bsd/ntp/dist/sntp/libevent/http-internal.h b/external/bsd/ntp/dist/sntp/libevent/http-internal.h index d781a6868e67..37adc6911d04 100644 --- a/external/bsd/ntp/dist/sntp/libevent/http-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/http-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: http-internal.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: http-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2001-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/http.c b/external/bsd/ntp/dist/sntp/libevent/http.c index be7d731cc928..5efa78e519b4 100644 --- a/external/bsd/ntp/dist/sntp/libevent/http.c +++ b/external/bsd/ntp/dist/sntp/libevent/http.c @@ -1,4 +1,4 @@ -/* $NetBSD: http.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: http.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/Makefile.in b/external/bsd/ntp/dist/sntp/libevent/include/Makefile.in deleted file mode 100644 index bf2377e123e6..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/include/Makefile.in +++ /dev/null @@ -1,561 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# include/Makefile.am for libevent -# Copyright 2000-2007 Niels Provos -# Copyright 2007-2012 Niels Provos and Nick Mathewson -# -# See LICENSE for copying information. - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include -DIST_COMMON = $(am__nobase_include_HEADERS_DIST) \ - $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_backport_259_ssizet.m4 \ - $(top_srcdir)/m4/libevent_openssl.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ntp_pkg_config.m4 \ - $(top_srcdir)/m4/openldap-thread-check.m4 \ - $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/evconfig-private.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__nobase_include_HEADERS_DIST = event2/buffer.h \ - event2/buffer_compat.h event2/bufferevent.h \ - event2/bufferevent_compat.h event2/bufferevent_ssl.h \ - event2/bufferevent_struct.h event2/dns.h event2/dns_compat.h \ - event2/dns_struct.h event2/event.h event2/event_compat.h \ - event2/event_struct.h event2/http.h event2/http_compat.h \ - event2/http_struct.h event2/keyvalq_struct.h event2/listener.h \ - event2/rpc.h event2/rpc_compat.h event2/rpc_struct.h \ - event2/tag.h event2/tag_compat.h event2/thread.h event2/util.h -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" -am__noinst_HEADERS_DIST = event2/buffer.h event2/buffer_compat.h \ - event2/bufferevent.h event2/bufferevent_compat.h \ - event2/bufferevent_ssl.h event2/bufferevent_struct.h \ - event2/dns.h event2/dns_compat.h event2/dns_struct.h \ - event2/event.h event2/event_compat.h event2/event_struct.h \ - event2/http.h event2/http_compat.h event2/http_struct.h \ - event2/keyvalq_struct.h event2/listener.h event2/rpc.h \ - event2/rpc_compat.h event2/rpc_struct.h event2/tag.h \ - event2/tag_compat.h event2/thread.h event2/util.h -HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) \ - $(nodist_noinst_HEADERS) $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EV_LIB_GDI = @EV_LIB_GDI@ -EV_LIB_WS32 = @EV_LIB_WS32@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBEVENT_GC_SECTIONS = @LIBEVENT_GC_SECTIONS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCS = @OPENSSL_INCS@ -OPENSSL_LIBADD = @OPENSSL_LIBADD@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign -EVENT2_EXPORT = \ - event2/buffer.h \ - event2/buffer_compat.h \ - event2/bufferevent.h \ - event2/bufferevent_compat.h \ - event2/bufferevent_ssl.h \ - event2/bufferevent_struct.h \ - event2/dns.h \ - event2/dns_compat.h \ - event2/dns_struct.h \ - event2/event.h \ - event2/event_compat.h \ - event2/event_struct.h \ - event2/http.h \ - event2/http_compat.h \ - event2/http_struct.h \ - event2/keyvalq_struct.h \ - event2/listener.h \ - event2/rpc.h \ - event2/rpc_compat.h \ - event2/rpc_struct.h \ - event2/tag.h \ - event2/tag_compat.h \ - event2/thread.h \ - event2/util.h - -EXTRA_SRC = $(EVENT2_EXPORT) -@INSTALL_LIBEVENT_TRUE@nobase_include_HEADERS = $(EVENT2_EXPORT) -@INSTALL_LIBEVENT_TRUE@nobase_nodist_include_HEADERS = ./event2/event-config.h -@INSTALL_LIBEVENT_FALSE@noinst_HEADERS = $(EVENT2_EXPORT) -@INSTALL_LIBEVENT_FALSE@nodist_noinst_HEADERS = ./event2/event-config.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign include/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-nobase_includeHEADERS: $(nobase_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_list) | while read dir files; do \ - xfiles=; for file in $$files; do \ - if test -f "$$file"; then xfiles="$$xfiles $$file"; \ - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ - test -z "$$xfiles" || { \ - test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ - echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ - $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ - done - -uninstall-nobase_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files -install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_list) | while read dir files; do \ - xfiles=; for file in $$files; do \ - if test -f "$$file"; then xfiles="$$xfiles $$file"; \ - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ - test -z "$$xfiles" || { \ - test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ - echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ - $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ - done - -uninstall-nobase_nodist_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -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_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-nobase_includeHEADERS \ - install-nobase_nodist_includeHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-nobase_includeHEADERS \ - uninstall-nobase_nodist_includeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nobase_includeHEADERS \ - install-nobase_nodist_includeHEADERS install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-nobase_includeHEADERS \ - uninstall-nobase_nodist_includeHEADERS - - -# 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. -.NOEXPORT: diff --git a/external/bsd/ntp/dist/sntp/libevent/include/evdns.h b/external/bsd/ntp/dist/sntp/libevent/include/evdns.h index 8d820cba0c0b..6dc2bcd70a3a 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/evdns.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/evdns.h @@ -1,4 +1,4 @@ -/* $NetBSD: evdns.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: evdns.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event.h b/external/bsd/ntp/dist/sntp/libevent/include/event.h index cf29a75dd42d..ee8244a5d6e1 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event.h @@ -1,4 +1,4 @@ -/* $NetBSD: event.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: event.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h index f3b2e94377e0..bf04852d8553 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h @@ -1,4 +1,4 @@ -/* $NetBSD: buffer.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: buffer.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer_compat.h index 5271b4fe5625..0d521d29089e 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: buffer_compat.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: buffer_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h index a146f4896601..c61ec4f8f3ae 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_compat.h index b2d86b64e327..3f8f15d0f951 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_compat.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: bufferevent_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_ssl.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_ssl.h index 7357551309fb..c18d5669a2d6 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_ssl.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_ssl.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_ssl.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: bufferevent_ssl.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_struct.h index 32c0e93cd5a5..9ac4a222a0e6 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufferevent_struct.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: bufferevent_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h index fab2f9854f9b..195146aeab6a 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h @@ -1,4 +1,4 @@ -/* $NetBSD: dns.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: dns.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_compat.h index 0096493c515f..be1b6d2d99e5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: dns_compat.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: dns_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_struct.h index a1a7ba7449dd..d1485094af44 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/dns_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: dns_struct.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: dns_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/event.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/event.h index d86089a34928..a6b7b68f4374 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/event.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/event.h @@ -1,4 +1,4 @@ -/* $NetBSD: event.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: event.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/event_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/event_compat.h index 87b5c4aae2d9..46b8199ebf00 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/event_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/event_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: event_compat.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: event_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/event_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/event_struct.h index 368ffc27b8bd..6fe3277182fc 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/event_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/event_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: event_struct.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: event_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/http.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/http.h index 26f9db1bea0c..f1b556508f4c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/http.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/http.h @@ -1,4 +1,4 @@ -/* $NetBSD: http.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: http.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/http_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/http_compat.h index c8ceb3acaed8..bb906031cf25 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/http_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/http_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: http_compat.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: http_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/http_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/http_struct.h index 84275d220d02..ae88a0c554c3 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/http_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/http_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: http_struct.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: http_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/keyvalq_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/keyvalq_struct.h index 104d28b5e0b8..31140fa95c2b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/keyvalq_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/keyvalq_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: keyvalq_struct.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: keyvalq_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h index 4ab6fae175bc..91ebc82673af 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h @@ -1,4 +1,4 @@ -/* $NetBSD: listener.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: listener.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc.h index 204d61d49946..7f004b0c4c7d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc.h @@ -1,4 +1,4 @@ -/* $NetBSD: rpc.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: rpc.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_compat.h index fbdd9aafb7dc..f2d19f8ad74c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_compat.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: rpc_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_struct.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_struct.h index 6801e5a1e468..0db2d4954bf4 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_struct.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/rpc_struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_struct.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: rpc_struct.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2006-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/tag.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/tag.h index 864768032fe5..3dea5ff57d7d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/tag.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/tag.h @@ -1,4 +1,4 @@ -/* $NetBSD: tag.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: tag.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/tag_compat.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/tag_compat.h index c746b8afa6c3..750b4af49439 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/tag_compat.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/tag_compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: tag_compat.h,v 1.1.1.1 2013/12/27 23:31:32 christos Exp $ */ +/* $NetBSD: tag_compat.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/thread.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/thread.h index 80682802bebf..6c7e97aaf240 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/thread.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/thread.h @@ -1,4 +1,4 @@ -/* $NetBSD: thread.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: thread.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/util.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/util.h index 9ab96bb4ccd7..2e89cb1b8712 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/util.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/util.h @@ -1,4 +1,4 @@ -/* $NetBSD: util.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: util.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/include/event2/visibility.h b/external/bsd/ntp/dist/sntp/libevent/include/event2/visibility.h index b05c42fbc962..fc3c2d32b13c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/event2/visibility.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/event2/visibility.h @@ -1,4 +1,4 @@ -/* $NetBSD: visibility.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: visibility.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* diff --git a/external/bsd/ntp/dist/sntp/libevent/include/evhttp.h b/external/bsd/ntp/dist/sntp/libevent/include/evhttp.h index a16f7b03558e..b03e4ecb6c4d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/evhttp.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/evhttp.h @@ -1,4 +1,4 @@ -/* $NetBSD: evhttp.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: evhttp.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/evrpc.h b/external/bsd/ntp/dist/sntp/libevent/include/evrpc.h index e0a2805dc79c..9dee30750e1c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/evrpc.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/evrpc.h @@ -1,4 +1,4 @@ -/* $NetBSD: evrpc.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: evrpc.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/include/evutil.h b/external/bsd/ntp/dist/sntp/libevent/include/evutil.h index ae6ca03c5c15..459d6f5e56f1 100644 --- a/external/bsd/ntp/dist/sntp/libevent/include/evutil.h +++ b/external/bsd/ntp/dist/sntp/libevent/include/evutil.h @@ -1,4 +1,4 @@ -/* $NetBSD: evutil.h,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: evutil.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/iocp-internal.h b/external/bsd/ntp/dist/sntp/libevent/iocp-internal.h index 0462ac9c1de4..3f097ffe2e3b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/iocp-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/iocp-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: iocp-internal.h,v 1.1.1.1 2013/12/27 23:31:25 christos Exp $ */ +/* $NetBSD: iocp-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/ipv6-internal.h b/external/bsd/ntp/dist/sntp/libevent/ipv6-internal.h index 8b458ad3c954..78add30620af 100644 --- a/external/bsd/ntp/dist/sntp/libevent/ipv6-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/ipv6-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: ipv6-internal.h,v 1.1.1.1 2013/12/27 23:31:17 christos Exp $ */ +/* $NetBSD: ipv6-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/kqueue-internal.h b/external/bsd/ntp/dist/sntp/libevent/kqueue-internal.h index 74d0596d4aab..02325560318e 100644 --- a/external/bsd/ntp/dist/sntp/libevent/kqueue-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/kqueue-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: kqueue-internal.h,v 1.1.1.1 2013/12/27 23:31:17 christos Exp $ */ +/* $NetBSD: kqueue-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/kqueue.c b/external/bsd/ntp/dist/sntp/libevent/kqueue.c index 82563ac25b07..12aaf43264ac 100644 --- a/external/bsd/ntp/dist/sntp/libevent/kqueue.c +++ b/external/bsd/ntp/dist/sntp/libevent/kqueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: kqueue.c,v 1.1.1.1 2013/12/27 23:31:18 christos Exp $ */ +/* $NetBSD: kqueue.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: kqueue.c,v 1.5 2002/07/10 14:41:31 art Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/listener.c b/external/bsd/ntp/dist/sntp/libevent/listener.c index 4589d143f771..eac571abf2aa 100644 --- a/external/bsd/ntp/dist/sntp/libevent/listener.c +++ b/external/bsd/ntp/dist/sntp/libevent/listener.c @@ -1,4 +1,4 @@ -/* $NetBSD: listener.c,v 1.1.1.1 2013/12/27 23:31:15 christos Exp $ */ +/* $NetBSD: listener.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/log-internal.h b/external/bsd/ntp/dist/sntp/libevent/log-internal.h index 9de7ed4ff129..3dee3441e4f5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/log-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/log-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: log-internal.h,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: log-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/log.c b/external/bsd/ntp/dist/sntp/libevent/log.c index bebf0357451a..048f40cf5965 100644 --- a/external/bsd/ntp/dist/sntp/libevent/log.c +++ b/external/bsd/ntp/dist/sntp/libevent/log.c @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: log.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: err.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/m4/LICENSE-OPENLDAP b/external/bsd/ntp/dist/sntp/libevent/m4/LICENSE-OPENLDAP deleted file mode 100644 index 05ad7571e448..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/m4/LICENSE-OPENLDAP +++ /dev/null @@ -1,47 +0,0 @@ -The OpenLDAP Public License - Version 2.8, 17 August 2003 - -Redistribution and use of this software and associated documentation -("Software"), with or without modification, are permitted provided -that the following conditions are met: - -1. Redistributions in source form must retain copyright statements - and notices, - -2. Redistributions in binary form must reproduce applicable copyright - statements and notices, this list of conditions, and the following - disclaimer in the documentation and/or other materials provided - with the distribution, and - -3. Redistributions must contain a verbatim copy of this document. - -The OpenLDAP Foundation may revise this license from time to time. -Each revision is distinguished by a version number. You may use -this Software under terms of this license revision or under the -terms of any subsequent revision of the license. - -THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS -CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) -OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -The names of the authors and copyright holders must not be used in -advertising or otherwise to promote the sale, use or other dealing -in this Software without specific, written prior permission. Title -to copyright in this Software shall at all times remain with copyright -holders. - -OpenLDAP is a registered trademark of the OpenLDAP Foundation. - -Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, -California, USA. All Rights Reserved. Permission to copy and -distribute verbatim copies of this document is granted. diff --git a/external/bsd/ntp/dist/sntp/libevent/make_epoll_table.py b/external/bsd/ntp/dist/sntp/libevent/make_epoll_table.py deleted file mode 100644 index 37d6df1edc1e..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/make_epoll_table.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/python2 - -def get(old,wc,rc): - if ('xxx' in (rc, wc)): - return "0",-1 - - if ('add' in (rc, wc)): - events = [] - if rc == 'add' or (rc != 'del' and 'r' in old): - events.append("EPOLLIN") - if wc == 'add' or (wc != 'del' and 'w' in old): - events.append("EPOLLOUT") - - if old == "0": - op = "EPOLL_CTL_ADD" - else: - op = "EPOLL_CTL_MOD" - return "|".join(events), op - - if ('del' in (rc, wc)): - op = "EPOLL_CTL_DEL" - if rc == 'del': - if wc == 'del': - events = "EPOLLIN|EPOLLOUT" - elif 'w' in old: - events = "EPOLLOUT" - op = "EPOLL_CTL_MOD" - else: - events = "EPOLLIN" - else: - assert wc == 'del' - if 'r' in old: - events = "EPOLLIN" - op = "EPOLL_CTL_MOD" - else: - events = "EPOLLOUT" - return events, op - - return 0, 0 - - -def fmt(op, ev, old, wc, rc): - entry = "{ %s, %s },"%(op, ev) - assert len(entry)<=36 - sp = " "*(36-len(entry)) - print "\t%s%s/* old=%2s, write:%3s, read:%3s */" % ( - entry, sp, old, wc, rc) - - -for old in ('0','r','w','rw'): - for wc in ('0', 'add', 'del', 'xxx'): - for rc in ('0', 'add', 'del', 'xxx'): - - op,ev = get(old,wc,rc) - - fmt(op, ev, old, wc, rc) - diff --git a/external/bsd/ntp/dist/sntp/libevent/minheap-internal.h b/external/bsd/ntp/dist/sntp/libevent/minheap-internal.h index 556a8739699e..f91ebe119ca1 100644 --- a/external/bsd/ntp/dist/sntp/libevent/minheap-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/minheap-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: minheap-internal.h,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: minheap-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/mm-internal.h b/external/bsd/ntp/dist/sntp/libevent/mm-internal.h index f719b72e08d8..56fd9b298b46 100644 --- a/external/bsd/ntp/dist/sntp/libevent/mm-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/mm-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: mm-internal.h,v 1.1.1.1 2013/12/27 23:31:18 christos Exp $ */ +/* $NetBSD: mm-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/poll.c b/external/bsd/ntp/dist/sntp/libevent/poll.c index ec1877ced76d..63861c61f529 100644 --- a/external/bsd/ntp/dist/sntp/libevent/poll.c +++ b/external/bsd/ntp/dist/sntp/libevent/poll.c @@ -1,4 +1,4 @@ -/* $NetBSD: poll.c,v 1.1.1.1 2013/12/27 23:31:22 christos Exp $ */ +/* $NetBSD: poll.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/ratelim-internal.h b/external/bsd/ntp/dist/sntp/libevent/ratelim-internal.h index bd36bd35eeb7..b3d0f439beb0 100644 --- a/external/bsd/ntp/dist/sntp/libevent/ratelim-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/ratelim-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: ratelim-internal.h,v 1.1.1.1 2013/12/27 23:31:16 christos Exp $ */ +/* $NetBSD: ratelim-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/Makefile.in b/external/bsd/ntp/dist/sntp/libevent/sample/Makefile.in deleted file mode 100644 index c102cfeaf556..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/sample/Makefile.in +++ /dev/null @@ -1,566 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# sample/Makefile.am for libevent -# Copyright 2000-2007 Niels Provos -# Copyright 2007-2012 Niels Provos and Nick Mathewson -# -# See LICENSE for copying information. - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -noinst_PROGRAMS = dns-example$(EXEEXT) event-read-fifo$(EXEEXT) \ - hello-world$(EXEEXT) http-server$(EXEEXT) signal-test$(EXEEXT) \ - time-test$(EXEEXT) $(am__EXEEXT_1) -@OPENSSL_TRUE@am__append_1 = $(OPENSSL_INCS) -@OPENSSL_TRUE@am__append_2 = le-proxy -subdir = sample -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_backport_259_ssizet.m4 \ - $(top_srcdir)/m4/libevent_openssl.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ntp_pkg_config.m4 \ - $(top_srcdir)/m4/openldap-thread-check.m4 \ - $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/evconfig-private.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@OPENSSL_TRUE@am__EXEEXT_1 = le-proxy$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_dns_example_OBJECTS = dns-example.$(OBJEXT) -dns_example_OBJECTS = $(am_dns_example_OBJECTS) -dns_example_LDADD = $(LDADD) -am__DEPENDENCIES_1 = -dns_example_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -am_event_read_fifo_OBJECTS = event-read-fifo.$(OBJEXT) -event_read_fifo_OBJECTS = $(am_event_read_fifo_OBJECTS) -event_read_fifo_LDADD = $(LDADD) -event_read_fifo_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am_hello_world_OBJECTS = hello-world.$(OBJEXT) -hello_world_OBJECTS = $(am_hello_world_OBJECTS) -hello_world_LDADD = $(LDADD) -hello_world_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am_http_server_OBJECTS = http-server.$(OBJEXT) -http_server_OBJECTS = $(am_http_server_OBJECTS) -http_server_LDADD = $(LDADD) -http_server_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am__le_proxy_SOURCES_DIST = le-proxy.c -@OPENSSL_TRUE@am_le_proxy_OBJECTS = le-proxy.$(OBJEXT) -le_proxy_OBJECTS = $(am_le_proxy_OBJECTS) -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) ../libevent.la -@OPENSSL_TRUE@le_proxy_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -@OPENSSL_TRUE@ ../libevent_openssl.la $(am__DEPENDENCIES_1) -am_signal_test_OBJECTS = signal-test.$(OBJEXT) -signal_test_OBJECTS = $(am_signal_test_OBJECTS) -signal_test_LDADD = $(LDADD) -signal_test_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am_time_test_OBJECTS = time-test.$(OBJEXT) -time_test_OBJECTS = $(am_time_test_OBJECTS) -time_test_LDADD = $(LDADD) -time_test_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = -am__depfiles_maybe = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(dns_example_SOURCES) $(event_read_fifo_SOURCES) \ - $(hello_world_SOURCES) $(http_server_SOURCES) \ - $(le_proxy_SOURCES) $(signal_test_SOURCES) \ - $(time_test_SOURCES) -DIST_SOURCES = $(dns_example_SOURCES) $(event_read_fifo_SOURCES) \ - $(hello_world_SOURCES) $(http_server_SOURCES) \ - $(am__le_proxy_SOURCES_DIST) $(signal_test_SOURCES) \ - $(time_test_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EV_LIB_GDI = @EV_LIB_GDI@ -EV_LIB_WS32 = @EV_LIB_WS32@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBEVENT_GC_SECTIONS = @LIBEVENT_GC_SECTIONS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCS = @OPENSSL_INCS@ -OPENSSL_LIBADD = @OPENSSL_LIBADD@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign no-dependencies -LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \ - -I$(top_srcdir)/include -I../include $(am__append_1) -event_read_fifo_SOURCES = event-read-fifo.c -time_test_SOURCES = time-test.c -signal_test_SOURCES = signal-test.c -dns_example_SOURCES = dns-example.c -hello_world_SOURCES = hello-world.c -http_server_SOURCES = http-server.c -@OPENSSL_TRUE@le_proxy_SOURCES = le-proxy.c -@OPENSSL_TRUE@le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD} -DISTCLEANFILES = *~ -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sample/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign sample/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -dns-example$(EXEEXT): $(dns_example_OBJECTS) $(dns_example_DEPENDENCIES) - @rm -f dns-example$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dns_example_OBJECTS) $(dns_example_LDADD) $(LIBS) -event-read-fifo$(EXEEXT): $(event_read_fifo_OBJECTS) $(event_read_fifo_DEPENDENCIES) - @rm -f event-read-fifo$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(event_read_fifo_OBJECTS) $(event_read_fifo_LDADD) $(LIBS) -hello-world$(EXEEXT): $(hello_world_OBJECTS) $(hello_world_DEPENDENCIES) - @rm -f hello-world$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hello_world_OBJECTS) $(hello_world_LDADD) $(LIBS) -http-server$(EXEEXT): $(http_server_OBJECTS) $(http_server_DEPENDENCIES) - @rm -f http-server$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(http_server_OBJECTS) $(http_server_LDADD) $(LIBS) -le-proxy$(EXEEXT): $(le_proxy_OBJECTS) $(le_proxy_DEPENDENCIES) - @rm -f le-proxy$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(le_proxy_OBJECTS) $(le_proxy_LDADD) $(LIBS) -signal-test$(EXEEXT): $(signal_test_OBJECTS) $(signal_test_DEPENDENCIES) - @rm -f signal-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(signal_test_OBJECTS) $(signal_test_LDADD) $(LIBS) -time-test$(EXEEXT): $(time_test_OBJECTS) $(time_test_DEPENDENCIES) - @rm -f time-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(time_test_OBJECTS) $(time_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -.c.o: - $(AM_V_CC) @AM_BACKSLASH@ - $(COMPILE) -c $< - -.c.obj: - $(AM_V_CC) @AM_BACKSLASH@ - $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: - $(AM_V_CC) @AM_BACKSLASH@ - $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -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_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - - -verify: - -# 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. -.NOEXPORT: diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c b/external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c index a7ff38634a27..02898b042244 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c @@ -1,4 +1,4 @@ -/* $NetBSD: dns-example.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: dns-example.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* This example code shows how to use the high-level, low-level, and diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c b/external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c index c16fca25e5be..3446f81f0aab 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c @@ -1,4 +1,4 @@ -/* $NetBSD: event-read-fifo.c,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: event-read-fifo.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * This sample code shows how to use Libevent to read from a named pipe. diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c b/external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c index f21eb1e8e9aa..0614bbf18053 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c @@ -1,4 +1,4 @@ -/* $NetBSD: hello-world.c,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: hello-world.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* This exmple program provides a trivial server program that listens for TCP diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c b/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c index d7ec819e3c10..4c1c3b55ce7f 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c @@ -1,4 +1,4 @@ -/* $NetBSD: hostcheck.c,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: hostcheck.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /*************************************************************************** * _ _ ____ _ diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h b/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h index c5c330d44e33..d02c7b7259f9 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h +++ b/external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h @@ -1,4 +1,4 @@ -/* $NetBSD: hostcheck.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: hostcheck.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ #ifndef HEADER_CURL_HOSTCHECK_H #define HEADER_CURL_HOSTCHECK_H diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/http-server.c b/external/bsd/ntp/dist/sntp/libevent/sample/http-server.c index 8890bf43e066..1664b9c475f6 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/http-server.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/http-server.c @@ -1,4 +1,4 @@ -/* $NetBSD: http-server.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: http-server.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* A trivial static http webserver using Libevent's evhttp. diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/https-client.c b/external/bsd/ntp/dist/sntp/libevent/sample/https-client.c index 1cdd0f07bb0c..6ebab860dc90 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/https-client.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/https-client.c @@ -1,4 +1,4 @@ -/* $NetBSD: https-client.c,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: https-client.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* This is an example of how to hook up evhttp with bufferevent_ssl diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c b/external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c index 7f5b8d9217b4..0c233de3847b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c @@ -1,4 +1,4 @@ -/* $NetBSD: le-proxy.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: le-proxy.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* This example code shows how to write an (optionally encrypting) SSL proxy diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c b/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c index 5eba59b192ca..98a34b8f653b 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c @@ -1,4 +1,4 @@ -/* $NetBSD: openssl_hostname_validation.c,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: openssl_hostname_validation.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* Obtained from: https://github.com/iSECPartners/ssl-conservatory */ diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h b/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h index f2579c056cc4..f9eb6c5daf7d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h +++ b/external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h @@ -1,4 +1,4 @@ -/* $NetBSD: openssl_hostname_validation.h,v 1.1.1.1 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: openssl_hostname_validation.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* Obtained from: https://github.com/iSECPartners/ssl-conservatory */ diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c b/external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c index 9e2e5ee5ff79..6e36211daa29 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c @@ -1,4 +1,4 @@ -/* $NetBSD: signal-test.c,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: signal-test.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Compile with: diff --git a/external/bsd/ntp/dist/sntp/libevent/sample/time-test.c b/external/bsd/ntp/dist/sntp/libevent/sample/time-test.c index 91c1de69e57f..64dcd43e40ec 100644 --- a/external/bsd/ntp/dist/sntp/libevent/sample/time-test.c +++ b/external/bsd/ntp/dist/sntp/libevent/sample/time-test.c @@ -1,4 +1,4 @@ -/* $NetBSD: time-test.c,v 1.1.1.1 2013/12/27 23:31:31 christos Exp $ */ +/* $NetBSD: time-test.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * XXX This sample code was once meant to show how to use the basic Libevent diff --git a/external/bsd/ntp/dist/sntp/libevent/select.c b/external/bsd/ntp/dist/sntp/libevent/select.c index 83e68b596d4d..f6a422b301fd 100644 --- a/external/bsd/ntp/dist/sntp/libevent/select.c +++ b/external/bsd/ntp/dist/sntp/libevent/select.c @@ -1,4 +1,4 @@ -/* $NetBSD: select.c,v 1.1.1.1 2013/12/27 23:31:18 christos Exp $ */ +/* $NetBSD: select.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/signal.c b/external/bsd/ntp/dist/sntp/libevent/signal.c index f4383f370f47..a3bd487af9c4 100644 --- a/external/bsd/ntp/dist/sntp/libevent/signal.c +++ b/external/bsd/ntp/dist/sntp/libevent/signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: signal.c,v 1.1.1.1 2013/12/27 23:31:25 christos Exp $ */ +/* $NetBSD: signal.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/strlcpy-internal.h b/external/bsd/ntp/dist/sntp/libevent/strlcpy-internal.h index 5eaf069e9a6c..754749baa166 100644 --- a/external/bsd/ntp/dist/sntp/libevent/strlcpy-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/strlcpy-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: strlcpy-internal.h,v 1.1.1.1 2013/12/27 23:31:17 christos Exp $ */ +/* $NetBSD: strlcpy-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef STRLCPY_INTERNAL_H_INCLUDED_ #define STRLCPY_INTERNAL_H_INCLUDED_ diff --git a/external/bsd/ntp/dist/sntp/libevent/strlcpy.c b/external/bsd/ntp/dist/sntp/libevent/strlcpy.c index f69e83d463da..3140a9ffa96a 100644 --- a/external/bsd/ntp/dist/sntp/libevent/strlcpy.c +++ b/external/bsd/ntp/dist/sntp/libevent/strlcpy.c @@ -1,4 +1,4 @@ -/* $NetBSD: strlcpy.c,v 1.1.1.1 2013/12/27 23:31:19 christos Exp $ */ +/* $NetBSD: strlcpy.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* $OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/test/Makefile.in b/external/bsd/ntp/dist/sntp/libevent/test/Makefile.in deleted file mode 100644 index d0ee761da147..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/test/Makefile.in +++ /dev/null @@ -1,1137 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# test/Makefile.am for libevent -# Copyright 2000-2007 Niels Provos -# Copyright 2007-2012 Niels Provos and Nick Mathewson -# -# See LICENSE for copying information. - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -noinst_PROGRAMS = bench$(EXEEXT) bench_cascade$(EXEEXT) \ - bench_http$(EXEEXT) bench_httpclient$(EXEEXT) \ - test-changelist$(EXEEXT) test-dumpevents$(EXEEXT) \ - test-eof$(EXEEXT) test-fdleak$(EXEEXT) test-init$(EXEEXT) \ - test-ratelim$(EXEEXT) test-time$(EXEEXT) test-weof$(EXEEXT) \ - $(am__EXEEXT_1) -@BUILD_REGRESS_TRUE@am__append_1 = regress -EXTRA_PROGRAMS = regress$(EXEEXT) -@BUILD_REGRESS_TRUE@am__append_2 = regress.gen.c regress.gen.h -@PTHREADS_TRUE@am__append_3 = ../libevent_pthreads.la -@BUILD_WIN32_TRUE@am__append_4 = regress_iocp.c -@OPENSSL_TRUE@am__append_5 = regress_ssl.c -@OPENSSL_TRUE@am__append_6 = ../libevent_openssl.la -lssl -lcrypto ${OPENSSL_LIBADD} -subdir = test -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_backport_259_ssizet.m4 \ - $(top_srcdir)/m4/libevent_openssl.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ntp_pkg_config.m4 \ - $(top_srcdir)/m4/openldap-thread-check.m4 \ - $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/evconfig-private.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -@BUILD_REGRESS_TRUE@am__EXEEXT_1 = regress$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_bench_OBJECTS = bench.$(OBJEXT) -bench_OBJECTS = $(am_bench_OBJECTS) -am__DEPENDENCIES_1 = -bench_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -am_bench_cascade_OBJECTS = bench_cascade.$(OBJEXT) -bench_cascade_OBJECTS = $(am_bench_cascade_OBJECTS) -bench_cascade_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am_bench_http_OBJECTS = bench_http.$(OBJEXT) -bench_http_OBJECTS = $(am_bench_http_OBJECTS) -bench_http_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la -am_bench_httpclient_OBJECTS = bench_httpclient.$(OBJEXT) -bench_httpclient_OBJECTS = $(am_bench_httpclient_OBJECTS) -bench_httpclient_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ../libevent_core.la -am__regress_SOURCES_DIST = regress.c regress.gen.c regress.gen.h \ - regress_buffer.c regress_bufferevent.c regress_dns.c \ - regress_et.c regress_http.c regress_listener.c regress_main.c \ - regress_minheap.c regress_rpc.c regress_testutils.c \ - regress_testutils.h regress_util.c tinytest.c regress_thread.c \ - regress_zlib.c regress_iocp.c regress_ssl.c -@BUILD_WIN32_FALSE@@PTHREADS_TRUE@am__objects_1 = regress-regress_thread.$(OBJEXT) -@BUILD_WIN32_TRUE@am__objects_1 = regress-regress_thread.$(OBJEXT) -@ZLIB_REGRESS_TRUE@am__objects_2 = regress-regress_zlib.$(OBJEXT) -@BUILD_WIN32_TRUE@am__objects_3 = regress-regress_iocp.$(OBJEXT) -@OPENSSL_TRUE@am__objects_4 = regress-regress_ssl.$(OBJEXT) -am_regress_OBJECTS = regress-regress.$(OBJEXT) \ - regress-regress.gen.$(OBJEXT) regress-regress_buffer.$(OBJEXT) \ - regress-regress_bufferevent.$(OBJEXT) \ - regress-regress_dns.$(OBJEXT) regress-regress_et.$(OBJEXT) \ - regress-regress_http.$(OBJEXT) \ - regress-regress_listener.$(OBJEXT) \ - regress-regress_main.$(OBJEXT) \ - regress-regress_minheap.$(OBJEXT) \ - regress-regress_rpc.$(OBJEXT) \ - regress-regress_testutils.$(OBJEXT) \ - regress-regress_util.$(OBJEXT) regress-tinytest.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) -regress_OBJECTS = $(am_regress_OBJECTS) -am__DEPENDENCIES_2 = $(am__append_3) -@OPENSSL_TRUE@am__DEPENDENCIES_3 = ../libevent_openssl.la \ -@OPENSSL_TRUE@ $(am__DEPENDENCIES_1) -regress_DEPENDENCIES = $(am__DEPENDENCIES_1) ../libevent.la \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_3) -regress_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(regress_LDFLAGS) $(LDFLAGS) -o $@ -am_test_changelist_OBJECTS = test-changelist.$(OBJEXT) -test_changelist_OBJECTS = $(am_test_changelist_OBJECTS) -test_changelist_DEPENDENCIES = ../libevent_core.la -am_test_dumpevents_OBJECTS = test-dumpevents.$(OBJEXT) -test_dumpevents_OBJECTS = $(am_test_dumpevents_OBJECTS) -test_dumpevents_DEPENDENCIES = ../libevent_core.la -am_test_eof_OBJECTS = test-eof.$(OBJEXT) -test_eof_OBJECTS = $(am_test_eof_OBJECTS) -test_eof_DEPENDENCIES = ../libevent_core.la -am_test_fdleak_OBJECTS = test-fdleak.$(OBJEXT) -test_fdleak_OBJECTS = $(am_test_fdleak_OBJECTS) -test_fdleak_DEPENDENCIES = ../libevent_core.la -am_test_init_OBJECTS = test-init.$(OBJEXT) -test_init_OBJECTS = $(am_test_init_OBJECTS) -test_init_DEPENDENCIES = ../libevent_core.la -am_test_ratelim_OBJECTS = test-ratelim.$(OBJEXT) -test_ratelim_OBJECTS = $(am_test_ratelim_OBJECTS) -test_ratelim_DEPENDENCIES = ../libevent_core.la -am_test_time_OBJECTS = test-time.$(OBJEXT) -test_time_OBJECTS = $(am_test_time_OBJECTS) -test_time_DEPENDENCIES = ../libevent_core.la -am_test_weof_OBJECTS = test-weof.$(OBJEXT) -test_weof_OBJECTS = $(am_test_weof_OBJECTS) -test_weof_DEPENDENCIES = ../libevent_core.la -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(bench_SOURCES) $(bench_cascade_SOURCES) \ - $(bench_http_SOURCES) $(bench_httpclient_SOURCES) \ - $(regress_SOURCES) $(test_changelist_SOURCES) \ - $(test_dumpevents_SOURCES) $(test_eof_SOURCES) \ - $(test_fdleak_SOURCES) $(test_init_SOURCES) \ - $(test_ratelim_SOURCES) $(test_time_SOURCES) \ - $(test_weof_SOURCES) -DIST_SOURCES = $(bench_SOURCES) $(bench_cascade_SOURCES) \ - $(bench_http_SOURCES) $(bench_httpclient_SOURCES) \ - $(am__regress_SOURCES_DIST) $(test_changelist_SOURCES) \ - $(test_dumpevents_SOURCES) $(test_eof_SOURCES) \ - $(test_fdleak_SOURCES) $(test_init_SOURCES) \ - $(test_ratelim_SOURCES) $(test_time_SOURCES) \ - $(test_weof_SOURCES) -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EV_LIB_GDI = @EV_LIB_GDI@ -EV_LIB_WS32 = @EV_LIB_WS32@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBEVENT_GC_SECTIONS = @LIBEVENT_GC_SECTIONS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OPENSSL_INCS = @OPENSSL_INCS@ -OPENSSL_LIBADD = @OPENSSL_LIBADD@ -OPENSSL_LIBS = @OPENSSL_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ $(am__append_3) -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL -EXTRA_DIST = \ - check-dumpevents.py \ - regress.gen.c \ - regress.gen.h \ - regress.rpc \ - rpcgen_wrapper.sh \ - test.sh - -noinst_HEADERS = \ - regress.h \ - tinytest.h \ - tinytest_local.h \ - tinytest_macros.h - -TESTS = $(top_srcdir)/test/test.sh -BUILT_SOURCES = $(am__append_2) -test_init_SOURCES = test-init.c -test_init_LDADD = ../libevent_core.la -test_dumpevents_SOURCES = test-dumpevents.c -test_dumpevents_LDADD = ../libevent_core.la -test_eof_SOURCES = test-eof.c -test_eof_LDADD = ../libevent_core.la -test_changelist_SOURCES = test-changelist.c -test_changelist_LDADD = ../libevent_core.la -test_weof_SOURCES = test-weof.c -test_weof_LDADD = ../libevent_core.la -test_time_SOURCES = test-time.c -test_time_LDADD = ../libevent_core.la -test_ratelim_SOURCES = test-ratelim.c -test_ratelim_LDADD = ../libevent_core.la -lm -test_fdleak_SOURCES = test-fdleak.c -test_fdleak_LDADD = ../libevent_core.la -regress_SOURCES = regress.c regress.gen.c regress.gen.h \ - regress_buffer.c regress_bufferevent.c regress_dns.c \ - regress_et.c regress_http.c regress_listener.c regress_main.c \ - regress_minheap.c regress_rpc.c regress_testutils.c \ - regress_testutils.h regress_util.c tinytest.c \ - $(regress_thread_SOURCES) $(regress_zlib_SOURCES) \ - $(am__append_4) $(am__append_5) -@BUILD_WIN32_TRUE@regress_thread_SOURCES = regress_thread.c -@PTHREADS_TRUE@regress_thread_SOURCES = regress_thread.c -@ZLIB_REGRESS_TRUE@regress_zlib_SOURCES = regress_zlib.c -regress_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la $(PTHREAD_LIBS) \ - $(ZLIB_LIBS) $(am__append_6) -regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) -regress_LDFLAGS = $(PTHREAD_CFLAGS) -bench_SOURCES = bench.c -bench_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la -bench_cascade_SOURCES = bench_cascade.c -bench_cascade_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la -bench_http_SOURCES = bench_http.c -bench_http_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la -bench_httpclient_SOURCES = bench_httpclient.c -bench_httpclient_LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent_core.la -CLEANFILES = rpcgen-attempted -DISTCLEANFILES = *~ -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign test/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -bench$(EXEEXT): $(bench_OBJECTS) $(bench_DEPENDENCIES) - @rm -f bench$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bench_OBJECTS) $(bench_LDADD) $(LIBS) -bench_cascade$(EXEEXT): $(bench_cascade_OBJECTS) $(bench_cascade_DEPENDENCIES) - @rm -f bench_cascade$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bench_cascade_OBJECTS) $(bench_cascade_LDADD) $(LIBS) -bench_http$(EXEEXT): $(bench_http_OBJECTS) $(bench_http_DEPENDENCIES) - @rm -f bench_http$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bench_http_OBJECTS) $(bench_http_LDADD) $(LIBS) -bench_httpclient$(EXEEXT): $(bench_httpclient_OBJECTS) $(bench_httpclient_DEPENDENCIES) - @rm -f bench_httpclient$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(bench_httpclient_OBJECTS) $(bench_httpclient_LDADD) $(LIBS) -regress$(EXEEXT): $(regress_OBJECTS) $(regress_DEPENDENCIES) - @rm -f regress$(EXEEXT) - $(AM_V_CCLD)$(regress_LINK) $(regress_OBJECTS) $(regress_LDADD) $(LIBS) -test-changelist$(EXEEXT): $(test_changelist_OBJECTS) $(test_changelist_DEPENDENCIES) - @rm -f test-changelist$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_changelist_OBJECTS) $(test_changelist_LDADD) $(LIBS) -test-dumpevents$(EXEEXT): $(test_dumpevents_OBJECTS) $(test_dumpevents_DEPENDENCIES) - @rm -f test-dumpevents$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_dumpevents_OBJECTS) $(test_dumpevents_LDADD) $(LIBS) -test-eof$(EXEEXT): $(test_eof_OBJECTS) $(test_eof_DEPENDENCIES) - @rm -f test-eof$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_eof_OBJECTS) $(test_eof_LDADD) $(LIBS) -test-fdleak$(EXEEXT): $(test_fdleak_OBJECTS) $(test_fdleak_DEPENDENCIES) - @rm -f test-fdleak$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_fdleak_OBJECTS) $(test_fdleak_LDADD) $(LIBS) -test-init$(EXEEXT): $(test_init_OBJECTS) $(test_init_DEPENDENCIES) - @rm -f test-init$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_init_OBJECTS) $(test_init_LDADD) $(LIBS) -test-ratelim$(EXEEXT): $(test_ratelim_OBJECTS) $(test_ratelim_DEPENDENCIES) - @rm -f test-ratelim$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_ratelim_OBJECTS) $(test_ratelim_LDADD) $(LIBS) -test-time$(EXEEXT): $(test_time_OBJECTS) $(test_time_DEPENDENCIES) - @rm -f test-time$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_time_OBJECTS) $(test_time_LDADD) $(LIBS) -test-weof$(EXEEXT): $(test_weof_OBJECTS) $(test_weof_DEPENDENCIES) - @rm -f test-weof$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_weof_OBJECTS) $(test_weof_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench_cascade.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench_http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench_httpclient.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress.gen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_buffer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_bufferevent.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_dns.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_et.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_iocp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_listener.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_minheap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_rpc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_ssl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_testutils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_thread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-regress_zlib.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regress-tinytest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-changelist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dumpevents.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-eof.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fdleak.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ratelim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-weof.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -regress-regress.o: regress.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress.o -MD -MP -MF $(DEPDIR)/regress-regress.Tpo -c -o regress-regress.o `test -f 'regress.c' || echo '$(srcdir)/'`regress.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress.Tpo $(DEPDIR)/regress-regress.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress.c' object='regress-regress.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress.o `test -f 'regress.c' || echo '$(srcdir)/'`regress.c - -regress-regress.obj: regress.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress.obj -MD -MP -MF $(DEPDIR)/regress-regress.Tpo -c -o regress-regress.obj `if test -f 'regress.c'; then $(CYGPATH_W) 'regress.c'; else $(CYGPATH_W) '$(srcdir)/regress.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress.Tpo $(DEPDIR)/regress-regress.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress.c' object='regress-regress.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress.obj `if test -f 'regress.c'; then $(CYGPATH_W) 'regress.c'; else $(CYGPATH_W) '$(srcdir)/regress.c'; fi` - -regress-regress.gen.o: regress.gen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress.gen.o -MD -MP -MF $(DEPDIR)/regress-regress.gen.Tpo -c -o regress-regress.gen.o `test -f 'regress.gen.c' || echo '$(srcdir)/'`regress.gen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress.gen.Tpo $(DEPDIR)/regress-regress.gen.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress.gen.c' object='regress-regress.gen.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress.gen.o `test -f 'regress.gen.c' || echo '$(srcdir)/'`regress.gen.c - -regress-regress.gen.obj: regress.gen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress.gen.obj -MD -MP -MF $(DEPDIR)/regress-regress.gen.Tpo -c -o regress-regress.gen.obj `if test -f 'regress.gen.c'; then $(CYGPATH_W) 'regress.gen.c'; else $(CYGPATH_W) '$(srcdir)/regress.gen.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress.gen.Tpo $(DEPDIR)/regress-regress.gen.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress.gen.c' object='regress-regress.gen.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress.gen.obj `if test -f 'regress.gen.c'; then $(CYGPATH_W) 'regress.gen.c'; else $(CYGPATH_W) '$(srcdir)/regress.gen.c'; fi` - -regress-regress_buffer.o: regress_buffer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_buffer.o -MD -MP -MF $(DEPDIR)/regress-regress_buffer.Tpo -c -o regress-regress_buffer.o `test -f 'regress_buffer.c' || echo '$(srcdir)/'`regress_buffer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_buffer.Tpo $(DEPDIR)/regress-regress_buffer.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_buffer.c' object='regress-regress_buffer.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_buffer.o `test -f 'regress_buffer.c' || echo '$(srcdir)/'`regress_buffer.c - -regress-regress_buffer.obj: regress_buffer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_buffer.obj -MD -MP -MF $(DEPDIR)/regress-regress_buffer.Tpo -c -o regress-regress_buffer.obj `if test -f 'regress_buffer.c'; then $(CYGPATH_W) 'regress_buffer.c'; else $(CYGPATH_W) '$(srcdir)/regress_buffer.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_buffer.Tpo $(DEPDIR)/regress-regress_buffer.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_buffer.c' object='regress-regress_buffer.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_buffer.obj `if test -f 'regress_buffer.c'; then $(CYGPATH_W) 'regress_buffer.c'; else $(CYGPATH_W) '$(srcdir)/regress_buffer.c'; fi` - -regress-regress_bufferevent.o: regress_bufferevent.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_bufferevent.o -MD -MP -MF $(DEPDIR)/regress-regress_bufferevent.Tpo -c -o regress-regress_bufferevent.o `test -f 'regress_bufferevent.c' || echo '$(srcdir)/'`regress_bufferevent.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_bufferevent.Tpo $(DEPDIR)/regress-regress_bufferevent.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_bufferevent.c' object='regress-regress_bufferevent.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_bufferevent.o `test -f 'regress_bufferevent.c' || echo '$(srcdir)/'`regress_bufferevent.c - -regress-regress_bufferevent.obj: regress_bufferevent.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_bufferevent.obj -MD -MP -MF $(DEPDIR)/regress-regress_bufferevent.Tpo -c -o regress-regress_bufferevent.obj `if test -f 'regress_bufferevent.c'; then $(CYGPATH_W) 'regress_bufferevent.c'; else $(CYGPATH_W) '$(srcdir)/regress_bufferevent.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_bufferevent.Tpo $(DEPDIR)/regress-regress_bufferevent.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_bufferevent.c' object='regress-regress_bufferevent.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_bufferevent.obj `if test -f 'regress_bufferevent.c'; then $(CYGPATH_W) 'regress_bufferevent.c'; else $(CYGPATH_W) '$(srcdir)/regress_bufferevent.c'; fi` - -regress-regress_dns.o: regress_dns.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_dns.o -MD -MP -MF $(DEPDIR)/regress-regress_dns.Tpo -c -o regress-regress_dns.o `test -f 'regress_dns.c' || echo '$(srcdir)/'`regress_dns.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_dns.Tpo $(DEPDIR)/regress-regress_dns.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_dns.c' object='regress-regress_dns.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_dns.o `test -f 'regress_dns.c' || echo '$(srcdir)/'`regress_dns.c - -regress-regress_dns.obj: regress_dns.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_dns.obj -MD -MP -MF $(DEPDIR)/regress-regress_dns.Tpo -c -o regress-regress_dns.obj `if test -f 'regress_dns.c'; then $(CYGPATH_W) 'regress_dns.c'; else $(CYGPATH_W) '$(srcdir)/regress_dns.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_dns.Tpo $(DEPDIR)/regress-regress_dns.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_dns.c' object='regress-regress_dns.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_dns.obj `if test -f 'regress_dns.c'; then $(CYGPATH_W) 'regress_dns.c'; else $(CYGPATH_W) '$(srcdir)/regress_dns.c'; fi` - -regress-regress_et.o: regress_et.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_et.o -MD -MP -MF $(DEPDIR)/regress-regress_et.Tpo -c -o regress-regress_et.o `test -f 'regress_et.c' || echo '$(srcdir)/'`regress_et.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_et.Tpo $(DEPDIR)/regress-regress_et.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_et.c' object='regress-regress_et.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_et.o `test -f 'regress_et.c' || echo '$(srcdir)/'`regress_et.c - -regress-regress_et.obj: regress_et.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_et.obj -MD -MP -MF $(DEPDIR)/regress-regress_et.Tpo -c -o regress-regress_et.obj `if test -f 'regress_et.c'; then $(CYGPATH_W) 'regress_et.c'; else $(CYGPATH_W) '$(srcdir)/regress_et.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_et.Tpo $(DEPDIR)/regress-regress_et.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_et.c' object='regress-regress_et.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_et.obj `if test -f 'regress_et.c'; then $(CYGPATH_W) 'regress_et.c'; else $(CYGPATH_W) '$(srcdir)/regress_et.c'; fi` - -regress-regress_http.o: regress_http.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_http.o -MD -MP -MF $(DEPDIR)/regress-regress_http.Tpo -c -o regress-regress_http.o `test -f 'regress_http.c' || echo '$(srcdir)/'`regress_http.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_http.Tpo $(DEPDIR)/regress-regress_http.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_http.c' object='regress-regress_http.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_http.o `test -f 'regress_http.c' || echo '$(srcdir)/'`regress_http.c - -regress-regress_http.obj: regress_http.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_http.obj -MD -MP -MF $(DEPDIR)/regress-regress_http.Tpo -c -o regress-regress_http.obj `if test -f 'regress_http.c'; then $(CYGPATH_W) 'regress_http.c'; else $(CYGPATH_W) '$(srcdir)/regress_http.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_http.Tpo $(DEPDIR)/regress-regress_http.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_http.c' object='regress-regress_http.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_http.obj `if test -f 'regress_http.c'; then $(CYGPATH_W) 'regress_http.c'; else $(CYGPATH_W) '$(srcdir)/regress_http.c'; fi` - -regress-regress_listener.o: regress_listener.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_listener.o -MD -MP -MF $(DEPDIR)/regress-regress_listener.Tpo -c -o regress-regress_listener.o `test -f 'regress_listener.c' || echo '$(srcdir)/'`regress_listener.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_listener.Tpo $(DEPDIR)/regress-regress_listener.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_listener.c' object='regress-regress_listener.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_listener.o `test -f 'regress_listener.c' || echo '$(srcdir)/'`regress_listener.c - -regress-regress_listener.obj: regress_listener.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_listener.obj -MD -MP -MF $(DEPDIR)/regress-regress_listener.Tpo -c -o regress-regress_listener.obj `if test -f 'regress_listener.c'; then $(CYGPATH_W) 'regress_listener.c'; else $(CYGPATH_W) '$(srcdir)/regress_listener.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_listener.Tpo $(DEPDIR)/regress-regress_listener.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_listener.c' object='regress-regress_listener.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_listener.obj `if test -f 'regress_listener.c'; then $(CYGPATH_W) 'regress_listener.c'; else $(CYGPATH_W) '$(srcdir)/regress_listener.c'; fi` - -regress-regress_main.o: regress_main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_main.o -MD -MP -MF $(DEPDIR)/regress-regress_main.Tpo -c -o regress-regress_main.o `test -f 'regress_main.c' || echo '$(srcdir)/'`regress_main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_main.Tpo $(DEPDIR)/regress-regress_main.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_main.c' object='regress-regress_main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_main.o `test -f 'regress_main.c' || echo '$(srcdir)/'`regress_main.c - -regress-regress_main.obj: regress_main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_main.obj -MD -MP -MF $(DEPDIR)/regress-regress_main.Tpo -c -o regress-regress_main.obj `if test -f 'regress_main.c'; then $(CYGPATH_W) 'regress_main.c'; else $(CYGPATH_W) '$(srcdir)/regress_main.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_main.Tpo $(DEPDIR)/regress-regress_main.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_main.c' object='regress-regress_main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_main.obj `if test -f 'regress_main.c'; then $(CYGPATH_W) 'regress_main.c'; else $(CYGPATH_W) '$(srcdir)/regress_main.c'; fi` - -regress-regress_minheap.o: regress_minheap.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_minheap.o -MD -MP -MF $(DEPDIR)/regress-regress_minheap.Tpo -c -o regress-regress_minheap.o `test -f 'regress_minheap.c' || echo '$(srcdir)/'`regress_minheap.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_minheap.Tpo $(DEPDIR)/regress-regress_minheap.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_minheap.c' object='regress-regress_minheap.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_minheap.o `test -f 'regress_minheap.c' || echo '$(srcdir)/'`regress_minheap.c - -regress-regress_minheap.obj: regress_minheap.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_minheap.obj -MD -MP -MF $(DEPDIR)/regress-regress_minheap.Tpo -c -o regress-regress_minheap.obj `if test -f 'regress_minheap.c'; then $(CYGPATH_W) 'regress_minheap.c'; else $(CYGPATH_W) '$(srcdir)/regress_minheap.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_minheap.Tpo $(DEPDIR)/regress-regress_minheap.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_minheap.c' object='regress-regress_minheap.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_minheap.obj `if test -f 'regress_minheap.c'; then $(CYGPATH_W) 'regress_minheap.c'; else $(CYGPATH_W) '$(srcdir)/regress_minheap.c'; fi` - -regress-regress_rpc.o: regress_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_rpc.o -MD -MP -MF $(DEPDIR)/regress-regress_rpc.Tpo -c -o regress-regress_rpc.o `test -f 'regress_rpc.c' || echo '$(srcdir)/'`regress_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_rpc.Tpo $(DEPDIR)/regress-regress_rpc.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_rpc.c' object='regress-regress_rpc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_rpc.o `test -f 'regress_rpc.c' || echo '$(srcdir)/'`regress_rpc.c - -regress-regress_rpc.obj: regress_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_rpc.obj -MD -MP -MF $(DEPDIR)/regress-regress_rpc.Tpo -c -o regress-regress_rpc.obj `if test -f 'regress_rpc.c'; then $(CYGPATH_W) 'regress_rpc.c'; else $(CYGPATH_W) '$(srcdir)/regress_rpc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_rpc.Tpo $(DEPDIR)/regress-regress_rpc.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_rpc.c' object='regress-regress_rpc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_rpc.obj `if test -f 'regress_rpc.c'; then $(CYGPATH_W) 'regress_rpc.c'; else $(CYGPATH_W) '$(srcdir)/regress_rpc.c'; fi` - -regress-regress_testutils.o: regress_testutils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_testutils.o -MD -MP -MF $(DEPDIR)/regress-regress_testutils.Tpo -c -o regress-regress_testutils.o `test -f 'regress_testutils.c' || echo '$(srcdir)/'`regress_testutils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_testutils.Tpo $(DEPDIR)/regress-regress_testutils.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_testutils.c' object='regress-regress_testutils.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_testutils.o `test -f 'regress_testutils.c' || echo '$(srcdir)/'`regress_testutils.c - -regress-regress_testutils.obj: regress_testutils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_testutils.obj -MD -MP -MF $(DEPDIR)/regress-regress_testutils.Tpo -c -o regress-regress_testutils.obj `if test -f 'regress_testutils.c'; then $(CYGPATH_W) 'regress_testutils.c'; else $(CYGPATH_W) '$(srcdir)/regress_testutils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_testutils.Tpo $(DEPDIR)/regress-regress_testutils.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_testutils.c' object='regress-regress_testutils.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_testutils.obj `if test -f 'regress_testutils.c'; then $(CYGPATH_W) 'regress_testutils.c'; else $(CYGPATH_W) '$(srcdir)/regress_testutils.c'; fi` - -regress-regress_util.o: regress_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_util.o -MD -MP -MF $(DEPDIR)/regress-regress_util.Tpo -c -o regress-regress_util.o `test -f 'regress_util.c' || echo '$(srcdir)/'`regress_util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_util.Tpo $(DEPDIR)/regress-regress_util.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_util.c' object='regress-regress_util.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_util.o `test -f 'regress_util.c' || echo '$(srcdir)/'`regress_util.c - -regress-regress_util.obj: regress_util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_util.obj -MD -MP -MF $(DEPDIR)/regress-regress_util.Tpo -c -o regress-regress_util.obj `if test -f 'regress_util.c'; then $(CYGPATH_W) 'regress_util.c'; else $(CYGPATH_W) '$(srcdir)/regress_util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_util.Tpo $(DEPDIR)/regress-regress_util.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_util.c' object='regress-regress_util.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_util.obj `if test -f 'regress_util.c'; then $(CYGPATH_W) 'regress_util.c'; else $(CYGPATH_W) '$(srcdir)/regress_util.c'; fi` - -regress-tinytest.o: tinytest.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-tinytest.o -MD -MP -MF $(DEPDIR)/regress-tinytest.Tpo -c -o regress-tinytest.o `test -f 'tinytest.c' || echo '$(srcdir)/'`tinytest.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-tinytest.Tpo $(DEPDIR)/regress-tinytest.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tinytest.c' object='regress-tinytest.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-tinytest.o `test -f 'tinytest.c' || echo '$(srcdir)/'`tinytest.c - -regress-tinytest.obj: tinytest.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-tinytest.obj -MD -MP -MF $(DEPDIR)/regress-tinytest.Tpo -c -o regress-tinytest.obj `if test -f 'tinytest.c'; then $(CYGPATH_W) 'tinytest.c'; else $(CYGPATH_W) '$(srcdir)/tinytest.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-tinytest.Tpo $(DEPDIR)/regress-tinytest.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tinytest.c' object='regress-tinytest.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-tinytest.obj `if test -f 'tinytest.c'; then $(CYGPATH_W) 'tinytest.c'; else $(CYGPATH_W) '$(srcdir)/tinytest.c'; fi` - -regress-regress_thread.o: regress_thread.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_thread.o -MD -MP -MF $(DEPDIR)/regress-regress_thread.Tpo -c -o regress-regress_thread.o `test -f 'regress_thread.c' || echo '$(srcdir)/'`regress_thread.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_thread.Tpo $(DEPDIR)/regress-regress_thread.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_thread.c' object='regress-regress_thread.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_thread.o `test -f 'regress_thread.c' || echo '$(srcdir)/'`regress_thread.c - -regress-regress_thread.obj: regress_thread.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_thread.obj -MD -MP -MF $(DEPDIR)/regress-regress_thread.Tpo -c -o regress-regress_thread.obj `if test -f 'regress_thread.c'; then $(CYGPATH_W) 'regress_thread.c'; else $(CYGPATH_W) '$(srcdir)/regress_thread.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_thread.Tpo $(DEPDIR)/regress-regress_thread.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_thread.c' object='regress-regress_thread.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_thread.obj `if test -f 'regress_thread.c'; then $(CYGPATH_W) 'regress_thread.c'; else $(CYGPATH_W) '$(srcdir)/regress_thread.c'; fi` - -regress-regress_zlib.o: regress_zlib.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_zlib.o -MD -MP -MF $(DEPDIR)/regress-regress_zlib.Tpo -c -o regress-regress_zlib.o `test -f 'regress_zlib.c' || echo '$(srcdir)/'`regress_zlib.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_zlib.Tpo $(DEPDIR)/regress-regress_zlib.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_zlib.c' object='regress-regress_zlib.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_zlib.o `test -f 'regress_zlib.c' || echo '$(srcdir)/'`regress_zlib.c - -regress-regress_zlib.obj: regress_zlib.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_zlib.obj -MD -MP -MF $(DEPDIR)/regress-regress_zlib.Tpo -c -o regress-regress_zlib.obj `if test -f 'regress_zlib.c'; then $(CYGPATH_W) 'regress_zlib.c'; else $(CYGPATH_W) '$(srcdir)/regress_zlib.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_zlib.Tpo $(DEPDIR)/regress-regress_zlib.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_zlib.c' object='regress-regress_zlib.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_zlib.obj `if test -f 'regress_zlib.c'; then $(CYGPATH_W) 'regress_zlib.c'; else $(CYGPATH_W) '$(srcdir)/regress_zlib.c'; fi` - -regress-regress_iocp.o: regress_iocp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_iocp.o -MD -MP -MF $(DEPDIR)/regress-regress_iocp.Tpo -c -o regress-regress_iocp.o `test -f 'regress_iocp.c' || echo '$(srcdir)/'`regress_iocp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_iocp.Tpo $(DEPDIR)/regress-regress_iocp.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_iocp.c' object='regress-regress_iocp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_iocp.o `test -f 'regress_iocp.c' || echo '$(srcdir)/'`regress_iocp.c - -regress-regress_iocp.obj: regress_iocp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_iocp.obj -MD -MP -MF $(DEPDIR)/regress-regress_iocp.Tpo -c -o regress-regress_iocp.obj `if test -f 'regress_iocp.c'; then $(CYGPATH_W) 'regress_iocp.c'; else $(CYGPATH_W) '$(srcdir)/regress_iocp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_iocp.Tpo $(DEPDIR)/regress-regress_iocp.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_iocp.c' object='regress-regress_iocp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_iocp.obj `if test -f 'regress_iocp.c'; then $(CYGPATH_W) 'regress_iocp.c'; else $(CYGPATH_W) '$(srcdir)/regress_iocp.c'; fi` - -regress-regress_ssl.o: regress_ssl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_ssl.o -MD -MP -MF $(DEPDIR)/regress-regress_ssl.Tpo -c -o regress-regress_ssl.o `test -f 'regress_ssl.c' || echo '$(srcdir)/'`regress_ssl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_ssl.Tpo $(DEPDIR)/regress-regress_ssl.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_ssl.c' object='regress-regress_ssl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_ssl.o `test -f 'regress_ssl.c' || echo '$(srcdir)/'`regress_ssl.c - -regress-regress_ssl.obj: regress_ssl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regress-regress_ssl.obj -MD -MP -MF $(DEPDIR)/regress-regress_ssl.Tpo -c -o regress-regress_ssl.obj `if test -f 'regress_ssl.c'; then $(CYGPATH_W) 'regress_ssl.c'; else $(CYGPATH_W) '$(srcdir)/regress_ssl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/regress-regress_ssl.Tpo $(DEPDIR)/regress-regress_ssl.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regress_ssl.c' object='regress-regress_ssl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(regress_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regress-regress_ssl.obj `if test -f 'regress_ssl.c'; then $(CYGPATH_W) 'regress_ssl.c'; else $(CYGPATH_W) '$(srcdir)/regress_ssl.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) -installdirs: -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -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_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: all check check-am install install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am - - -regress.gen.c regress.gen.h: rpcgen-attempted - -rpcgen-attempted: $(srcdir)/regress.rpc $(srcdir)/../event_rpcgen.py $(srcdir)/rpcgen_wrapper.sh - date -u > $@ - if $(srcdir)/rpcgen_wrapper.sh $(srcdir); then \ - echo "rpcgen okay"; \ - else \ - echo "No Python installed; stubbing out RPC test." >&2; \ - echo " "> regress.gen.c; \ - echo "#define NO_PYTHON_EXISTS" > regress.gen.h; \ - fi - -verify: check - -bench test-init test-eof test-weof test-time test-changelist \ - test-fdleak: ../libevent.la - -# 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. -.NOEXPORT: diff --git a/external/bsd/ntp/dist/sntp/libevent/test/bench.c b/external/bsd/ntp/dist/sntp/libevent/test/bench.c index 2cbd1e3b8ad0..4b69dd26269c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/bench.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/bench.c @@ -1,4 +1,4 @@ -/* $NetBSD: bench.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: bench.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/bench_cascade.c b/external/bsd/ntp/dist/sntp/libevent/test/bench_cascade.c index 2a90170c923d..d8fb90f4b001 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/bench_cascade.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/bench_cascade.c @@ -1,4 +1,4 @@ -/* $NetBSD: bench_cascade.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: bench_cascade.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/bench_http.c b/external/bsd/ntp/dist/sntp/libevent/test/bench_http.c index e409091b159b..71438bf40912 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/bench_http.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/bench_http.c @@ -1,4 +1,4 @@ -/* $NetBSD: bench_http.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: bench_http.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright 2008-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c b/external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c index dc1c5dc9b7ad..27a3850f4b76 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c @@ -1,4 +1,4 @@ -/* $NetBSD: bench_httpclient.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: bench_httpclient.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/print-winsock-errors.c b/external/bsd/ntp/dist/sntp/libevent/test/print-winsock-errors.c deleted file mode 100644 index cac2e0f05750..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/test/print-winsock-errors.c +++ /dev/null @@ -1,86 +0,0 @@ -/* $NetBSD: print-winsock-errors.c,v 1.1.1.1 2013/12/27 23:31:27 christos Exp $ */ - -#include -#include - -#include -#include - -#include "event2/event.h" -#include "event2/util.h" -#include "event2/thread.h" - -#define E(x) printf (#x " -> \"%s\"\n", evutil_socket_error_to_string (x)); - -int main (int argc, char **argv) -{ - int i, j; - const char *s1, *s2; - - evthread_use_windows_threads (); - - s1 = evutil_socket_error_to_string (WSAEINTR); - - for (i = 0; i < 3; i++) { - printf ("\niteration %d:\n\n", i); - E(WSAEINTR); - E(WSAEACCES); - E(WSAEFAULT); - E(WSAEINVAL); - E(WSAEMFILE); - E(WSAEWOULDBLOCK); - E(WSAEINPROGRESS); - E(WSAEALREADY); - E(WSAENOTSOCK); - E(WSAEDESTADDRREQ); - E(WSAEMSGSIZE); - E(WSAEPROTOTYPE); - E(WSAENOPROTOOPT); - E(WSAEPROTONOSUPPORT); - E(WSAESOCKTNOSUPPORT); - E(WSAEOPNOTSUPP); - E(WSAEPFNOSUPPORT); - E(WSAEAFNOSUPPORT); - E(WSAEADDRINUSE); - E(WSAEADDRNOTAVAIL); - E(WSAENETDOWN); - E(WSAENETUNREACH); - E(WSAENETRESET); - E(WSAECONNABORTED); - E(WSAECONNRESET); - E(WSAENOBUFS); - E(WSAEISCONN); - E(WSAENOTCONN); - E(WSAESHUTDOWN); - E(WSAETIMEDOUT); - E(WSAECONNREFUSED); - E(WSAEHOSTDOWN); - E(WSAEHOSTUNREACH); - E(WSAEPROCLIM); - E(WSASYSNOTREADY); - E(WSAVERNOTSUPPORTED); - E(WSANOTINITIALISED); - E(WSAEDISCON); - E(WSATYPE_NOT_FOUND); - E(WSAHOST_NOT_FOUND); - E(WSATRY_AGAIN); - E(WSANO_RECOVERY); - E(WSANO_DATA); - E(0xdeadbeef); /* test the case where no message is available */ - - /* fill up the hash table a bit to make sure it grows properly */ - for (j = 0; j < 50; j++) { - int err; - evutil_secure_rng_get_bytes(&err, sizeof(err)); - evutil_socket_error_to_string(err); - } - } - - s2 = evutil_socket_error_to_string (WSAEINTR); - if (s1 != s2) - printf ("caching failed!\n"); - - libevent_global_shutdown (); - - return EXIT_SUCCESS; -} diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress.c b/external/bsd/ntp/dist/sntp/libevent/test/regress.c index 7cc0388a2c4d..ee2470dc6cb5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c b/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c index a7d84e49958e..1a7cb6c873f8 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c @@ -1,3 +1,3 @@ -/* $NetBSD: regress.gen.c,v 1.1.1.1 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress.gen.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h b/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h index 595d082c203a..723a23415a8e 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h @@ -1,3 +1,3 @@ -/* $NetBSD: regress.gen.h,v 1.1.1.1 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress.gen.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ #define NO_PYTHON_EXISTS diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress.h b/external/bsd/ntp/dist/sntp/libevent/test/regress.h index 4ce9b6124296..07a8155cc15f 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress.h @@ -1,4 +1,4 @@ -/* $NetBSD: regress.h,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c index 08c40e3f6ae3..63062f50bac5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_buffer.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_buffer.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c index 34fd7f89faa0..045376830783 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_bufferevent.c,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: regress_bufferevent.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c index e8db31bb342c..6c0bfa0e6856 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_dns.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_dns.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_et.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_et.c index ea661a3e808c..6d59b2b94349 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_et.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_et.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_et.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c index f4f8393e42ca..5a11c7b8cbea 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_finalize.c,v 1.1.1.1 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_finalize.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2013 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_http.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_http.c index 3eee4351313e..d754866169e5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_http.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_http.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_http.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_http.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_iocp.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_iocp.c index 5957dafd0e31..ad4f2afa2df1 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_iocp.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_iocp.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_iocp.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: regress_iocp.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_listener.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_listener.c index ef2a8ed15c4f..5f4af0aff098 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_listener.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_listener.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_listener.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: regress_listener.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_main.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_main.c index 5316147e6798..d373b7c93900 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_main.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_main.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_main.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c index a3da3d5b2444..0e68e74be0c5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_minheap.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: regress_minheap.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_rpc.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_rpc.c index ea470c9f9e66..b3616b5dd959 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_rpc.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_rpc.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_rpc.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_rpc.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c index b480d1a69f9a..c93ca7c90cea 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_ssl.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_ssl.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.c index f80bc34cc097..6384aeb41591 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_testutils.c,v 1.1.1.1 2013/12/27 23:31:30 christos Exp $ */ +/* $NetBSD: regress_testutils.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.h b/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.h index 1c84caae9c78..5b744bf8df9e 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_testutils.h @@ -1,4 +1,4 @@ -/* $NetBSD: regress_testutils.h,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: regress_testutils.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c index 37e487fdbe59..8997ac57531d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_thread.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_thread.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.h b/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.h index da98a5470ff2..4384a5302458 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.h @@ -1,4 +1,4 @@ -/* $NetBSD: regress_thread.h,v 1.1.1.1 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_thread.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_util.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_util.c index 1399e351c4af..de198b82bd56 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_util.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_util.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_util.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: regress_util.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Nick Mathewson and Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c b/external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c index 07c4dd0e4a0a..e1ff48000e5c 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c @@ -1,4 +1,4 @@ -/* $NetBSD: regress_zlib.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: regress_zlib.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-changelist.c b/external/bsd/ntp/dist/sntp/libevent/test/test-changelist.c index 3738b86fcaec..e0dd2d0f5925 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-changelist.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-changelist.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-changelist.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: test-changelist.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-closed.c b/external/bsd/ntp/dist/sntp/libevent/test/test-closed.c index 11215133e7d4..849f6a8f87cc 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-closed.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-closed.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-closed.c,v 1.1.1.1 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: test-closed.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-dumpevents.c b/external/bsd/ntp/dist/sntp/libevent/test/test-dumpevents.c index 4e7a38b7ef4c..6b76eab918c4 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-dumpevents.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-dumpevents.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-dumpevents.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: test-dumpevents.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-eof.c b/external/bsd/ntp/dist/sntp/libevent/test/test-eof.c index b33fb0f231fe..65e31eb4cd59 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-eof.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-eof.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-eof.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: test-eof.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c b/external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c index 6da75d844975..e2538e866313 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-fdleak.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: test-fdleak.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2012 Ross Lagerwall diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-init.c b/external/bsd/ntp/dist/sntp/libevent/test/test-init.c index e626e93c61b3..a6fef2056dce 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-init.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-init.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-init.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: test-init.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c b/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c index ed8198d0a822..cff85a1f36f5 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-ratelim.c,v 1.1.1.2 2014/12/19 20:37:48 christos Exp $ */ +/* $NetBSD: test-ratelim.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.sh b/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.sh deleted file mode 100755 index b5e0ca62a920..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -FAILED=no - -if test "x$TEST_OUTPUT_FILE" = "x" -then - TEST_OUTPUT_FILE=/dev/null -fi - -# /bin/echo is a little more likely to support -n than sh's builtin echo. -if test -x /bin/echo -then - ECHO=/bin/echo -else - ECHO=echo -fi - -if test "$TEST_OUTPUT_FILE" != "/dev/null" -then - touch "$TEST_OUTPUT_FILE" || exit 1 -fi - -TEST_DIR=. - -T=`echo "$0" | sed -e 's/test-ratelim.sh$//'` -if test -x "$T/test-ratelim" -then - TEST_DIR="$T" -fi - -announce () { - echo $@ - echo $@ >>"$TEST_OUTPUT_FILE" -} - -announce_n () { - $ECHO -n $@ - echo $@ >>"$TEST_OUTPUT_FILE" -} - - -run_tests () { - announce_n " Group limits, no connection limit:" - if $TEST_DIR/test-ratelim -g 30000 -n 30 -t 100 --check-grouplimit 1000 --check-stddev 100 >>"$TEST_OUTPUT_FILE" - then - announce OKAY - else - announce FAILED - FAILED=yes - fi - - announce_n " Connection limit, no group limit:" - if $TEST_DIR/test-ratelim -c 1000 -n 30 -t 100 --check-connlimit 50 --check-stddev 50 >>"$TEST_OUTPUT_FILE" - then - announce OKAY ; - else - announce FAILED ; - FAILED=yes - fi - - announce_n " Connection limit and group limit:" - if $TEST_DIR/test-ratelim -c 1000 -g 30000 -n 30 -t 100 --check-grouplimit 1000 --check-connlimit 50 --check-stddev 50 >>"$TEST_OUTPUT_FILE" - then - announce OKAY ; - else - announce FAILED ; - FAILED=yes - fi - - announce_n " Connection limit and group limit with independent drain:" - if $TEST_DIR/test-ratelim -c 1000 -g 35000 -n 30 -t 100 -G 500 --check-grouplimit 1000 --check-connlimit 50 --check-stddev 50 >>"$TEST_OUTPUT_FILE" - then - announce OKAY ; - else - announce FAILED ; - FAILED=yes - fi - - -} - -announce "Running rate-limiting tests:" - -run_tests - -if test "$FAILED" = "yes"; then - exit 1 -fi diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-time.c b/external/bsd/ntp/dist/sntp/libevent/test/test-time.c index a7940253263a..5cade4866b5d 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-time.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-time.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-time.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: test-time.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/test-weof.c b/external/bsd/ntp/dist/sntp/libevent/test/test-weof.c index e34eadad8678..8f700631c634 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/test-weof.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/test-weof.c @@ -1,4 +1,4 @@ -/* $NetBSD: test-weof.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: test-weof.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * Copyright (c) 2002-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/test/tinytest.c b/external/bsd/ntp/dist/sntp/libevent/test/tinytest.c index dd513a19c270..d7e92407e843 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/tinytest.c +++ b/external/bsd/ntp/dist/sntp/libevent/test/tinytest.c @@ -1,4 +1,4 @@ -/* $NetBSD: tinytest.c,v 1.1.1.1 2013/12/27 23:31:29 christos Exp $ */ +/* $NetBSD: tinytest.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* tinytest.c -- Copyright 2009-2012 Nick Mathewson * diff --git a/external/bsd/ntp/dist/sntp/libevent/test/tinytest.h b/external/bsd/ntp/dist/sntp/libevent/test/tinytest.h index 4ba2eda33399..744580a49a2e 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/tinytest.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/tinytest.h @@ -1,4 +1,4 @@ -/* $NetBSD: tinytest.h,v 1.1.1.1 2013/12/27 23:31:27 christos Exp $ */ +/* $NetBSD: tinytest.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* tinytest.h -- Copyright 2009-2012 Nick Mathewson * diff --git a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_demo.c b/external/bsd/ntp/dist/sntp/libevent/test/tinytest_demo.c deleted file mode 100644 index eff01dc400b2..000000000000 --- a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_demo.c +++ /dev/null @@ -1,259 +0,0 @@ -/* $NetBSD: tinytest_demo.c,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ - -/* tinytest_demo.c -- Copyright 2009-2012 Nick Mathewson - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -/* Welcome to the example file for tinytest! I'll show you how to set up - * some simple and not-so-simple testcases. */ - -/* Make sure you include these headers. */ -#include "tinytest.h" -#include "tinytest_macros.h" - -#include -#include -#include -#include -#include -#ifndef _WIN32 -#include -#endif - -/* ============================================================ */ - -/* First, let's see if strcmp is working. (All your test cases should be - * functions declared to take a single void * as an argument.) */ -void -test_strcmp(void *data) -{ - (void)data; /* This testcase takes no data. */ - - /* Let's make sure the empty string is equal to itself */ - if (strcmp("","")) { - /* This macro tells tinytest to stop the current test - * and go straight to the "end" label. */ - tt_abort_msg("The empty string was not equal to itself"); - } - - /* Pretty often, calling tt_abort_msg to indicate failure is more - heavy-weight than you want. Instead, just say: */ - tt_assert(strcmp("testcase", "testcase") == 0); - - /* Occasionally, you don't want to stop the current testcase just - because a single assertion has failed. In that case, use - tt_want: */ - tt_want(strcmp("tinytest", "testcase") > 0); - - /* You can use the tt_*_op family of macros to compare values and to - fail unless they have the relationship you want. They produce - more useful output than tt_assert, since they display the actual - values of the failing things. - - Fail unless strcmp("abc, "abc") == 0 */ - tt_int_op(strcmp("abc", "abc"), ==, 0); - - /* Fail unless strcmp("abc, "abcd") is less than 0 */ - tt_int_op(strcmp("abc", "abcd"), < , 0); - - /* Incidentally, there's a test_str_op that uses strcmp internally. */ - tt_str_op("abc", <, "abcd"); - - - /* Every test-case function needs to finish with an "end:" - label and (optionally) code to clean up local variables. */ - end: - ; -} - -/* ============================================================ */ - -/* Now let's mess with setup and teardown functions! These are handy if - you have a bunch of tests that all need a similar environment, and you - want to reconstruct that environment freshly for each one. */ - -/* First you declare a type to hold the environment info, and functions to - set it up and tear it down. */ -struct data_buffer { - /* We're just going to have couple of character buffer. Using - setup/teardown functions is probably overkill for this case. - - You could also do file descriptors, complicated handles, temporary - files, etc. */ - char buffer1[512]; - char buffer2[512]; -}; -/* The setup function needs to take a const struct testcase_t and return - void* */ -void * -setup_data_buffer(const struct testcase_t *testcase) -{ - struct data_buffer *db = malloc(sizeof(struct data_buffer)); - - /* If you had a complicated set of setup rules, you might behave - differently here depending on testcase->flags or - testcase->setup_data or even or testcase->name. */ - - /* Returning a NULL here would mean that we couldn't set up for this - test, so we don't need to test db for null. */ - return db; -} -/* The clean function deallocates storage carefully and returns true on - success. */ -int -clean_data_buffer(const struct testcase_t *testcase, void *ptr) -{ - struct data_buffer *db = ptr; - - if (db) { - free(db); - return 1; - } - return 0; -} -/* Finally, declare a testcase_setup_t with these functions. */ -struct testcase_setup_t data_buffer_setup = { - setup_data_buffer, clean_data_buffer -}; - - -/* Now let's write our test. */ -void -test_memcpy(void *ptr) -{ - /* This time, we use the argument. */ - struct data_buffer *db = ptr; - - /* We'll also introduce a local variable that might need cleaning up. */ - char *mem = NULL; - - /* Let's make sure that memcpy does what we'd like. */ - strcpy(db->buffer1, "String 0"); - memcpy(db->buffer2, db->buffer1, sizeof(db->buffer1)); - tt_str_op(db->buffer1, ==, db->buffer2); - - /* Now we've allocated memory that's referenced by a local variable. - The end block of the function will clean it up. */ - mem = strdup("Hello world."); - tt_assert(mem); - - /* Another rather trivial test. */ - tt_str_op(db->buffer1, !=, mem); - - end: - /* This time our end block has something to do. */ - if (mem) - free(mem); -} - -void -test_timeout(void *ptr) -{ - time_t t1, t2; - (void)ptr; - t1 = time(NULL); -#ifdef _WIN32 - Sleep(5000); -#else - sleep(5); -#endif - t2 = time(NULL); - - tt_int_op(t2-t1, >=, 4); - - tt_int_op(t2-t1, <=, 6); - - end: - ; -} - -/* ============================================================ */ - -/* Now we need to make sure that our tests get invoked. First, you take - a bunch of related tests and put them into an array of struct testcase_t. -*/ - -struct testcase_t demo_tests[] = { - /* Here's a really simple test: it has a name you can refer to it - with, and a function to invoke it. */ - { "strcmp", test_strcmp, }, - - /* The second test has a flag, "TT_FORK", to make it run in a - subprocess, and a pointer to the testcase_setup_t that configures - its environment. */ - { "memcpy", test_memcpy, TT_FORK, &data_buffer_setup }, - - /* This flag is off-by-default, since it takes a while to run. You - * can enable it manually by passing +demo/timeout at the command line.*/ - { "timeout", test_timeout, TT_OFF_BY_DEFAULT }, - - /* The array has to end with END_OF_TESTCASES. */ - END_OF_TESTCASES -}; - -/* Next, we make an array of testgroups. This is mandatory. Unlike more - heavy-duty testing frameworks, groups can't nest. */ -struct testgroup_t groups[] = { - - /* Every group has a 'prefix', and an array of tests. That's it. */ - { "demo/", demo_tests }, - - END_OF_GROUPS -}; - -/* We can also define test aliases. These can be used for types of tests that - * cut across groups. */ -const char *alltests[] = { "+..", NULL }; -const char *slowtests[] = { "+demo/timeout", NULL }; -struct testlist_alias_t aliases[] = { - - { "ALL", alltests }, - { "SLOW", slowtests }, - - END_OF_ALIASES -}; - - -int -main(int c, const char **v) -{ - /* Finally, just call tinytest_main(). It lets you specify verbose - or quiet output with --verbose and --quiet. You can list - specific tests: - - tinytest-demo demo/memcpy - - or use a ..-wildcard to select multiple tests with a common - prefix: - - tinytest-demo demo/.. - - If you list no tests, you get them all by default, so that - "tinytest-demo" and "tinytest-demo .." mean the same thing. - - */ - tinytest_set_aliases(aliases); - return tinytest_main(c, v, groups); -} diff --git a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_local.h b/external/bsd/ntp/dist/sntp/libevent/test/tinytest_local.h index 6cd92c96f5d5..bc3e2ec25a80 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_local.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/tinytest_local.h @@ -1,4 +1,4 @@ -/* $NetBSD: tinytest_local.h,v 1.1.1.1 2013/12/27 23:31:27 christos Exp $ */ +/* $NetBSD: tinytest_local.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ #include "util-internal.h" diff --git a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h b/external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h index e424410d519b..250e1b82fcf0 100644 --- a/external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h +++ b/external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h @@ -1,4 +1,4 @@ -/* $NetBSD: tinytest_macros.h,v 1.1.1.1 2013/12/27 23:31:28 christos Exp $ */ +/* $NetBSD: tinytest_macros.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* tinytest_macros.h -- Copyright 2009-2012 Nick Mathewson * diff --git a/external/bsd/ntp/dist/sntp/libevent/time-internal.h b/external/bsd/ntp/dist/sntp/libevent/time-internal.h index 0bff098e0454..68e0acfe1127 100644 --- a/external/bsd/ntp/dist/sntp/libevent/time-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/time-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: time-internal.h,v 1.1.1.1 2013/12/27 23:31:18 christos Exp $ */ +/* $NetBSD: time-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2000-2007 Niels Provos diff --git a/external/bsd/ntp/dist/sntp/libevent/util-internal.h b/external/bsd/ntp/dist/sntp/libevent/util-internal.h index 0bf4a0df05d9..fbec088bf10f 100644 --- a/external/bsd/ntp/dist/sntp/libevent/util-internal.h +++ b/external/bsd/ntp/dist/sntp/libevent/util-internal.h @@ -1,4 +1,4 @@ -/* $NetBSD: util-internal.h,v 1.1.1.2 2014/12/19 20:37:47 christos Exp $ */ +/* $NetBSD: util-internal.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libevent/win32select.c b/external/bsd/ntp/dist/sntp/libevent/win32select.c index 5a8d3d6485e9..e6f900c25d9a 100644 --- a/external/bsd/ntp/dist/sntp/libevent/win32select.c +++ b/external/bsd/ntp/dist/sntp/libevent/win32select.c @@ -1,4 +1,4 @@ -/* $NetBSD: win32select.c,v 1.1.1.2 2014/12/19 20:37:46 christos Exp $ */ +/* $NetBSD: win32select.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * Copyright 2007-2012 Niels Provos and Nick Mathewson diff --git a/external/bsd/ntp/dist/sntp/libopts/ag-char-map.h b/external/bsd/ntp/dist/sntp/libopts/ag-char-map.h index 91d8d06bb04b..2bec5dfe827c 100644 --- a/external/bsd/ntp/dist/sntp/libopts/ag-char-map.h +++ b/external/bsd/ntp/dist/sntp/libopts/ag-char-map.h @@ -1,4 +1,4 @@ -/* $NetBSD: ag-char-map.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: ag-char-map.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* * 29 bits for 46 character classifications diff --git a/external/bsd/ntp/dist/sntp/libopts/alias.c b/external/bsd/ntp/dist/sntp/libopts/alias.c index 706c64fadec9..5881cb9908a5 100644 --- a/external/bsd/ntp/dist/sntp/libopts/alias.c +++ b/external/bsd/ntp/dist/sntp/libopts/alias.c @@ -1,4 +1,4 @@ -/* $NetBSD: alias.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: alias.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/ao-strs.c b/external/bsd/ntp/dist/sntp/libopts/ao-strs.c index 40882b02e220..4dd41f88ecf7 100644 --- a/external/bsd/ntp/dist/sntp/libopts/ao-strs.c +++ b/external/bsd/ntp/dist/sntp/libopts/ao-strs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ao-strs.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: ao-strs.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/ao-strs.h b/external/bsd/ntp/dist/sntp/libopts/ao-strs.h index 45f472f54254..20154c964884 100644 --- a/external/bsd/ntp/dist/sntp/libopts/ao-strs.h +++ b/external/bsd/ntp/dist/sntp/libopts/ao-strs.h @@ -1,4 +1,4 @@ -/* $NetBSD: ao-strs.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: ao-strs.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/autoopts.c b/external/bsd/ntp/dist/sntp/libopts/autoopts.c index 36ef791b185d..02edcd2b32fc 100644 --- a/external/bsd/ntp/dist/sntp/libopts/autoopts.c +++ b/external/bsd/ntp/dist/sntp/libopts/autoopts.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoopts.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: autoopts.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** @@ -15,7 +15,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/autoopts.h b/external/bsd/ntp/dist/sntp/libopts/autoopts.h index 1b08a5f78567..5a11ffd5af6f 100644 --- a/external/bsd/ntp/dist/sntp/libopts/autoopts.h +++ b/external/bsd/ntp/dist/sntp/libopts/autoopts.h @@ -1,4 +1,4 @@ -/* $NetBSD: autoopts.h,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: autoopts.h,v 1.6 2014/12/19 20:43:19 christos Exp $ */ /* @@ -13,7 +13,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -34,6 +34,7 @@ #ifndef AUTOGEN_AUTOOPTS_H #define AUTOGEN_AUTOOPTS_H +#include #define AO_NAME_LIMIT 127 #define AO_NAME_SIZE ((size_t)(AO_NAME_LIMIT + 1)) @@ -384,6 +385,16 @@ extern char* strchr(char const *s, int c); extern char* strrchr(char const *s, int c); #endif +/** + * INQUERY_CALL() tests whether the option handling function has been + * called by an inquery (help text needed, or option being reset), + * or called by a set-the-option operation. + */ +#define INQUERY_CALL(_o, _d) ( \ + ((_o) <= OPTPROC_EMIT_LIMIT) \ + || ((_d) == NULL) \ + || (((_d)->fOptState & OPTST_RESET) != 0) ) + /** * Define and initialize all the user visible strings. * We do not do translations. If translations are to be done, then diff --git a/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h b/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h index 59792a9ed675..1868ff39e776 100644 --- a/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h +++ b/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h @@ -1,21 +1,21 @@ -/* $NetBSD: options.h,v 1.7 2014/11/23 01:47:59 joerg Exp $ */ +/* $NetBSD: options.h,v 1.8 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * * DO NOT EDIT THIS FILE (options.h) * - * It has been AutoGen-ed November 10, 2013 at 01:00:42 PM by AutoGen 5.18.2 + * It has been AutoGen-ed August 3, 2014 at 10:44:46 AM by AutoGen 5.18.4pre11 * From the definitions funcs.def * and the template file options_h * * This file defines all the global structures and special values * used in the automated option processing library. * - * Automated Options Copyright (C) 1992-2013 by Bruce Korb + * Automated Options Copyright (C) 1992-2014 by Bruce Korb * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -103,15 +103,15 @@ * @{ */ /// autoopts structure version -#define OPTIONS_STRUCT_VERSION 163841 +#define OPTIONS_STRUCT_VERSION 167936 /// autoopts structure version string -#define OPTIONS_VERSION_STRING "40:1:15" +#define OPTIONS_VERSION_STRING "41:0:16" /// minimum version the autoopts library supports #define OPTIONS_MINIMUM_VERSION 102400 /// minimum version the autoopts library supports as a string #define OPTIONS_MIN_VER_STRING "25:0:0" /// the display version of the autoopts library, as a string -#define OPTIONS_DOTTED_VERSION "40.1" +#define OPTIONS_DOTTED_VERSION "41.0" /// convert a version/release number pair to an integer value #define OPTIONS_VER_TO_NUM(_v, _r) (((_v) * 4096) + (_r)) /// @} @@ -967,6 +967,31 @@ extern const tOptionValue* optionNextValue(const tOptionValue*, const tOptionVal extern void optionOnlyUsage(tOptions*, int); +/** + * optionPrintVersion - Print the program version + * + * This routine will print the version to stdout. + * + * @param opts program options descriptor + * @param od the descriptor for this arg + */ +extern void optionPrintVersion(tOptions*, tOptDesc*); + + +/** + * optionPrintVersionAndReturn - Print the program version + * + * This routine will print the version to stdout and return + * instead of exiting. Please see the source for the + * @code{print_ver} funtion for details on selecting how + * verbose to be after this function returns. + * + * @param opts program options descriptor + * @param od the descriptor for this arg + */ +extern void optionPrintVersionAndReturn(tOptions*, tOptDesc*); + + /** * optionProcess - this is the main option processing routine * @@ -1199,8 +1224,6 @@ extern void optionParseShell(tOptions*); extern void optionPrintParagraphs(char const *, bool, FILE *); -extern void optionPrintVersion(tOptions*, tOptDesc*); - extern void optionPutShell(tOptions*); extern char const * optionQuoteString(char const *, char const *); diff --git a/external/bsd/ntp/dist/sntp/libopts/autoopts/project.h b/external/bsd/ntp/dist/sntp/libopts/autoopts/project.h index 22d5e94bcadd..2f8cafae7246 100644 --- a/external/bsd/ntp/dist/sntp/libopts/autoopts/project.h +++ b/external/bsd/ntp/dist/sntp/libopts/autoopts/project.h @@ -1,4 +1,4 @@ -/* $NetBSD: project.h,v 1.1.1.3 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: project.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/autoopts/usage-txt.h b/external/bsd/ntp/dist/sntp/libopts/autoopts/usage-txt.h index 2742a033a356..73f8f90aec3c 100644 --- a/external/bsd/ntp/dist/sntp/libopts/autoopts/usage-txt.h +++ b/external/bsd/ntp/dist/sntp/libopts/autoopts/usage-txt.h @@ -1,4 +1,4 @@ -/* $NetBSD: usage-txt.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: usage-txt.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/boolean.c b/external/bsd/ntp/dist/sntp/libopts/boolean.c index 5a1bd6e84b92..3223b32a22e4 100644 --- a/external/bsd/ntp/dist/sntp/libopts/boolean.c +++ b/external/bsd/ntp/dist/sntp/libopts/boolean.c @@ -1,4 +1,4 @@ -/* $NetBSD: boolean.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: boolean.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/check.c b/external/bsd/ntp/dist/sntp/libopts/check.c index 980c00f7d262..b420fc3ed2c8 100644 --- a/external/bsd/ntp/dist/sntp/libopts/check.c +++ b/external/bsd/ntp/dist/sntp/libopts/check.c @@ -1,4 +1,4 @@ -/* $NetBSD: check.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: check.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /** * @file check.c diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/_Noreturn.h b/external/bsd/ntp/dist/sntp/libopts/compat/_Noreturn.h index f90a17e5fab6..82424408de2f 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/_Noreturn.h +++ b/external/bsd/ntp/dist/sntp/libopts/compat/_Noreturn.h @@ -1,4 +1,4 @@ -/* $NetBSD: _Noreturn.h,v 1.1.1.1 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: _Noreturn.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #if !defined _Noreturn && __STDC_VERSION__ < 201112 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/compat.h b/external/bsd/ntp/dist/sntp/libopts/compat/compat.h index 02470d414044..94ab55e29261 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/compat.h +++ b/external/bsd/ntp/dist/sntp/libopts/compat/compat.h @@ -1,4 +1,4 @@ -/* $NetBSD: compat.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: compat.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- Mode: C -*- * diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c b/external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c index 63c83ac4995e..58007c441eb9 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c +++ b/external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c @@ -1,4 +1,4 @@ -/* $NetBSD: pathfind.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: pathfind.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /* -*- Mode: C -*- */ diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/snprintf.c b/external/bsd/ntp/dist/sntp/libopts/compat/snprintf.c index d3e9f80b1906..f87a67aa380c 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/snprintf.c +++ b/external/bsd/ntp/dist/sntp/libopts/compat/snprintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: snprintf.c,v 1.1.1.2 2013/12/27 23:31:37 christos Exp $ */ +/* $NetBSD: snprintf.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #ifndef HAVE_VPRINTF diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/strchr.c b/external/bsd/ntp/dist/sntp/libopts/compat/strchr.c index d0e1d7300e7d..bd53e752d2dd 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/strchr.c +++ b/external/bsd/ntp/dist/sntp/libopts/compat/strchr.c @@ -1,4 +1,4 @@ -/* $NetBSD: strchr.c,v 1.1.1.2 2013/12/27 23:31:37 christos Exp $ */ +/* $NetBSD: strchr.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* SYNOPSIS diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/strdup.c b/external/bsd/ntp/dist/sntp/libopts/compat/strdup.c index 97a98c4b3a06..2a887d086401 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/strdup.c +++ b/external/bsd/ntp/dist/sntp/libopts/compat/strdup.c @@ -1,4 +1,4 @@ -/* $NetBSD: strdup.c,v 1.1.1.2 2013/12/27 23:31:37 christos Exp $ */ +/* $NetBSD: strdup.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * Platforms without strdup ?!?!?! diff --git a/external/bsd/ntp/dist/sntp/libopts/compat/windows-config.h b/external/bsd/ntp/dist/sntp/libopts/compat/windows-config.h index 98dd9130a2c4..4ddf3217e789 100644 --- a/external/bsd/ntp/dist/sntp/libopts/compat/windows-config.h +++ b/external/bsd/ntp/dist/sntp/libopts/compat/windows-config.h @@ -1,4 +1,4 @@ -/* $NetBSD: windows-config.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: windows-config.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/configfile.c b/external/bsd/ntp/dist/sntp/libopts/configfile.c index 79067ff45190..36f0245ff377 100644 --- a/external/bsd/ntp/dist/sntp/libopts/configfile.c +++ b/external/bsd/ntp/dist/sntp/libopts/configfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: configfile.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: configfile.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** * \file configfile.c @@ -11,7 +11,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/cook.c b/external/bsd/ntp/dist/sntp/libopts/cook.c index ed97744285c1..7966d8dc2b0f 100644 --- a/external/bsd/ntp/dist/sntp/libopts/cook.c +++ b/external/bsd/ntp/dist/sntp/libopts/cook.c @@ -1,4 +1,4 @@ -/* $NetBSD: cook.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: cook.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /** * \file cook.c diff --git a/external/bsd/ntp/dist/sntp/libopts/enum.c b/external/bsd/ntp/dist/sntp/libopts/enum.c index 9c8ee0d11114..e88dd71cc956 100644 --- a/external/bsd/ntp/dist/sntp/libopts/enum.c +++ b/external/bsd/ntp/dist/sntp/libopts/enum.c @@ -1,4 +1,4 @@ -/* $NetBSD: enum.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: enum.c,v 1.3 2014/12/19 20:43:19 christos Exp $ */ /** @@ -16,7 +16,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/env.c b/external/bsd/ntp/dist/sntp/libopts/env.c index 7b6bcadf137f..9c23f6c95677 100644 --- a/external/bsd/ntp/dist/sntp/libopts/env.c +++ b/external/bsd/ntp/dist/sntp/libopts/env.c @@ -1,4 +1,4 @@ -/* $NetBSD: env.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: env.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/file.c b/external/bsd/ntp/dist/sntp/libopts/file.c index 97cd4c084383..2d9677fe14d7 100644 --- a/external/bsd/ntp/dist/sntp/libopts/file.c +++ b/external/bsd/ntp/dist/sntp/libopts/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: file.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/find.c b/external/bsd/ntp/dist/sntp/libopts/find.c index 0dfdad7e4df3..2528747901c4 100644 --- a/external/bsd/ntp/dist/sntp/libopts/find.c +++ b/external/bsd/ntp/dist/sntp/libopts/find.c @@ -1,4 +1,4 @@ -/* $NetBSD: find.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: find.c,v 1.3 2014/12/19 20:43:19 christos Exp $ */ /** * @file check.c @@ -14,7 +14,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/genshell.c b/external/bsd/ntp/dist/sntp/libopts/genshell.c index 28733bb8195a..bb3374987516 100644 --- a/external/bsd/ntp/dist/sntp/libopts/genshell.c +++ b/external/bsd/ntp/dist/sntp/libopts/genshell.c @@ -1,4 +1,4 @@ -/* $NetBSD: genshell.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: genshell.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/genshell.h b/external/bsd/ntp/dist/sntp/libopts/genshell.h index 88df5d486d4e..44f34d5730a6 100644 --- a/external/bsd/ntp/dist/sntp/libopts/genshell.h +++ b/external/bsd/ntp/dist/sntp/libopts/genshell.h @@ -1,4 +1,4 @@ -/* $NetBSD: genshell.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: genshell.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/gettext.h b/external/bsd/ntp/dist/sntp/libopts/gettext.h index e6a80cc51087..6b3047d030de 100644 --- a/external/bsd/ntp/dist/sntp/libopts/gettext.h +++ b/external/bsd/ntp/dist/sntp/libopts/gettext.h @@ -1,4 +1,4 @@ -/* $NetBSD: gettext.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: gettext.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* Convenience header for conditional use of GNU . Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software diff --git a/external/bsd/ntp/dist/sntp/libopts/init.c b/external/bsd/ntp/dist/sntp/libopts/init.c index 165c3e8ae4cf..12c4593b88fd 100644 --- a/external/bsd/ntp/dist/sntp/libopts/init.c +++ b/external/bsd/ntp/dist/sntp/libopts/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.3 2014/11/23 01:47:59 joerg Exp $ */ +/* $NetBSD: init.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** * \file initialize.c @@ -11,7 +11,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/intprops.h b/external/bsd/ntp/dist/sntp/libopts/intprops.h index 1761f1eb043f..d90266046491 100644 --- a/external/bsd/ntp/dist/sntp/libopts/intprops.h +++ b/external/bsd/ntp/dist/sntp/libopts/intprops.h @@ -1,4 +1,4 @@ -/* $NetBSD: intprops.h,v 1.1.1.1 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: intprops.h,v 1.2 2014/12/19 20:43:19 christos Exp $ */ /* intprops.h -- properties of integer types diff --git a/external/bsd/ntp/dist/sntp/libopts/libopts.c b/external/bsd/ntp/dist/sntp/libopts/libopts.c index 1f9d19b7ba0e..48af885a8638 100644 --- a/external/bsd/ntp/dist/sntp/libopts/libopts.c +++ b/external/bsd/ntp/dist/sntp/libopts/libopts.c @@ -1,4 +1,4 @@ -/* $NetBSD: libopts.c,v 1.1.1.3 2013/12/27 23:31:35 christos Exp $ */ +/* $NetBSD: libopts.c,v 1.2 2014/12/19 20:43:19 christos Exp $ */ #define AUTOOPTS_INTERNAL 1 #include "autoopts/project.h" diff --git a/external/bsd/ntp/dist/sntp/libopts/load.c b/external/bsd/ntp/dist/sntp/libopts/load.c index 29b5666845cf..9cd77404d277 100644 --- a/external/bsd/ntp/dist/sntp/libopts/load.c +++ b/external/bsd/ntp/dist/sntp/libopts/load.c @@ -1,4 +1,4 @@ -/* $NetBSD: load.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: load.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** @@ -14,7 +14,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/makeshell.c b/external/bsd/ntp/dist/sntp/libopts/makeshell.c index 4e46ee951131..c3455d71521f 100644 --- a/external/bsd/ntp/dist/sntp/libopts/makeshell.c +++ b/external/bsd/ntp/dist/sntp/libopts/makeshell.c @@ -1,4 +1,4 @@ -/* $NetBSD: makeshell.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: makeshell.c,v 1.4 2014/12/19 20:43:19 christos Exp $ */ /** @@ -13,7 +13,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -70,7 +70,7 @@ static void open_out(char const * fname, char const * pname); /* = = = END-STATIC-FORWARD = = = */ -LOCAL void +LOCAL noreturn void option_exits(int exit_code) { if (print_exit) @@ -78,7 +78,7 @@ option_exits(int exit_code) exit(exit_code); } -LOCAL void +LOCAL noreturn void ao_bug(char const * msg) { fprintf(stderr, zao_bug_msg, msg); @@ -92,7 +92,7 @@ fserr_warn(char const * prog, char const * op, char const * fname) op, fname); } -LOCAL void +LOCAL noreturn void fserr_exit(char const * prog, char const * op, char const * fname) { fserr_warn(prog, op, fname); diff --git a/external/bsd/ntp/dist/sntp/libopts/nested.c b/external/bsd/ntp/dist/sntp/libopts/nested.c index 96fecb5514df..e8d2ddebfb97 100644 --- a/external/bsd/ntp/dist/sntp/libopts/nested.c +++ b/external/bsd/ntp/dist/sntp/libopts/nested.c @@ -1,4 +1,4 @@ -/* $NetBSD: nested.c,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: nested.c,v 1.6 2014/12/19 20:43:19 christos Exp $ */ /** @@ -14,7 +14,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -60,22 +60,22 @@ scan_q_str(char const* pzTxt); static tOptionValue * add_string(void ** pp, char const * name, size_t nm_len, - char const* pzValue, size_t dataLen); + char const * val, size_t d_len); static tOptionValue * add_bool(void ** pp, char const * name, size_t nm_len, char const * val, size_t d_len); static tOptionValue* -add_number(void** pp, char const* pzName, size_t nm_len, - char const* val, size_t d_len); +add_number(void ** pp, char const * name, size_t nm_len, + char const * val, size_t d_len); static tOptionValue* -add_nested(void** pp, char const* pzName, size_t nm_len, - char* val, size_t d_len); +add_nested(void ** pp, char const * name, size_t nm_len, + char * val, size_t d_len); static char const * -scan_name(char const* pzName, tOptionValue* pRes); +scan_name(char const * name, tOptionValue * res); static char const * unnamed_xml(char const * txt); @@ -171,28 +171,34 @@ scan_q_str(char const* pzTxt) /** * Associate a name with either a string or no value. + * + * @param[in,out] pp argument list to add to + * @param[in] name the name of the "suboption" + * @param[in] nm_len the length of the name + * @param[in] val the string value for the suboption + * @param[in] d_len the length of the value + * + * @returns the new value structure */ static tOptionValue * add_string(void ** pp, char const * name, size_t nm_len, - char const* pzValue, size_t dataLen) + char const * val, size_t d_len) { tOptionValue* pNV; - size_t sz = nm_len + dataLen + sizeof(*pNV); + size_t sz = nm_len + d_len + sizeof(*pNV); pNV = AGALOC(sz, "option name/str value pair"); - if (pNV == NULL) - return NULL; - if (pzValue == NULL) { + if (val == NULL) { pNV->valType = OPARG_TYPE_NONE; pNV->pzName = pNV->v.strVal; } else { pNV->valType = OPARG_TYPE_STRING; - if (dataLen > 0) { - char const * src = pzValue; + if (d_len > 0) { + char const * src = val; char * pzDst = pNV->v.strVal; - int ct = (int)dataLen; + int ct = (int)d_len; do { int ch = *(src++) & 0xFF; if (ch == NUL) goto data_copy_done; @@ -207,7 +213,7 @@ add_string(void ** pp, char const * name, size_t nm_len, pNV->v.strVal[0] = NUL; } - pNV->pzName = pNV->v.strVal + dataLen + 1; + pNV->pzName = pNV->v.strVal + d_len + 1; } memcpy(pNV->pzName, name, nm_len); @@ -217,23 +223,28 @@ add_string(void ** pp, char const * name, size_t nm_len, } /** - * Associate a name with either a string or no value. + * Associate a name with a boolean value + * + * @param[in,out] pp argument list to add to + * @param[in] name the name of the "suboption" + * @param[in] nm_len the length of the name + * @param[in] val the boolean value for the suboption + * @param[in] d_len the length of the value + * + * @returns the new value structure */ static tOptionValue * add_bool(void ** pp, char const * name, size_t nm_len, char const * val, size_t d_len) { - tOptionValue * new_val; + size_t sz = nm_len + sizeof(tOptionValue) + 1; + tOptionValue * new_val = AGALOC(sz, "bool val"); - { - size_t sz = nm_len + sizeof(tOptionValue) + 1; - new_val = AGALOC(sz, "name/bool value"); - } - - { - char * p = SPN_WHITESPACE_CHARS(val); - d_len -= (unsigned long)(p - val); - val = p; + /* + * Scan over whitespace is constrained by "d_len" + */ + while (IS_WHITESPACE_CHAR(*val) && (d_len > 0)) { + d_len--; val++; } if (d_len == 0) @@ -253,18 +264,26 @@ add_bool(void ** pp, char const * name, size_t nm_len, } /** - * Associate a name with either a string or no value. + * Associate a name with strtol() value, defaulting to zero. + * + * @param[in,out] pp argument list to add to + * @param[in] name the name of the "suboption" + * @param[in] nm_len the length of the name + * @param[in] val the numeric value for the suboption + * @param[in] d_len the length of the value + * + * @returns the new value structure */ static tOptionValue* -add_number(void** pp, char const* pzName, size_t nm_len, - char const* val, size_t d_len) +add_number(void ** pp, char const * name, size_t nm_len, + char const * val, size_t d_len) { - tOptionValue* new_val; - size_t sz = nm_len + sizeof(*new_val) + 1; + size_t sz = nm_len + sizeof(tOptionValue) + 1; + tOptionValue * new_val = AGALOC(sz, "int val"); - new_val = AGALOC(sz, "bool val"); - if (new_val == NULL) - return NULL; + /* + * Scan over whitespace is constrained by "d_len" + */ while (IS_WHITESPACE_CHAR(*val) && (d_len > 0)) { d_len--; val++; } @@ -275,34 +294,40 @@ add_number(void** pp, char const* pzName, size_t nm_len, new_val->valType = OPARG_TYPE_NUMERIC; new_val->pzName = (char*)(new_val + 1); - memcpy(new_val->pzName, pzName, nm_len); + memcpy(new_val->pzName, name, nm_len); new_val->pzName[ nm_len ] = NUL; addArgListEntry(pp, new_val); return new_val; } /** - * Associate a name with either a string or no value. + * Associate a name with a nested/hierarchical value. + * + * @param[in,out] pp argument list to add to + * @param[in] name the name of the "suboption" + * @param[in] nm_len the length of the name + * @param[in] val the nested values for the suboption + * @param[in] d_len the length of the value + * + * @returns the new value structure */ static tOptionValue* -add_nested(void** pp, char const* pzName, size_t nm_len, - char* val, size_t d_len) +add_nested(void ** pp, char const * name, size_t nm_len, + char * val, size_t d_len) { tOptionValue* new_val; if (d_len == 0) { size_t sz = nm_len + sizeof(*new_val) + 1; new_val = AGALOC(sz, "empty nest"); - if (new_val == NULL) - return NULL; new_val->v.nestVal = NULL; new_val->valType = OPARG_TYPE_HIERARCHY; new_val->pzName = (char*)(new_val + 1); - memcpy(new_val->pzName, pzName, nm_len); + memcpy(new_val->pzName, name, nm_len); new_val->pzName[ nm_len ] = NUL; } else { - new_val = optionLoadNested(val, pzName, nm_len); + new_val = optionLoadNested(val, name, nm_len); } if (new_val != NULL) @@ -316,10 +341,10 @@ add_nested(void** pp, char const* pzName, size_t nm_len, * (if called for) and create the name/value association. */ static char const * -scan_name(char const* pzName, tOptionValue* pRes) +scan_name(char const * name, tOptionValue * res) { tOptionValue* new_val; - char const * pzScan = pzName+1; /* we know first char is a name char */ + char const * pzScan = name+1; /* we know first char is a name char */ char const * pzVal; size_t nm_len = 1; size_t d_len = 0; @@ -328,10 +353,10 @@ scan_name(char const* pzName, tOptionValue* pRes) * Scan over characters that name a value. These names may not end * with a colon, but they may contain colons. */ - pzScan = SPN_VALUE_NAME_CHARS(pzName + 1); + pzScan = SPN_VALUE_NAME_CHARS(name + 1); if (pzScan[-1] == ':') pzScan--; - nm_len = (size_t)(pzScan - pzName); + nm_len = (size_t)(pzScan - name); pzScan = SPN_HORIZ_WHITE_CHARS(pzScan); @@ -351,7 +376,7 @@ scan_name(char const* pzName, tOptionValue* pRes) /* FALLTHROUGH */ case NUL: - add_string(&(pRes->v.nestVal), pzName, nm_len, NULL, (size_t)0); + add_string(&(res->v.nestVal), name, nm_len, NULL, (size_t)0); break; case '"': @@ -359,7 +384,7 @@ scan_name(char const* pzName, tOptionValue* pRes) pzVal = pzScan; pzScan = scan_q_str(pzScan); d_len = (size_t)(pzScan - pzVal); - new_val = add_string(&(pRes->v.nestVal), pzName, nm_len, pzVal, + new_val = add_string(&(res->v.nestVal), name, nm_len, pzVal, d_len); if ((new_val != NULL) && (option_load_mode == OPTION_LOAD_COOKED)) ao_string_cook(new_val->v.strVal, NULL); @@ -391,7 +416,7 @@ scan_name(char const* pzName, tOptionValue* pRes) case ',': d_len = (size_t)(pzScan - pzVal) - 1; string_done: - new_val = add_string(&(pRes->v.nestVal), pzName, nm_len, + new_val = add_string(&(res->v.nestVal), name, nm_len, pzVal, d_len); if (new_val != NULL) remove_continuation(new_val->v.strVal); @@ -587,8 +612,6 @@ scan_xml(char const * xml_name, tOptionValue * res_val) case OPARG_TYPE_HIERARCHY: { char * pz = AGALOC(v_len+1, "h scan"); - if (pz == NULL) - break; memcpy(pz, val_str, v_len); pz[v_len] = NUL; add_nested(&(res_val->v.nestVal), xml_name, nm_len, pz, v_len); diff --git a/external/bsd/ntp/dist/sntp/libopts/numeric.c b/external/bsd/ntp/dist/sntp/libopts/numeric.c index 138b08f15f07..de04291b75d8 100644 --- a/external/bsd/ntp/dist/sntp/libopts/numeric.c +++ b/external/bsd/ntp/dist/sntp/libopts/numeric.c @@ -1,4 +1,4 @@ -/* $NetBSD: numeric.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: numeric.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /** @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -111,6 +111,13 @@ optionNumericVal(tOptions * opts, tOptDesc * od) char* pz; long val; + /* + * Guard against all the different ways this procedure might get invoked + * when there is no string argument provided. + */ + if (INQUERY_CALL(opts, od) || (od->optArg.argString == NULL)) + return; + /* * Numeric options may have a range associated with it. * If it does, the usage procedure requests that it be diff --git a/external/bsd/ntp/dist/sntp/libopts/option-value-type.c b/external/bsd/ntp/dist/sntp/libopts/option-value-type.c index 0e596092256a..7bb636e4bee3 100644 --- a/external/bsd/ntp/dist/sntp/libopts/option-value-type.c +++ b/external/bsd/ntp/dist/sntp/libopts/option-value-type.c @@ -1,4 +1,4 @@ -/* $NetBSD: option-value-type.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: option-value-type.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/option-value-type.h b/external/bsd/ntp/dist/sntp/libopts/option-value-type.h index 0fd8faab0a8a..dc484978379a 100644 --- a/external/bsd/ntp/dist/sntp/libopts/option-value-type.h +++ b/external/bsd/ntp/dist/sntp/libopts/option-value-type.h @@ -1,4 +1,4 @@ -/* $NetBSD: option-value-type.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: option-value-type.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.c b/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.c index f53d6e613399..270f7a72cbf6 100644 --- a/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.c +++ b/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.c @@ -1,4 +1,4 @@ -/* $NetBSD: option-xat-attribute.c,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: option-xat-attribute.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.h b/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.h index 24f2beaef743..b8380b2b0830 100644 --- a/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.h +++ b/external/bsd/ntp/dist/sntp/libopts/option-xat-attribute.h @@ -1,4 +1,4 @@ -/* $NetBSD: option-xat-attribute.h,v 1.1.1.2 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: option-xat-attribute.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/parse-duration.c b/external/bsd/ntp/dist/sntp/libopts/parse-duration.c index 99bf5e80b75d..0dc5c629d539 100644 --- a/external/bsd/ntp/dist/sntp/libopts/parse-duration.c +++ b/external/bsd/ntp/dist/sntp/libopts/parse-duration.c @@ -1,7 +1,7 @@ -/* $NetBSD: parse-duration.c,v 1.4 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: parse-duration.c,v 1.5 2014/12/19 20:43:20 christos Exp $ */ /* Parse a time duration and return a seconds count - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruce Korb , 2008. This program is free software: you can redistribute it and/or modify @@ -29,6 +29,8 @@ #include #include +#include "intprops.h" + #ifndef NUL #define NUL '\0' #endif @@ -53,7 +55,8 @@ typedef enum { #define SEC_PER_MONTH (SEC_PER_DAY * 30) #define SEC_PER_YEAR (SEC_PER_DAY * 365) -#define TIME_MAX 0x7FFFFFFF +#undef MAX_DURATION +#define MAX_DURATION TYPE_MAXIMUM(time_t) /* Wrapper around strtoul that does not require a cast. */ static unsigned long @@ -82,14 +85,14 @@ scale_n_add (time_t base, time_t val, int scale) return BAD_TIME; } - if (val > TIME_MAX / scale) + if (val > MAX_DURATION / scale) { errno = ERANGE; return BAD_TIME; } val *= scale; - if (base > TIME_MAX - val) + if (base > MAX_DURATION - val) { errno = ERANGE; return BAD_TIME; diff --git a/external/bsd/ntp/dist/sntp/libopts/parse-duration.h b/external/bsd/ntp/dist/sntp/libopts/parse-duration.h index 4a2344ba84ad..ac2fa00c5cc7 100644 --- a/external/bsd/ntp/dist/sntp/libopts/parse-duration.h +++ b/external/bsd/ntp/dist/sntp/libopts/parse-duration.h @@ -1,4 +1,4 @@ -/* $NetBSD: parse-duration.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: parse-duration.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* Parse a time duration and return a seconds count Copyright (C) 2008-2014 Free Software Foundation, Inc. diff --git a/external/bsd/ntp/dist/sntp/libopts/pgusage.c b/external/bsd/ntp/dist/sntp/libopts/pgusage.c index b35ba1d7e898..dca556e1d635 100644 --- a/external/bsd/ntp/dist/sntp/libopts/pgusage.c +++ b/external/bsd/ntp/dist/sntp/libopts/pgusage.c @@ -1,4 +1,4 @@ -/* $NetBSD: pgusage.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: pgusage.c,v 1.3 2014/12/19 20:43:20 christos Exp $ */ /** @@ -15,7 +15,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/proto.h b/external/bsd/ntp/dist/sntp/libopts/proto.h index 816d6b902657..1cdc95b6874b 100644 --- a/external/bsd/ntp/dist/sntp/libopts/proto.h +++ b/external/bsd/ntp/dist/sntp/libopts/proto.h @@ -1,4 +1,4 @@ -/* $NetBSD: proto.h,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: proto.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* -*- buffer-read-only: t -*- vi: set ro: * diff --git a/external/bsd/ntp/dist/sntp/libopts/putshell.c b/external/bsd/ntp/dist/sntp/libopts/putshell.c index ba58e4232d8b..e6978add7241 100644 --- a/external/bsd/ntp/dist/sntp/libopts/putshell.c +++ b/external/bsd/ntp/dist/sntp/libopts/putshell.c @@ -1,4 +1,4 @@ -/* $NetBSD: putshell.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: putshell.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /** @@ -14,7 +14,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/reset.c b/external/bsd/ntp/dist/sntp/libopts/reset.c index ba7234444ebe..7449183892b8 100644 --- a/external/bsd/ntp/dist/sntp/libopts/reset.c +++ b/external/bsd/ntp/dist/sntp/libopts/reset.c @@ -1,4 +1,4 @@ -/* $NetBSD: reset.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: reset.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /** @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/restore.c b/external/bsd/ntp/dist/sntp/libopts/restore.c index f079b5ec5805..16d44c159c5a 100644 --- a/external/bsd/ntp/dist/sntp/libopts/restore.c +++ b/external/bsd/ntp/dist/sntp/libopts/restore.c @@ -1,4 +1,4 @@ -/* $NetBSD: restore.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: restore.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* diff --git a/external/bsd/ntp/dist/sntp/libopts/save.c b/external/bsd/ntp/dist/sntp/libopts/save.c index 017b1b277450..bcf998ba4d99 100644 --- a/external/bsd/ntp/dist/sntp/libopts/save.c +++ b/external/bsd/ntp/dist/sntp/libopts/save.c @@ -1,4 +1,4 @@ -/* $NetBSD: save.c,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: save.c,v 1.6 2014/12/19 20:43:20 christos Exp $ */ /* @@ -14,7 +14,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/sort.c b/external/bsd/ntp/dist/sntp/libopts/sort.c index 1e7c9d65e183..763c5d492381 100644 --- a/external/bsd/ntp/dist/sntp/libopts/sort.c +++ b/external/bsd/ntp/dist/sntp/libopts/sort.c @@ -1,4 +1,4 @@ -/* $NetBSD: sort.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: sort.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* diff --git a/external/bsd/ntp/dist/sntp/libopts/stack.c b/external/bsd/ntp/dist/sntp/libopts/stack.c index 19e1b8431b79..ec9d31716f63 100644 --- a/external/bsd/ntp/dist/sntp/libopts/stack.c +++ b/external/bsd/ntp/dist/sntp/libopts/stack.c @@ -1,4 +1,4 @@ -/* $NetBSD: stack.c,v 1.4 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: stack.c,v 1.5 2014/12/19 20:43:20 christos Exp $ */ /** @@ -13,7 +13,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -40,35 +40,30 @@ * private: * * what: Remove option args from a stack - * arg: + tOptions* + pOpts + program options descriptor + - * arg: + tOptDesc* + pOptDesc + the descriptor for this arg + + * arg: + tOptions* + opts + program options descriptor + + * arg: + tOptDesc* + od + the descriptor for this arg + * * doc: * Invoked for options that are equivalenced to stacked options. =*/ void -optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) +optionUnstackArg(tOptions * opts, tOptDesc * od) { - tArgList * pAL; + tArgList * arg_list; - (void)pOpts; - - if (pOpts <= OPTPROC_EMIT_LIMIT) + if (INQUERY_CALL(opts, od)) return; - if ((pOptDesc->fOptState & OPTST_RESET) != 0) - return; - - pAL = (tArgList*)pOptDesc->optCookie; + arg_list = (tArgList*)od->optCookie; /* * IF we don't have any stacked options, * THEN indicate that we don't have any of these options */ - if (pAL == NULL) { - pOptDesc->fOptState &= OPTST_PERSISTENT_MASK; - if ((pOptDesc->fOptState & OPTST_INITENABLED) == 0) - pOptDesc->fOptState |= OPTST_DISABLED; + if (arg_list == NULL) { + od->fOptState &= OPTST_PERSISTENT_MASK; + if ((od->fOptState & OPTST_INITENABLED) == 0) + od->fOptState |= OPTST_DISABLED; return; } @@ -77,7 +72,7 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) regex_t re; int i, ct, dIdx; - if (regcomp(&re, pOptDesc->optArg.argString, REG_NOSUB) != 0) + if (regcomp(&re, od->optArg.argString, REG_NOSUB) != 0) return; /* @@ -86,8 +81,8 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * index is incremented every time. The destination only when * we are keeping a define. */ - for (i = 0, dIdx = 0, ct = pAL->useCt; --ct >= 0; i++) { - char const * pzSrc = pAL->apzArgs[ i ]; + for (i = 0, dIdx = 0, ct = arg_list->useCt; --ct >= 0; i++) { + char const * pzSrc = arg_list->apzArgs[ i ]; char * pzEq = strchr(pzSrc, '='); int res; @@ -104,7 +99,7 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * the list. */ AGFREE(pzSrc); - pAL->useCt--; + arg_list->useCt--; break; default: @@ -117,7 +112,7 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * THEN we have to move the current one. */ if (dIdx != i) - pAL->apzArgs[ dIdx ] = pzSrc; + arg_list->apzArgs[ dIdx ] = pzSrc; dIdx++; } } @@ -134,21 +129,21 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * index is incremented every time. The destination only when * we are keeping a define. */ - for (i = 0, dIdx = 0, ct = pAL->useCt; --ct >= 0; i++) { - const char * pzSrc = pAL->apzArgs[ i ]; + for (i = 0, dIdx = 0, ct = arg_list->useCt; --ct >= 0; i++) { + const char * pzSrc = arg_list->apzArgs[ i ]; char * pzEq = strchr(pzSrc, '='); if (pzEq != NULL) *pzEq = NUL; - if (strcmp(pzSrc, pOptDesc->optArg.argString) == 0) { + if (strcmp(pzSrc, od->optArg.argString) == 0) { /* * Remove this entry by reducing the in-use count * and *not* putting the string pointer back into * the list. */ AGFREE(pzSrc); - pAL->useCt--; + arg_list->useCt--; } else { if (pzEq != NULL) *pzEq = '='; @@ -158,7 +153,7 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * THEN we have to move the current one. */ if (dIdx != i) - pAL->apzArgs[ dIdx ] = pzSrc; + arg_list->apzArgs[ dIdx ] = pzSrc; dIdx++; } } @@ -168,12 +163,12 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * IF we have unstacked everything, * THEN indicate that we don't have any of these options */ - if (pAL->useCt == 0) { - pOptDesc->fOptState &= OPTST_PERSISTENT_MASK; - if ((pOptDesc->fOptState & OPTST_INITENABLED) == 0) - pOptDesc->fOptState |= OPTST_DISABLED; - AGFREE((void*)pAL); - pOptDesc->optCookie = NULL; + if (arg_list->useCt == 0) { + od->fOptState &= OPTST_PERSISTENT_MASK; + if ((od->fOptState & OPTST_INITENABLED) == 0) + od->fOptState |= OPTST_DISABLED; + AGFREE((void *)arg_list); + od->optCookie = NULL; } } @@ -184,7 +179,7 @@ optionUnstackArg(tOptions * pOpts, tOptDesc * pOptDesc) * as an opaque address. */ LOCAL void -addArgListEntry(void** ppAL, void* entry) +addArgListEntry(void ** ppAL, void * entry) { tArgList* pAL = *(void**)ppAL; @@ -231,37 +226,37 @@ addArgListEntry(void** ppAL, void* entry) * private: * * what: put option args on a stack - * arg: + tOptions* + pOpts + program options descriptor + - * arg: + tOptDesc* + pOptDesc + the descriptor for this arg + + * arg: + tOptions* + opts + program options descriptor + + * arg: + tOptDesc* + od + the descriptor for this arg + * * doc: * Keep an entry-ordered list of option arguments. =*/ void -optionStackArg(tOptions * pOpts, tOptDesc * pOD) +optionStackArg(tOptions * opts, tOptDesc * od) { char * pz; - if (pOpts <= OPTPROC_EMIT_LIMIT) + if (INQUERY_CALL(opts, od)) return; - if ((pOD->fOptState & OPTST_RESET) != 0) { - tArgList* pAL = (void*)pOD->optCookie; + if ((od->fOptState & OPTST_RESET) != 0) { + tArgList * arg_list = (void*)od->optCookie; int ix; - if (pAL == NULL) + if (arg_list == NULL) return; - ix = pAL->useCt; + ix = arg_list->useCt; while (--ix >= 0) - AGFREE(pAL->apzArgs[ix]); - AGFREE(pAL); + AGFREE(arg_list->apzArgs[ix]); + AGFREE(arg_list); } else { - if (pOD->optArg.argString == NULL) + if (od->optArg.argString == NULL) return; - AGDUPSTR(pz, pOD->optArg.argString, "stack arg"); - addArgListEntry(&(pOD->optCookie), (void*)pz); + AGDUPSTR(pz, od->optArg.argString, "stack arg"); + addArgListEntry(&(od->optCookie), (void*)pz); } } /** @} diff --git a/external/bsd/ntp/dist/sntp/libopts/stdnoreturn.in.h b/external/bsd/ntp/dist/sntp/libopts/stdnoreturn.in.h index 9536ae17a4bf..bde35882fece 100644 --- a/external/bsd/ntp/dist/sntp/libopts/stdnoreturn.in.h +++ b/external/bsd/ntp/dist/sntp/libopts/stdnoreturn.in.h @@ -1,4 +1,4 @@ -/* $NetBSD: stdnoreturn.in.h,v 1.1.1.1 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: stdnoreturn.in.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* A substitute for ISO C11 . diff --git a/external/bsd/ntp/dist/sntp/libopts/streqvcmp.c b/external/bsd/ntp/dist/sntp/libopts/streqvcmp.c index 0b7deeeb644f..2da50169e5b0 100644 --- a/external/bsd/ntp/dist/sntp/libopts/streqvcmp.c +++ b/external/bsd/ntp/dist/sntp/libopts/streqvcmp.c @@ -1,4 +1,4 @@ -/* $NetBSD: streqvcmp.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: streqvcmp.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /** @@ -17,7 +17,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/text_mmap.c b/external/bsd/ntp/dist/sntp/libopts/text_mmap.c index 07324e2b4c0f..6d10edaf5112 100644 --- a/external/bsd/ntp/dist/sntp/libopts/text_mmap.c +++ b/external/bsd/ntp/dist/sntp/libopts/text_mmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: text_mmap.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: text_mmap.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /** * @file text_mmap.c diff --git a/external/bsd/ntp/dist/sntp/libopts/time.c b/external/bsd/ntp/dist/sntp/libopts/time.c index 4e9958427a38..5395f200ce0b 100644 --- a/external/bsd/ntp/dist/sntp/libopts/time.c +++ b/external/bsd/ntp/dist/sntp/libopts/time.c @@ -1,4 +1,4 @@ -/* $NetBSD: time.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: time.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /** diff --git a/external/bsd/ntp/dist/sntp/libopts/tokenize.c b/external/bsd/ntp/dist/sntp/libopts/tokenize.c index 9303f5229074..fb90dc66a13c 100644 --- a/external/bsd/ntp/dist/sntp/libopts/tokenize.c +++ b/external/bsd/ntp/dist/sntp/libopts/tokenize.c @@ -1,4 +1,4 @@ -/* $NetBSD: tokenize.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: tokenize.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /** \file tokenize.c * @@ -11,7 +11,7 @@ * This file defines the string_tokenize interface * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/usage.c b/external/bsd/ntp/dist/sntp/libopts/usage.c index be438d905ee2..751e452ef3a1 100644 --- a/external/bsd/ntp/dist/sntp/libopts/usage.c +++ b/external/bsd/ntp/dist/sntp/libopts/usage.c @@ -1,4 +1,4 @@ -/* $NetBSD: usage.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: usage.c,v 1.3 2014/12/19 20:43:20 christos Exp $ */ /* @@ -20,7 +20,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2013 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff --git a/external/bsd/ntp/dist/sntp/libopts/version.c b/external/bsd/ntp/dist/sntp/libopts/version.c index 1ebc09833d29..3d4d50af88f0 100644 --- a/external/bsd/ntp/dist/sntp/libopts/version.c +++ b/external/bsd/ntp/dist/sntp/libopts/version.c @@ -1,4 +1,4 @@ -/* $NetBSD: version.c,v 1.1.1.4 2014/12/19 20:37:45 christos Exp $ */ +/* $NetBSD: version.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /** \file version.c diff --git a/external/bsd/ntp/dist/sntp/log.c b/external/bsd/ntp/dist/sntp/log.c index e16a98b0dfb6..77bf58bac6a1 100644 --- a/external/bsd/ntp/dist/sntp/log.c +++ b/external/bsd/ntp/dist/sntp/log.c @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.6 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: log.c,v 1.7 2014/12/19 20:43:18 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/sntp/log.h b/external/bsd/ntp/dist/sntp/log.h index ea9c0cf80d8e..e646bdbdc233 100644 --- a/external/bsd/ntp/dist/sntp/log.h +++ b/external/bsd/ntp/dist/sntp/log.h @@ -1,4 +1,4 @@ -/* $NetBSD: log.h,v 1.4 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: log.h,v 1.5 2014/12/19 20:43:18 christos Exp $ */ #ifndef LOG_H #define LOG_H diff --git a/external/bsd/ntp/dist/sntp/main.c b/external/bsd/ntp/dist/sntp/main.c index 0d3b61b7dac2..b11f8dd7bbd6 100644 --- a/external/bsd/ntp/dist/sntp/main.c +++ b/external/bsd/ntp/dist/sntp/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2013/12/30 01:34:23 christos Exp $ */ +/* $NetBSD: main.c,v 1.11 2014/12/19 20:43:18 christos Exp $ */ #include @@ -87,7 +87,7 @@ sent_pkt * fam_listheads[2]; static union { struct pkt pkt; - char buf[1500]; + char buf[LEN_PKT_NOMAC + NTP_MAXEXTEN + MAX_MAC_LEN]; } rbuf; #define r_pkt rbuf.pkt diff --git a/external/bsd/ntp/dist/sntp/main.h b/external/bsd/ntp/dist/sntp/main.h index bfa87f653b2a..bdb09f96fbe4 100644 --- a/external/bsd/ntp/dist/sntp/main.h +++ b/external/bsd/ntp/dist/sntp/main.h @@ -1,4 +1,4 @@ -/* $NetBSD: main.h,v 1.1.1.2 2013/12/27 23:31:10 christos Exp $ */ +/* $NetBSD: main.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef MAIN_H #define MAIN_H diff --git a/external/bsd/ntp/dist/sntp/networking.c b/external/bsd/ntp/dist/sntp/networking.c index 9387d84e8137..7c16f98a06ef 100644 --- a/external/bsd/ntp/dist/sntp/networking.c +++ b/external/bsd/ntp/dist/sntp/networking.c @@ -1,4 +1,4 @@ -/* $NetBSD: networking.c,v 1.7 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: networking.c,v 1.8 2014/12/19 20:43:18 christos Exp $ */ #include #include "networking.h" @@ -64,6 +64,30 @@ recvdata( return recvc; } +/* Parsing from a short 'struct pkt' directly is bound to create + * coverity warnings. These are hard to avoid, as the formal declaration + * does not reflect the true layout in the presence of autokey extension + * fields. Parsing and skipping the extension fields of a received packet + * until there's only the MAC left is better done in this separate + * function. + */ +static void* +skip_efields( + u_int32 *head, /* head of extension chain */ + u_int32 *tail /* tail/end of extension chain */ + ) +{ + + u_int nlen; /* next extension length */ + while ((tail - head) > 6) { + nlen = ntohl(*head++) & 0xffff; + nlen = (nlen + 3) >> 2; + if (nlen > (tail - head) || nlen < 4) + return NULL; /* Blooper! Inconsistent! */ + head += nlen; + } + return head; +} /* ** Check if it's data for us and whether it's useable or not. @@ -84,16 +108,15 @@ process_pkt ( u_int key_id; struct key * pkt_key; int is_authentic; - u_int exten_words; - u_int exten_words_used; int mac_size; u_int exten_len; + u_int32 * exten_end; + u_int32 * packet_end; l_fp sent_xmt; l_fp resp_org; key_id = 0; pkt_key = NULL; - exten_words_used = 0; is_authentic = (HAVE_OPT(AUTHENTICATION)) ? 0 : -1; /* @@ -114,35 +137,36 @@ process_pkt ( func_name, pkt_len); return PACKET_UNUSEABLE; } - /* skip past the extensions, if any */ - exten_words = ((unsigned)pkt_len - LEN_PKT_NOMAC) >> 2; - while (exten_words > 6) { - exten_len = ntohl(rpkt->exten[exten_words_used]) & 0xffff; - exten_len = (exten_len + 7) >> 2; /* convert to words, add 1 */ - if (exten_len > exten_words || exten_len < 5) - goto unusable; - exten_words -= exten_len; - exten_words_used += exten_len; - } + /* Note: pkt_len must be a multiple of 4 at this point! */ + packet_end = (u_int32*)((char*)rpkt + pkt_len); + exten_end = skip_efields(rpkt->exten, packet_end); + if (NULL == exten_end) + goto unusable; + /* get size of MAC in cells; can be zero */ + exten_len = (u_int)(packet_end - exten_end); - switch (exten_words) { + /* deduce action required from remaining length */ + switch (exten_len) { - case 0: + case 0: /* no MAC at all */ break; - case 1: - key_id = ntohl(rpkt->exten[exten_words_used]); + case 1: /* crypto NAK */ + key_id = ntohl(*exten_end); printf("Crypto NAK = 0x%08x\n", key_id); break; - case 5: - case 6: + case 3: /* key ID + 3DES MAC -- unsupported! */ + goto unusable; + + case 5: /* key ID + MD5 MAC */ + case 6: /* key ID + SHA MAC */ /* ** Look for the key used by the server in the specified ** keyfile and if existent, fetch it or else leave the ** pointer untouched */ - key_id = ntohl(rpkt->exten[exten_words_used]); + key_id = ntohl(*exten_end); get_key(key_id, &pkt_key); if (!pkt_key) { printf("unrecognized key ID = 0x%08x\n", key_id); @@ -154,7 +178,7 @@ process_pkt ( ** Generate a md5sum of the packet with the key from our ** keyfile and compare those md5sums. */ - mac_size = exten_words << 2; + mac_size = exten_len << 2; if (!auth_md5((char *)rpkt, pkt_len - mac_size, mac_size - 4, pkt_key)) { is_authentic = FALSE; @@ -168,7 +192,6 @@ process_pkt ( default: goto unusable; - break; } switch (is_authentic) { diff --git a/external/bsd/ntp/dist/sntp/networking.h b/external/bsd/ntp/dist/sntp/networking.h index 23685b9c7b0e..00056c7d1d41 100644 --- a/external/bsd/ntp/dist/sntp/networking.h +++ b/external/bsd/ntp/dist/sntp/networking.h @@ -1,4 +1,4 @@ -/* $NetBSD: networking.h,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: networking.h,v 1.6 2014/12/19 20:43:18 christos Exp $ */ #ifndef NETWORKING_H #define NETWORKING_H diff --git a/external/bsd/ntp/dist/sntp/sntp-opts.c b/external/bsd/ntp/dist/sntp/sntp-opts.c index 6a0492150727..cdaa4cba690b 100644 --- a/external/bsd/ntp/dist/sntp/sntp-opts.c +++ b/external/bsd/ntp/dist/sntp/sntp-opts.c @@ -1,13 +1,13 @@ -/* $NetBSD: sntp-opts.c,v 1.2 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: sntp-opts.c,v 1.3 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed December 24, 2013 at 11:31:42 AM by AutoGen 5.18.3pre5 + * It has been AutoGen-ed December 19, 2014 at 07:51:01 AM by AutoGen 5.18.5pre4 * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 40:1:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -20,7 +20,7 @@ * The sntp program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2013 The University of Delaware, all rights reserved. + * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (sntp_opt_strs+0) -#define zLicenseDescrip (sntp_opt_strs+314) +#define zLicenseDescrip (sntp_opt_strs+310) /* * global included definitions @@ -71,15 +71,15 @@ extern FILE * option_usage_fp; /** * static const strings for sntp options */ -static char const sntp_opt_strs[2499] = -/* 0 */ "sntp 4.2.7p404\n" - "Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n" +static char const sntp_opt_strs[2487] = +/* 0 */ "sntp 4.2.8\n" + "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" "can be seen at:\n" " \n" " \n\0" -/* 314 */ "Permission to use, copy, modify, and distribute this software and its\n" +/* 310 */ "Permission to use, copy, modify, and distribute this software and its\n" "documentation for any purpose with or without fee is hereby granted,\n" "provided that the above copyright notice appears in all copies and that\n" "both the copyright notice and this permission notice appear in supporting\n" @@ -88,94 +88,94 @@ static char const sntp_opt_strs[2499] = "specific, written prior permission. The University of Delaware makes no\n" "representations about the suitability this software for any purpose. It is\n" "provided \"as is\" without express or implied warranty.\n\0" -/* 954 */ "Force IPv4 DNS name resolution\0" -/* 985 */ "IPV4\0" -/* 990 */ "ipv4\0" -/* 995 */ "Force IPv6 DNS name resolution\0" -/* 1026 */ "IPV6\0" -/* 1031 */ "ipv6\0" -/* 1036 */ "Enable authentication with the key auth-keynumber\0" -/* 1086 */ "AUTHENTICATION\0" -/* 1101 */ "authentication\0" -/* 1116 */ "Listen to the address specified for broadcast time sync\0" -/* 1172 */ "BROADCAST\0" -/* 1182 */ "broadcast\0" -/* 1192 */ "Concurrently query all IPs returned for host-name\0" -/* 1242 */ "CONCURRENT\0" -/* 1253 */ "concurrent\0" -/* 1264 */ "Increase debug verbosity level\0" -/* 1295 */ "DEBUG_LEVEL\0" -/* 1307 */ "debug-level\0" -/* 1319 */ "Set the debug verbosity level\0" -/* 1349 */ "SET_DEBUG_LEVEL\0" -/* 1365 */ "set-debug-level\0" -/* 1381 */ "The gap (in milliseconds) between time requests\0" -/* 1429 */ "GAP\0" -/* 1433 */ "gap\0" -/* 1437 */ "KoD history filename\0" -/* 1458 */ "KOD\0" -/* 1462 */ "kod\0" -/* 1466 */ "/var/db/ntp-kod\0" -/* 1482 */ "Look in this file for the key specified with -a\0" -/* 1530 */ "KEYFILE\0" -/* 1538 */ "keyfile\0" -/* 1546 */ "Log to specified logfile\0" -/* 1571 */ "LOGFILE\0" -/* 1579 */ "logfile\0" -/* 1587 */ "Adjustments less than steplimit msec will be slewed\0" -/* 1639 */ "STEPLIMIT\0" -/* 1649 */ "steplimit\0" -/* 1659 */ "Send int as our NTP protocol version\0" -/* 1696 */ "NTPVERSION\0" -/* 1707 */ "ntpversion\0" -/* 1718 */ "Use the NTP Reserved Port (port 123)\0" -/* 1755 */ "USERESERVEDPORT\0" -/* 1771 */ "usereservedport\0" -/* 1787 */ "OK to 'step' the time with settimeofday(2)\0" -/* 1830 */ "STEP\0" -/* 1835 */ "step\0" -/* 1840 */ "OK to 'slew' the time with adjtime(2)\0" -/* 1878 */ "SLEW\0" -/* 1883 */ "slew\0" -/* 1888 */ "The number of seconds to wait for responses\0" -/* 1932 */ "TIMEOUT\0" -/* 1940 */ "timeout\0" -/* 1948 */ "Wait for pending replies (if not setting the time)\0" -/* 1999 */ "WAIT\0" -/* 2004 */ "no-wait\0" -/* 2012 */ "no\0" -/* 2015 */ "display extended usage information and exit\0" -/* 2059 */ "help\0" -/* 2064 */ "extended usage information passed thru pager\0" -/* 2109 */ "more-help\0" -/* 2119 */ "output version information and exit\0" -/* 2155 */ "version\0" -/* 2163 */ "save the option state to a config file\0" -/* 2202 */ "save-opts\0" -/* 2212 */ "load options from a config file\0" -/* 2244 */ "LOAD_OPTS\0" -/* 2254 */ "no-load-opts\0" -/* 2267 */ "SNTP\0" -/* 2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p404\n" +/* 950 */ "Force IPv4 DNS name resolution\0" +/* 981 */ "IPV4\0" +/* 986 */ "ipv4\0" +/* 991 */ "Force IPv6 DNS name resolution\0" +/* 1022 */ "IPV6\0" +/* 1027 */ "ipv6\0" +/* 1032 */ "Enable authentication with the key auth-keynumber\0" +/* 1082 */ "AUTHENTICATION\0" +/* 1097 */ "authentication\0" +/* 1112 */ "Listen to the address specified for broadcast time sync\0" +/* 1168 */ "BROADCAST\0" +/* 1178 */ "broadcast\0" +/* 1188 */ "Concurrently query all IPs returned for host-name\0" +/* 1238 */ "CONCURRENT\0" +/* 1249 */ "concurrent\0" +/* 1260 */ "Increase debug verbosity level\0" +/* 1291 */ "DEBUG_LEVEL\0" +/* 1303 */ "debug-level\0" +/* 1315 */ "Set the debug verbosity level\0" +/* 1345 */ "SET_DEBUG_LEVEL\0" +/* 1361 */ "set-debug-level\0" +/* 1377 */ "The gap (in milliseconds) between time requests\0" +/* 1425 */ "GAP\0" +/* 1429 */ "gap\0" +/* 1433 */ "KoD history filename\0" +/* 1454 */ "KOD\0" +/* 1458 */ "kod\0" +/* 1462 */ "/var/db/ntp-kod\0" +/* 1478 */ "Look in this file for the key specified with -a\0" +/* 1526 */ "KEYFILE\0" +/* 1534 */ "keyfile\0" +/* 1542 */ "Log to specified logfile\0" +/* 1567 */ "LOGFILE\0" +/* 1575 */ "logfile\0" +/* 1583 */ "Adjustments less than steplimit msec will be slewed\0" +/* 1635 */ "STEPLIMIT\0" +/* 1645 */ "steplimit\0" +/* 1655 */ "Send int as our NTP protocol version\0" +/* 1692 */ "NTPVERSION\0" +/* 1703 */ "ntpversion\0" +/* 1714 */ "Use the NTP Reserved Port (port 123)\0" +/* 1751 */ "USERESERVEDPORT\0" +/* 1767 */ "usereservedport\0" +/* 1783 */ "OK to 'step' the time with settimeofday(2)\0" +/* 1826 */ "STEP\0" +/* 1831 */ "step\0" +/* 1836 */ "OK to 'slew' the time with adjtime(2)\0" +/* 1874 */ "SLEW\0" +/* 1879 */ "slew\0" +/* 1884 */ "The number of seconds to wait for responses\0" +/* 1928 */ "TIMEOUT\0" +/* 1936 */ "timeout\0" +/* 1944 */ "Wait for pending replies (if not setting the time)\0" +/* 1995 */ "WAIT\0" +/* 2000 */ "no-wait\0" +/* 2008 */ "no\0" +/* 2011 */ "display extended usage information and exit\0" +/* 2055 */ "help\0" +/* 2060 */ "extended usage information passed thru pager\0" +/* 2105 */ "more-help\0" +/* 2115 */ "output version information and exit\0" +/* 2151 */ "version\0" +/* 2159 */ "save the option state to a config file\0" +/* 2198 */ "save-opts\0" +/* 2208 */ "load options from a config file\0" +/* 2240 */ "LOAD_OPTS\0" +/* 2250 */ "no-load-opts\0" +/* 2263 */ "SNTP\0" +/* 2268 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ hostname-or-IP ...]\n\0" -/* 2433 */ "$HOME\0" -/* 2439 */ ".\0" -/* 2441 */ ".ntprc\0" -/* 2448 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 2482 */ "\n\0" -/* 2484 */ "sntp 4.2.7p404"; +/* 2425 */ "$HOME\0" +/* 2431 */ ".\0" +/* 2433 */ ".ntprc\0" +/* 2440 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 2474 */ "\n\0" +/* 2476 */ "sntp 4.2.8"; /** * ipv4 option description with * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv4 option */ -#define IPV4_DESC (sntp_opt_strs+954) +#define IPV4_DESC (sntp_opt_strs+950) /** Upper-cased name for the ipv4 option */ -#define IPV4_NAME (sntp_opt_strs+985) +#define IPV4_NAME (sntp_opt_strs+981) /** Name string for the ipv4 option */ -#define IPV4_name (sntp_opt_strs+990) +#define IPV4_name (sntp_opt_strs+986) /** Other options that appear in conjunction with the ipv4 option */ static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; @@ -187,11 +187,11 @@ static int const aIpv4CantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv6 option */ -#define IPV6_DESC (sntp_opt_strs+995) +#define IPV6_DESC (sntp_opt_strs+991) /** Upper-cased name for the ipv6 option */ -#define IPV6_NAME (sntp_opt_strs+1026) +#define IPV6_NAME (sntp_opt_strs+1022) /** Name string for the ipv6 option */ -#define IPV6_name (sntp_opt_strs+1031) +#define IPV6_name (sntp_opt_strs+1027) /** Other options that appear in conjunction with the ipv6 option */ static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; @@ -202,11 +202,11 @@ static int const aIpv6CantList[] = { * authentication option description: */ /** Descriptive text for the authentication option */ -#define AUTHENTICATION_DESC (sntp_opt_strs+1036) +#define AUTHENTICATION_DESC (sntp_opt_strs+1032) /** Upper-cased name for the authentication option */ -#define AUTHENTICATION_NAME (sntp_opt_strs+1086) +#define AUTHENTICATION_NAME (sntp_opt_strs+1082) /** Name string for the authentication option */ -#define AUTHENTICATION_name (sntp_opt_strs+1101) +#define AUTHENTICATION_name (sntp_opt_strs+1097) /** Compiled in flag settings for the authentication option */ #define AUTHENTICATION_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -215,11 +215,11 @@ static int const aIpv6CantList[] = { * broadcast option description: */ /** Descriptive text for the broadcast option */ -#define BROADCAST_DESC (sntp_opt_strs+1116) +#define BROADCAST_DESC (sntp_opt_strs+1112) /** Upper-cased name for the broadcast option */ -#define BROADCAST_NAME (sntp_opt_strs+1172) +#define BROADCAST_NAME (sntp_opt_strs+1168) /** Name string for the broadcast option */ -#define BROADCAST_name (sntp_opt_strs+1182) +#define BROADCAST_name (sntp_opt_strs+1178) /** Compiled in flag settings for the broadcast option */ #define BROADCAST_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -228,11 +228,11 @@ static int const aIpv6CantList[] = { * concurrent option description: */ /** Descriptive text for the concurrent option */ -#define CONCURRENT_DESC (sntp_opt_strs+1192) +#define CONCURRENT_DESC (sntp_opt_strs+1188) /** Upper-cased name for the concurrent option */ -#define CONCURRENT_NAME (sntp_opt_strs+1242) +#define CONCURRENT_NAME (sntp_opt_strs+1238) /** Name string for the concurrent option */ -#define CONCURRENT_name (sntp_opt_strs+1253) +#define CONCURRENT_name (sntp_opt_strs+1249) /** Compiled in flag settings for the concurrent option */ #define CONCURRENT_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -241,11 +241,11 @@ static int const aIpv6CantList[] = { * debug-level option description: */ /** Descriptive text for the debug-level option */ -#define DEBUG_LEVEL_DESC (sntp_opt_strs+1264) +#define DEBUG_LEVEL_DESC (sntp_opt_strs+1260) /** Upper-cased name for the debug-level option */ -#define DEBUG_LEVEL_NAME (sntp_opt_strs+1295) +#define DEBUG_LEVEL_NAME (sntp_opt_strs+1291) /** Name string for the debug-level option */ -#define DEBUG_LEVEL_name (sntp_opt_strs+1307) +#define DEBUG_LEVEL_name (sntp_opt_strs+1303) /** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) @@ -253,11 +253,11 @@ static int const aIpv6CantList[] = { * set-debug-level option description: */ /** Descriptive text for the set-debug-level option */ -#define SET_DEBUG_LEVEL_DESC (sntp_opt_strs+1319) +#define SET_DEBUG_LEVEL_DESC (sntp_opt_strs+1315) /** Upper-cased name for the set-debug-level option */ -#define SET_DEBUG_LEVEL_NAME (sntp_opt_strs+1349) +#define SET_DEBUG_LEVEL_NAME (sntp_opt_strs+1345) /** Name string for the set-debug-level option */ -#define SET_DEBUG_LEVEL_name (sntp_opt_strs+1365) +#define SET_DEBUG_LEVEL_name (sntp_opt_strs+1361) /** Compiled in flag settings for the set-debug-level option */ #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -266,11 +266,11 @@ static int const aIpv6CantList[] = { * gap option description: */ /** Descriptive text for the gap option */ -#define GAP_DESC (sntp_opt_strs+1381) +#define GAP_DESC (sntp_opt_strs+1377) /** Upper-cased name for the gap option */ -#define GAP_NAME (sntp_opt_strs+1429) +#define GAP_NAME (sntp_opt_strs+1425) /** Name string for the gap option */ -#define GAP_name (sntp_opt_strs+1433) +#define GAP_name (sntp_opt_strs+1429) /** The compiled in default value for the gap option argument */ #define GAP_DFT_ARG ((char const*)50) /** Compiled in flag settings for the gap option */ @@ -281,13 +281,13 @@ static int const aIpv6CantList[] = { * kod option description: */ /** Descriptive text for the kod option */ -#define KOD_DESC (sntp_opt_strs+1437) +#define KOD_DESC (sntp_opt_strs+1433) /** Upper-cased name for the kod option */ -#define KOD_NAME (sntp_opt_strs+1458) +#define KOD_NAME (sntp_opt_strs+1454) /** Name string for the kod option */ -#define KOD_name (sntp_opt_strs+1462) +#define KOD_name (sntp_opt_strs+1458) /** The compiled in default value for the kod option argument */ -#define KOD_DFT_ARG (sntp_opt_strs+1466) +#define KOD_DFT_ARG (sntp_opt_strs+1462) /** Compiled in flag settings for the kod option */ #define KOD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -296,11 +296,11 @@ static int const aIpv6CantList[] = { * keyfile option description: */ /** Descriptive text for the keyfile option */ -#define KEYFILE_DESC (sntp_opt_strs+1482) +#define KEYFILE_DESC (sntp_opt_strs+1478) /** Upper-cased name for the keyfile option */ -#define KEYFILE_NAME (sntp_opt_strs+1530) +#define KEYFILE_NAME (sntp_opt_strs+1526) /** Name string for the keyfile option */ -#define KEYFILE_name (sntp_opt_strs+1538) +#define KEYFILE_name (sntp_opt_strs+1534) /** Compiled in flag settings for the keyfile option */ #define KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -309,11 +309,11 @@ static int const aIpv6CantList[] = { * logfile option description: */ /** Descriptive text for the logfile option */ -#define LOGFILE_DESC (sntp_opt_strs+1546) +#define LOGFILE_DESC (sntp_opt_strs+1542) /** Upper-cased name for the logfile option */ -#define LOGFILE_NAME (sntp_opt_strs+1571) +#define LOGFILE_NAME (sntp_opt_strs+1567) /** Name string for the logfile option */ -#define LOGFILE_name (sntp_opt_strs+1579) +#define LOGFILE_name (sntp_opt_strs+1575) /** Compiled in flag settings for the logfile option */ #define LOGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE)) @@ -322,11 +322,11 @@ static int const aIpv6CantList[] = { * steplimit option description: */ /** Descriptive text for the steplimit option */ -#define STEPLIMIT_DESC (sntp_opt_strs+1587) +#define STEPLIMIT_DESC (sntp_opt_strs+1583) /** Upper-cased name for the steplimit option */ -#define STEPLIMIT_NAME (sntp_opt_strs+1639) +#define STEPLIMIT_NAME (sntp_opt_strs+1635) /** Name string for the steplimit option */ -#define STEPLIMIT_name (sntp_opt_strs+1649) +#define STEPLIMIT_name (sntp_opt_strs+1645) /** Compiled in flag settings for the steplimit option */ #define STEPLIMIT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -335,11 +335,11 @@ static int const aIpv6CantList[] = { * ntpversion option description: */ /** Descriptive text for the ntpversion option */ -#define NTPVERSION_DESC (sntp_opt_strs+1659) +#define NTPVERSION_DESC (sntp_opt_strs+1655) /** Upper-cased name for the ntpversion option */ -#define NTPVERSION_NAME (sntp_opt_strs+1696) +#define NTPVERSION_NAME (sntp_opt_strs+1692) /** Name string for the ntpversion option */ -#define NTPVERSION_name (sntp_opt_strs+1707) +#define NTPVERSION_name (sntp_opt_strs+1703) /** The compiled in default value for the ntpversion option argument */ #define NTPVERSION_DFT_ARG ((char const*)4) /** Compiled in flag settings for the ntpversion option */ @@ -350,11 +350,11 @@ static int const aIpv6CantList[] = { * usereservedport option description: */ /** Descriptive text for the usereservedport option */ -#define USERESERVEDPORT_DESC (sntp_opt_strs+1718) +#define USERESERVEDPORT_DESC (sntp_opt_strs+1714) /** Upper-cased name for the usereservedport option */ -#define USERESERVEDPORT_NAME (sntp_opt_strs+1755) +#define USERESERVEDPORT_NAME (sntp_opt_strs+1751) /** Name string for the usereservedport option */ -#define USERESERVEDPORT_name (sntp_opt_strs+1771) +#define USERESERVEDPORT_name (sntp_opt_strs+1767) /** Compiled in flag settings for the usereservedport option */ #define USERESERVEDPORT_FLAGS (OPTST_DISABLED) @@ -362,11 +362,11 @@ static int const aIpv6CantList[] = { * step option description: */ /** Descriptive text for the step option */ -#define STEP_DESC (sntp_opt_strs+1787) +#define STEP_DESC (sntp_opt_strs+1783) /** Upper-cased name for the step option */ -#define STEP_NAME (sntp_opt_strs+1830) +#define STEP_NAME (sntp_opt_strs+1826) /** Name string for the step option */ -#define STEP_name (sntp_opt_strs+1835) +#define STEP_name (sntp_opt_strs+1831) /** Compiled in flag settings for the step option */ #define STEP_FLAGS (OPTST_DISABLED) @@ -374,11 +374,11 @@ static int const aIpv6CantList[] = { * slew option description: */ /** Descriptive text for the slew option */ -#define SLEW_DESC (sntp_opt_strs+1840) +#define SLEW_DESC (sntp_opt_strs+1836) /** Upper-cased name for the slew option */ -#define SLEW_NAME (sntp_opt_strs+1878) +#define SLEW_NAME (sntp_opt_strs+1874) /** Name string for the slew option */ -#define SLEW_name (sntp_opt_strs+1883) +#define SLEW_name (sntp_opt_strs+1879) /** Compiled in flag settings for the slew option */ #define SLEW_FLAGS (OPTST_DISABLED) @@ -386,11 +386,11 @@ static int const aIpv6CantList[] = { * timeout option description: */ /** Descriptive text for the timeout option */ -#define TIMEOUT_DESC (sntp_opt_strs+1888) +#define TIMEOUT_DESC (sntp_opt_strs+1884) /** Upper-cased name for the timeout option */ -#define TIMEOUT_NAME (sntp_opt_strs+1932) +#define TIMEOUT_NAME (sntp_opt_strs+1928) /** Name string for the timeout option */ -#define TIMEOUT_name (sntp_opt_strs+1940) +#define TIMEOUT_name (sntp_opt_strs+1936) /** The compiled in default value for the timeout option argument */ #define TIMEOUT_DFT_ARG ((char const*)5) /** Compiled in flag settings for the timeout option */ @@ -401,13 +401,13 @@ static int const aIpv6CantList[] = { * wait option description: */ /** Descriptive text for the wait option */ -#define WAIT_DESC (sntp_opt_strs+1948) +#define WAIT_DESC (sntp_opt_strs+1944) /** Upper-cased name for the wait option */ -#define WAIT_NAME (sntp_opt_strs+1999) +#define WAIT_NAME (sntp_opt_strs+1995) /** disablement name for the wait option */ -#define NOT_WAIT_name (sntp_opt_strs+2004) +#define NOT_WAIT_name (sntp_opt_strs+2000) /** disablement prefix for the wait option */ -#define NOT_WAIT_PFX (sntp_opt_strs+2012) +#define NOT_WAIT_PFX (sntp_opt_strs+2008) /** Name string for the wait option */ #define WAIT_name (NOT_WAIT_name + 3) /** Compiled in flag settings for the wait option */ @@ -416,11 +416,11 @@ static int const aIpv6CantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (sntp_opt_strs+2015) -#define HELP_name (sntp_opt_strs+2059) +#define HELP_DESC (sntp_opt_strs+2011) +#define HELP_name (sntp_opt_strs+2055) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (sntp_opt_strs+2064) -#define MORE_HELP_name (sntp_opt_strs+2109) +#define MORE_HELP_DESC (sntp_opt_strs+2060) +#define MORE_HELP_name (sntp_opt_strs+2105) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -433,54 +433,26 @@ static int const aIpv6CantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (sntp_opt_strs+2119) -#define VER_name (sntp_opt_strs+2155) -#define SAVE_OPTS_DESC (sntp_opt_strs+2163) -#define SAVE_OPTS_name (sntp_opt_strs+2202) -#define LOAD_OPTS_DESC (sntp_opt_strs+2212) -#define LOAD_OPTS_NAME (sntp_opt_strs+2244) -#define NO_LOAD_OPTS_name (sntp_opt_strs+2254) -#define LOAD_OPTS_pfx (sntp_opt_strs+2012) +#define VER_DESC (sntp_opt_strs+2115) +#define VER_name (sntp_opt_strs+2151) +#define SAVE_OPTS_DESC (sntp_opt_strs+2159) +#define SAVE_OPTS_name (sntp_opt_strs+2198) +#define LOAD_OPTS_DESC (sntp_opt_strs+2208) +#define LOAD_OPTS_NAME (sntp_opt_strs+2240) +#define NO_LOAD_OPTS_name (sntp_opt_strs+2250) +#define LOAD_OPTS_pfx (sntp_opt_strs+2008) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /** * Declare option callback procedures */ -/* extracted from optmain.tlib near line 723 */ - -#if defined(TEST_SNTP_OPTS) -/* - * Under test, omit argument processing, or call optionStackArg, - * if multiple copies are allowed. - */ -static tOptProc - doOptKeyfile, doOptKod, doOptLogfile, doOptNtpversion, - doOptSteplimit, doUsageOpt; - -/* - * #define map the "normal" callout procs to the test ones... - */ -#define DEBUG_LEVEL_OPT_PROC optionStackArg - - -#else /* NOT defined TEST_SNTP_OPTS */ -/* - * When not under test, there are different procs to use - */ extern tOptProc ntpOptionPrintVersion, optionBooleanVal, optionNestedVal, optionNumericVal, optionPagedUsage, optionResetOpt, optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVendorOption, optionVersionStderr; + optionUnstackArg, optionVendorOption; static tOptProc doOptDebug_Level, doOptKeyfile, doOptKod, doOptLogfile, doOptNtpversion, doOptSteplimit, doUsageOpt; - -/** - * #define map the "normal" callout procs - */ -#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level - -#endif /* TEST_SNTP_OPTS */ #define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -558,7 +530,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* last opt argumnt */ { NULL }, /* --debug-level */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, - /* option proc */ DEBUG_LEVEL_OPT_PROC, + /* option proc */ doOptDebug_Level, /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name, /* disablement strs */ NULL, NULL }, @@ -774,24 +746,24 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of sntp. */ -#define zPROGNAME (sntp_opt_strs+2267) +#define zPROGNAME (sntp_opt_strs+2263) /** Reference to the title line for sntp usage. */ -#define zUsageTitle (sntp_opt_strs+2272) +#define zUsageTitle (sntp_opt_strs+2268) /** sntp configuration file name. */ -#define zRcName (sntp_opt_strs+2441) +#define zRcName (sntp_opt_strs+2433) /** Directories to search for sntp config files. */ static char const * const apzHomeList[3] = { - sntp_opt_strs+2433, - sntp_opt_strs+2439, + sntp_opt_strs+2425, + sntp_opt_strs+2431, NULL }; /** The sntp program bug email address. */ -#define zBugsAddr (sntp_opt_strs+2448) +#define zBugsAddr (sntp_opt_strs+2440) /** Clarification/explanation of what sntp does. */ -#define zExplain (sntp_opt_strs+2482) +#define zExplain (sntp_opt_strs+2474) /** Extra detail explaining what sntp does. */ #define zDetail (NULL) /** The full version string for sntp. */ -#define zFullVersion (sntp_opt_strs+2484) +#define zFullVersion (sntp_opt_strs+2476) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -829,8 +801,6 @@ doUsageOpt(tOptions * opts, tOptDesc * od) (void)od; } -#if ! defined(TEST_SNTP_OPTS) - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Code to handle the debug-level option. @@ -852,13 +822,13 @@ OPT_VALUE_SET_DEBUG_LEVEL++; (void)pOptDesc; (void)pOptions; } -#endif /* defined(TEST_SNTP_OPTS) */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Code to handle the kod option. * Specifies the filename to be used for the persistent history of KoD - * responses received from servers. + * responses received from servers. If the file does not exist, a + * warning message will be displayed. The file will not be created. * @param[in] pOptions the sntp options data structure * @param[in,out] pOptDesc the option descriptor for this option. */ @@ -1003,32 +973,6 @@ doOptNtpversion(tOptions* pOptions, tOptDesc* pOptDesc) emit_ranges: optionShowRange(pOptions, pOptDesc, (void *)(intptr_t)rng, 1); } -/* extracted from optmain.tlib near line 46 */ - -#if defined(TEST_SNTP_OPTS) /* TEST-MAIN-PROCEDURE: */ - -extern void optionPutShell(tOptions*); - -/** - * Generated main procedure. This will emit text that a Bourne shell can - * process to handle its command line arguments. - * - * @param[in] argc argument count - * @param[in] argv argument vector - * @returns program exit code - */ -int -main(int argc, char ** argv) -{ - int res = SNTP_EXIT_SUCCESS; - (void)optionProcess(&sntpOptions, argc, argv); - optionPutShell(&sntpOptions); - res = ferror(stdout); - if (res != 0) - fputs("output error writing to stdout\n", stderr); - return res; -} -#endif /* TEST_SNTP_OPTS END-TEST-MAIN-PROCEDURE */ /* extracted from optmain.tlib near line 1245 */ /** @@ -1075,8 +1019,7 @@ tOptions sntpOptions = { + OPTPROC_NO_REQ_OPT + OPTPROC_NEGATIONS + OPTPROC_ENVIRON - + OPTPROC_MISUSE - + OPTPROC_SHELL_OUTPUT ), + + OPTPROC_MISUSE ), 0, NULL, /* current option index, current option */ NULL, NULL, zPROGNAME, zRcName, zCopyright, zLicenseDescrip, @@ -1229,8 +1172,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via sntpOptions.pzCopyright */ - puts(_("sntp 4.2.7p404\n\ -Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n\ + puts(_("sntp 4.2.8\n\ +Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ can be seen at:\n")); @@ -1318,7 +1261,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via sntpOptions.pzUsageTitle */ - puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p404\n\ + puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ hostname-or-IP ...]\n")); @@ -1326,7 +1269,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via sntpOptions.pzFullVersion */ - puts(_("sntp 4.2.7p404")); + puts(_("sntp 4.2.8")); /* referenced via sntpOptions.pzFullUsage */ puts(_("<<>>")); @@ -1340,18 +1283,18 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); -#line 90 "../init.c" +#line 86 "../init.c" puts(_("\tThis exceeds the compiled library version: ")); -#line 88 "../init.c" +#line 84 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); #line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); -#line 92 "../init.c" +#line 88 "../init.c" puts(_("\tThis is less than the minimum library version: ")); #line 121 "../version.c" puts(_("Automated Options version %s\n" - "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n")); + "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n")); #line 82 "../makeshell.c" puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" @@ -1440,15 +1383,15 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("%s error: no saved option state\n")); #line 231 "../autoopts.c" puts(_("'%s' is not a command line option.\n")); -#line 114 "../time.c" +#line 111 "../time.c" puts(_("%s error: '%s' is not a recognizable date/time.\n")); #line 132 "../save.c" puts(_("'%s' not defined\n")); -#line 53 "../time.c" +#line 50 "../time.c" puts(_("%s error: '%s' is not a recognizable time duration.\n")); #line 92 "../check.c" puts(_("%s error: The %s option must appear %d times.\n")); -#line 157 "../numeric.c" +#line 164 "../numeric.c" puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); diff --git a/external/bsd/ntp/dist/sntp/sntp-opts.h b/external/bsd/ntp/dist/sntp/sntp-opts.h index 8acba3d25c8d..16873e6d6fd5 100644 --- a/external/bsd/ntp/dist/sntp/sntp-opts.h +++ b/external/bsd/ntp/dist/sntp/sntp-opts.h @@ -1,4 +1,4 @@ -/* $NetBSD: sntp-opts.h,v 1.1.1.4 2014/12/19 20:37:43 christos Exp $ */ +/* $NetBSD: sntp-opts.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) diff --git a/external/bsd/ntp/dist/sntp/sntp.c b/external/bsd/ntp/dist/sntp/sntp.c index 2ec0b7088740..cd9bda77e4e7 100644 --- a/external/bsd/ntp/dist/sntp/sntp.c +++ b/external/bsd/ntp/dist/sntp/sntp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sntp.c,v 1.1.1.2 2013/12/27 23:31:10 christos Exp $ */ +/* $NetBSD: sntp.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h b/external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h index f6f6a41fc07d..6264c852f60a 100644 --- a/external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h +++ b/external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h @@ -1,4 +1,4 @@ -/* $NetBSD: fileHandlingTest.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: fileHandlingTest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #ifndef FILE_HANDLING_TEST_H #define FILE_HANDLING_TEST_H diff --git a/external/bsd/ntp/dist/sntp/tests/sntptest.h b/external/bsd/ntp/dist/sntp/tests/sntptest.h index cf1f13403bd7..7a51df147841 100644 --- a/external/bsd/ntp/dist/sntp/tests/sntptest.h +++ b/external/bsd/ntp/dist/sntp/tests/sntptest.h @@ -1,4 +1,4 @@ -/* $NetBSD: sntptest.h,v 1.1.1.1 2013/12/27 23:31:33 christos Exp $ */ +/* $NetBSD: sntptest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #ifndef SNTPTEST_H #define SNTPTEST_H diff --git a/external/bsd/ntp/dist/sntp/tests_main.h b/external/bsd/ntp/dist/sntp/tests_main.h index 1d6d7408b793..3c621f132b8c 100644 --- a/external/bsd/ntp/dist/sntp/tests_main.h +++ b/external/bsd/ntp/dist/sntp/tests_main.h @@ -1,4 +1,4 @@ -/* $NetBSD: tests_main.h,v 1.1.1.1 2013/12/27 23:31:10 christos Exp $ */ +/* $NetBSD: tests_main.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef TESTS_MAIN_H #define TESTS_MAIN_H diff --git a/external/bsd/ntp/dist/sntp/utilities.c b/external/bsd/ntp/dist/sntp/utilities.c index 3246246a02c1..d55b0caba4c2 100644 --- a/external/bsd/ntp/dist/sntp/utilities.c +++ b/external/bsd/ntp/dist/sntp/utilities.c @@ -1,4 +1,4 @@ -/* $NetBSD: utilities.c,v 1.1.1.3 2013/12/27 23:31:15 christos Exp $ */ +/* $NetBSD: utilities.c,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #include #include "utilities.h" diff --git a/external/bsd/ntp/dist/sntp/utilities.h b/external/bsd/ntp/dist/sntp/utilities.h index f46c592c5b4f..650cf447e971 100644 --- a/external/bsd/ntp/dist/sntp/utilities.h +++ b/external/bsd/ntp/dist/sntp/utilities.h @@ -1,4 +1,4 @@ -/* $NetBSD: utilities.h,v 1.1.1.3 2013/12/27 23:31:10 christos Exp $ */ +/* $NetBSD: utilities.h,v 1.2 2014/12/19 20:43:18 christos Exp $ */ #ifndef UTILITIES_H #define UTILITIES_H diff --git a/external/bsd/ntp/dist/tests/libntp/lfptest.h b/external/bsd/ntp/dist/tests/libntp/lfptest.h index dce364c4d1b5..4a9c07d558b9 100644 --- a/external/bsd/ntp/dist/tests/libntp/lfptest.h +++ b/external/bsd/ntp/dist/tests/libntp/lfptest.h @@ -1,4 +1,4 @@ -/* $NetBSD: lfptest.h,v 1.1.1.1 2013/12/27 23:31:38 christos Exp $ */ +/* $NetBSD: lfptest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #ifndef NTP_TESTS_LFPTEST_H #define NTP_TESTS_LFPTEST_H diff --git a/external/bsd/ntp/dist/tests/libntp/libntptest.h b/external/bsd/ntp/dist/tests/libntp/libntptest.h index 3d452b1f61d2..1d530ce74292 100644 --- a/external/bsd/ntp/dist/tests/libntp/libntptest.h +++ b/external/bsd/ntp/dist/tests/libntp/libntptest.h @@ -1,4 +1,4 @@ -/* $NetBSD: libntptest.h,v 1.1.1.1 2013/12/27 23:31:38 christos Exp $ */ +/* $NetBSD: libntptest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #include "tests_main.h" diff --git a/external/bsd/ntp/dist/tests/libntp/sockaddrtest.h b/external/bsd/ntp/dist/tests/libntp/sockaddrtest.h index 86d605fc7751..95903e8dd5c9 100644 --- a/external/bsd/ntp/dist/tests/libntp/sockaddrtest.h +++ b/external/bsd/ntp/dist/tests/libntp/sockaddrtest.h @@ -1,4 +1,4 @@ -/* $NetBSD: sockaddrtest.h,v 1.1.1.1 2013/12/27 23:31:38 christos Exp $ */ +/* $NetBSD: sockaddrtest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #ifndef TESTS_SOCKADDRTEST_H #define TESTS_SOCKADDRTEST_H diff --git a/external/bsd/ntp/dist/tests/libntp/timestructs.h b/external/bsd/ntp/dist/tests/libntp/timestructs.h index 1bf4ca4c3862..5fbf17899690 100644 --- a/external/bsd/ntp/dist/tests/libntp/timestructs.h +++ b/external/bsd/ntp/dist/tests/libntp/timestructs.h @@ -1,4 +1,4 @@ -/* $NetBSD: timestructs.h,v 1.1.1.1 2013/12/27 23:31:39 christos Exp $ */ +/* $NetBSD: timestructs.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * timestructs.h -- test bed adaptors for time structs. diff --git a/external/bsd/ntp/dist/tests/ntpd/ntpdtest.h b/external/bsd/ntp/dist/tests/ntpd/ntpdtest.h index 560aa7218591..8a964cc71187 100644 --- a/external/bsd/ntp/dist/tests/ntpd/ntpdtest.h +++ b/external/bsd/ntp/dist/tests/ntpd/ntpdtest.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdtest.h,v 1.1.1.1 2013/12/27 23:31:38 christos Exp $ */ +/* $NetBSD: ntpdtest.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #include "tests_main.h" diff --git a/external/bsd/ntp/dist/util/audio-pcm.c b/external/bsd/ntp/dist/util/audio-pcm.c index 4433448b3512..e7775d79c60b 100644 --- a/external/bsd/ntp/dist/util/audio-pcm.c +++ b/external/bsd/ntp/dist/util/audio-pcm.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio-pcm.c,v 1.1.1.2 2013/12/27 23:31:39 christos Exp $ */ +/* $NetBSD: audio-pcm.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * audio-pcm.c - Scope out the PCM audio stuff diff --git a/external/bsd/ntp/dist/util/byteorder.c b/external/bsd/ntp/dist/util/byteorder.c index 4830d1f9e410..0aa12df91975 100644 --- a/external/bsd/ntp/dist/util/byteorder.c +++ b/external/bsd/ntp/dist/util/byteorder.c @@ -1,4 +1,4 @@ -/* $NetBSD: byteorder.c,v 1.1.1.1 2009/12/13 16:57:28 kardel Exp $ */ +/* $NetBSD: byteorder.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * This works on: diff --git a/external/bsd/ntp/dist/util/hist.c b/external/bsd/ntp/dist/util/hist.c index f8197064c15f..4f9040194396 100644 --- a/external/bsd/ntp/dist/util/hist.c +++ b/external/bsd/ntp/dist/util/hist.c @@ -1,4 +1,4 @@ -/* $NetBSD: hist.c,v 1.1.1.2 2013/12/27 23:31:41 christos Exp $ */ +/* $NetBSD: hist.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * This program can be used to calibrate the clock reading jitter of a diff --git a/external/bsd/ntp/dist/util/jitter.c b/external/bsd/ntp/dist/util/jitter.c index e66f4bdaf438..f36dfd731883 100644 --- a/external/bsd/ntp/dist/util/jitter.c +++ b/external/bsd/ntp/dist/util/jitter.c @@ -1,4 +1,4 @@ -/* $NetBSD: jitter.c,v 1.1.1.2 2013/12/27 23:31:40 christos Exp $ */ +/* $NetBSD: jitter.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * This program can be used to calibrate the clock reading jitter of a diff --git a/external/bsd/ntp/dist/util/jitter.h b/external/bsd/ntp/dist/util/jitter.h index 3c0a930cc80d..2ce62648c355 100644 --- a/external/bsd/ntp/dist/util/jitter.h +++ b/external/bsd/ntp/dist/util/jitter.h @@ -1,4 +1,4 @@ -/* $NetBSD: jitter.h,v 1.2 2010/12/04 23:08:48 christos Exp $ */ +/* $NetBSD: jitter.h,v 1.3 2014/12/19 20:43:20 christos Exp $ */ /* * ntp_types.h - defines how int32 and u_int32 are treated. diff --git a/external/bsd/ntp/dist/util/kern.c b/external/bsd/ntp/dist/util/kern.c index 89b04ddbdc82..500eacef2691 100644 --- a/external/bsd/ntp/dist/util/kern.c +++ b/external/bsd/ntp/dist/util/kern.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern.c,v 1.1.1.1 2009/12/13 16:57:28 kardel Exp $ */ +/* $NetBSD: kern.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * This program simulates a first-order, type-II phase-lock loop using diff --git a/external/bsd/ntp/dist/util/longsize.c b/external/bsd/ntp/dist/util/longsize.c index 13d1ea635509..b6b186592656 100644 --- a/external/bsd/ntp/dist/util/longsize.c +++ b/external/bsd/ntp/dist/util/longsize.c @@ -1,4 +1,4 @@ -/* $NetBSD: longsize.c,v 1.1.1.1 2009/12/13 16:57:28 kardel Exp $ */ +/* $NetBSD: longsize.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #include diff --git a/external/bsd/ntp/dist/util/ntp-keygen-opts.c b/external/bsd/ntp/dist/util/ntp-keygen-opts.c index b33338277b90..41f731de37ed 100644 --- a/external/bsd/ntp/dist/util/ntp-keygen-opts.c +++ b/external/bsd/ntp/dist/util/ntp-keygen-opts.c @@ -1,13 +1,13 @@ -/* $NetBSD: ntp-keygen-opts.c,v 1.6 2013/12/28 13:27:39 mrg Exp $ */ +/* $NetBSD: ntp-keygen-opts.c,v 1.7 2014/12/19 20:43:20 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed December 24, 2013 at 11:39:23 AM by AutoGen 5.18.3pre5 + * It has been AutoGen-ed December 19, 2014 at 07:50:39 AM by AutoGen 5.18.5pre4 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 40:1:15 templates. + * Generated from AutoOpts 41:0:16 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -20,7 +20,7 @@ * The ntp-keygen program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2013 The University of Delaware, all rights reserved. + * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -53,7 +53,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (ntp_keygen_opt_strs+0) -#define zLicenseDescrip (ntp_keygen_opt_strs+326) +#define zLicenseDescrip (ntp_keygen_opt_strs+322) /* * global included definitions @@ -74,14 +74,14 @@ extern FILE * option_usage_fp; * static const strings for ntp-keygen options */ static char const ntp_keygen_opt_strs[2357] = -/* 0 */ "ntp-keygen (ntp) 4.2.7p404\n" - "Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n" +/* 0 */ "ntp-keygen (ntp) 4.2.8\n" + "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" "can be seen at:\n" " \n" " \n\0" -/* 326 */ "Permission to use, copy, modify, and distribute this software and its\n" +/* 322 */ "Permission to use, copy, modify, and distribute this software and its\n" "documentation for any purpose with or without fee is hereby granted,\n" "provided that the above copyright notice appears in all copies and that\n" "both the copyright notice and this permission notice appear in supporting\n" @@ -90,100 +90,100 @@ static char const ntp_keygen_opt_strs[2357] = "specific, written prior permission. The University of Delaware makes no\n" "representations about the suitability this software for any purpose. It is\n" "provided \"as is\" without express or implied warranty.\n\0" -/* 966 */ "identity modulus bits\0" -/* 988 */ "IMBITS\0" -/* 995 */ "imbits\0" -/* 1002 */ "certificate scheme\0" -/* 1021 */ "CERTIFICATE\0" -/* 1033 */ "certificate\0" -/* 1045 */ "privatekey cipher\0" -/* 1063 */ "CIPHER\0" -/* 1070 */ "cipher\0" -/* 1077 */ "Increase debug verbosity level\0" -/* 1108 */ "DEBUG_LEVEL\0" -/* 1120 */ "debug-level\0" -/* 1132 */ "Set the debug verbosity level\0" -/* 1162 */ "SET_DEBUG_LEVEL\0" -/* 1178 */ "set-debug-level\0" -/* 1194 */ "Write IFF or GQ identity keys\0" -/* 1224 */ "ID_KEY\0" -/* 1231 */ "id-key\0" -/* 1238 */ "Generate GQ parameters and keys\0" -/* 1270 */ "GQ_PARAMS\0" -/* 1280 */ "gq-params\0" -/* 1290 */ "generate RSA host key\0" -/* 1312 */ "HOST_KEY\0" -/* 1321 */ "host-key\0" -/* 1330 */ "generate IFF parameters\0" -/* 1354 */ "IFFKEY\0" -/* 1361 */ "iffkey\0" -/* 1368 */ "set Autokey group name\0" -/* 1391 */ "IDENT\0" -/* 1397 */ "ident\0" -/* 1403 */ "set certificate lifetime\0" -/* 1428 */ "LIFETIME\0" -/* 1437 */ "lifetime\0" -/* 1446 */ "generate MD5 keys\0" -/* 1464 */ "MD5KEY\0" -/* 1471 */ "md5key\0" -/* 1478 */ "modulus\0" -/* 1486 */ "MODULUS\0" -/* 1494 */ "generate PC private certificate\0" -/* 1526 */ "PVT_CERT\0" -/* 1535 */ "pvt-cert\0" -/* 1544 */ "output private password\0" -/* 1568 */ "PVT_PASSWD\0" -/* 1579 */ "pvt-passwd\0" -/* 1590 */ "input private password\0" -/* 1613 */ "GET_PVT_PASSWD\0" -/* 1628 */ "get-pvt-passwd\0" -/* 1643 */ "generate sign key (RSA or DSA)\0" -/* 1674 */ "SIGN_KEY\0" -/* 1683 */ "sign-key\0" -/* 1692 */ "set host and optionally group name\0" -/* 1727 */ "SUBJECT_NAME\0" -/* 1740 */ "subject-name\0" -/* 1753 */ "trusted certificate (TC scheme)\0" -/* 1785 */ "TRUSTED_CERT\0" -/* 1798 */ "trusted-cert\0" -/* 1811 */ "generate MV parameters\0" -/* 1840 */ "MV_PARAMS\0" -/* 1850 */ "mv-params\0" -/* 1860 */ "update MV keys\0" -/* 1881 */ "MV_KEYS\0" -/* 1889 */ "mv-keys\0" -/* 1897 */ "display extended usage information and exit\0" -/* 1941 */ "help\0" -/* 1946 */ "extended usage information passed thru pager\0" -/* 1991 */ "more-help\0" -/* 2001 */ "output version information and exit\0" -/* 2037 */ "version\0" -/* 2045 */ "save the option state to a config file\0" -/* 2084 */ "save-opts\0" -/* 2094 */ "load options from a config file\0" -/* 2126 */ "LOAD_OPTS\0" -/* 2136 */ "no-load-opts\0" -/* 2149 */ "no\0" -/* 2152 */ "NTP_KEYGEN\0" -/* 2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p404\n" +/* 962 */ "identity modulus bits\0" +/* 984 */ "IMBITS\0" +/* 991 */ "imbits\0" +/* 998 */ "certificate scheme\0" +/* 1017 */ "CERTIFICATE\0" +/* 1029 */ "certificate\0" +/* 1041 */ "privatekey cipher\0" +/* 1059 */ "CIPHER\0" +/* 1066 */ "cipher\0" +/* 1073 */ "Increase debug verbosity level\0" +/* 1104 */ "DEBUG_LEVEL\0" +/* 1116 */ "debug-level\0" +/* 1128 */ "Set the debug verbosity level\0" +/* 1158 */ "SET_DEBUG_LEVEL\0" +/* 1174 */ "set-debug-level\0" +/* 1190 */ "Write IFF or GQ identity keys\0" +/* 1220 */ "ID_KEY\0" +/* 1227 */ "id-key\0" +/* 1234 */ "Generate GQ parameters and keys\0" +/* 1266 */ "GQ_PARAMS\0" +/* 1276 */ "gq-params\0" +/* 1286 */ "generate RSA host key\0" +/* 1308 */ "HOST_KEY\0" +/* 1317 */ "host-key\0" +/* 1326 */ "generate IFF parameters\0" +/* 1350 */ "IFFKEY\0" +/* 1357 */ "iffkey\0" +/* 1364 */ "set Autokey group name\0" +/* 1387 */ "IDENT\0" +/* 1393 */ "ident\0" +/* 1399 */ "set certificate lifetime\0" +/* 1424 */ "LIFETIME\0" +/* 1433 */ "lifetime\0" +/* 1442 */ "generate MD5 keys\0" +/* 1460 */ "MD5KEY\0" +/* 1467 */ "md5key\0" +/* 1474 */ "modulus\0" +/* 1482 */ "MODULUS\0" +/* 1490 */ "generate PC private certificate\0" +/* 1522 */ "PVT_CERT\0" +/* 1531 */ "pvt-cert\0" +/* 1540 */ "local private password\0" +/* 1563 */ "PASSWORD\0" +/* 1572 */ "password\0" +/* 1581 */ "export IFF or GQ group keys with password\0" +/* 1623 */ "EXPORT_PASSWD\0" +/* 1637 */ "export-passwd\0" +/* 1651 */ "generate sign key (RSA or DSA)\0" +/* 1682 */ "SIGN_KEY\0" +/* 1691 */ "sign-key\0" +/* 1700 */ "set host and optionally group name\0" +/* 1735 */ "SUBJECT_NAME\0" +/* 1748 */ "subject-name\0" +/* 1761 */ "trusted certificate (TC scheme)\0" +/* 1793 */ "TRUSTED_CERT\0" +/* 1806 */ "trusted-cert\0" +/* 1819 */ "generate MV parameters\0" +/* 1848 */ "MV_PARAMS\0" +/* 1858 */ "mv-params\0" +/* 1868 */ "update MV keys\0" +/* 1889 */ "MV_KEYS\0" +/* 1897 */ "mv-keys\0" +/* 1905 */ "display extended usage information and exit\0" +/* 1949 */ "help\0" +/* 1954 */ "extended usage information passed thru pager\0" +/* 1999 */ "more-help\0" +/* 2009 */ "output version information and exit\0" +/* 2045 */ "version\0" +/* 2053 */ "save the option state to a config file\0" +/* 2092 */ "save-opts\0" +/* 2102 */ "load options from a config file\0" +/* 2134 */ "LOAD_OPTS\0" +/* 2144 */ "no-load-opts\0" +/* 2157 */ "no\0" +/* 2160 */ "NTP_KEYGEN\0" +/* 2171 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" -/* 2279 */ "$HOME\0" -/* 2285 */ ".\0" -/* 2287 */ ".ntprc\0" -/* 2294 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 2328 */ "\n\0" -/* 2330 */ "ntp-keygen (ntp) 4.2.7p404"; +/* 2283 */ "$HOME\0" +/* 2289 */ ".\0" +/* 2291 */ ".ntprc\0" +/* 2298 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 2332 */ "\n\0" +/* 2334 */ "ntp-keygen (ntp) 4.2.8"; /** * imbits option description: */ #ifdef AUTOKEY /** Descriptive text for the imbits option */ -#define IMBITS_DESC (ntp_keygen_opt_strs+966) +#define IMBITS_DESC (ntp_keygen_opt_strs+962) /** Upper-cased name for the imbits option */ -#define IMBITS_NAME (ntp_keygen_opt_strs+988) +#define IMBITS_NAME (ntp_keygen_opt_strs+984) /** Name string for the imbits option */ -#define IMBITS_name (ntp_keygen_opt_strs+995) +#define IMBITS_name (ntp_keygen_opt_strs+991) /** Compiled in flag settings for the imbits option */ #define IMBITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -200,11 +200,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the certificate option */ -#define CERTIFICATE_DESC (ntp_keygen_opt_strs+1002) +#define CERTIFICATE_DESC (ntp_keygen_opt_strs+998) /** Upper-cased name for the certificate option */ -#define CERTIFICATE_NAME (ntp_keygen_opt_strs+1021) +#define CERTIFICATE_NAME (ntp_keygen_opt_strs+1017) /** Name string for the certificate option */ -#define CERTIFICATE_name (ntp_keygen_opt_strs+1033) +#define CERTIFICATE_name (ntp_keygen_opt_strs+1029) /** Compiled in flag settings for the certificate option */ #define CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -221,11 +221,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the cipher option */ -#define CIPHER_DESC (ntp_keygen_opt_strs+1045) +#define CIPHER_DESC (ntp_keygen_opt_strs+1041) /** Upper-cased name for the cipher option */ -#define CIPHER_NAME (ntp_keygen_opt_strs+1063) +#define CIPHER_NAME (ntp_keygen_opt_strs+1059) /** Name string for the cipher option */ -#define CIPHER_name (ntp_keygen_opt_strs+1070) +#define CIPHER_name (ntp_keygen_opt_strs+1066) /** Compiled in flag settings for the cipher option */ #define CIPHER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -241,11 +241,11 @@ static char const ntp_keygen_opt_strs[2357] = * debug-level option description: */ /** Descriptive text for the debug-level option */ -#define DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1077) +#define DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1073) /** Upper-cased name for the debug-level option */ -#define DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1108) +#define DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1104) /** Name string for the debug-level option */ -#define DEBUG_LEVEL_name (ntp_keygen_opt_strs+1120) +#define DEBUG_LEVEL_name (ntp_keygen_opt_strs+1116) /** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) @@ -253,11 +253,11 @@ static char const ntp_keygen_opt_strs[2357] = * set-debug-level option description: */ /** Descriptive text for the set-debug-level option */ -#define SET_DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1132) +#define SET_DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1128) /** Upper-cased name for the set-debug-level option */ -#define SET_DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1162) +#define SET_DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1158) /** Name string for the set-debug-level option */ -#define SET_DEBUG_LEVEL_name (ntp_keygen_opt_strs+1178) +#define SET_DEBUG_LEVEL_name (ntp_keygen_opt_strs+1174) /** Compiled in flag settings for the set-debug-level option */ #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -267,11 +267,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the id-key option */ -#define ID_KEY_DESC (ntp_keygen_opt_strs+1194) +#define ID_KEY_DESC (ntp_keygen_opt_strs+1190) /** Upper-cased name for the id-key option */ -#define ID_KEY_NAME (ntp_keygen_opt_strs+1224) +#define ID_KEY_NAME (ntp_keygen_opt_strs+1220) /** Name string for the id-key option */ -#define ID_KEY_name (ntp_keygen_opt_strs+1231) +#define ID_KEY_name (ntp_keygen_opt_strs+1227) /** Compiled in flag settings for the id-key option */ #define ID_KEY_FLAGS (OPTST_DISABLED) @@ -287,11 +287,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the gq-params option */ -#define GQ_PARAMS_DESC (ntp_keygen_opt_strs+1238) +#define GQ_PARAMS_DESC (ntp_keygen_opt_strs+1234) /** Upper-cased name for the gq-params option */ -#define GQ_PARAMS_NAME (ntp_keygen_opt_strs+1270) +#define GQ_PARAMS_NAME (ntp_keygen_opt_strs+1266) /** Name string for the gq-params option */ -#define GQ_PARAMS_name (ntp_keygen_opt_strs+1280) +#define GQ_PARAMS_name (ntp_keygen_opt_strs+1276) /** Compiled in flag settings for the gq-params option */ #define GQ_PARAMS_FLAGS (OPTST_DISABLED) @@ -307,11 +307,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the host-key option */ -#define HOST_KEY_DESC (ntp_keygen_opt_strs+1290) +#define HOST_KEY_DESC (ntp_keygen_opt_strs+1286) /** Upper-cased name for the host-key option */ -#define HOST_KEY_NAME (ntp_keygen_opt_strs+1312) +#define HOST_KEY_NAME (ntp_keygen_opt_strs+1308) /** Name string for the host-key option */ -#define HOST_KEY_name (ntp_keygen_opt_strs+1321) +#define HOST_KEY_name (ntp_keygen_opt_strs+1317) /** Compiled in flag settings for the host-key option */ #define HOST_KEY_FLAGS (OPTST_DISABLED) @@ -327,11 +327,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the iffkey option */ -#define IFFKEY_DESC (ntp_keygen_opt_strs+1330) +#define IFFKEY_DESC (ntp_keygen_opt_strs+1326) /** Upper-cased name for the iffkey option */ -#define IFFKEY_NAME (ntp_keygen_opt_strs+1354) +#define IFFKEY_NAME (ntp_keygen_opt_strs+1350) /** Name string for the iffkey option */ -#define IFFKEY_name (ntp_keygen_opt_strs+1361) +#define IFFKEY_name (ntp_keygen_opt_strs+1357) /** Compiled in flag settings for the iffkey option */ #define IFFKEY_FLAGS (OPTST_DISABLED) @@ -347,11 +347,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the ident option */ -#define IDENT_DESC (ntp_keygen_opt_strs+1368) +#define IDENT_DESC (ntp_keygen_opt_strs+1364) /** Upper-cased name for the ident option */ -#define IDENT_NAME (ntp_keygen_opt_strs+1391) +#define IDENT_NAME (ntp_keygen_opt_strs+1387) /** Name string for the ident option */ -#define IDENT_name (ntp_keygen_opt_strs+1397) +#define IDENT_name (ntp_keygen_opt_strs+1393) /** Compiled in flag settings for the ident option */ #define IDENT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -368,11 +368,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the lifetime option */ -#define LIFETIME_DESC (ntp_keygen_opt_strs+1403) +#define LIFETIME_DESC (ntp_keygen_opt_strs+1399) /** Upper-cased name for the lifetime option */ -#define LIFETIME_NAME (ntp_keygen_opt_strs+1428) +#define LIFETIME_NAME (ntp_keygen_opt_strs+1424) /** Name string for the lifetime option */ -#define LIFETIME_name (ntp_keygen_opt_strs+1437) +#define LIFETIME_name (ntp_keygen_opt_strs+1433) /** Compiled in flag settings for the lifetime option */ #define LIFETIME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -388,11 +388,11 @@ static char const ntp_keygen_opt_strs[2357] = * md5key option description: */ /** Descriptive text for the md5key option */ -#define MD5KEY_DESC (ntp_keygen_opt_strs+1446) +#define MD5KEY_DESC (ntp_keygen_opt_strs+1442) /** Upper-cased name for the md5key option */ -#define MD5KEY_NAME (ntp_keygen_opt_strs+1464) +#define MD5KEY_NAME (ntp_keygen_opt_strs+1460) /** Name string for the md5key option */ -#define MD5KEY_name (ntp_keygen_opt_strs+1471) +#define MD5KEY_name (ntp_keygen_opt_strs+1467) /** Compiled in flag settings for the md5key option */ #define MD5KEY_FLAGS (OPTST_DISABLED) @@ -401,11 +401,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the modulus option */ -#define MODULUS_DESC (ntp_keygen_opt_strs+1478) +#define MODULUS_DESC (ntp_keygen_opt_strs+1474) /** Upper-cased name for the modulus option */ -#define MODULUS_NAME (ntp_keygen_opt_strs+1486) +#define MODULUS_NAME (ntp_keygen_opt_strs+1482) /** Name string for the modulus option */ -#define MODULUS_name (ntp_keygen_opt_strs+1478) +#define MODULUS_name (ntp_keygen_opt_strs+1474) /** Compiled in flag settings for the modulus option */ #define MODULUS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -422,11 +422,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the pvt-cert option */ -#define PVT_CERT_DESC (ntp_keygen_opt_strs+1494) +#define PVT_CERT_DESC (ntp_keygen_opt_strs+1490) /** Upper-cased name for the pvt-cert option */ -#define PVT_CERT_NAME (ntp_keygen_opt_strs+1526) +#define PVT_CERT_NAME (ntp_keygen_opt_strs+1522) /** Name string for the pvt-cert option */ -#define PVT_CERT_name (ntp_keygen_opt_strs+1535) +#define PVT_CERT_name (ntp_keygen_opt_strs+1531) /** Compiled in flag settings for the pvt-cert option */ #define PVT_CERT_FLAGS (OPTST_DISABLED) @@ -438,45 +438,45 @@ static char const ntp_keygen_opt_strs[2357] = #endif /* AUTOKEY */ /** - * pvt-passwd option description: + * password option description: */ #ifdef AUTOKEY -/** Descriptive text for the pvt-passwd option */ -#define PVT_PASSWD_DESC (ntp_keygen_opt_strs+1544) -/** Upper-cased name for the pvt-passwd option */ -#define PVT_PASSWD_NAME (ntp_keygen_opt_strs+1568) -/** Name string for the pvt-passwd option */ -#define PVT_PASSWD_name (ntp_keygen_opt_strs+1579) -/** Compiled in flag settings for the pvt-passwd option */ -#define PVT_PASSWD_FLAGS (OPTST_DISABLED \ +/** Descriptive text for the password option */ +#define PASSWORD_DESC (ntp_keygen_opt_strs+1540) +/** Upper-cased name for the password option */ +#define PASSWORD_NAME (ntp_keygen_opt_strs+1563) +/** Name string for the password option */ +#define PASSWORD_name (ntp_keygen_opt_strs+1572) +/** Compiled in flag settings for the password option */ +#define PASSWORD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable pvt-passwd */ -#define PVT_PASSWD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define PVT_PASSWD_NAME NULL -#define PVT_PASSWD_DESC NULL -#define PVT_PASSWD_name NULL +#else /* disable password */ +#define PASSWORD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define PASSWORD_NAME NULL +#define PASSWORD_DESC NULL +#define PASSWORD_name NULL #endif /* AUTOKEY */ /** - * get-pvt-passwd option description: + * export-passwd option description: */ #ifdef AUTOKEY -/** Descriptive text for the get-pvt-passwd option */ -#define GET_PVT_PASSWD_DESC (ntp_keygen_opt_strs+1590) -/** Upper-cased name for the get-pvt-passwd option */ -#define GET_PVT_PASSWD_NAME (ntp_keygen_opt_strs+1613) -/** Name string for the get-pvt-passwd option */ -#define GET_PVT_PASSWD_name (ntp_keygen_opt_strs+1628) -/** Compiled in flag settings for the get-pvt-passwd option */ -#define GET_PVT_PASSWD_FLAGS (OPTST_DISABLED \ +/** Descriptive text for the export-passwd option */ +#define EXPORT_PASSWD_DESC (ntp_keygen_opt_strs+1581) +/** Upper-cased name for the export-passwd option */ +#define EXPORT_PASSWD_NAME (ntp_keygen_opt_strs+1623) +/** Name string for the export-passwd option */ +#define EXPORT_PASSWD_name (ntp_keygen_opt_strs+1637) +/** Compiled in flag settings for the export-passwd option */ +#define EXPORT_PASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable get-pvt-passwd */ -#define GET_PVT_PASSWD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define GET_PVT_PASSWD_NAME NULL -#define GET_PVT_PASSWD_DESC NULL -#define GET_PVT_PASSWD_name NULL +#else /* disable export-passwd */ +#define EXPORT_PASSWD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define EXPORT_PASSWD_NAME NULL +#define EXPORT_PASSWD_DESC NULL +#define EXPORT_PASSWD_name NULL #endif /* AUTOKEY */ /** @@ -484,11 +484,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the sign-key option */ -#define SIGN_KEY_DESC (ntp_keygen_opt_strs+1643) +#define SIGN_KEY_DESC (ntp_keygen_opt_strs+1651) /** Upper-cased name for the sign-key option */ -#define SIGN_KEY_NAME (ntp_keygen_opt_strs+1674) +#define SIGN_KEY_NAME (ntp_keygen_opt_strs+1682) /** Name string for the sign-key option */ -#define SIGN_KEY_name (ntp_keygen_opt_strs+1683) +#define SIGN_KEY_name (ntp_keygen_opt_strs+1691) /** Compiled in flag settings for the sign-key option */ #define SIGN_KEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -505,11 +505,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the subject-name option */ -#define SUBJECT_NAME_DESC (ntp_keygen_opt_strs+1692) +#define SUBJECT_NAME_DESC (ntp_keygen_opt_strs+1700) /** Upper-cased name for the subject-name option */ -#define SUBJECT_NAME_NAME (ntp_keygen_opt_strs+1727) +#define SUBJECT_NAME_NAME (ntp_keygen_opt_strs+1735) /** Name string for the subject-name option */ -#define SUBJECT_NAME_name (ntp_keygen_opt_strs+1740) +#define SUBJECT_NAME_name (ntp_keygen_opt_strs+1748) /** Compiled in flag settings for the subject-name option */ #define SUBJECT_NAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -526,11 +526,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the trusted-cert option */ -#define TRUSTED_CERT_DESC (ntp_keygen_opt_strs+1753) +#define TRUSTED_CERT_DESC (ntp_keygen_opt_strs+1761) /** Upper-cased name for the trusted-cert option */ -#define TRUSTED_CERT_NAME (ntp_keygen_opt_strs+1785) +#define TRUSTED_CERT_NAME (ntp_keygen_opt_strs+1793) /** Name string for the trusted-cert option */ -#define TRUSTED_CERT_name (ntp_keygen_opt_strs+1798) +#define TRUSTED_CERT_name (ntp_keygen_opt_strs+1806) /** Compiled in flag settings for the trusted-cert option */ #define TRUSTED_CERT_FLAGS (OPTST_DISABLED) @@ -546,11 +546,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the mv-params option */ -#define MV_PARAMS_DESC (ntp_keygen_opt_strs+1811) +#define MV_PARAMS_DESC (ntp_keygen_opt_strs+1819) /** Upper-cased name for the mv-params option */ -#define MV_PARAMS_NAME (ntp_keygen_opt_strs+1840) +#define MV_PARAMS_NAME (ntp_keygen_opt_strs+1848) /** Name string for the mv-params option */ -#define MV_PARAMS_name (ntp_keygen_opt_strs+1850) +#define MV_PARAMS_name (ntp_keygen_opt_strs+1858) /** Compiled in flag settings for the mv-params option */ #define MV_PARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -567,11 +567,11 @@ static char const ntp_keygen_opt_strs[2357] = */ #ifdef AUTOKEY /** Descriptive text for the mv-keys option */ -#define MV_KEYS_DESC (ntp_keygen_opt_strs+1860) +#define MV_KEYS_DESC (ntp_keygen_opt_strs+1868) /** Upper-cased name for the mv-keys option */ -#define MV_KEYS_NAME (ntp_keygen_opt_strs+1881) +#define MV_KEYS_NAME (ntp_keygen_opt_strs+1889) /** Name string for the mv-keys option */ -#define MV_KEYS_name (ntp_keygen_opt_strs+1889) +#define MV_KEYS_name (ntp_keygen_opt_strs+1897) /** Compiled in flag settings for the mv-keys option */ #define MV_KEYS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -586,11 +586,11 @@ static char const ntp_keygen_opt_strs[2357] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntp_keygen_opt_strs+1897) -#define HELP_name (ntp_keygen_opt_strs+1941) +#define HELP_DESC (ntp_keygen_opt_strs+1905) +#define HELP_name (ntp_keygen_opt_strs+1949) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntp_keygen_opt_strs+1946) -#define MORE_HELP_name (ntp_keygen_opt_strs+1991) +#define MORE_HELP_DESC (ntp_keygen_opt_strs+1954) +#define MORE_HELP_name (ntp_keygen_opt_strs+1999) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -603,14 +603,14 @@ static char const ntp_keygen_opt_strs[2357] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (ntp_keygen_opt_strs+2001) -#define VER_name (ntp_keygen_opt_strs+2037) -#define SAVE_OPTS_DESC (ntp_keygen_opt_strs+2045) -#define SAVE_OPTS_name (ntp_keygen_opt_strs+2084) -#define LOAD_OPTS_DESC (ntp_keygen_opt_strs+2094) -#define LOAD_OPTS_NAME (ntp_keygen_opt_strs+2126) -#define NO_LOAD_OPTS_name (ntp_keygen_opt_strs+2136) -#define LOAD_OPTS_pfx (ntp_keygen_opt_strs+2149) +#define VER_DESC (ntp_keygen_opt_strs+2009) +#define VER_name (ntp_keygen_opt_strs+2045) +#define SAVE_OPTS_DESC (ntp_keygen_opt_strs+2053) +#define SAVE_OPTS_name (ntp_keygen_opt_strs+2092) +#define LOAD_OPTS_DESC (ntp_keygen_opt_strs+2102) +#define LOAD_OPTS_NAME (ntp_keygen_opt_strs+2134) +#define NO_LOAD_OPTS_name (ntp_keygen_opt_strs+2144) +#define LOAD_OPTS_pfx (ntp_keygen_opt_strs+2157) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /** * Declare option callback procedures @@ -625,40 +625,13 @@ static char const ntp_keygen_opt_strs[2357] = #else /* not AUTOKEY */ # define doOptModulus NULL #endif /* def/not AUTOKEY */ -/* extracted from optmain.tlib near line 723 */ - -#if defined(TEST_NTP_KEYGEN_OPTS) -/* - * Under test, omit argument processing, or call optionStackArg, - * if multiple copies are allowed. - */ -static tOptProc - doUsageOpt; - -/* - * #define map the "normal" callout procs to the test ones... - */ -#define DEBUG_LEVEL_OPT_PROC optionStackArg - - -#else /* NOT defined TEST_NTP_KEYGEN_OPTS */ -/* - * When not under test, there are different procs to use - */ extern tOptProc ntpOptionPrintVersion, optionBooleanVal, optionNestedVal, optionNumericVal, optionPagedUsage, optionResetOpt, optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVendorOption, optionVersionStderr; + optionUnstackArg, optionVendorOption; static tOptProc doOptDebug_Level, doUsageOpt; - -/** - * #define map the "normal" callout procs - */ -#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level - -#endif /* TEST_NTP_KEYGEN_OPTS */ #define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -712,7 +685,7 @@ static tOptDesc optDesc[OPTION_CT] = { /* last opt argumnt */ { NULL }, /* --debug-level */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, - /* option proc */ DEBUG_LEVEL_OPT_PROC, + /* option proc */ doOptDebug_Level, /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name, /* disablement strs */ NULL, NULL }, @@ -836,28 +809,28 @@ static tOptDesc optDesc[OPTION_CT] = { /* desc, NAME, name */ PVT_CERT_DESC, PVT_CERT_NAME, PVT_CERT_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 14, VALUE_OPT_PVT_PASSWD, - /* equiv idx, value */ 14, VALUE_OPT_PVT_PASSWD, + { /* entry idx, value */ 14, VALUE_OPT_PASSWORD, + /* equiv idx, value */ 14, VALUE_OPT_PASSWORD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PVT_PASSWD_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --pvt-passwd */ + /* opt state flags */ PASSWORD_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --password */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ PVT_PASSWD_DESC, PVT_PASSWD_NAME, PVT_PASSWD_name, + /* desc, NAME, name */ PASSWORD_DESC, PASSWORD_NAME, PASSWORD_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 15, VALUE_OPT_GET_PVT_PASSWD, - /* equiv idx, value */ 15, VALUE_OPT_GET_PVT_PASSWD, + { /* entry idx, value */ 15, VALUE_OPT_EXPORT_PASSWD, + /* equiv idx, value */ 15, VALUE_OPT_EXPORT_PASSWD, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ GET_PVT_PASSWD_FLAGS, 0, - /* last opt argumnt */ { NULL }, /* --get-pvt-passwd */ + /* opt state flags */ EXPORT_PASSWD_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --export-passwd */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ GET_PVT_PASSWD_DESC, GET_PVT_PASSWD_NAME, GET_PVT_PASSWD_name, + /* desc, NAME, name */ EXPORT_PASSWD_DESC, EXPORT_PASSWD_NAME, EXPORT_PASSWD_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 16, VALUE_OPT_SIGN_KEY, @@ -988,24 +961,24 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of ntp-keygen. */ -#define zPROGNAME (ntp_keygen_opt_strs+2152) +#define zPROGNAME (ntp_keygen_opt_strs+2160) /** Reference to the title line for ntp-keygen usage. */ -#define zUsageTitle (ntp_keygen_opt_strs+2163) +#define zUsageTitle (ntp_keygen_opt_strs+2171) /** ntp-keygen configuration file name. */ -#define zRcName (ntp_keygen_opt_strs+2287) +#define zRcName (ntp_keygen_opt_strs+2291) /** Directories to search for ntp-keygen config files. */ static char const * const apzHomeList[3] = { - ntp_keygen_opt_strs+2279, - ntp_keygen_opt_strs+2285, + ntp_keygen_opt_strs+2283, + ntp_keygen_opt_strs+2289, NULL }; /** The ntp-keygen program bug email address. */ -#define zBugsAddr (ntp_keygen_opt_strs+2294) +#define zBugsAddr (ntp_keygen_opt_strs+2298) /** Clarification/explanation of what ntp-keygen does. */ -#define zExplain (ntp_keygen_opt_strs+2328) +#define zExplain (ntp_keygen_opt_strs+2332) /** Extra detail explaining what ntp-keygen does. */ #define zDetail (NULL) /** The full version string for ntp-keygen. */ -#define zFullVersion (ntp_keygen_opt_strs+2330) +#define zFullVersion (ntp_keygen_opt_strs+2334) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1080,8 +1053,6 @@ doOptImbits(tOptions* pOptions, tOptDesc* pOptDesc) } #endif /* defined AUTOKEY */ -#if ! defined(TEST_NTP_KEYGEN_OPTS) - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Code to handle the debug-level option. @@ -1103,7 +1074,6 @@ OPT_VALUE_SET_DEBUG_LEVEL++; (void)pOptDesc; (void)pOptions; } -#endif /* defined(TEST_NTP_KEYGEN_OPTS) */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** @@ -1141,32 +1111,6 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc) optionShowRange(pOptions, pOptDesc, rng, 1); } #endif /* defined AUTOKEY */ -/* extracted from optmain.tlib near line 46 */ - -#if defined(TEST_NTP_KEYGEN_OPTS) /* TEST-MAIN-PROCEDURE: */ - -extern void optionPutShell(tOptions*); - -/** - * Generated main procedure. This will emit text that a Bourne shell can - * process to handle its command line arguments. - * - * @param[in] argc argument count - * @param[in] argv argument vector - * @returns program exit code - */ -int -main(int argc, char ** argv) -{ - int res = NTP_KEYGEN_EXIT_SUCCESS; - (void)optionProcess(&ntp_keygenOptions, argc, argv); - optionPutShell(&ntp_keygenOptions); - res = ferror(stdout); - if (res != 0) - fputs("output error writing to stdout\n", stderr); - return res; -} -#endif /* TEST_NTP_KEYGEN_OPTS END-TEST-MAIN-PROCEDURE */ /* extracted from optmain.tlib near line 1245 */ /** @@ -1213,8 +1157,7 @@ tOptions ntp_keygenOptions = { + OPTPROC_NO_REQ_OPT + OPTPROC_ENVIRON + OPTPROC_NO_ARGS - + OPTPROC_MISUSE - + OPTPROC_SHELL_OUTPUT ), + + OPTPROC_MISUSE ), 0, NULL, /* current option index, current option */ NULL, NULL, zPROGNAME, zRcName, zCopyright, zLicenseDescrip, @@ -1367,8 +1310,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntp_keygenOptions.pzCopyright */ - puts(_("ntp-keygen (ntp) 4.2.7p404\n\ -Copyright (C) 1970-2013 The University of Delaware, all rights reserved.\n\ + puts(_("ntp-keygen (ntp) 4.2.8\n\ +Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ can be seen at:\n")); @@ -1429,10 +1372,10 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("generate PC private certificate")); /* referenced via ntp_keygenOptions.pOptDesc->pzText */ - puts(_("output private password")); + puts(_("local private password")); /* referenced via ntp_keygenOptions.pOptDesc->pzText */ - puts(_("input private password")); + puts(_("export IFF or GQ group keys with password")); /* referenced via ntp_keygenOptions.pOptDesc->pzText */ puts(_("generate sign key (RSA or DSA)")); @@ -1465,14 +1408,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntp_keygenOptions.pzUsageTitle */ - puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p404\n\ + puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntp_keygenOptions.pzExplain */ puts(_("\n")); /* referenced via ntp_keygenOptions.pzFullVersion */ - puts(_("ntp-keygen (ntp) 4.2.7p404")); + puts(_("ntp-keygen (ntp) 4.2.8")); /* referenced via ntp_keygenOptions.pzFullUsage */ puts(_("<<>>")); @@ -1486,18 +1429,18 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("allocation of %d bytes failed\n")); #line 53 "../init.c" puts(_("AutoOpts function called without option descriptor\n")); -#line 90 "../init.c" +#line 86 "../init.c" puts(_("\tThis exceeds the compiled library version: ")); -#line 88 "../init.c" +#line 84 "../init.c" puts(_("Automated Options Processing Error!\n" "\t%s called AutoOpts function with structure version %d:%d:%d.\n")); #line 80 "../autoopts.c" puts(_("realloc of %d bytes at 0x%p failed\n")); -#line 92 "../init.c" +#line 88 "../init.c" puts(_("\tThis is less than the minimum library version: ")); #line 121 "../version.c" puts(_("Automated Options version %s\n" - "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n")); + "\tCopyright (C) 1999-2014 by Bruce Korb - all rights reserved\n")); #line 82 "../makeshell.c" puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" @@ -1586,15 +1529,15 @@ Usage: %s [ - [] | --[{=| }] ]...\n")); puts(_("%s error: no saved option state\n")); #line 231 "../autoopts.c" puts(_("'%s' is not a command line option.\n")); -#line 114 "../time.c" +#line 111 "../time.c" puts(_("%s error: '%s' is not a recognizable date/time.\n")); #line 132 "../save.c" puts(_("'%s' not defined\n")); -#line 53 "../time.c" +#line 50 "../time.c" puts(_("%s error: '%s' is not a recognizable time duration.\n")); #line 92 "../check.c" puts(_("%s error: The %s option must appear %d times.\n")); -#line 157 "../numeric.c" +#line 164 "../numeric.c" puts(_("%s error: '%s' is not a recognizable number.\n")); #line 200 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); diff --git a/external/bsd/ntp/dist/util/ntp-keygen-opts.h b/external/bsd/ntp/dist/util/ntp-keygen-opts.h index 0ca6db0e82c7..19b74ef7876b 100644 --- a/external/bsd/ntp/dist/util/ntp-keygen-opts.h +++ b/external/bsd/ntp/dist/util/ntp-keygen-opts.h @@ -1,4 +1,4 @@ -/* $NetBSD: ntp-keygen-opts.h,v 1.1.1.4 2014/12/19 20:37:49 christos Exp $ */ +/* $NetBSD: ntp-keygen-opts.h,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) diff --git a/external/bsd/ntp/dist/util/ntp-keygen.c b/external/bsd/ntp/dist/util/ntp-keygen.c index e5f58b4b9880..8ba3b0b99f09 100644 --- a/external/bsd/ntp/dist/util/ntp-keygen.c +++ b/external/bsd/ntp/dist/util/ntp-keygen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp-keygen.c,v 1.5 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: ntp-keygen.c,v 1.6 2014/12/19 20:43:20 christos Exp $ */ /* * Program to generate cryptographic keys for ntp clients and servers @@ -339,6 +339,8 @@ main( ssl_check_version(); #endif /* OPENSSL */ + ntp_crypto_srandom(); + /* * Process options, initialize host name and timestamp. * gethostname() won't null-terminate if hostname is exactly the @@ -351,7 +353,6 @@ main( passwd1 = hostbuf; passwd2 = NULL; GETTIMEOFDAY(&tv, NULL); - ntp_srandom((u_long)(tv.tv_sec + tv.tv_usec)); epoch = tv.tv_sec; fstamp = (u_int)(epoch + JAN_1970); @@ -373,11 +374,11 @@ main( if (HAVE_OPT( MD5KEY )) md5key++; #ifdef AUTOKEY - if (HAVE_OPT( PVT_PASSWD )) - passwd1 = estrdup(OPT_ARG( PVT_PASSWD )); + if (HAVE_OPT( PASSWORD )) + passwd1 = estrdup(OPT_ARG( PASSWORD )); - if (HAVE_OPT( GET_PVT_PASSWD )) - passwd2 = estrdup(OPT_ARG( GET_PVT_PASSWD )); + if (HAVE_OPT( EXPORT_PASSWD )) + passwd2 = estrdup(OPT_ARG( EXPORT_PASSWD )); if (HAVE_OPT( HOST_KEY )) hostkey++; @@ -831,7 +832,14 @@ gen_md5( int temp; while (1) { - temp = ntp_random() & 0xff; + int rc; + + rc = ntp_crypto_random_buf(&temp, 1); + if (-1 == rc) { + fprintf(stderr, "ntp_crypto_random_buf() failed.\n"); + exit (-1); + } + temp &= 0xff; if (temp == '#') continue; @@ -961,7 +969,7 @@ gen_rsa( FILE *str; fprintf(stderr, "Generating RSA keys (%d bits)...\n", modulus); - rsa = RSA_generate_key(modulus, 3, cb, _UC("RSA")); + rsa = RSA_generate_key(modulus, 65537, cb, _UC("RSA")); fprintf(stderr, "\n"); if (rsa == NULL) { fprintf(stderr, "RSA generate keys fails\n%s\n", @@ -1302,7 +1310,7 @@ gen_gqkey( fprintf(stderr, "Generating GQ parameters (%d bits)...\n", modulus2); - rsa = RSA_generate_key(modulus2, 3, cb, _UC("GQ")); + rsa = RSA_generate_key(modulus2, 65537, cb, _UC("GQ")); fprintf(stderr, "\n"); if (rsa == NULL) { fprintf(stderr, "RSA generate keys fails\n%s\n", diff --git a/external/bsd/ntp/dist/util/ntptime.c b/external/bsd/ntp/dist/util/ntptime.c index 69d391236fa0..6b993faa9de7 100644 --- a/external/bsd/ntp/dist/util/ntptime.c +++ b/external/bsd/ntp/dist/util/ntptime.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntptime.c,v 1.3 2013/12/28 03:20:15 christos Exp $ */ +/* $NetBSD: ntptime.c,v 1.4 2014/12/19 20:43:20 christos Exp $ */ /* * NTP test program diff --git a/external/bsd/ntp/dist/util/pps-api.c b/external/bsd/ntp/dist/util/pps-api.c index 22c401d75914..c127c967acae 100644 --- a/external/bsd/ntp/dist/util/pps-api.c +++ b/external/bsd/ntp/dist/util/pps-api.c @@ -1,4 +1,4 @@ -/* $NetBSD: pps-api.c,v 1.1.1.1 2009/12/13 16:57:31 kardel Exp $ */ +/* $NetBSD: pps-api.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* diff --git a/external/bsd/ntp/dist/util/precision.c b/external/bsd/ntp/dist/util/precision.c index 7573e236679f..49d78705c123 100644 --- a/external/bsd/ntp/dist/util/precision.c +++ b/external/bsd/ntp/dist/util/precision.c @@ -1,4 +1,4 @@ -/* $NetBSD: precision.c,v 1.1.1.1 2009/12/13 16:57:31 kardel Exp $ */ +/* $NetBSD: precision.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #include "ntp_unixtime.h" diff --git a/external/bsd/ntp/dist/util/sht.c b/external/bsd/ntp/dist/util/sht.c index 8fbce8109af5..e1064a963154 100644 --- a/external/bsd/ntp/dist/util/sht.c +++ b/external/bsd/ntp/dist/util/sht.c @@ -1,4 +1,4 @@ -/* $NetBSD: sht.c,v 1.1.1.3 2014/12/19 20:37:49 christos Exp $ */ +/* $NetBSD: sht.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * sht.c - Testprogram for shared memory refclock diff --git a/external/bsd/ntp/dist/util/testrs6000.c b/external/bsd/ntp/dist/util/testrs6000.c index d697fb4103e0..94ecf80ef97a 100644 --- a/external/bsd/ntp/dist/util/testrs6000.c +++ b/external/bsd/ntp/dist/util/testrs6000.c @@ -1,4 +1,4 @@ -/* $NetBSD: testrs6000.c,v 1.1.1.1 2009/12/13 16:57:31 kardel Exp $ */ +/* $NetBSD: testrs6000.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* Checks for the RS/6000 AIX adjtime() bug, in which if a negative * offset is given, the system gets messed up and never completes the diff --git a/external/bsd/ntp/dist/util/tg.c b/external/bsd/ntp/dist/util/tg.c index 2f716136839c..d2c2870bcdd1 100644 --- a/external/bsd/ntp/dist/util/tg.c +++ b/external/bsd/ntp/dist/util/tg.c @@ -1,4 +1,4 @@ -/* $NetBSD: tg.c,v 1.1.1.2 2013/12/27 23:31:40 christos Exp $ */ +/* $NetBSD: tg.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * tg.c generate WWV or IRIG signals for test diff --git a/external/bsd/ntp/dist/util/tg2.c b/external/bsd/ntp/dist/util/tg2.c index 8df2003b8fc7..806a56c073ea 100644 --- a/external/bsd/ntp/dist/util/tg2.c +++ b/external/bsd/ntp/dist/util/tg2.c @@ -1,4 +1,4 @@ -/* $NetBSD: tg2.c,v 1.1.1.1 2013/12/27 23:31:39 christos Exp $ */ +/* $NetBSD: tg2.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * tg.c generate WWV or IRIG signals for test diff --git a/external/bsd/ntp/dist/util/tickadj.c b/external/bsd/ntp/dist/util/tickadj.c index 283c6eef1326..8d71d94e618d 100644 --- a/external/bsd/ntp/dist/util/tickadj.c +++ b/external/bsd/ntp/dist/util/tickadj.c @@ -1,4 +1,4 @@ -/* $NetBSD: tickadj.c,v 1.1.1.3 2013/12/27 23:31:39 christos Exp $ */ +/* $NetBSD: tickadj.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ /* * tickadj - read, and possibly modify, the kernel `tick' and diff --git a/external/bsd/ntp/dist/util/timetrim.c b/external/bsd/ntp/dist/util/timetrim.c index 29ef3b2af3de..517efc9399d3 100644 --- a/external/bsd/ntp/dist/util/timetrim.c +++ b/external/bsd/ntp/dist/util/timetrim.c @@ -1,4 +1,4 @@ -/* $NetBSD: timetrim.c,v 1.1.1.1 2009/12/13 16:57:31 kardel Exp $ */ +/* $NetBSD: timetrim.c,v 1.2 2014/12/19 20:43:20 christos Exp $ */ #if defined(sgi) || defined(_UNICOSMP) /* diff --git a/external/bsd/ntp/include/config.h b/external/bsd/ntp/include/config.h index 1a7e5b6e6215..55e9d9700ef8 100644 --- a/external/bsd/ntp/include/config.h +++ b/external/bsd/ntp/include/config.h @@ -52,6 +52,9 @@ /* Forum Graphic GPS datating station driver? */ #define CLOCK_FG 1 +/* GPSD JSON receiver */ +#define CLOCK_GPSDJSON 1 + /* TrueTime GPS receiver/VME interface? */ /* #undef CLOCK_GPSVME */ @@ -393,6 +396,12 @@ /* Define to 1 if you have the `finite' function. */ /* #undef HAVE_FINITE */ +/* Define to 1 if you have the `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FNMATCH_H 1 + /* Define to 1 if you have the `fork' function. */ #define HAVE_FORK 1 @@ -690,7 +699,7 @@ /* #undef HAVE_PTH_H */ /* Define to 1 if the system has the type `ptrdiff_t'. */ -/* #undef HAVE_PTRDIFF_T */ +#define HAVE_PTRDIFF_T 1 /* Define to 1 if you have the `pututline' function. */ /* #undef HAVE_PUTUTLINE */ @@ -698,6 +707,12 @@ /* Define to 1 if you have the `pututxline' function. */ #define HAVE_PUTUTXLINE 1 +/* Define to 1 if you have the `RAND_bytes' function. */ +#define HAVE_RAND_BYTES 1 + +/* Define to 1 if you have the `RAND_poll' function. */ +#define HAVE_RAND_POLL 1 + /* Define to 1 if you have the header file. */ /* #undef HAVE_READLINE_H */ @@ -857,6 +872,9 @@ /* Define to 1 if you have the `strsignal' function. */ #define HAVE_STRSIGNAL 1 +/* Define to 1 if you have the `strtoll' function. */ +#define HAVE_STRTOLL 1 + /* Define to 1 if `decimal_point' is a member of `struct lconv'. */ /* #undef HAVE_STRUCT_LCONV_DECIMAL_POINT */ @@ -1285,6 +1303,9 @@ /* Does the kernel support precision time discipline? */ #define KERNEL_PLL 1 +/* Define to use libseccomp system call filtering. */ +/* #undef KERN_SECCOMP */ + /* What is (probably) the name of DOSYNCTODR in the kernel? */ #define K_DOSYNCTODR_NAME "_dosynctodr" @@ -1300,6 +1321,9 @@ /* define to 1 if library is thread safe */ #define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1 +/* Define to any value to include libseccomp sandboxing. */ +/* #undef LIBSECCOMP */ + /* Should we align with the NIST lockclock scheme? */ /* #undef LOCKCLOCK */ @@ -1404,7 +1428,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.7p404" +#define PACKAGE_STRING "ntp 4.2.8" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1413,16 +1437,13 @@ #define PACKAGE_URL "http://www.ntp.org./" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.7p404" +#define PACKAGE_VERSION "4.2.8" /* data dir */ #define PERLLIBDIR "/usr/local/share/ntp/lib" -#ifndef __NetBSD__ -/* NetBSD: set by build process */ /* define to a working POSIX compliant shell */ #define POSIX_SHELL "/usr/pkg/bin/bash" -#endif /* PARSE kernel PLL PPS support */ /* #undef PPS_SYNC */ @@ -1558,6 +1579,9 @@ typedef unsigned int uintptr_t; /* Must we have a CTTY for fsetown? */ /* #undef USE_FSETOWNCTTY */ +/* Use OpenSSL's crypto random functions */ +#define USE_OPENSSL_CRYPTO_RAND 1 + /* Can we use SIGPOLL for tty IO? */ /* #undef USE_TTY_SIGPOLL */ @@ -1565,7 +1589,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.7p404" +#define VERSION "4.2.8" /* vsnprintf expands "%m" to strerror(errno) */ /* #undef VSNPRINTF_PERCENT_M */ diff --git a/external/bsd/ntp/lib/libiscntp/Makefile b/external/bsd/ntp/lib/libiscntp/Makefile index a0a1f6a5abe6..b4b27db45d33 100644 --- a/external/bsd/ntp/lib/libiscntp/Makefile +++ b/external/bsd/ntp/lib/libiscntp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/06/14 20:49:36 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2014/12/19 20:43:20 christos Exp $ LIBISPRIVATE=yes @@ -35,6 +35,7 @@ SRCS= assertions.c \ ondestroy.c \ random.c \ result.c \ + sha1.c \ stdio.c \ stdtime.c \ strerror.c \ diff --git a/external/bsd/ntp/lib/libntp/Makefile b/external/bsd/ntp/lib/libntp/Makefile index 6e9a3ef9c56e..493c0056dc75 100644 --- a/external/bsd/ntp/lib/libntp/Makefile +++ b/external/bsd/ntp/lib/libntp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2014/06/14 20:49:36 mrg Exp $ +# $NetBSD: Makefile,v 1.13 2014/12/19 20:43:20 christos Exp $ LIBISPRIVATE=yes @@ -48,6 +48,7 @@ mstolfp.c \ msyslog.c \ netof.c \ ntp_calendar.c \ +ntp_crypto_rnd.c \ ntp_intres.c \ ntp_libopts.c \ ntp_lineedit.c \ @@ -71,6 +72,7 @@ syssignal.c \ systime.c \ timetoa.c \ uglydate.c \ +vint64ops.c \ work_fork.c \ work_thread.c \ ymd2yd.c