<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-cbc/+/23011">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix encoding of CBSP cell identifiers<br><br>We need to use the matching enum values if we actually want to<br>match correctly.  Before this patch, the Cell List Items in CBSP<br>were encoded wrongly.<br><br>Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48<br>---<br>M src/smscb_peer_fsm.c<br>1 file changed, 10 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c</span><br><span>index 341c205..4e431ff 100644</span><br><span>--- a/src/smscb_peer_fsm.c</span><br><span>+++ b/src/smscb_peer_fsm.c</span><br><span>@@ -149,25 +149,28 @@</span><br><span> static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci)</span><br><span> {</span><br><span>   switch (cci->id_discr) {</span><br><span style="color: hsl(0, 100%, 40%);">-     case CELL_IDENT_NO_CELL:</span><br><span style="color: hsl(120, 100%, 40%);">+      case CBC_CELL_ID_NONE:</span><br><span>               break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_WHOLE_GLOBAL:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CBC_CELL_ID_CGI:</span><br><span>                u->global = cci->u.cgi;</span><br><span style="color: hsl(120, 100%, 40%);">+         printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global)));</span><br><span>            break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_LAC_AND_CI:</span><br><span style="color: hsl(120, 100%, 40%);">+   case CBC_CELL_ID_LAC_CI:</span><br><span>             u->lac_and_ci = cci->u.lac_and_ci;</span><br><span>             break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_CI:</span><br><span style="color: hsl(120, 100%, 40%);">+   case CBC_CELL_ID_CI:</span><br><span>                 u->ci = cci->u.ci;</span><br><span>             break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_LAI:</span><br><span style="color: hsl(120, 100%, 40%);">+  case CBC_CELL_ID_LAI:</span><br><span>                u->lai_and_lac = cci->u.lai;</span><br><span>           break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_LAC:</span><br><span style="color: hsl(120, 100%, 40%);">+  case CBC_CELL_ID_LAC:</span><br><span>                u->lac = cci->u.lac;</span><br><span>           break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CELL_IDENT_BSS:</span><br><span style="color: hsl(120, 100%, 40%);">+  case CBC_CELL_ID_BSS:</span><br><span>                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              OSMO_ASSERT(0);</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-cbc/+/23011">change 23011</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-cbc/+/23011"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-cbc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 </div>
<div style="display:none"> Gerrit-Change-Number: 23011 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>