- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: lint: ignore MACRO_WITH_FLOW_CONTROL
by osmith 15 Sep '22

15 Sep '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29359 ) Change subject: lint: ignore MACRO_WITH_FLOW_CONTROL ...................................................................... lint: ignore MACRO_WITH_FLOW_CONTROL It seems that we don't care about this one, e.g. here: https://gerrit.osmocom.org/c/osmo-msc/+/28848 Change-Id: I79da5a426db59031e3b16aecedeaa1498c91e847 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/29359/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index b0c3985..7a60ad6 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -68,6 +68,7 @@ # * LINE_CONTINUATIONS: false positives # * LINE_SPACING: we don't always put a blank line after declarations # * LONG_LINE*: should be 120 chars, but exceptions are done often so don't fail here +# * MACRO_WITH_FLOW_CONTROL: not followed # * MISSING_SPACE: warns about breaking strings at space characters, not useful for long strings of hex chars # * PREFER_DEFINED_ATTRIBUTE_MACRO: macros like __packed not defined in libosmocore # * PREFER_FALLTHROUGH: pseudo keyword macro "fallthrough" is not defined in libosmocore @@ -108,6 +109,7 @@ --ignore LONG_LINE \ --ignore LONG_LINE_COMMENT \ --ignore LONG_LINE_STRING \ + --ignore MACRO_WITH_FLOW_CONTROL \ --ignore MISSING_SPACE \ --ignore PREFER_DEFINED_ATTRIBUTE_MACRO \ --ignore PREFER_FALLTHROUGH \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79da5a426db59031e3b16aecedeaa1498c91e847 Gerrit-Change-Number: 29359 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-msc[master]: SMPP: move read/write callbacks to libsmpputil
by Jenkins Builder 15 Sep '22

15 Sep '22

Attention is currently required from: msuraev. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: move read/write callbacks to libsmpputil ...................................................................... Patch Set 28: (1 comment) File include/osmocom/smpp/smpp.h: Robot Comment from checkpatch (run ID jenkins-gerrit-osmo-msc-lint-361): https://gerrit.osmocom.org/c/osmo-msc/+/28848/comment/7ef84a92_d318371e PS28, Line 57: #define OSMO_FD_CHECK_READ(rc, err_label) do { \ Macros with flow control statements should be avoided -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 28 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 03:29:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: SMPP: move read/write callbacks to libsmpputil
by msuraev 15 Sep '22

15 Sep '22

Attention is currently required from: msuraev. Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 to look at the new patch set (#28). Change subject: SMPP: move read/write callbacks to libsmpputil ...................................................................... SMPP: move read/write callbacks to libsmpputil Related: OS#5568 Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 --- M include/osmocom/smpp/smpp.h M src/libsmpputil/smpp_smsc.c M src/libsmpputil/smpp_utils.c M src/utils/smpp_mirror.c 4 files changed, 150 insertions(+), 168 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/28848/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 28 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-msc[master]: Make esme struct shared
by msuraev 15 Sep '22

15 Sep '22

Attention is currently required from: neels, laforge, pespin, dexter. Hello Jenkins Builder, neels, laforge, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 to look at the new patch set (#21). Change subject: Make esme struct shared ...................................................................... Make esme struct shared This helps to merge similar code from smpp_mirror and smpp_* in follow-up patches. Related: OS#5568 Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 --- M include/osmocom/msc/gsm_data.h M include/osmocom/smpp/smpp.h M include/osmocom/smpp/smpp_smsc.h M src/libsmpputil/smpp_msc.c M src/libsmpputil/smpp_smsc.c M src/libsmpputil/smpp_vty.c M src/utils/Makefile.am M src/utils/smpp_mirror.c M tests/stubs.c 9 files changed, 160 insertions(+), 144 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/28846/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 21 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-msc[master]: Make esme struct shared
by msuraev 15 Sep '22

15 Sep '22

Attention is currently required from: neels, laforge, pespin, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28846 ) Change subject: Make esme struct shared ...................................................................... Patch Set 20: (1 comment) File include/osmocom/smpp/smpp.h: https://gerrit.osmocom.org/c/osmo-msc/+/28846/comment/94b52709_d7e956c8 PS19, Line 14: struct esme { > does that mean you disagree here? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 20 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Sep 2022 03:28:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: vty: Allow setting LAC as hexadecimal value
by pespin 15 Sep '22

15 Sep '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29358 to look at the new patch set (#2). Change subject: vty: Allow setting LAC as hexadecimal value ...................................................................... vty: Allow setting LAC as hexadecimal value The LAC value currently configured is now printed as hexadecimal value too. It can still be entered as a decimal value in order to keep backward compatibility, though the hexadecimal one is now preferred. Related: OS#5631 Depends: libosmocore.git Ia2b7fbbf5502c28374c21dbff548232680da27d4 Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 --- M TODO-RELEASE M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg M doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg M doc/examples/osmo-bsc/osmo-bsc-4trx.cfg M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg M doc/manuals/chapters/bts-examples.adoc M doc/manuals/chapters/bts.adoc M doc/manuals/chapters/handover.adoc M src/osmo-bsc/bts_vty.c M tests/ctrl/osmo-bsc-apply-config-file.cfg M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/neighbor_ident.vty 20 files changed, 45 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/29358/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 Gerrit-Change-Number: 29358 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: vty: Allow setting LAC as hexadecimal value
by Jenkins Builder 15 Sep '22

15 Sep '22

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29358 ) Change subject: vty: Allow setting LAC as hexadecimal value ...................................................................... Patch Set 1: (2 comments) File src/osmo-bsc/bts_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-osmo-bsc-lint-880): https://gerrit.osmocom.org/c/osmo-bsc/+/29358/comment/fba89066_42033b09 PS1, Line 282: "LAC in hexdecimal format\n") 'hexdecimal' may be misspelled - perhaps 'hexadecimal'? Robot Comment from checkpatch (run ID jenkins-gerrit-osmo-bsc-lint-880): https://gerrit.osmocom.org/c/osmo-bsc/+/29358/comment/5a502870_28898415 PS1, Line 286: if(osmo_str_to_int(&lac, argv[0], 0, 0, 0xffff) < 0) space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 Gerrit-Change-Number: 29358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 14 Sep 2022 18:08:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: vty: Allow setting LAC as hexadecimal value
by pespin 15 Sep '22

