<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10145">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename gsm_04_08_utils.[hc] to gsm_04_08_rr<br><br>"utils" suggests thin helpers to aid using a proper API, while this .c file<br>actually *is* the proper RR API. Rename from "utils" to "rr".<br><br>Change-Id: I0ffff63d57f03cb324df8e40e41caea5b55a2c85<br>---<br>M include/osmocom/bsc/Makefile.am<br>R include/osmocom/bsc/gsm_04_08_rr.h<br>M src/libfilter/bsc_msg_filter.c<br>M src/osmo-bsc/Makefile.am<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bsc_api.c<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/chan_alloc.c<br>R src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/handover_logic.c<br>M src/osmo-bsc/net_init.c<br>M src/osmo-bsc/osmo_bsc_api.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/osmo_bsc_filter.c<br>M src/osmo-bsc/paging.c<br>M src/osmo-bsc/pcu_sock.c<br>M src/osmo-bsc/system_information.c<br>M tests/bsc/Makefile.am<br>M tests/handover/Makefile.am<br>20 files changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index 0b576cd..1e26c34 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -16,7 +16,7 @@</span><br><span> ctrl.h \</span><br><span> debug.h \</span><br><span> e1_config.h \</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_04_08_utils.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_04_08_rr.h \</span><br><span> gsm_04_80.h \</span><br><span> gsm_data.h \</span><br><span> handover.h \</span><br><span>diff --git a/include/osmocom/bsc/gsm_04_08_utils.h b/include/osmocom/bsc/gsm_04_08_rr.h</span><br><span>similarity index 100%</span><br><span>rename from include/osmocom/bsc/gsm_04_08_utils.h</span><br><span>rename to include/osmocom/bsc/gsm_04_08_rr.h</span><br><span>diff --git a/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c</span><br><span>index bcabc24..1318689 100644</span><br><span>--- a/src/libfilter/bsc_msg_filter.c</span><br><span>+++ b/src/libfilter/bsc_msg_filter.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/ipaccess.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index bf7ef11..0bc78d5 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -55,7 +55,7 @@</span><br><span> chan_alloc.c \</span><br><span> codec_pref.c \</span><br><span> e1_config.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_04_08_utils.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_04_08_rr.c \</span><br><span> gsm_04_80_utils.c \</span><br><span> gsm_data.c \</span><br><span> handover_cfg.c \</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index d5e69ac..bf8dfa5 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -28,7 +28,7 @@</span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span>diff --git a/src/osmo-bsc/bsc_api.c b/src/osmo-bsc/bsc_api.c</span><br><span>index 35e6977..2ce8d3b 100644</span><br><span>--- a/src/osmo-bsc/bsc_api.c</span><br><span>+++ b/src/osmo-bsc/bsc_api.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/handover.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/penalty_timers.h></span><br><span> #include <osmocom/bsc/osmo_bsc_sigtran.h></span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index 641b6db..b1388b8 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> #include <osmocom/bsc/pcu_if.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span> </span><br><span> #include <time.h></span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index b1e6d78..b187704 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -59,7 +59,7 @@</span><br><span> #include <osmocom/bsc/handover.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span> #include <osmocom/bsc/handover_vty.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/acc_ramp.h></span><br><span> #include <osmocom/bsc/meas_feed.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span>diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c</span><br><span>index cec5846..c73ecb7 100644</span><br><span>--- a/src/osmo-bsc/chan_alloc.c</span><br><span>+++ b/src/osmo-bsc/chan_alloc.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/signal.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_utils.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>similarity index 99%</span><br><span>rename from src/osmo-bsc/gsm_04_08_utils.c</span><br><span>rename to src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index c548500..64eace7 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_utils.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> #include <osmocom/bsc/paging.h></span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> </span><br><span> /* should ip.access BTS use direct RTP streams between each other (1),</span><br><span> * or should OpenBSC always act as RTP relay/proxy in between (0) ? */</span><br><span>diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c</span><br><span>index 028b2d4..0b0a8f4 100644</span><br><span>--- a/src/osmo-bsc/handover_logic.c</span><br><span>+++ b/src/osmo-bsc/handover_logic.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/handover.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span>diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c</span><br><span>index db3d01c..208b4ef 100644</span><br><span>--- a/src/osmo-bsc/net_init.c</span><br><span>+++ b/src/osmo-bsc/net_init.c</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> #include <osmocom/bsc/osmo_bsc.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span> #include <osmocom/bsc/chan_alloc.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c</span><br><span>index d409c93..1ce9194 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_api.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_api.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> #include <osmocom/bsc/debug.h></span><br><span> </span><br><span> #include <osmocom/bsc/gsm_04_80.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/a_reset.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_08_08.h></span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 887a866..60c858f 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/paging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/codec_pref.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>index 0d0fc29..773a146 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>@@ -22,11 +22,11 @@</span><br><span> #include <osmocom/bsc/osmo_bsc.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/gsm_04_80.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/paging.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> </span><br><span> #include <stdlib.h></span><br><span> </span><br><span>diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c</span><br><span>index feb9fea..7e833d3 100644</span><br><span>--- a/src/osmo-bsc/paging.c</span><br><span>+++ b/src/osmo-bsc/paging.c</span><br><span>@@ -50,7 +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(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.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 8a3c331..82d01e1 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,7 +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(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.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>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 3c0c76c..caf29ec 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -38,7 +38,7 @@</span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/rest_octets.h></span><br><span> #include <osmocom/bsc/arfcn_range_encode.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/gsm_04_08_utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/acc_ramp.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span> </span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index 2e34d79..6ffeed2 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -40,7 +40,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_rll.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span> $(top_builddir)/src/osmo-bsc/chan_alloc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/gsm_04_08_utils.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_04_80_utils.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span> $(top_builddir)/src/osmo-bsc/handover_cfg.o \</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 140d8ff..f8c2664 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -51,7 +51,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_sysmobts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/chan_alloc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/gsm_04_08_utils.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_04_80_utils.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span> $(top_builddir)/src/osmo-bsc/handover_cfg.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10145">change 10145</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/10145"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0ffff63d57f03cb324df8e40e41caea5b55a2c85 </div>
<div style="display:none"> Gerrit-Change-Number: 10145 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>