[ntp:bk-ntp-stable-send] BitKeeper patch

Harlan Stenn stenn at whimsy.udel.edu
Sat Dec 20 17:20:06 PST 2003


This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20031221011851|14905

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/backroom/ntp-stable

#
#--- 1.2/sntp/internet.c	Sat Oct 19 21:51:33 2002
#+++ 1.3/sntp/internet.c	Sat Dec 20 20:15:55 2003
#@@ -71,8 +71,6 @@
#     int family, rval;
#     struct addrinfo hints;
#     struct addrinfo *res;
#-    struct sockaddr_in *sin;
#-    struct sockaddr_in6 *sin6;
# 
#     res = NULL;
#     memset(address, 0, sizeof(struct sockaddr_storage));
#
#--- 1.2/sntp/main.c	Sat Oct 19 21:51:33 2002
#+++ 1.3/sntp/main.c	Sat Dec 20 20:15:55 2003
#@@ -241,7 +241,24 @@
#     double dispersion, weight, when, offset, error;
# } data_record;
# 
#-
#+void syntax(int);
#+void display_data(ntp_data *);
#+void display_packet(unsigned char *, int);
#+void pack_ntp(unsigned char *, int, ntp_data *);
#+void unpack_ntp(ntp_data *, unsigned char *, int);
#+void make_packet(ntp_data *, int);
#+int read_packet(int, ntp_data *, double *, double *);
#+void format_time(char *, int, double, double, double, double);
#+double reset_clock(double, double, int);
#+void run_server(void);
#+double estimate_stats(int *, int *, data_record *, double, double *, double *,
#+	double *, double *, double *, double *, int *, int);
#+double correct_drift(double *, double *, double);
#+void handle_saving(int, int *, int *, int *, data_record *, double *,
#+	double *, double *);
#+void query_savefile(void);
#+void run_daemon(char **, int, int);
#+void run_client(char **, int);
# 
# void fatal (int syserr, const char *message, const char *insert) {
# 
#
#--- 1.2/sntp/socket.c	Sat Oct 19 21:51:33 2002
#+++ 1.3/sntp/socket.c	Sat Dec 20 20:15:56 2003
#@@ -30,6 +30,12 @@
# static struct sockaddr_in here[MAX_SOCKETS], there[MAX_SOCKETS];
# #endif
# 
#+void display_in_hex(const void *, int);
#+#ifdef HAVE_IPV6
#+void display_sock_in_hex(struct sockaddr_storage *);
#+#else
#+void display_sock_in_hex (struct sockaddr_in *);
#+#endif
# 
# /* There needs to be some disgusting grobble for handling timeouts, that is
# identical to the grobble in internet.c. */
#@@ -63,7 +69,7 @@
# #ifdef HAVE_IPV6
# 
# void display_sock_in_hex (struct sockaddr_storage *sock) {
#-    int family, len;
#+    int family;
#     struct sockaddr_in *sin;
#     struct sockaddr_in6 *sin6;
# 
#
#--- 1.1/sntp/timing.c	Sat Oct  5 03:40:01 2002
#+++ 1.2/sntp/timing.c	Sat Dec 20 20:17:33 2003
#@@ -94,6 +94,8 @@
#       /*  if (settimeofday(&new,NULL))
#             fatal(1,"unable to reset current system time",NULL);*/
#     } else {
#+	previous.tv_sec  = 0;
#+	previous.tv_usec = 0;
#         errno = 0;
#        /* if (adjtime(&adjust,&previous))
#             fatal(1,"unable to adjust current system time",NULL);*/
#

# Diff checksum=940b0cc3


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031220234412|14868
D 1.1183 03/12/20 20:18:51-05:00 stenn at whimsy.udel.edu +4 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 258] sntp cleanup
K 14905
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|sntp/internet.c|20021005073959|03574|11247a3e15ca386 stenn at whimsy.udel.edu|sntp/internet.c|20031221011555|22500
> stenn at whimsy.udel.edu|sntp/main.c|20021005074000|14063|39106f7558b218f3 stenn at whimsy.udel.edu|sntp/main.c|20031221011555|37074
> stenn at whimsy.udel.edu|sntp/socket.c|20021005074000|18978|bcfbeadcbf8e39d stenn at whimsy.udel.edu|sntp/socket.c|20031221011556|56379
> stenn at whimsy.udel.edu|sntp/timing.c|20021005074001|28755|d6b4ecfb79770fdc stenn at whimsy.udel.edu|sntp/timing.c|20031221011733|53821

== sntp/internet.c ==
stenn at whimsy.udel.edu|sntp/internet.c|20021005073959|03574|11247a3e15ca386
stenn at whimsy.udel.edu|sntp/internet.c|20021020015133|27534
D 1.3 03/12/20 20:15:55-05:00 stenn at whimsy.udel.edu +0 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 258] Matthias Drochner: sntp lint cleanup (plus IPv6 patch from HMS)
K 22500
O -rw-rw-r--
P sntp/internet.c
------------------------------------------------

D74 2

== sntp/main.c ==
stenn at whimsy.udel.edu|sntp/main.c|20021005074000|14063|39106f7558b218f3
stenn at whimsy.udel.edu|sntp/main.c|20021020015133|35736
D 1.3 03/12/20 20:15:55-05:00 stenn at whimsy.udel.edu +18 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 258] Matthias Drochner: sntp lint cleanup (plus IPv6 patch from HMS)
K 37074
O -rw-rw-r--
P sntp/main.c
------------------------------------------------

D244 1
I244 18
void syntax(int);
void display_data(ntp_data *);
void display_packet(unsigned char *, int);
void pack_ntp(unsigned char *, int, ntp_data *);
void unpack_ntp(ntp_data *, unsigned char *, int);
void make_packet(ntp_data *, int);
int read_packet(int, ntp_data *, double *, double *);
void format_time(char *, int, double, double, double, double);
double reset_clock(double, double, int);
void run_server(void);
double estimate_stats(int *, int *, data_record *, double, double *, double *,
	double *, double *, double *, double *, int *, int);
double correct_drift(double *, double *, double);
void handle_saving(int, int *, int *, int *, data_record *, double *,
	double *, double *);
void query_savefile(void);
void run_daemon(char **, int, int);
void run_client(char **, int);

== sntp/socket.c ==
stenn at whimsy.udel.edu|sntp/socket.c|20021005074000|18978|bcfbeadcbf8e39d
stenn at whimsy.udel.edu|sntp/socket.c|20021020015133|41164
D 1.3 03/12/20 20:15:56-05:00 stenn at whimsy.udel.edu +7 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 258] Matthias Drochner: sntp lint cleanup (plus IPv6 patch from HMS)
K 56379
O -rw-rw-r--
P sntp/socket.c
------------------------------------------------

I32 6
void display_in_hex(const void *, int);
#ifdef HAVE_IPV6
void display_sock_in_hex(struct sockaddr_storage *);
#else
void display_sock_in_hex (struct sockaddr_in *);
#endif
D66 1
I66 1
    int family;

== sntp/timing.c ==
stenn at whimsy.udel.edu|sntp/timing.c|20021005074001|28755|d6b4ecfb79770fdc
stenn at whimsy.udel.edu|sntp/timing.c|20021005074002|50004
D 1.2 03/12/20 20:17:33-05:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 258] Marc Brett: more sntp lint cleanup.
K 53821
O -rw-rw-r--
P sntp/timing.c
------------------------------------------------

I96 2
	previous.tv_sec  = 0;
	previous.tv_usec = 0;

# Patch checksum=2cff7c42



More information about the bk-ntp-stable-send mailing list