add support for SNTP & split out RFC868 time support. ok deraadt@

1 files changed, 118 insertions, 0 deletions

diff --git a/usr.sbin/rdate/rfc868time.c b/usr.sbin/rdate/rfc868time.c
new file mode 100644
index 00000000000..4f138837990
--- /dev/null
+++ b/usr.sbin/rdate/rfc868time.c
@@ -0,0 +1,118 @@
+/*	$OpenBSD: rfc868time.c,v 1.1 2002/05/16 10:46:34 jakob Exp $	*/
+/*	$NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $	*/
+
+/*
+ * Copyright (c) 1994 Christos Zoulas
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Christos Zoulas.
+ * 4. 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.
+ */
+
+/*
+ * rdate.c: Set the date from the specified host
+ * 
+ * 	Uses the rfc868 time protocol at socket 37.
+ *	Time is returned as the number of seconds since
+ *	midnight January 1st 1900.
+ */
+#ifndef lint
+#if 0
+from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
+#else
+static const char rcsid[] = "$OpenBSD: rfc868time.c,v 1.1 2002/05/16 10:46:34 jakob Exp $";
+#endif
+#endif				/* lint */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <err.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <util.h>
+#include <time.h>
+
+/* seconds from midnight Jan 1900 - 1970 */
+#define DIFFERENCE 2208988800UL
+
+
+void
+rfc868time_client (const char *hostname,
+	     struct timeval *new, struct timeval *adjust)
+{
+	struct hostent *hp;
+	struct servent *sp, ssp;
+	struct protoent *pp, ppp;
+	struct sockaddr_in sin;
+
+	int s;
+	struct timeval old;
+	time_t tim;
+
+	if ((hp = gethostbyname(hostname)) == NULL)
+		errx(1, "%s: %s", hostname, hstrerror(h_errno));
+
+	if ((sp = getservbyname("time", "tcp")) == NULL) {
+		sp = &ssp;
+		sp->s_port = 37;
+		sp->s_proto = "tcp";
+	}
+	if ((pp = getprotobyname(sp->s_proto)) == NULL) {
+		pp = &ppp;
+		pp->p_proto = 6;
+	}
+	if ((s = socket(AF_INET, SOCK_STREAM, pp->p_proto)) == -1)
+		err(1, "Could not create socket");
+
+	bzero(&sin, sizeof sin);
+	sin.sin_family = AF_INET;
+	sin.sin_port = sp->s_port;
+
+	(void) memcpy(&(sin.sin_addr.s_addr), hp->h_addr, hp->h_length);
+
+	if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) == -1)
+		err(1, "Could not connect socket");
+
+	if (read(s, &tim, sizeof(time_t)) != sizeof(time_t))
+		err(1, "Could not read data");
+
+	(void) close(s);
+	tim = ntohl(tim) - DIFFERENCE;
+
+	if (gettimeofday(&old, NULL) == -1)
+		err(1, "Could not get local time of day");
+
+	adjust->tv_sec = tim - old.tv_sec;
+	adjust->tv_usec = 0;
+
+	new->tv_sec = tim;
+	new->tv_usec = 0;
+}