<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11269">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">server: Properly name main talloc ctx<br><br>Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228<br>---<br>M src/osmo_server_main.c<br>1 file changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c</span><br><span>index 95f3ce1..20928cd 100644</span><br><span>--- a/src/osmo_server_main.c</span><br><span>+++ b/src/osmo_server_main.c</span><br><span>@@ -49,7 +49,7 @@</span><br><span> static const char *config_file = "osmo-pcap-server.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_srv_ctx;</span><br><span> struct osmo_pcap_server *pcap_server;</span><br><span> extern void *tall_msgb_ctx;</span><br><span> extern void *tall_ctr_ctx;</span><br><span>@@ -173,7 +173,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_srv_ctx, stderr);</span><br><span> break;</span><br><span> case SIGHUP:</span><br><span> osmo_pcap_server_reopen(pcap_server);</span><br><span>@@ -185,9 +185,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, "server");</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_srv_ctx = talloc_named_const(NULL, 0, "server");</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_msgb_ctx = talloc_named_const(tall_srv_ctx, 0, "msgb");</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_ctr_ctx = talloc_named_const(tall_srv_ctx, 0, "counter");</span><br><span> }</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span>@@ -205,8 +205,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_srv_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_init(tall_srv_ctx);</span><br><span> </span><br><span> /* seed the PRNG */</span><br><span> srand(time(NULL));</span><br><span>@@ -219,13 +219,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_SERVER);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init(tall_srv_ctx, NULL, OSMO_VTY_PORT_PCAP_SERVER);</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_server = talloc_zero(tall_bsc_ctx, struct osmo_pcap_server);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server);</span><br><span> if (!pcap_server) {</span><br><span> LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n");</span><br><span> exit(1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11269">change 11269</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/11269"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228 </div>
<div style="display:none"> Gerrit-Change-Number: 11269 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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>