<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10887">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging vty: write: check logging levels validity<br><br>Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315<br>---<br>M include/osmocom/core/logging_internal.h<br>M src/logging.c<br>M src/vty/logging_vty.c<br>3 files changed, 25 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h</span><br><span>index 55b1bbd..a510f83 100644</span><br><span>--- a/include/osmocom/core/logging_internal.h</span><br><span>+++ b/include/osmocom/core/logging_internal.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> </span><br><span> extern void *tall_log_ctx;</span><br><span> extern const struct log_info *osmo_log_info;</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string loglevel_strs[];</span><br><span> </span><br><span> void assert_loginfo(const char *src);</span><br><span> </span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 67470a5..e7cc472 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> void *tall_log_ctx = NULL;</span><br><span> LLIST_HEAD(osmo_log_target_list);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string loglevel_strs[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string loglevel_strs[] = {</span><br><span>      { LOGL_DEBUG,   "DEBUG" },</span><br><span>         { LOGL_INFO,    "INFO" },</span><br><span>  { LOGL_NOTICE,  "NOTICE" },</span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index 6758dd2..c8e8520 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -861,21 +861,37 @@</span><br><span>               get_value_string(logging_print_file_args, tgt->print_filename2),</span><br><span>          VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       /* stupid old osmo logging API uses uppercase strings... */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (tgt->loglevel)</span><br><span style="color: hsl(0, 100%, 40%);">-           vty_out(vty, "  logging level all %s%s", osmo_str_tolower(log_level_str(tgt->loglevel)),</span><br><span style="color: hsl(0, 100%, 40%);">-                   VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tgt->loglevel) {</span><br><span style="color: hsl(120, 100%, 40%);">+               const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel);</span><br><span style="color: hsl(120, 100%, 40%);">+            level_str = osmo_str_tolower(level_str);</span><br><span style="color: hsl(120, 100%, 40%);">+              if (!level_str)</span><br><span style="color: hsl(120, 100%, 40%);">+                       vty_out(vty, "%% Invalid log level %u for 'all'%s", tgt->loglevel, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+         else</span><br><span style="color: hsl(120, 100%, 40%);">+                  vty_out(vty, "  logging level all %s%s", level_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        for (i = 0; i < osmo_log_info->num_cat; i++) {</span><br><span>                 const struct log_category *cat = &tgt->categories[i];</span><br><span style="color: hsl(120, 100%, 40%);">+          const char *cat_name;</span><br><span style="color: hsl(120, 100%, 40%);">+         const char *level_str;</span><br><span> </span><br><span>           /* skip empty entries in the array */</span><br><span>                if (!osmo_log_info->cat[i].name)</span><br><span>                  continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           /* stupid old osmo logging API uses uppercase strings... */</span><br><span style="color: hsl(0, 100%, 40%);">-             vty_out(vty, "  logging level %s", osmo_str_tolower(osmo_log_info->cat[i].name+1));</span><br><span style="color: hsl(0, 100%, 40%);">-                vty_out(vty, " %s%s", osmo_str_tolower(log_level_str(cat->loglevel)), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will</span><br><span style="color: hsl(120, 100%, 40%);">+            * become invalid after next osmo_str_tolower() invocation. */</span><br><span style="color: hsl(120, 100%, 40%);">+                cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+               level_str = get_value_string_or_null(loglevel_strs, cat->loglevel);</span><br><span style="color: hsl(120, 100%, 40%);">+                if (!level_str) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     vty_out(vty, "%% Invalid log level %u for %s%s", cat->loglevel, cat_name,</span><br><span style="color: hsl(120, 100%, 40%);">+                                VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+                 continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           vty_out(vty, "  logging level %s", cat_name);</span><br><span style="color: hsl(120, 100%, 40%);">+               vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE);</span><br><span>   }</span><br><span> </span><br><span>        return 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10887">change 10887</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10887"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315 </div>
<div style="display:none"> Gerrit-Change-Number: 10887 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>