[Git][NTPsec/ntpsec][master] Repair thr build with refclocks.

Eric S. Raymond gitlab at mg.gitlab.com
Mon Jan 28 18:52:34 UTC 2019


Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
3d194979 by Eric S. Raymond at 2019-01-28T18:51:46Z
Repair thr build with refclocks.

- - - - -


4 changed files:

- ntpd/ntp_io.c
- ntpd/refclock_oncore.c
- ntpd/refclock_trimble.c
- ntpd/refclock_zyfer.c


Changes:

=====================================
ntpd/ntp_io.c
=====================================
@@ -2080,11 +2080,11 @@ read_refclock_packet(
 	}
 
 	i = (rp->datalen == 0
-	     || rp->datalen > sizeof(rb->recv_space))
-	        ? sizeof(rb->recv_space)
+	     || rp->datalen > sizeof(rb->recv_buffer))
+	        ? sizeof(rb->recv_buffer)
 		: rp->datalen;
 	do {
-		buflen = read(fd, (char *)&rb->recv_space, i);
+		buflen = read(fd, (char *)&rb->recv_buffer, i);
 	} while (buflen < 0 && EINTR == errno);
 
 	if (buflen <= 0) {


=====================================
ntpd/refclock_oncore.c
=====================================
@@ -1433,7 +1433,7 @@ oncore_receive(
 
 	peer = rbufp->recv_peer;
 	instance = peer->procptr->unitptr;
-	p = (uint8_t *) &rbufp->recv_space;
+	p = (uint8_t *) &rbufp->recv_buffer;
 
 #ifdef ONCORE_VERBOSE_RECEIVE
 	if (debug > 4) { /* SPECIAL DEBUG */


=====================================
ntpd/refclock_trimble.c
=====================================
@@ -955,7 +955,7 @@ trimble_io (
 	pp = peer->procptr;
 	up = pp->unitptr;
 
-	c = (char *) &rbufp->recv_space;
+	c = (char *) &rbufp->recv_buffer;
 	d = c + rbufp->recv_length;
 
 	while (c != d) {


=====================================
ntpd/refclock_zyfer.c
=====================================
@@ -184,10 +184,10 @@ zyfer_receive(
 	peer = rbufp->recv_peer;
 	pp = peer->procptr;
 	up = pp->unitptr;
-	p = (uint8_t *) &rbufp->recv_space;
+	p = (uint8_t *) &rbufp->recv_buffer;
 	/*
 	 * If lencode is 0:
-	 * - if *rbufp->recv_space is !
+	 * - if *rbufp->recv_buffer is !
 	 * - - call refclock_gtlin to get things going
 	 * - else flush
 	 * else stuff it on the end of lastcode



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/3d194979e02d6ddee4c6ac9bc5c3aee684b7a7da

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/3d194979e02d6ddee4c6ac9bc5c3aee684b7a7da
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20190128/514c31d7/attachment-0001.html>


More information about the vc mailing list