[ntp:bk-ntp-stable-send] BitKeeper patch
Harlan Stenn
stenn at whimsy.udel.edu
Sat Nov 29 00:05:41 PST 2003
This BitKeeper patch contains the following changesets:
stenn at pogo.udel.edu|ChangeSet|20031129080313|18414
# 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.21/ntpd/refclock_nmea.c Wed Nov 26 19:21:26 2003
#+++ 1.22/ntpd/refclock_nmea.c Sat Nov 29 03:03:01 2003
#@@ -174,7 +174,6 @@
# struct hostent *he;
# struct protoent *p;
# struct sockaddr_in so_addr;
#- socklen_t so_addr_len = sizeof(so_addr);
#
# if ((len = readlink(device,buffer,sizeof(buffer))) == -1)
# return(0);
#@@ -195,7 +194,7 @@
#
# if ((fd = socket(PF_INET,SOCK_STREAM,p->p_proto)) == -1)
# return(0);
#- if (connect(fd,(struct sockaddr *)&so_addr,so_addr_len) == -1) {
#+ if (connect(fd,(struct sockaddr *)&so_addr,SOCKLEN(&so_addr)) == -1) {
# close(fd);
# return (0);
# }
#
# Diff checksum=c426c11f
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20031127005229|18641
D 1.1174 03/11/29 03:03:13-05:00 stenn at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Use our portable way of getting socklen
K 18414
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|ntpd/refclock_nmea.c|19990526004818|01635|3aed0663 stenn at pogo.udel.edu|ntpd/refclock_nmea.c|20031129080301|57792
== ntpd/refclock_nmea.c ==
stenn at whimsy.udel.edu|ntpd/refclock_nmea.c|19990526004818|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/refclock_nmea.c|20031127002126|61683
D 1.22 03/11/29 03:03:01-05:00 stenn at pogo.udel.edu +1 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Use our portable way of getting socklen
K 57792
O -rw-rw-r--
P ntpd/refclock_nmea.c
------------------------------------------------
D177 1
D198 1
I198 1
if (connect(fd,(struct sockaddr *)&so_addr,SOCKLEN(&so_addr)) == -1) {
# Patch checksum=4da8423d
More information about the bk-ntp-stable-send
mailing list