<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gb_proxy: fix wrong usage of bssgp_rim_ri_name()<br><br>In some logging statements the function bssgp_rim_ri_name() is used<br>twice. This is wrong since _name() functions use an internal buffer,<br>which can not be used twice in the same logging statement, so for the<br>affected log statements the function bssgp_rim_ri_name_buf() must be<br>used.<br><br>Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519<br>Related: SYS#5103<br>---<br>M src/gb_proxy.c<br>1 file changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/24/22824/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb_proxy.c b/src/gb_proxy.c</span><br><span>index 4147d86..43d819d 100644</span><br><span>--- a/src/gb_proxy.c</span><br><span>+++ b/src/gb_proxy.c</span><br><span>@@ -897,6 +897,8 @@</span><br><span>   struct bssgp_rim_routing_info dest_ri;</span><br><span>       struct bssgp_rim_routing_info src_ri;</span><br><span>        int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       char ri_src_str[64];</span><br><span style="color: hsl(120, 100%, 40%);">+  char ri_dest_str[64];</span><br><span> </span><br><span>    rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO),</span><br><span>                               TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO));</span><br><span>@@ -938,8 +940,10 @@</span><br><span>                     /* TODO: Also check if dest_cell->bss_bvc is RIM-capable (see also above). If not we should</span><br><span>                        * respond with a BSSGP STATUS message as well because it also would make no sense to try</span><br><span>                     * routing the RIM message to the next RIM-capable SGSN. */</span><br><span style="color: hsl(0, 100%, 40%);">-                     LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name,</span><br><span style="color: hsl(0, 100%, 40%);">-                       dest_cell->bss_bvc->nse->nsei, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri));</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                         log_pfx, pdut_name, dest_cell->bss_bvc->nse->nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+                           bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri),</span><br><span style="color: hsl(120, 100%, 40%);">+                           bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri));</span><br><span>                         return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0);</span><br><span>             }</span><br><span>    }</span><br><span>@@ -954,8 +958,10 @@</span><br><span>                  pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri));</span><br><span>            return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg);</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name,</span><br><span style="color: hsl(0, 100%, 40%);">-        sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri));</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+          log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name,</span><br><span style="color: hsl(120, 100%, 40%);">+             bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri),</span><br><span style="color: hsl(120, 100%, 40%);">+           bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri));</span><br><span> </span><br><span>     return gbprox_relay2nse(msg, sgsn->nse, 0);</span><br><span> }</span><br><span>@@ -1216,6 +1222,8 @@</span><br><span>  struct bssgp_rim_routing_info dest_ri;</span><br><span>       struct bssgp_rim_routing_info src_ri;</span><br><span>        int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       char ri_src_str[64];</span><br><span style="color: hsl(120, 100%, 40%);">+  char ri_dest_str[64];</span><br><span> </span><br><span>    /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in</span><br><span>      gbprox_rx_rim_from_bss() */</span><br><span>@@ -1253,8 +1261,10 @@</span><br><span>      sgsn = gbproxy_sgsn_by_nsei(nse->cfg, nse->nsei);</span><br><span>      OSMO_ASSERT(sgsn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name,</span><br><span style="color: hsl(0, 100%, 40%);">-      sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri));</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+        log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name,</span><br><span style="color: hsl(120, 100%, 40%);">+             bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri),</span><br><span style="color: hsl(120, 100%, 40%);">+           bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri));</span><br><span> </span><br><span>     return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824">change 22824</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/c/osmo-gbproxy/+/22824"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gbproxy </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 </div>
<div style="display:none"> Gerrit-Change-Number: 22824 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>