November 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags ...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email ) Change subject: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC ...................................................................... firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC It seems that those flags have always been gcc flags, and not ld flags. After decades of tolerating this, binutils 2.36.x no longer tolerates those flags but prints an error: arm-none-eabi-ld: Error: unable to disambiguate: -nostartfiles (did you mean --nostartfiles ?) See also https://github.com/apache/nuttx/issues/3826 and the related https://github.com/apache/nuttx/pull/3836 how this was solved in another project - I adopted that solution here 1:1 Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 --- M src/target/firmware/Makefile.inc 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 2be240d..86e8f3c 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -4,7 +4,7 @@ CROSS_COMPILE?=arm-none-eabi- CC=gcc -LD=ld +LD=gcc AR=ar SIZE=size OBJCOPY=objcopy @@ -22,7 +22,7 @@ #ASFLAGS=--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__ ASFLAGS=$(INCLUDES) -D__ASSEMBLY__ -LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs --gc-sections --cref +LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs -Wl,--gc-sections -Wl,--cref #### QUIET OUTPUT #### @@ -99,8 +99,8 @@ # define compilation rule, also generates map file board/$(2)/$(1).$(3).elf board/$(2)/$(1).$(3).map: $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) $$(ENV_$(3)_LDS) $$(Q_LD)$(CROSS_COMPILE)$(LD) $(LDFLAGS) -T $$(ENV_$(3)_LDS) -Bstatic \ - -Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ - --start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) --end-group + -Wl,-Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ + -Wl,--start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) -Wl,--end-group # define size rule board/$(2)/$(1).$(3).size: board/$(2)/$(1).$(3).elf -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 Gerrit-Change-Number: 35089 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Nov 2023 17:45:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email ) Change subject: sgsn_vty: Fix output in config_write_sgsn ...................................................................... sgsn_vty: Fix output in config_write_sgsn The encryption uea option was missing Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 --- M src/sgsn/sgsn_vty.c 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index b31fb59..e69307f 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -282,6 +282,15 @@ vty_out(vty, "%s", VTY_NEWLINE); } + if (g_cfg->uea_encryption_mask != 0) { + vty_out(vty, " encryption uea"); + + for (i = 0; i < _OSMO_UTRAN_UEA_NUM; i++) + if (g_cfg->uea_encryption_mask >> i & 1) + vty_out(vty, " %u", i); + + vty_out(vty, "%s", VTY_NEWLINE); + } if (g_cfg->crypt_cipher_plugin_path) vty_out(vty, "encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); if (g_cfg->sgsn_ipa_name) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 Gerrit-Change-Number: 35091 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path ...................................................................... sgsn_vty: Correctly indent encryption cipher-plugin-path Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 --- M src/sgsn/sgsn_vty.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index e69307f..4c04368 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -292,7 +292,7 @@ vty_out(vty, "%s", VTY_NEWLINE); } if (g_cfg->crypt_cipher_plugin_path) - vty_out(vty, "encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); + vty_out(vty, " encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); if (g_cfg->sgsn_ipa_name) vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE); if (g_cfg->gsup_server_addr.sin_addr.s_addr) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-sgsn[master]: vty-tests: Test encryption options

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email ) Change subject: vty-tests: Test encryption options ...................................................................... vty-tests: Test encryption options Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 --- M tests/osmo-sgsn_test-nodes.vty 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/tests/osmo-sgsn_test-nodes.vty b/tests/osmo-sgsn_test-nodes.vty index 4c65415..32ff8e7 100644 --- a/tests/osmo-sgsn_test-nodes.vty +++ b/tests/osmo-sgsn_test-nodes.vty @@ -120,3 +120,14 @@ gtp remote-ip 5.6.7.8 ... OsmoSGSN(config-sgsn)# no mme test1 +OsmoSGSN(config-sgsn)# encryption gea 0 3 +OsmoSGSN(config-sgsn)# encryption uea 1 2 +OsmoSGSN(config-sgsn)# encryption cipher-plugin-path /foo/bar +OsmoSGSN(config-sgsn)# show running-config +... +sgsn +... + encryption gea 0 3 + encryption uea 1 2 + encryption cipher-plugin-path /foo/bar +... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 Gerrit-Change-Number: 35093 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Nov 2023 17:32:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email ) Change subject: sgsn_vty: Fix output in config_write_sgsn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 Gerrit-Change-Number: 35091 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Nov 2023 17:31:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email to look at the new patch set (#2). Change subject: vty: disallow combination of early-IA and frequency hopping ...................................................................... vty: disallow combination of early-IA and frequency hopping Related: osmo-bts Id9a930e5c67122812b229dc27ea2bfe246b67611 Related: SYS#6655 Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 --- M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c A tests/early_ia.vty 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend

