[Git][NTPsec/ntpsec][master] 6 commits: Restore lost picture: Trimble Palisade

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
aee3c01e by Hal Murray at 2016-08-13T03:05:07-07:00
Restore lost picture: Trimble Palisade

- - - - -
b9a1c09d by Hal Murray at 2016-08-13T03:05:39-07:00
Remove unnecessary link ntpq/ntp => ../pylib

- - - - -
8aa17caf by Hal Murray at 2016-08-13T03:06:54-07:00
Remove unnecessary import of waflib.Task

- - - - -
cd46fcb2 by Hal Murray at 2016-08-13T03:11:07-07:00
Fixup exit codes, add intercept_

- - - - -
5cc6f6a8 by Hal Murray at 2016-08-13T03:12:05-07:00
Add error message before exit if offset is too big

- - - - -
1e35f2ab by Hal Murray at 2016-08-13T03:12:52-07:00
Fix warning from missing {} vs indent (add missing {})

- - - - -


5 changed files:

- + docs/pic/driver_palisade.gif
- ntpd/ntp_proto.c
- ntpd/refclock_oncore.c
- − ntpq/ntp
- ntpq/wscript


Changes:

=====================================
docs/pic/driver_palisade.gif
=====================================
Binary files /dev/null and b/docs/pic/driver_palisade.gif differ


=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -354,7 +354,7 @@ transmit(
 					if (!termlogit)
 						printf(
 						    "ntpd: no servers found\n");
-					intercept_exit(0);
+					intercept_exit(1);
 				}
 			}
 		}
@@ -1639,7 +1639,7 @@ clock_update(
 			if (smf_maintain_instance(fmri, 0) < 0) {
 				printf("smf_maintain_instance: %s\n",
 				    scf_strerror(scf_error()));
-				exit(1);
+				intercept_exit(1);
 			}
 			/*
 			 * Sleep until SMF kills us.
@@ -1648,7 +1648,8 @@ clock_update(
 				pause();
 		}
 #endif /* HAVE_LIBSCF_H */
-		exit (-1);
+		msyslog(LOG_ERR, "Panic: offset too big: %.3f", sys_offset);
+		intercept_exit (1);
 		/* not reached */
 
 	/*
@@ -2821,7 +2822,7 @@ peer_xmit(
 	sendlen += authlen;
 	if (sendlen > sizeof(xpkt)) {
 		msyslog(LOG_ERR, "proto: buffer overflow %zu", sendlen);
-		exit (-1);
+		intercept_exit(1);
 	}
 	peer->t21_bytes = sendlen;
 	intercept_sendpkt(__func__, &peer->srcadr, peer->dstadr, sys_ttl[peer->ttl], &xpkt,
@@ -3341,7 +3342,7 @@ measure_tick_fuzz(void)
 	}
 	if (changes < MINCHANGES) {
 		msyslog(LOG_ERR, "Fatal error: precision could not be measured (MINSTEP too large?)");
-		exit(1);
+		intercept_exit(1);
 	}
 
 	if (0 == max_repeats) {


=====================================
ntpd/refclock_oncore.c
=====================================
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -3895,9 +3895,10 @@ oncore_set_traim(
 			oncore_sendmsg(instance, oncore_cmd_Bnx, sizeof(oncore_cmd_Bnx));
 		else if (instance->chan == 8)
 			oncore_sendmsg(instance, oncore_cmd_Enx, sizeof(oncore_cmd_Enx));
-		else	/* chan == 12 */
+		else {	/* chan == 12 */
 			oncore_sendmsg(instance, oncore_cmd_Ge0, sizeof(oncore_cmd_Ge0));
 			oncore_sendmsg(instance, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0));
+		}
 	}
 }
 


=====================================
ntpq/ntp deleted
=====================================
--- a/ntpq/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib
\ No newline at end of file


=====================================
ntpq/wscript
=====================================
--- a/ntpq/wscript
+++ b/ntpq/wscript
@@ -1,5 +1,3 @@
-from waflib.Task import Task
-
 def build(ctx):
 	srcnode = ctx.srcnode.abspath()
 	bldnode = ctx.bldnode.abspath()



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/c36a4f3d5445bb8f71fdb496c0e17bb9b0e87d0f...1e35f2ab0db094f5da6864c1834ef5eb385ba8b9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160813/0ed403f4/attachment.html>