15 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29358 ) Change subject: vty: Allow setting LAC as hexadecimal value ...................................................................... vty: Allow setting LAC as hexadecimal value The LAC value currently configured is now printed as hexadecimal value too. It can still be entered as a decimal value in order to keep backward compatibility, though the hexadecimal one is now preferred. Related: OS#5631 Depends: libosmocore.git Ia2b7fbbf5502c28374c21dbff548232680da27d4 Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 --- M TODO-RELEASE M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg M doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg M doc/examples/osmo-bsc/osmo-bsc-4trx.cfg M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg M doc/manuals/chapters/bts-examples.adoc M doc/manuals/chapters/bts.adoc M doc/manuals/chapters/handover.adoc M src/osmo-bsc/bts_vty.c M tests/ctrl/osmo-bsc-apply-config-file.cfg M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/neighbor_ident.vty 20 files changed, 45 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/29358/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index f172501..532f154 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmogsm >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID +libosmocore >1.7.0 vty hexadecimal range support (location_area_code) diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg index 8ef1619..7d676d6 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg index 7c9b847..464b37f 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg index 6db88b5..844bf05 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg index a90cfa1..82283c8 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg @@ -39,7 +39,7 @@ type rbs2000 band PCS1900 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 33 diff --git a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg index a8e8e5c..0b0afa8 100644 --- a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg +++ b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg @@ -27,7 +27,7 @@ type nokia_site band GSM1900 cell_identity 1 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 training_sequence_code 7 diff --git a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg index 206a3c7..f2fcf77 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg @@ -11,7 +11,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg index 2258495..5e1ac11 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg @@ -4,7 +4,7 @@ bts 0 type osmo-bts band GSM-1800 - location_area_code 23 + location_area_code 0x0017 ipa unit-id 1800 0 trx 0 rf_locked 0 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 22afa07..17ca152 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -23,7 +23,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index 21187c7..a053dbe 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -22,7 +22,7 @@ type osmo-bts band DCS1800 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg index a308db5..8d75296 100644 --- a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg +++ b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg @@ -39,7 +39,7 @@ type bs11 band GSM900 cell_identity 1 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 oml e1 line 2 timeslot 1 sub-slot full diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc index 2afc8ff..1f3652b 100644 --- a/doc/manuals/chapters/bts-examples.adoc +++ b/doc/manuals/chapters/bts-examples.adoc @@ -26,7 +26,7 @@ type nanobts <2> band DCS1800 <3> cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 @@ -104,7 +104,7 @@ type nanobts band DCS1800 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 @@ -197,7 +197,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 <2> cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 4662c1a..177d1c5 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -108,7 +108,7 @@ type osmo-bts band DCS1800 description The new BTS in Baikonur - location_area_code 2342 + location_area_code 0x0926 cell_identity 5 base_station_id_code 63 ip.access unit_id 8888 0 diff --git a/doc/manuals/chapters/handover.adoc b/doc/manuals/chapters/handover.adoc index f567259..4affe3b 100644 --- a/doc/manuals/chapters/handover.adoc +++ b/doc/manuals/chapters/handover.adoc @@ -223,15 +223,15 @@ network bts 0 - # this cell's LAC=23 CI=5 - location_area_code 23 + # this cell's LAC=0x0017 CI=5 + location_area_code 0x0017 cell_identity 5 # reference bts 1 neighbor lac-ci 23 6 bts 1 - # this cell's LAC=23 CI=6 - location_area_code 23 + # this cell's LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # reference bts 0 neighbor lac-ci 23 5 @@ -252,8 +252,8 @@ network bts 0 - # this cell's LAC=23 CI=5 - location_area_code 23 + # this cell's LAC=0x0017 CI=5 + location_area_code 0x0017 cell_identity 5 # this cell's ARFCN=1 BSIC=1 trx 0 @@ -263,8 +263,8 @@ neighbor lac-ci 23 6 arfcn 2 bsic 2 bts 1 - # LAC=23 CI=6 - location_area_code 23 + # LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # this cell's ARFCN=2 BSIC=2 trx 0 @@ -286,8 +286,8 @@ # BSC Alpha's osmo-bsc.cfg network bts 0 - # this cell's LAC=23 CI=6 - location_area_code 23 + # this cell's LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # this cell's ARFCN=2 BSIC=2 trx 0 @@ -299,8 +299,8 @@ # BSC Beta's osmo-bsc.cfg network bts 0 - # this cell's LAC=42 CI=3 - location_area_code 42 + # this cell's LAC=0x002A CI=3 + location_area_code 0x002A cell_identity 3 # this cell's ARFCN=1 BSIC=3 trx 0 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3900768..8ce6142 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -276,17 +276,15 @@ DEFUN_USRATTR(cfg_bts_lac, cfg_bts_lac_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), - "location_area_code <0-65535>", - "Set the Location Area Code (LAC) of this BTS\n" "LAC\n") + "location_area_code (<0-65535>|<0x0000-0xffff>)", + "Set the Location Area Code (LAC) of this BTS\n" + "LAC in decimal format\n" + "LAC in hexdecimal format\n") { struct gsm_bts *bts = vty->index; - int lac = atoi(argv[0]); - - if (lac < 0 || lac > 0xffff) { - vty_out(vty, "%% LAC %d is not in the valid range (0-65535)%s", - lac, VTY_NEWLINE); + int lac; + if(osmo_str_to_int(&lac, argv[0], 0, 0, 0xffff) < 0) return CMD_WARNING; - } if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) { vty_out(vty, "%% LAC %d is reserved by GSM 04.08%s", @@ -4307,7 +4305,7 @@ vty_out(vty, " description %s%s", bts->description, VTY_NEWLINE); vty_out(vty, " band %s%s", gsm_band_name(bts->band), VTY_NEWLINE); vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE); - vty_out(vty, " location_area_code %u%s", bts->location_area_code, + vty_out(vty, " location_area_code 0x%04x%s", bts->location_area_code, VTY_NEWLINE); if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED) vty_out(vty, " dtx uplink%s%s", diff --git a/tests/ctrl/osmo-bsc-apply-config-file.cfg b/tests/ctrl/osmo-bsc-apply-config-file.cfg index 0094cd7..5f27465 100644 --- a/tests/ctrl/osmo-bsc-apply-config-file.cfg +++ b/tests/ctrl/osmo-bsc-apply-config-file.cfg @@ -3,7 +3,7 @@ type osmo-bts band DCS1800 cell_identity 123 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 55 ms max power 15 cell reselection hysteresis 4 diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index baf5f36..b1c5bdf 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -20,7 +20,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 @@ -77,7 +77,7 @@ type osmo-bts band DCS1800 cell_identity 123 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 55 ms max power 15 cell reselection hysteresis 4 diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index d237ab7..6830b48 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -257,7 +257,7 @@ return NULL; } - bts->location_area_code = 23; + bts->location_area_code = 0x0017; bts->cell_identity = ci++; bts->c0->arfcn = arfcn++; diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 32e2c53..83b6c5e 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -160,7 +160,7 @@ bts->c0->arfcn = 866; bts->cell_identity = 1337; bts->network->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 }; - bts->location_area_code = 1; + bts->location_area_code = 0x0001; bts->gprs.rac = 0; uint8_t attr_bts_expected[] = { 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00, diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 950d852..211159c 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -21,7 +21,7 @@ OsmoBSC(config-net)# bts 0 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 10 -OsmoBSC(config-net-bts)# location_area_code 20 +OsmoBSC(config-net-bts)# location_area_code 0x0014 OsmoBSC(config-net-bts)# cell_identity 30 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 40 @@ -31,7 +31,7 @@ OsmoBSC(config-net)# bts 1 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 11 -OsmoBSC(config-net-bts)# location_area_code 21 +OsmoBSC(config-net-bts)# location_area_code 0x0015 OsmoBSC(config-net-bts)# cell_identity 31 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 41 @@ -41,7 +41,7 @@ OsmoBSC(config-net)# bts 2 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 12 -OsmoBSC(config-net-bts)# location_area_code 22 +OsmoBSC(config-net-bts)# location_area_code 0x0016 OsmoBSC(config-net-bts)# cell_identity 65535 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 42 @@ -53,7 +53,7 @@ bts 0 ... cell_identity 30 - location_area_code 20 + location_area_code 0x0014 base_station_id_code 10 ... trx 0 @@ -63,7 +63,7 @@ bts 1 ... cell_identity 31 - location_area_code 21 + location_area_code 0x0015 base_station_id_code 11 ... trx 0 @@ -73,7 +73,7 @@ bts 2 ... cell_identity 65535 - location_area_code 22 + location_area_code 0x0016 base_station_id_code 12 ... trx 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 Gerrit-Change-Number: 29358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: vty: Allow using hex representations in cmd numeric ranges
by pespin 15 Sep '22

