<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11268">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Properly name main talloc ctx<br><br>Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07<br>---<br>M src/osmo_client_main.c<br>1 file changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/68/11268/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c</span><br><span>index 46a49b5..43de544 100644</span><br><span>--- a/src/osmo_client_main.c</span><br><span>+++ b/src/osmo_client_main.c</span><br><span>@@ -48,7 +48,7 @@</span><br><span> static const char *config_file = "osmo-pcap-client.cfg";</span><br><span> static int daemonize = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_cli_ctx;</span><br><span> struct osmo_pcap_client *pcap_client;</span><br><span> extern void *tall_msgb_ctx;</span><br><span> extern void *tall_ctr_ctx;</span><br><span>@@ -163,7 +163,7 @@</span><br><span>             * and then return to the caller, who will abort the process */</span><br><span>      case SIGUSR1:</span><br><span>                talloc_report(tall_vty_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">-            talloc_report_full(tall_bsc_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+             talloc_report_full(tall_cli_ctx, stderr);</span><br><span>            break;</span><br><span>       default:</span><br><span>             break;</span><br><span>@@ -172,9 +172,9 @@</span><br><span> </span><br><span> static void talloc_init_ctx()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  tall_bsc_ctx = talloc_named_const(NULL, 0, "nat");</span><br><span style="color: hsl(0, 100%, 40%);">-    tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb");</span><br><span style="color: hsl(0, 100%, 40%);">-  tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter");</span><br><span style="color: hsl(120, 100%, 40%);">+      tall_cli_ctx = talloc_named_const(NULL, 0, "client");</span><br><span style="color: hsl(120, 100%, 40%);">+       tall_msgb_ctx = talloc_named_const(tall_cli_ctx, 0, "msgb");</span><br><span style="color: hsl(120, 100%, 40%);">+        tall_ctr_ctx = talloc_named_const(tall_cli_ctx, 0, "counter");</span><br><span> }</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span>@@ -192,8 +192,8 @@</span><br><span>   /* parse options */</span><br><span>  handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(tall_bsc_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_stats_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+        rate_ctr_init(tall_cli_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_stats_init(tall_cli_ctx);</span><br><span> </span><br><span>   /* seed the PRNG */</span><br><span>  srand(time(NULL));</span><br><span>@@ -206,13 +206,13 @@</span><br><span> </span><br><span>       osmo_tls_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    rc = telnet_init(tall_bsc_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = telnet_init(tall_cli_ctx, NULL, OSMO_VTY_PORT_PCAP_CLIENT);</span><br><span>     if (rc < 0) {</span><br><span>             LOGP(DCLIENT, LOGL_ERROR, "Failed to bind telnet interface\n");</span><br><span>            exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   pcap_client = talloc_zero(tall_bsc_ctx, struct osmo_pcap_client);</span><br><span style="color: hsl(120, 100%, 40%);">+     pcap_client = talloc_zero(tall_cli_ctx, struct osmo_pcap_client);</span><br><span>    if (!pcap_client) {</span><br><span>          LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n");</span><br><span>               exit(1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11268">change 11268</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/11268"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07 </div>
<div style="display:none"> Gerrit-Change-Number: 11268 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>