<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9665">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic / linking: move str_to_imsi() out of abis_rsl.c<br><br>Move to gsm_04_08_utils.c so that it's possible to use it without<br>linking/stubbing all of RSL.<br><br>Change-Id: I6e90831d7e618ce3c8e7417082a82c97f6681668<br>---<br>M include/osmocom/bsc/abis_rsl.h<br>M include/osmocom/bsc/gsm_04_08_utils.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/gsm_04_08_utils.c<br>M src/osmo-bsc/paging.c<br>M src/osmo-bsc/pcu_sock.c<br>6 files changed, 14 insertions(+), 11 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/65/9665/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h</span><br><span>index fc21238..2fe8c38 100644</span><br><span>--- a/include/osmocom/bsc/abis_rsl.h</span><br><span>+++ b/include/osmocom/bsc/abis_rsl.h</span><br><span>@@ -68,7 +68,6 @@</span><br><span> </span><br><span> int abis_rsl_rcvmsg(struct msgb *msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint64_t str_to_imsi(const char *imsi_str);</span><br><span> int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id,</span><br><span>                    enum rsl_rel_mode release_mode);</span><br><span> </span><br><span>diff --git a/include/osmocom/bsc/gsm_04_08_utils.h b/include/osmocom/bsc/gsm_04_08_utils.h</span><br><span>index bdfca71..4349a37 100644</span><br><span>--- a/include/osmocom/bsc/gsm_04_08_utils.h</span><br><span>+++ b/include/osmocom/bsc/gsm_04_08_utils.h</span><br><span>@@ -39,3 +39,5 @@</span><br><span>         return msgb_alloc_headroom(GSM48_ALLOC_SIZE, GSM48_ALLOC_HEADROOM,</span><br><span>                                    name);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uint64_t str_to_imsi(const char *imsi_str);</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index add4390..ab3658d 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -167,16 +167,6 @@</span><br><span>     return lchan;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */</span><br><span style="color: hsl(0, 100%, 40%);">-uint64_t str_to_imsi(const char *imsi_str)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      uint64_t ret;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   ret = strtoull(imsi_str, NULL, 10);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct msgb *rsl_msgb_alloc(void)</span><br><span> {</span><br><span>        return msgb_alloc_headroom(RSL_ALLOC_SIZE, RSL_ALLOC_HEADROOM,</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_utils.c b/src/osmo-bsc/gsm_04_08_utils.c</span><br><span>index 5bfdf97..e9aeb55 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_utils.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_utils.c</span><br><span>@@ -703,3 +703,13 @@</span><br><span>   return gsm48_extract_mi(classmark2_lv, length - classmark_offset,</span><br><span>                            mi_string, mi_type);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */</span><br><span style="color: hsl(120, 100%, 40%);">+uint64_t str_to_imsi(const char *imsi_str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint64_t ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       ret = strtoull(imsi_str, NULL, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c</span><br><span>index 886d28b..feb9fea 100644</span><br><span>--- a/src/osmo-bsc/paging.c</span><br><span>+++ b/src/osmo-bsc/paging.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/bsc_api.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span> </span><br><span> void *tall_paging_ctx = NULL;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index 5a3fefa..8a3c331 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -43,6 +43,7 @@</span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span> </span><br><span> static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg);</span><br><span> uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9665">change 9665</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/9665"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6e90831d7e618ce3c8e7417082a82c97f6681668 </div>
<div style="display:none"> Gerrit-Change-Number: 9665 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>