<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11709">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make pointcode width function public<br><br>That's useful for external programs veryfying pointcode validity. For<br>example if used as part of BSS-related identity in GCR construction by<br>LCLS code we should be able to double.check that no significant bits off<br>pointcode are lost/ignored.<br><br>Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7.c<br>2 files changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>index 414606a..a97e236 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -113,6 +113,8 @@</span><br><span> </span><br><span> struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span>  * MTP Users (Users of MTP, such as SCCP or ISUP)</span><br><span>  ***********************************************************************/</span><br><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index f97876c..73f8127 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -179,7 +179,7 @@</span><br><span> }</span><br><span> </span><br><span> /* get the total width (in bits) of the point-codes in this ss7_instance */</span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned int get_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt)</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt)</span><br><span> {</span><br><span>     return pc_fmt->component_len[0] + pc_fmt->component_len[1] + pc_fmt->component_len[2];</span><br><span> }</span><br><span>@@ -189,7 +189,7 @@</span><br><span> static unsigned int get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt,</span><br><span>                                    unsigned int comp_num)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     uint32_t pc_width = get_pc_width(pc_fmt);</span><br><span style="color: hsl(120, 100%, 40%);">+     uint32_t pc_width = osmo_ss7_pc_width(pc_fmt);</span><br><span>       switch (comp_num) {</span><br><span>  case 0:</span><br><span>              return pc_width - pc_fmt->component_len[0];</span><br><span>@@ -287,7 +287,7 @@</span><br><span> </span><br><span> int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       unsigned int width = get_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt);</span><br><span style="color: hsl(120, 100%, 40%);">+     unsigned int width = osmo_ss7_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt);</span><br><span> </span><br><span>   if (in[0] == '/') {</span><br><span>          /* parse mask by length */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11709">change 11709</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/11709"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf </div>
<div style="display:none"> Gerrit-Change-Number: 11709 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>