Attention is currently required from: fixeria.
Hello osmith, Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/31992
to look at the new patch set (#4).
Change subject: contrib/osmo-bts.spec.in: do not depend on libosmogb
......................................................................
contrib/osmo-bts.spec.in: do not depend on libosmogb
The header file <osmocom/gprs/protocol/gsm_04_60.h> was recently
deprecated and moved to <osmocom/gsm/protocol/gsm_44_060.h>, so
it's now part of libosmogsn and depending libosmogb is not needed.
Change-Id: I823de7ebac2fe5dfddb88d533f1a9419f4a605db
Related: libosmocore.git I70cc21bf25a7081070738abacb409ed19094c3b2
Related: OS#5312
---
M TODO-RELEASE
M contrib/osmo-bts.spec.in
2 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/31992/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31992
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I823de7ebac2fe5dfddb88d533f1a9419f4a605db
Gerrit-Change-Number: 31992
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31994 )
Change subject: lc15bts.h: add missing extern keyword
......................................................................
lc15bts.h: add missing extern keyword
Fix linker errors with ld from binutils 2.35.2 in Debian 11:
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x100): multiple definition of `lc15bts_l1prim_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x80): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x2a0): multiple definition of `lc15bts_sysprim_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x220): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x420): multiple definition of `lc15bts_l1sapi_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x3a0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x5a0): multiple definition of `lc15bts_l1status_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x520): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x760): multiple definition of `lc15bts_tracef_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x6e0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0x940): multiple definition of `lc15bts_tracef_docs'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x8c0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0xb20): multiple definition of `lc15bts_tch_pl_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xaa0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0xc20): multiple definition of `lc15bts_clksrc_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xba0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0xcc0): multiple definition of `lc15bts_dir_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xc40): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15_l1_hw.o:(.rodata+0xd20): multiple definition of `pdch_msu_size'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xca0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x0): multiple definition of `lc15bts_l1prim_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x80): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x1a0): multiple definition of `lc15bts_sysprim_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x220): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x320): multiple definition of `lc15bts_l1sapi_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x3a0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x4a0): multiple definition of `lc15bts_l1status_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x520): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x660): multiple definition of `lc15bts_tracef_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x6e0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0x840): multiple definition of `lc15bts_tracef_docs'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0x8c0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0xa20): multiple definition of `lc15bts_tch_pl_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xaa0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.rodata+0x820): multiple definition of `lc15bts_clksrc_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xba0): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.data.rel.ro.local+0xb20): multiple definition of `lc15bts_dir_names'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xc40): first defined here
/usr/bin/ld: osmo-bts-litecell15/lc15bts.o:(.rodata+0x8e0): multiple definition of `pdch_msu_size'; osmo-bts-litecell15/lc15_l1_if.o:(.rodata+0xca0): first defined here
Change-Id: I33c061e79536a6e9ea7289a245af996e8d17c6ce
---
M src/osmo-bts-litecell15/lc15bts.h
1 file changed, 42 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/31994/1
diff --git a/src/osmo-bts-litecell15/lc15bts.h b/src/osmo-bts-litecell15/lc15bts.h
index 4c40db0..31ca923 100644
--- a/src/osmo-bts-litecell15/lc15bts.h
+++ b/src/osmo-bts-litecell15/lc15bts.h
@@ -23,24 +23,24 @@
};
enum l1prim_type lc15bts_get_l1prim_type(GsmL1_PrimId_t id);
-const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1];
+extern const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1];
GsmL1_PrimId_t lc15bts_get_l1prim_conf(GsmL1_PrimId_t id);
enum l1prim_type lc15bts_get_sysprim_type(Litecell15_PrimId_t id);
-const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1];
+extern const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1];
Litecell15_PrimId_t lc15bts_get_sysprim_conf(Litecell15_PrimId_t id);
-const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1];
-const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1];
+extern const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1];
+extern const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1];
-const struct value_string lc15bts_tracef_names[29];
-const struct value_string lc15bts_tracef_docs[29];
+extern const struct value_string lc15bts_tracef_names[29];
+extern const struct value_string lc15bts_tracef_docs[29];
-const struct value_string lc15bts_tch_pl_names[15];
+extern const struct value_string lc15bts_tch_pl_names[15];
-const struct value_string lc15bts_clksrc_names[10];
+extern const struct value_string lc15bts_clksrc_names[10];
-const struct value_string lc15bts_dir_names[6];
+extern const struct value_string lc15bts_dir_names[6];
enum pdch_cs {
PDCH_CS_1,
@@ -59,6 +59,6 @@
_NUM_PDCH_CS
};
-const uint8_t pdch_msu_size[_NUM_PDCH_CS];
+extern const uint8_t pdch_msu_size[_NUM_PDCH_CS];
#endif /* LC15BTS_H */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31994
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I33c061e79536a6e9ea7289a245af996e8d17c6ce
Gerrit-Change-Number: 31994
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31993 )
Change subject: mgw_fsm: use __func__ to mention function name in log line
......................................................................
mgw_fsm: use __func__ to mention function name in log line
Change-Id: I23050fc5f644340dfbd0323eef6309cff6fc4515
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index eff8e90..2ecd7a5 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -738,8 +738,8 @@
* on the way between RANAP RAB Assignment Request and RANAP RAB Assignment Response. */
LOGP(DMGW, LOGL_ERROR,
- "mgw_fsm_handle_rab_ass_resp() rua_ctx_id=%d, no MGW fsm -- sending Iu-Release-Request!\n",
- map->rua_ctx_id);
+ "%s() rua_ctx_id=%d, no MGW fsm -- sending Iu-Release-Request!\n",
+ __func__, map->rua_ctx_id);
/* Send a release request, to make sure that the MSC is aware of the problem. */
tx_release_req(map);
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31993
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I23050fc5f644340dfbd0323eef6309cff6fc4515
Gerrit-Change-Number: 31993
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: merged
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31988 )
Change subject: mgw_fsm: fix log line
......................................................................
mgw_fsm: fix log line
The function name mentioned in the log line does not match the actual
function name.
Change-Id: Iefc005f10e3c8f165c5686781747460a10ada1e0
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 14 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index 0b129b5..eff8e90 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -699,8 +699,8 @@
* will block all incoming RAB assignments that try to assign more (or less) than one RAB. */
if (ranap_rab_ass_req_ies_get_count(&message->msg.raB_AssignmentRequestIEs) != 1) {
LOGP(DMGW, LOGL_ERROR,
- "mgw_fsm_alloc_and_handle_rab_ass_req() rua_ctx_id=%d, RAB-AssignmentRequest with more than one RAB assignment -- abort!\n",
- map->rua_ctx_id);
+ "%s() rua_ctx_id=%d, RAB-AssignmentRequest with more than one RAB assignment -- abort!\n",
+ __func__, map->rua_ctx_id);
tx_release_req(map);
return -1;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31988
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iefc005f10e3c8f165c5686781747460a10ada1e0
Gerrit-Change-Number: 31988
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31989 )
Change subject: mgw_fsm: refactor helper function handle_rab_release()
......................................................................
Patch Set 4: Code-Review+1
(1 comment)
File src/osmo-hnbgw/mgw_fsm.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/31989/comment/cd514aec_cf772da1
PS3, Line 656: static bool is_our_rab_release(struct hnbgw_context_map *map, ranap_message *message)
> Yes, it is of course checked that the message contains a RAB-ReleaseItem, but the more important che […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31989
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I3595502b98ea5febbde7f2fab3999e2533766b48
Gerrit-Change-Number: 31989
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 21 Mar 2023 10:25:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31992 )
Change subject: contrib/osmo-bts.spec.in: do not depend on libosmogb
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
ACK, TODO-RELEASE is a must here.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31992
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I823de7ebac2fe5dfddb88d533f1a9419f4a605db
Gerrit-Change-Number: 31992
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 21 Mar 2023 10:19:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31993 )
Change subject: mgw_fsm: use __func__ to mention function name in log line
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31993
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I23050fc5f644340dfbd0323eef6309cff6fc4515
Gerrit-Change-Number: 31993
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 21 Mar 2023 09:04:12 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment