From a3ffac33f27b7b0cd6875eab0ae93b6f9e9a3015 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Tue, 1 Mar 2016 14:13:18 +1300 Subject: [PATCH] ndrdump: add quiet flag Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett --- librpc/tools/ndrdump.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c index 2d2c229349e..2dbc427f0b4 100644 --- a/librpc/tools/ndrdump.c +++ b/librpc/tools/ndrdump.c @@ -184,6 +184,12 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function, return NT_STATUS_OK; } +static void ndr_print_dummy(struct ndr_print *ndr, const char *format, ...) +{ + /* This is here so that you can turn ndr printing off for the purposes + of benchmarking ndr parsing. */ +} + int main(int argc, const char *argv[]) { const struct ndr_interface_table *p = NULL; @@ -206,8 +212,9 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function, bool validate = false; bool dumpdata = false; bool assume_ndr64 = false; + bool quiet = false; int opt; - enum {OPT_CONTEXT_FILE=1000, OPT_VALIDATE, OPT_DUMP_DATA, OPT_LOAD_DSO, OPT_NDR64}; + enum {OPT_CONTEXT_FILE=1000, OPT_VALIDATE, OPT_DUMP_DATA, OPT_LOAD_DSO, OPT_NDR64, OPT_QUIET}; struct poptOption long_options[] = { POPT_AUTOHELP {"context-file", 'c', POPT_ARG_STRING, NULL, OPT_CONTEXT_FILE, "In-filename to parse first", "CTX-FILE" }, @@ -215,6 +222,7 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function, {"dump-data", 0, POPT_ARG_NONE, NULL, OPT_DUMP_DATA, "dump the hex data", NULL }, {"load-dso", 'l', POPT_ARG_STRING, NULL, OPT_LOAD_DSO, "load from shared object file", NULL }, {"ndr64", 0, POPT_ARG_NONE, NULL, OPT_NDR64, "Assume NDR64 data", NULL }, + {"quiet", 0, POPT_ARG_NONE, NULL, OPT_QUIET, "Don't actually dump anything", NULL }, POPT_COMMON_SAMBA POPT_COMMON_VERSION { NULL } @@ -255,6 +263,9 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function, case OPT_NDR64: assume_ndr64 = true; break; + case OPT_QUIET: + quiet = true; + break; } } @@ -399,7 +410,11 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function, } ndr_print = talloc_zero(mem_ctx, struct ndr_print); - ndr_print->print = ndr_print_printf_helper; + if (quiet) { + ndr_print->print = ndr_print_dummy; + } else { + ndr_print->print = ndr_print_printf_helper; + } ndr_print->depth = 1; ndr_err = ndr_pop_dcerpc_sec_verification_trailer(ndr_pull, mem_ctx, &sec_vt);