From patchwork Sun May 31 04:41:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stotland, Inga" X-Patchwork-Id: 11580585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F7FC90 for ; Sun, 31 May 2020 04:41:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80E82206F1 for ; Sun, 31 May 2020 04:41:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728712AbgEaElg (ORCPT ); Sun, 31 May 2020 00:41:36 -0400 Received: from mga11.intel.com ([192.55.52.93]:40465 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725895AbgEaElg (ORCPT ); Sun, 31 May 2020 00:41:36 -0400 IronPort-SDR: qypyKhNLrWw4pvgMOUSeN8vXRs8J7rFJV8A4b8ecn0QHZlENuv7Ur2I3+d65QOZ6xasJV5H5l1 cem/9RkQKdnQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2020 21:41:35 -0700 IronPort-SDR: x/L7JVHDcBE+BvN8o6DzK3XU3aOoZWSOLiqgYvnvxc6T8mhUcznnu97W1/Y+VkM5TJHXczG1NH pnMuHUdK/2yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,455,1583222400"; d="scan'208";a="377087055" Received: from rfcheney-mobl.amr.corp.intel.com (HELO ingas-nuc1.sea.intel.com) ([10.254.68.158]) by fmsmga001.fm.intel.com with ESMTP; 30 May 2020 21:41:35 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ v2 1/5] mesh: Helper packet print should depend on debug setting Date: Sat, 30 May 2020 21:41:24 -0700 Message-Id: <20200531044128.16734-2-inga.stotland@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200531044128.16734-1-inga.stotland@intel.com> References: <20200531044128.16734-1-inga.stotland@intel.com> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This changes the utility function print_packet() to check if daemon is running in debug mode. --- mesh/main.c | 3 ++- mesh/util.c | 11 +++++++++++ mesh/util.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mesh/main.c b/mesh/main.c index c6bf1ff41..1a4e6ba76 100644 --- a/mesh/main.c +++ b/mesh/main.c @@ -37,6 +37,7 @@ #include "mesh/crypto.h" #include "mesh/dbus.h" #include "mesh/mesh-io.h" +#include "mesh/util.h" static const char *config_dir; static const char *mesh_conf_fname; @@ -210,7 +211,7 @@ int main(int argc, char *argv[]) detached = false; break; case 'd': - l_debug_enable("*"); + enable_debug(); break; case 'c': config_dir = optarg; diff --git a/mesh/util.c b/mesh/util.c index 43340f159..7d283331a 100644 --- a/mesh/util.c +++ b/mesh/util.c @@ -34,10 +34,15 @@ #include "mesh/util.h" +static bool debug_enabled; + void print_packet(const char *label, const void *data, uint16_t size) { struct timeval pkt_time; + if (!debug_enabled) + return; + gettimeofday(&pkt_time, NULL); if (size > 0) { @@ -154,3 +159,9 @@ void del_path(const char *path) { nftw(path, del_fobject, 5, FTW_DEPTH | FTW_PHYS); } + +void enable_debug(void) +{ + debug_enabled = true; + l_debug_enable("*"); +} diff --git a/mesh/util.h b/mesh/util.h index 092d33041..93c2d8687 100644 --- a/mesh/util.h +++ b/mesh/util.h @@ -24,3 +24,4 @@ size_t hex2str(uint8_t *in, size_t in_len, char *out, size_t out_len); void print_packet(const char *label, const void *data, uint16_t size); int create_dir(const char *dir_name); void del_path(const char *path); +void enable_debug(void);