nlattr: add UID/GID netlink attribute decoders

[strace] / ptp.c

diff --git a/ptp.c b/ptp.c
index f01f9c4c00deabd78d18cb4d3f83fb0fc0dfc093..0987111f084a4d8415627ad416af3a91a37763c1 100644 (file)
--- a/ptp.c
+++ b/ptp.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2014 Stefan Sørensen <stefan.sorensen@spectralink.com>
  * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,14 +28,18 @@
  */
 
 #include "defs.h"
-#include <linux/ioctl.h>
-#include <linux/ptp_clock.h>
 
-#include "xlat/ptp_flags_options.h"
+#ifdef HAVE_STRUCT_PTP_SYS_OFFSET
+
+# include <linux/ioctl.h>
+# include <linux/ptp_clock.h>
+
+# include "print_fields.h"
+# include "xlat/ptp_flags_options.h"
 
 int
 ptp_ioctl(struct tcb *const tcp, const unsigned int code,
-         const kernel_ureg_t arg)
+         const kernel_ulong_t arg)
 {
        if (!verbose(tcp))
                return RVAL_DECODED;
@@ -47,8 +52,8 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                if (umove_or_printaddr(tcp, arg, &extts))
                        break;
 
-               tprintf("{index=%d, flags=", extts.index);
-               printflags(ptp_flags_options, extts.flags, "PTP_???");
+               PRINT_FIELD_D("{", extts, index);
+               PRINT_FIELD_FLAGS(", ", extts, flags, ptp_flags_options, "PTP_???");
                tprints("}");
                break;
        }
@@ -60,19 +65,18 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                if (umove_or_printaddr(tcp, arg, &perout))
                        break;
 
-               tprintf("{start={%" PRId64 ", %" PRIu32 "}"
-                          ", period={%" PRId64 ", %" PRIu32 "}"
-                          ", index=%d, flags=",
-                       (int64_t)perout.start.sec, perout.start.nsec,
-                       (int64_t)perout.period.sec, perout.period.nsec,
-                       perout.index);
-               printflags(ptp_flags_options, perout.flags, "PTP_???");
+               PRINT_FIELD_D("{start={", perout.start, sec);
+               PRINT_FIELD_U(", ", perout.start, nsec);
+               PRINT_FIELD_D("}, period={", perout.period, sec);
+               PRINT_FIELD_U(", ", perout.period, nsec);
+               PRINT_FIELD_D("}, ", perout, index);
+               PRINT_FIELD_FLAGS(", ", perout, flags, ptp_flags_options, "PTP_???");
                tprints("}");
                break;
        }
 
        case PTP_ENABLE_PPS:
-               tprintf(", %" PRI_krd, arg);
+               tprintf(", %" PRI_kld, arg);
                break;
 
        case PTP_SYS_OFFSET: {
@@ -83,8 +87,8 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                        if (umove_or_printaddr(tcp, arg, &sysoff))
                                break;
 
-                       tprintf("{n_samples=%u", sysoff.n_samples);
-                       return 1;
+                       PRINT_FIELD_U("{", sysoff, n_samples);
+                       return 0;
                } else {
                        unsigned int n_samples, i;
 
@@ -105,9 +109,9 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                        for (i = 0; i < 2 * n_samples + 1; ++i) {
                                if (i > 0)
                                        tprints(", ");
-                               tprintf("{%" PRId64 ", %" PRIu32 "}",
-                                       (int64_t)sysoff.ts[i].sec,
-                                       sysoff.ts[i].nsec);
+                               PRINT_FIELD_D("{", sysoff.ts[i], sec);
+                               PRINT_FIELD_U(", ", sysoff.ts[i], nsec);
+                               tprints("}");
                        }
                        if (sysoff.n_samples > PTP_MAX_SAMPLES)
                                tprints(", ...");
@@ -125,9 +129,12 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                if (umove_or_printaddr(tcp, arg, &caps))
                        break;
 
-               tprintf("{max_adj=%d, n_alarm=%d, n_ext_ts=%d, n_per_out=%d, pps=%d}",
-                       caps.max_adj, caps.n_alarm, caps.n_ext_ts,
-                       caps.n_per_out, caps.pps);
+               PRINT_FIELD_D("{", caps, max_adj);
+               PRINT_FIELD_D(", ", caps, n_alarm);
+               PRINT_FIELD_D(", ", caps, n_ext_ts);
+               PRINT_FIELD_D(", ", caps, n_per_out);
+               PRINT_FIELD_D(", ", caps, pps);
+               tprints("}");
                break;
        }
 
@@ -135,5 +142,7 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
                return RVAL_DECODED;
        }
 
-       return RVAL_DECODED | 1;
+       return RVAL_IOCTL_DECODED;
 }
+
+#endif /* HAVE_STRUCT_PTP_SYS_OFFSET */