15 Sep '22

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19422 to look at the new patch set (#6). Change subject: vty: Allow using hex representations in cmd numeric ranges ...................................................................... vty: Allow using hex representations in cmd numeric ranges Ranges can now be specified in hexadecimal range. In this case, only hexadecimal values are accepted (prefixed with "0x"). In order to allow using a hexadecimal value as an input argument, the command must specify the range in hexadecimal form. This way all existing commands (decimal) won't get an hexadecimal value unless they are further extended in the future, avoiding hard to notice breakage due to use of stroul() without using base=0 or even worse, using atoi() directly (which only understands decimal and provides no error checking mechanism). A command argument can be expanded to accept both decimal and hex in a range by means of specifying both, example: "mycmd (<0-255>|<0x0-0xff>)". Related: OS#5631 Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.err M tests/vty/vty_test.ok 4 files changed, 182 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/19422/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmocore[master]: vty: Allow using hex representations in cmd numeric ranges
by pespin 15 Sep '22

15 Sep '22

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19422 to look at the new patch set (#5). Change subject: vty: Allow using hex representations in cmd numeric ranges ...................................................................... vty: Allow using hex representations in cmd numeric ranges Ranges can now be specified in hexadecimal range. In this case, only hexadecimal values are accepted (prefixed with "0x"). In order to allow using a hexadecimal value as an input argument, the command must specify the range in hexadecimal form. This way all existing commands (decimal) won't get an hexadecimal value unless they are further extended in the future, avoiding hard to notice breakage due to use of stroul() without using base=0 or even worse, using atoi() directly (which only understands decimal and provides no error checking mechanism). A command argument can be expanded to accept both decimal and hex in a range by means of specifying both, example: "mycmd (<0-255>|<0x0-0xff>)". Related: OS#5631 Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.err M tests/vty/vty_test.ok 4 files changed, 178 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/19422/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log