[Git][NTPsec/ntpsec][master] 2 commits: Fix for #800 - Debian buildprep needs python3-dev

[Hal Murray (@hal.murray)]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
5ea864cd by Hal Murray at 2023-10-21T01:17:28-07:00
Fix for #800 - Debian buildprep needs python3-dev

- - - - -
9ab4d380 by Hal Murray at 2023-10-21T01:18:36-07:00
Tweak printout for ntpq's mssntpinfo

- - - - -


2 changed files:

- buildprep
- ntpd/ntp_control.c


Changes:

=====================================
buildprep
=====================================
@@ -181,6 +181,7 @@ daemon () {
 	    $install libcap-dev libseccomp-dev		# build
 	    $install libavahi-compat-libdnssd-dev	# optional build
 	    $install pps-tools
+	    $install python3-dev python-is-python3
 	    ;;
 	emerge)
 						# Build environment included!


=====================================
ntpd/ntp_control.c
=====================================
@@ -165,7 +165,7 @@ enum var_type {v_time,
 	v_str, v_dbl, v_uli, v_li, v_uint, v_int,
 	v_u64, v_i64, v_u32, v_i32, v_u8, v_i8, v_bool,
 	v_strP, v_u64P, v_u32P, v_uliP,
-	v_l_fp, v_l_fp_ms, v_l_fp_sec,
+	v_l_fp, v_l_fp_ms, v_l_fp_sec, v_l_fp_sec6,
 	v_u64_r, v_l_fp_sec_r,
 	v_mrumem,
 	v_since, v_kli, v_special};
@@ -258,6 +258,8 @@ struct var {
 #define Var_l_fp_r(xname, xflags, xlocation) { \
   .name = xname, .flags = xflags, .type = v_l_fp_sec_r, \
   .p_l_fp = &xlocation, .p2_l_fp = &(old_##xlocation) }
+#define Var_l_fp_sec6(xname, xflags, xlocation) { \
+  .name = xname, .flags = xflags, .type = v_l_fp_sec6, .p_l_fp = &xlocation }
 #define Var_since(xname, xflags, xlocation) { \
   .name = xname, .flags = xflags, .type = v_since, .p_up = &xlocation }
 
@@ -474,10 +476,16 @@ static const struct var sys_var[] = {
   Var_Pair("mssntp_serves_err", mssntp_cnt.serves_err),
   Var_Pair("mssntp_serves_good", mssntp_cnt.serves_good),
   Var_PairF("mssntp_serves_good_wall", mssntp_cnt.serves_good_wall),
-  Var_PairF("mssntp_serves_good_slowest", mssntp_cnt.serves_good_slowest),
+  Var_l_fp_sec6("mssntp_serves_good_slowest", RO,
+    mssntp_cnt.serves_good_slowest),
+  Var_l_fp_sec6("mssntp_serves_good_slowest_r", RO,
+    old_mssntp_cnt.serves_good_slowest),
   Var_Pair("mssntp_serves_bad", mssntp_cnt.serves_bad),
   Var_PairF("mssntp_serves_bad_wall", mssntp_cnt.serves_bad_wall),
-  Var_PairF("mssntp_serves_bad_slowest", mssntp_cnt.serves_bad_slowest),
+  Var_l_fp_sec6("mssntp_serves_bad_slowest", RO,
+    mssntp_cnt.serves_bad_slowest),
+  Var_l_fp_sec6("mssntp_serves_bad_slowest_r", RO,
+    old_mssntp_cnt.serves_bad_slowest),
 #undef Var_Pair
 #undef Var_PairF
 #endif
@@ -1488,6 +1496,10 @@ ctl_putsys(const struct var * v) {
 	    temp_d = lfptod(*v->p_l_fp);
 	    ctl_putdbl(v->name, temp_d);
             break;
+	case v_l_fp_sec6:
+	    temp_d = lfptod(*v->p_l_fp);
+	    ctl_putdbl6(v->name, temp_d);
+            break;
 	case v_l_fp_sec_r:
 	    temp_d = lfptod(*v->p_l_fp-*v->p2_l_fp);
 	    ctl_putdbl(v->name, temp_d);



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/c988a07405d8d95d23cc2bce1c06ed56ef66d1cc...9ab4d380e7819de71af2797d2edd1a7d7d908422

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/c988a07405d8d95d23cc2bce1c06ed56ef66d1cc...9ab4d380e7819de71af2797d2edd1a7d7d908422
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/20231021/2bbb6e80/attachment-0001.htm>