<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9401">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;">gb_proxy: tallocate memory for gbproxy cfg so it can be a talloc ctx<br><br>Change-Id: Iad7cde5c08daacc3f5c4175d21d89fad25a5c3d7<br>---<br>M src/gprs/gb_proxy_main.c<br>1 file changed, 14 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c</span><br><span>index 04143bb..474aa52 100644</span><br><span>--- a/src/gprs/gb_proxy_main.c</span><br><span>+++ b/src/gprs/gb_proxy_main.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span> #define CONFIG_FILE_LEGACY "osmo_gbproxy.cfg"</span><br><span> </span><br><span> static char *config_file = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-struct gbproxy_config gbcfg = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_config *gbcfg;</span><br><span> static int daemonize = 0;</span><br><span> </span><br><span> /* Pointer to the SGSN peer */</span><br><span>@@ -84,7 +84,7 @@</span><br><span> </span><br><span>     switch (event) {</span><br><span>     case GPRS_NS_EVT_UNIT_DATA:</span><br><span style="color: hsl(0, 100%, 40%);">-             rc = gbprox_rcvmsg(&gbcfg, msg, nsvc->nsei, bvci, nsvc->nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+             rc = gbprox_rcvmsg(gbcfg, msg, nsvc->nsei, bvci, nsvc->nsvci);</span><br><span>                 break;</span><br><span>       default:</span><br><span>             LOGP(DGPRS, LOGL_ERROR, "SGSN: Unknown event %u from NS\n", event);</span><br><span>@@ -309,14 +309,20 @@</span><br><span>                LOGP(DGPRS, LOGL_ERROR, "Unable to instantiate NS\n");</span><br><span>             exit(1);</span><br><span>     }</span><br><span style="color: hsl(0, 100%, 40%);">-       gbproxy_init_config(&gbcfg);</span><br><span style="color: hsl(0, 100%, 40%);">-        gbcfg.nsi = bssgp_nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      gbcfg = talloc_zero(tall_bsc_ctx, struct gbproxy_config);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (!gbcfg) {</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DGPRS, LOGL_FATAL, "Unable to allocate config\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+     gbproxy_init_config(gbcfg);</span><br><span style="color: hsl(120, 100%, 40%);">+   gbcfg->nsi = bssgp_nsi;</span><br><span>   gprs_ns_vty_init(bssgp_nsi);</span><br><span>         gprs_ns_set_log_ss(DNS);</span><br><span>     bssgp_set_log_ss(DBSSGP);</span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_signal_register_handler(SS_L_NS, &gbprox_signal, &gbcfg);</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_signal_register_handler(SS_L_NS, &gbprox_signal, gbcfg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rc = gbproxy_parse_config(config_file, &gbcfg);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = gbproxy_parse_config(config_file, gbcfg);</span><br><span>       if (rc < 0) {</span><br><span>             LOGP(DGPRS, LOGL_FATAL, "Cannot parse config file '%s'\n", config_file);</span><br><span>           exit(2);</span><br><span>@@ -328,10 +334,10 @@</span><br><span>     if (rc < 0)</span><br><span>               exit(1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (!gprs_nsvc_by_nsei(gbcfg.nsi, gbcfg.nsip_sgsn_nsei)) {</span><br><span style="color: hsl(120, 100%, 40%);">+    if (!gprs_nsvc_by_nsei(gbcfg->nsi, gbcfg->nsip_sgsn_nsei)) {</span><br><span>           LOGP(DGPRS, LOGL_FATAL, "You cannot proxy to NSEI %u "</span><br><span>                     "without creating that NSEI before\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                        gbcfg.nsip_sgsn_nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+                        gbcfg->nsip_sgsn_nsei);</span><br><span>           exit(2);</span><br><span>     }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9401">change 9401</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/9401"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iad7cde5c08daacc3f5c4175d21d89fad25a5c3d7 </div>
<div style="display:none"> Gerrit-Change-Number: 9401 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>