diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-11 16:50:23 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-11 16:50:23 +0000 |
| commit | 8e9ccba371480fb1fb3da9235fabdbb7861523c3 (patch) | |
| tree | 369636a4a765a571e1c6a6ecf2a52ca0131cc90e /util-linux/rdate.c | |
| parent | 085231fbbad159d2275cbd5ecdcf4732512bb80f (diff) | |
| download | busybox-8e9ccba371480fb1fb3da9235fabdbb7861523c3.tar.gz | |
ipv6-ization efforts continue. Few bugs are found,
unknown number likely introduced...
Diffstat (limited to 'util-linux/rdate.c')
| -rw-r--r-- | util-linux/rdate.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 12105953d..ccbf96966 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -8,21 +8,15 @@ * Licensed under GPL v2 or later, see file License for details. */ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netdb.h> -#include <stdio.h> -#include <string.h> -#include <time.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> +//#include <sys/socket.h> +//#include <netinet/in.h> +//#include <netdb.h> +//#include <signal.h> #include "busybox.h" -static const int RFC_868_BIAS = 2208988800UL; +enum { RFC_868_BIAS = 2208988800UL }; static void socket_timeout(int sig) { @@ -31,18 +25,14 @@ static void socket_timeout(int sig) static time_t askremotedate(const char *host) { - unsigned long nett; - struct sockaddr_in s_in; + uint32_t nett; int fd; - bb_lookup_host(&s_in, host); - s_in.sin_port = bb_lookup_port("time", "tcp", 37); - /* Add a timeout for dead or inaccessible servers */ alarm(10); signal(SIGALRM, socket_timeout); - fd = xconnect_tcp_v4(&s_in); + fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37)); if (safe_read(fd, (void *)&nett, 4) != 4) /* read time from server */ bb_error_msg_and_die("%s did not send the complete time", host); @@ -50,9 +40,9 @@ static time_t askremotedate(const char *host) /* convert from network byte order to local byte order. * RFC 868 time is the number of seconds - * since 00:00 (midnight) 1 January 1900 GMT - * the RFC 868 time 2,208,988,800 corresponds to 00:00 1 Jan 1970 GMT - * Subtract the RFC 868 time to get Linux epoch + * since 00:00 (midnight) 1 January 1900 GMT + * the RFC 868 time 2,208,988,800 corresponds to 00:00 1 Jan 1970 GMT + * Subtract the RFC 868 time to get Linux epoch */ return ntohl(nett) - RFC_868_BIAS; |