<p>tnt has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18061">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2k: Don't use slashes in FSM IDs and use dashes instead<br><br>slashes are invalid so we can't use om2k_mo_name() directly, so we just<br>build it manually with dashes.<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: I3cfc19670e6d7bb607d796cabcee5e86a15d1985<br>---<br>M src/osmo-bsc/abis_om2000.c<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/61/18061/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index b221441..d5eb24a 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -1880,8 +1880,9 @@</span><br><span>   struct om2k_mo_fsm_priv *omfp;</span><br><span>       char idbuf[64];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     snprintf(idbuf, sizeof(idbuf), "%s-%s", parent->id,</span><br><span style="color: hsl(0, 100%, 40%);">-                 om2k_mo_name(&mo->addr));</span><br><span style="color: hsl(120, 100%, 40%);">+     snprintf(idbuf, sizeof(idbuf), "%s-%s-%02x-%02x-%02x", parent->id,</span><br><span style="color: hsl(120, 100%, 40%);">+                get_value_string(om2k_mo_class_short_vals, mo->addr.class),</span><br><span style="color: hsl(120, 100%, 40%);">+                mo->addr.bts, mo->addr.assoc_so, mo->addr.inst);</span><br><span> </span><br><span>       fi = osmo_fsm_inst_alloc_child_id(&om2k_mo_fsm, parent,</span><br><span>                                    term_event, idbuf);</span><br><span>@@ -2143,7 +2144,7 @@</span><br><span>        struct om2k_trx_fsm_priv *otfp;</span><br><span>      char idbuf[32];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     snprintf(idbuf, sizeof(idbuf), "%u/%u", trx->bts->nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+    snprintf(idbuf, sizeof(idbuf), "%u-%u", trx->bts->nr, trx->nr);</span><br><span> </span><br><span>       fi = osmo_fsm_inst_alloc_child_id(&om2k_trx_fsm, parent, term_event,</span><br><span>                                       idbuf);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18061">change 18061</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-bsc/+/18061"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3cfc19670e6d7bb607d796cabcee5e86a15d1985 </div>
<div style="display:none"> Gerrit-Change-Number: 18061 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>