by daniel

Attention is currently required from: lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email ) Change subject: osmo_io: Factor out and use common send function from backend ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/5ee32e96_ea710d82 PS1, Line 188: iofd_msghdr_free(msghdr); > here you are now checking also for EAGAIN by iofd_msghdr_free I don't understand? Are you saying that the -EAGAIN case was previously missed (only checking for < 0 and erroring out) and refactoring has fixed this for us? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59 Gerrit-Change-Number: 35078 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 22 Nov 2023 17:28:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping ...................................................................... vty: disallow combination of early-IA and frequency hopping Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 --- M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c A tests/early_ia.vty 3 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/1 diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index 385336b..b349951 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -351,6 +351,13 @@ ts->hopping.enabled = enabled; + if (enabled && bts->imm_ass_time != IMM_ASS_TIME_POST_CHAN_ACK) { + vty_out(vty, + "%% ERROR: 'hopping enabled 1' works only with 'immediate-assignment post-chan-ack'%s", + VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; } diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3af7296..afe71b1 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3229,6 +3229,28 @@ bts->imm_ass_time = IMM_ASS_TIME_PRE_CHAN_ACK; else bts->imm_ass_time = IMM_ASS_TIME_POST_CHAN_ACK; + + if (bts->imm_ass_time != IMM_ASS_TIME_POST_CHAN_ACK) { + struct gsm_bts_trx *trx; + int hopping_enabled = 0; + + /* Early-IA does not work with frequency hopping, because the IMM ASS does not convey an ARFCN when + * frequency is in use. Make sure the user knows that. */ + llist_for_each_entry(trx, &bts->trx_list, list) { + int ts_nr; + for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { + struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; + if (ts->hopping.enabled) + hopping_enabled++; + } + } + if (hopping_enabled) { + vty_out(vty, + "%% ERROR: 'hopping enabled 1' works only with 'immediate-assignment post-chan-ack'%s", + VTY_NEWLINE); + return CMD_WARNING; + } + } return CMD_SUCCESS; } diff --git a/tests/early_ia.vty b/tests/early_ia.vty new file mode 100644 index 0000000..d97aeed --- /dev/null +++ b/tests/early_ia.vty @@ -0,0 +1,24 @@ +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 + +OsmoBSC(config-net-bts)# ### Check that first setting early-IA and then enabling frequency hopping throws an error +OsmoBSC(config-net-bts)# immediate-assignment pre-chan-ack +OsmoBSC(config-net-bts)# trx 0 +OsmoBSC(config-net-bts-trx)# timeslot 2 +OsmoBSC(config-net-bts-trx-ts)# hopping enabled 1 +% ERROR: 'hopping enabled 1' works only with 'immediate-assignment post-chan-ack' +OsmoBSC(config-net-bts-trx-ts)# hopping enabled 0 +OsmoBSC(config-net-bts-trx-ts)# exit +OsmoBSC(config-net-bts-trx)# exit +OsmoBSC(config-net-bts)# immediate-assignment post-chan-ack + +OsmoBSC(config-net-bts)# ### Check that first enabling frequency hopping and then setting early-IA throws an error +OsmoBSC(config-net-bts)# trx 0 +OsmoBSC(config-net-bts-trx)# timeslot 2 +OsmoBSC(config-net-bts-trx-ts)# hopping enabled 1 +OsmoBSC(config-net-bts-trx-ts)# exit +OsmoBSC(config-net-bts-trx)# exit +OsmoBSC(config-net-bts)# immediate-assignment pre-chan-ack +% ERROR: 'hopping enabled 1' works only with 'immediate-assignment post-chan-ack' -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023